From 458507324d66da2b52bcc3ae3c39094441075ca7 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 2 Jun 2025 21:29:38 -0400
Subject: [PATCH 001/258] ted: enable on darwin

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/by-name/te/ted/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index b8da10b305da..cf78bc44881a 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -9,10 +9,11 @@
   libjpeg,
   libtiff,
   libpng,
-  gtk2,
+  gtk2-x11,
   libpaper,
   makeWrapper,
   ghostscript,
+  libXft,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,6 +57,8 @@ stdenv.mkDerivation rec {
     "compile.shared"
   ];
 
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
   installPhase = ''
     runHook preInstall
 
@@ -91,8 +94,9 @@ stdenv.mkDerivation rec {
     libjpeg
     libtiff
     libpng
-    gtk2
+    gtk2-x11
     libpaper
+    libXft
   ];
 
   meta = with lib; {
@@ -112,7 +116,6 @@ stdenv.mkDerivation rec {
     homepage = "https://nllgg.nl/Ted/";
     license = licenses.gpl2Only;
     platforms = platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with maintainers; [ obadz ];
   };
 }

From 3265b95424400747466ffb79cce164ee4e5698e4 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 2 Jun 2025 21:32:44 -0400
Subject: [PATCH 002/258] ted: modernize

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/by-name/te/ted/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index cf78bc44881a..a626f8812265 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
-    sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z";
+    hash = "sha256-P6mSwryWrzyniO+UHLUxT0odhDIC79AgG4tO6a2/MWw=";
   };
 
   preConfigure = ''
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     libXft
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Easy rich text processor";
     longDescription = ''
       Ted is a text processor running under X Windows on Unix/Linux systems.
@@ -114,8 +114,8 @@ stdenv.mkDerivation rec {
       Acrobat PDF converter.
     '';
     homepage = "https://nllgg.nl/Ted/";
-    license = licenses.gpl2Only;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ obadz ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ obadz ];
   };
 }

From 86710a779c0cb90c2a844055c693856e78cfc110 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 10 Aug 2025 17:56:00 -0400
Subject: [PATCH 003/258] ted: fix homepage

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

diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index a626f8812265..eaa5c5a373d8 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
       MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to
       Acrobat PDF converter.
     '';
-    homepage = "https://nllgg.nl/Ted/";
+    homepage = "https://ftp.nluug.nl/pub/editors/ted/";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ obadz ];

From f31fad47e8127344f99bafdb6f5be92362bfad9f Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 22 Aug 2025 21:38:23 -0400
Subject: [PATCH 004/258] python313Packages.tqdm-multiprocess: disable
 updateScript

The default updater fails, and it's hard or impossible to implement an
updater. Not worth the effort.
---
 pkgs/development/python-modules/tqdm-multiprocess/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/tqdm-multiprocess/default.nix b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
index 812a694078d0..e01b5cc0fa0f 100644
--- a/pkgs/development/python-modules/tqdm-multiprocess/default.nix
+++ b/pkgs/development/python-modules/tqdm-multiprocess/default.nix
@@ -32,6 +32,9 @@ buildPythonPackage {
     "tqdm_multiprocess"
   ];
 
+  # pypi is broken; github has no tags; the package haven't seen updates for years
+  passthru.updateScript = null;
+
   meta = {
     description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process";
     homepage = "https://github.com/EleutherAI/tqdm-multiprocess";

From 71a478fb6e8056c90a209e62092ae9a306bb4e6b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 22 Aug 2025 22:10:27 -0400
Subject: [PATCH 005/258] python313Packages.pypdfium2: ignore beta releases

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

diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix
index 66cdf166a6fb..8a566a791873 100644
--- a/pkgs/development/python-modules/pypdfium2/default.nix
+++ b/pkgs/development/python-modules/pypdfium2/default.nix
@@ -5,6 +5,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchgit,
+  gitUpdater,
   setuptools-scm,
   pdfium-binaries,
   numpy,
@@ -133,6 +134,12 @@ buildPythonPackage rec {
     "pypdfium2"
   ];
 
+  passthru = {
+    updateScript = gitUpdater {
+      allowedVersions = "^[.0-9]+$";
+    };
+  };
+
   meta = {
     changelog = "https://github.com/pypdfium2-team/pypdfium2/releases/tag/${version}";
     description = "Python bindings to PDFium";

From 0fd6f799b975a34ecd86fbc82bec58c03153ef12 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Fri, 5 Sep 2025 20:02:49 +0800
Subject: [PATCH 006/258] rime-wanxiang: correct description

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

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index c01ee22ee0d9..6eb8b7411401 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -32,13 +32,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Feature-rich pinyin schema for Rime, basic edition";
+    description = "Feature-rich pinyin schema for Rime";
     longDescription = ''
-      万象拼音基础版 is a basic quanpin and shuangpin input schema for Rime based on
+      万象拼音 is a quanpin and shuangpin input schema for Rime based on
       [万象 dictionaries and grammar models](https://github.com/amzxyz/RIME-LMDG),
       supporting traditional shuangpin as well as tonal schemata such as 自然龙 and
       龙码.
 
+      This package is built from the upstream repository snapshots, and includes
+      all the auxiliary encodings.
+
       The schema requires to work the grammar model `wanxiang-lts-zh-hans.gram`.
       However, this file is
       [released](https://github.com/amzxyz/RIME-LMDG/releases/tag/LTS) by

From 3d52f4bb4abcdebd21afda5698361f66938c36dd Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 19 Jul 2025 01:04:29 +0200
Subject: [PATCH 007/258] jitsi-meet: 1.0.8043 -> 1.0.8792, from GitHub

---
 pkgs/by-name/ji/jitsi-meet/package.nix | 44 ++++++++++++++++++++------
 pkgs/by-name/ji/jitsi-meet/update.sh   | 14 ++++----
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ji/jitsi-meet/package.nix b/pkgs/by-name/ji/jitsi-meet/package.nix
index 90cad423959c..623e554f0370 100644
--- a/pkgs/by-name/ji/jitsi-meet/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet/package.nix
@@ -1,26 +1,50 @@
 {
   lib,
   stdenv,
-  fetchurl,
   nixosTests,
+
+  fetchFromGitHub,
+  fetchNpmDeps,
+  npmHooks,
+
+  libarchive,
+  nodejs,
+
   olm,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jitsi-meet";
-  version = "1.0.8043";
+  version = "1.0.8792";
 
-  src = fetchurl {
-    url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
-    sha256 = "XJlfCMQXnHjfHQhK916RXsdPzrU2U2IaOMiXIHL1sCI=";
+  src = fetchFromGitHub {
+    owner = "jitsi";
+    repo = "jitsi-meet";
+    tag = lib.last (lib.splitVersion finalAttrs.version);
+    hash = "sha256-K4Xrse1kpNqlUChbQnAjP5lRCRuDfJKiN/022tCmMVQ=";
   };
 
-  dontBuild = true;
+  env = {
+    makeFlags = "source-package";
+    makeCacheWritable = true;
+    npmDeps = fetchNpmDeps {
+      inherit (finalAttrs) src;
+      hash = "sha256-2NPfr3gskHz9zSGs//uzyCCuE+CZ295hhitDPlS9xuY=";
+    };
+  };
 
+  nativeBuildInputs = [
+    libarchive
+    nodejs
+    npmHooks.npmConfigHook
+  ];
+
+  # yes, the only way in the build system is to generate a tarball and extract
+  # it immediately after
   installPhase = ''
     runHook preInstall
-    mkdir $out
-    mv * $out/
+    mkdir -p $out
+    bsdtar -xf jitsi-meet.tar.bz2 -C $out --strip-components 1
     runHook postInstall
   '';
 
@@ -43,4 +67,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     inherit (olm.meta) knownVulnerabilities;
   };
-}
+})
diff --git a/pkgs/by-name/ji/jitsi-meet/update.sh b/pkgs/by-name/ji/jitsi-meet/update.sh
index 1ccf45fd1a4c..12fb08e99c02 100755
--- a/pkgs/by-name/ji/jitsi-meet/update.sh
+++ b/pkgs/by-name/ji/jitsi-meet/update.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl pup common-updater-scripts
+#!nix-shell -i bash -p curl pup nix-update
 
 set -eu -o pipefail
 
-version="$(curl https://download.jitsi.org/stable/ | \
-    pup 'a[href] text{}' | \
-    awk -F'[_-]' '/jitsi-meet-web_/ {printf $4"\n"}' | \
-    sort -Vu | \
-    tail -n 1)"
+version="$(curl https://download.jitsi.org/jitsi-meet/src/ |
+  pup 'a[href] text{}' |
+  awk -F'-|.tar.bz2' '/jitsi-meet-/ {printf $3"\n"}' |
+  sort -Vu |
+  tail -n 1)"
 
-update-source-version jitsi-meet "$version"
+nix-update --version="$version" jitsi-meet

From 5fa5ca491f6557a3df3a569dbe65498c8f8e298b Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 19 Jul 2025 01:04:29 +0200
Subject: [PATCH 008/258] jitsi-meet: remove with lib

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

diff --git a/pkgs/by-name/ji/jitsi-meet/package.nix b/pkgs/by-name/ji/jitsi-meet/package.nix
index 623e554f0370..50425b233027 100644
--- a/pkgs/by-name/ji/jitsi-meet/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet/package.nix
@@ -55,16 +55,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Secure, Simple and Scalable Video Conferences";
     longDescription = ''
       Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses Jitsi Videobridge
       to provide high quality, secure and scalable video conferences.
     '';
     homepage = "https://github.com/jitsi/jitsi-meet";
-    license = licenses.asl20;
-    teams = [ teams.jitsi ];
-    platforms = platforms.all;
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.jitsi ];
+    inherit (nodejs.meta) platforms;
     inherit (olm.meta) knownVulnerabilities;
   };
 })

From f05f1abb5e0c2d3216011992a2ec0c72eefc95f2 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 19 Jul 2025 03:26:45 +0200
Subject: [PATCH 009/258] element-web-unwrapped: unbreak

This indirectly marks element-desktop as insecure. This might not be
desirable. I don't see a comment in jitsi-meet as to why it is
vulnerable in the same way libolm is, so I don't have a way to verify
if jitsi-meet actually is vulerable or not...
---
 pkgs/by-name/el/element-web-unwrapped/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index 1c842d2fe8ec..b8d6f9a5e80e 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (
       runHook preInstall
 
       cp -R webapp $out
-      tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js
+      cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js
       echo "${finalAttrs.version}" > "$out/version"
       jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
 

From 4e3eb5a44fcc7a87ae9b2e5f95fe64023c5467cb Mon Sep 17 00:00:00 2001
From: Alex Tunstall <alex@tunstall.xyz>
Date: Mon, 15 Sep 2025 23:40:35 +0100
Subject: [PATCH 010/258] hugs: Fix build failure

We change to Lennart Augustsson's branch in preparation for booting
MicroHs via Hugs.
---
 pkgs/by-name/hu/hugs/package.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/hu/hugs/package.nix b/pkgs/by-name/hu/hugs/package.nix
index 4bc39894a6fb..d256e99d76a1 100644
--- a/pkgs/by-name/hu/hugs/package.nix
+++ b/pkgs/by-name/hu/hugs/package.nix
@@ -1,29 +1,28 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   bison,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "hugs98";
   version = "2006-09";
 
-  src = fetchurl {
-    url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz";
-    sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w";
+  src = fetchFromGitHub {
+    owner = "augustss";
+    repo = "hugs98-plus-Sep2006";
+    rev = "1f7b60e05b12df00d715d535bb01c189bc1b9b3c";
+    hash = "sha256-g6/4kmdWKGDIu5PXVfP8O6Fl3v4bstXWAVkoxZiS6qo=";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs";
-      name = "hsbase_inline.patch";
-      sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v";
-    })
-  ];
-
   nativeBuildInputs = [ bison ];
 
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=implicit-int"
+    "-Wno-error=implicit-function-declaration"
+  ];
+
   postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +";
 
   preConfigure = "unset STRIP";
@@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "hugs";
     homepage = "https://www.haskell.org/hugs";
     description = "Haskell interpreter";

From 351312ca3a89a5afc7fb2da178cc841f2989e0d7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 21 Sep 2025 09:16:15 +0200
Subject: [PATCH 011/258] python313Packages.elementpath: 5.0.3 -> 5.0.4

Diff: https://github.com/sissaschool/elementpath/compare/v5.0.3...v5.0.4

Changelog: https://github.com/sissaschool/elementpath/blob/v5.0.4/CHANGELOG.rst
---
 pkgs/development/python-modules/elementpath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index de31d75927d9..12a672b332b5 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "elementpath";
-  version = "5.0.3";
+  version = "5.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     tag = "v${version}";
-    hash = "sha256-gjJsgc3JrFHgdhDDzLHQspoj99jHmIbkCULEq20yAss=";
+    hash = "sha256-puScPtX46KQ5tSpsZMtuyiCz1cRY43STeJD4P3rkoFY=";
   };
 
   build-system = [ setuptools ];

From 5b621c249e32f4f4bd0aef7e9b7c33a3029f5a43 Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <mail@pascalj.de>
Date: Sun, 20 Jul 2025 16:38:50 +0200
Subject: [PATCH 012/258] distcc: Add aarch64-darwin as a platform

The platform was removed in 431141c, but it builds fine on current
aarch64-darwin systems.
---
 pkgs/development/tools/misc/distcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index cc5a704dcef0..4e0df97cb35b 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -102,8 +102,8 @@ let
       homepage = "http://distcc.org";
       license = "GPL";
 
-      platforms = lib.platforms.linux;
-      maintainers = with lib.maintainers; [ anderspapitto ];
+      platforms = lib.platforms.linux ++ lib.platforms.darwin;
+      maintainers = with lib.maintainers; [ pascalj ];
     };
   };
 in

From dae43f1d78609e281caf7c1d75b5e46bdabf339b Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <mail@pascalj.de>
Date: Mon, 21 Jul 2025 22:02:46 +0200
Subject: [PATCH 013/258] distcc: Update license from string to gpl2Only

---
 pkgs/development/tools/misc/distcc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 4e0df97cb35b..51541298b9bc 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -100,7 +100,7 @@ let
     meta = {
       description = "Fast, free distributed C/C++ compiler";
       homepage = "http://distcc.org";
-      license = "GPL";
+      license = lib.licenses.gpl2Only;
 
       platforms = lib.platforms.linux ++ lib.platforms.darwin;
       maintainers = with lib.maintainers; [ pascalj ];

From 148e17cfc3a9a09fe58524fc63b3f40f2faac657 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 04:57:09 +0000
Subject: [PATCH 014/258] autobase: 7.19.2 -> 7.20.0

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

diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix
index 8ebad595c3e3..a5d7ad5d8723 100644
--- a/pkgs/by-name/au/autobase/package.nix
+++ b/pkgs/by-name/au/autobase/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "autobase";
-  version = "7.19.2";
+  version = "7.20.0";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "autobase";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IsqpVx7GFcbIouIAoLHiHLivE6RCzehW1TTmYC6SDgw=";
+    hash = "sha256-SEeCbNja5BIgpQh0q0LKo452JClKQe6do5YHwRRBMcs=";
   };
 
   npmDepsHash = "sha256-H9Xy1VD7WQvi0+86v6CMcmc0L3mB6KuSCtgQSF4AlkY=";

From c98e04fffc4702cfaf90415b8592fcdaa10e7692 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 12 Oct 2025 00:21:47 +0200
Subject: [PATCH 015/258] python313Packages.pyinstaller-versionfile: fix build

---
 .../python-modules/pyinstaller-versionfile/default.nix        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index 2962ea7b3004..295894446e06 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -20,6 +20,10 @@ buildPythonPackage rec {
     hash = "sha256-UNrXP5strO6LIkIM3etBo1+Vm+1lR5wF0VfKtZYRoYc=";
   };
 
+  preBuild = ''
+    touch requirements.txt
+  '';
+
   propagatedBuildInputs = [
     packaging
     jinja2

From 7d77e5b064481113b9f0091080f355772fef5977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 14:29:59 +0000
Subject: [PATCH 016/258] linuxPackages.ecapture: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index e9c2d499ea42..7fc676d3bcf9 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -24,13 +24,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-1FyZMUII+bPQDmNK1eJkfeoTjdhe/jj2qiooWuNFsNg=";
+    hash = "sha256-Y/VDK0m+SCUtswPCA+S/U57nHy0Q/rUaPz0R0AWLxxA=";
     fetchSubmodules = true;
   };
 
@@ -122,7 +122,7 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  vendorHash = "sha256-cN6pCfc9LEItASCoZ4+BU1AOtwMmFaUEzOM/BZ13jcI=";
+  vendorHash = "sha256-jkc8UdFNPYFwXZoei+IRb7CS06r+U0UvKfPxKeACobM=";
 
   passthru.updateScript = nix-update-script { };
 

From e4ff028cb80d883515340ecb6bdaa86a16281451 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 04:05:15 +0000
Subject: [PATCH 017/258] appdaemon: 4.5.11 -> 4.5.12

---
 pkgs/servers/home-assistant/appdaemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 40e2c2b4ba63..18ca5ac5d03e 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "4.5.11";
+  version = "4.5.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AppDaemon";
     repo = "appdaemon";
     rev = "refs/tags/${version}";
-    hash = "sha256-1wnAniw7fdyfH6QeFjdIAxX5mU92ZZxLLJ/QkKge1eY=";
+    hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48=";
   };
 
   pythonRelaxDeps = true;

From b349beae2a59ef716aed745ddb900a4209632894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 15:28:11 +0000
Subject: [PATCH 018/258] python3Packages.aioconsole: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index d4a473ebeefe..94360f89d706 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -19,7 +19,7 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "vxgmichel";
     repo = "aioconsole";
     tag = "v${version}";
-    hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs=";
+    hash = "sha256-j4nzt8mvn+AYObh1lvgxS8wWK662KN+OxjJ2b5ZNAcQ=";
   };
 
   postPatch = ''

From 0074a31d5e80d17241f5c1ae37beffa56ac3866c Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Mon, 20 Oct 2025 17:03:16 +0800
Subject: [PATCH 019/258] rocmPackages.amdsmi: fix libdrm runtime loading and
 set mainProgram

---
 pkgs/development/rocm-modules/6/amdsmi/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/6/amdsmi/default.nix
index 6f26889ab01b..a145e4d61ded 100644
--- a/pkgs/development/rocm-modules/6/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/6/amdsmi/default.nix
@@ -70,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
+    makeWrapperArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdrm ]})
     wrapPythonProgramsIn $out
     rm $out/bin/amd-smi
     ln -sf $out/libexec/amdsmi_cli/amdsmi_cli.py $out/bin/amd-smi
@@ -88,5 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [ lovesegfault ];
     teams = [ teams.rocm ];
     platforms = [ "x86_64-linux" ];
+    mainProgram = "amd-smi";
   };
 })

From 1af1e23427d118c5fee547da78be32af4a6b6248 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 07:56:15 +0000
Subject: [PATCH 020/258] python3Packages.google-cloud-speech: 2.33.0 -> 2.34.0

---
 .../python-modules/google-cloud-speech/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index c2f1ce1628b6..2965b2a5b304 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.33.0";
+  version = "2.34.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_speech";
     inherit version;
-    hash = "sha256-/QhRG1Ek/ap2jXGkBU6EpdjrAlMctvhPMRwDh+oTFO0=";
+    hash = "sha256-Knv/2E8TS5twyfEcu1CIxTT5K+FJ1x2Qc9C53TpDGs8=";
   };
 
   build-system = [ setuptools ];

From 8c2d3efebd80179a69286302b034430157b01853 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 19:33:54 +0000
Subject: [PATCH 021/258] python3Packages.python-pkcs11: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix
index b67fab579aa6..1cf70ac288c1 100644
--- a/pkgs/development/python-modules/python-pkcs11/default.nix
+++ b/pkgs/development/python-modules/python-pkcs11/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "python-pkcs11";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danni";
     repo = "python-pkcs11";
     tag = "v${version}";
-    sha256 = "sha256-8KLc/jNpYAsuRaiRVD9m5rQWW6u1EG1yf9fwwXRk4Qc=";
+    sha256 = "sha256-3OfX7PlVyH8X8oJs0DpmZp0xbWzdahVXOvgnKwCDrPo=";
   };
 
   build-system = [

From 82115da3eff2232edc52190318854c443264097b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 26 Oct 2025 18:53:39 +0100
Subject: [PATCH 022/258] courier-unicode: 2.3.2 -> 2.4.0

Changes:
```
2.4.0

2025-08-24  Sam Varshavchik  <mrsam@courier-mta.com>

	* Updated to the Unicode 16 standard.

2025-08-10  Sam Varshavchik  <mrsam@courier-mta.com>

	* unicode.c: when a conversion error is encountered try to include
	the unconverted input in the output, as <##> sequences.

2025-08-07  Sam Varshavchik  <mrsam@courier-mta.com>

	* unicodecpp.C (unicode::iconvert::convert): Fix null ptr
	dereference.

2025-05-25  Sam Varshavchik  <mrsam@courier-mta.com>

	* Use C++17 features for templates.

2025-05-11  Sam Varshavchik  <mrsam@courier-mta.com>

	* ABI break. Update the C++ API to C++17. Several functions'
	std::u32string parameter replaced with a std::u32string_view,
	where possible. Fill in a small functional gap, implement
	unicode::totitle().
```
---
 pkgs/by-name/co/courier-unicode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix
index e8c757e1a395..c62ac7747720 100644
--- a/pkgs/by-name/co/courier-unicode/package.nix
+++ b/pkgs/by-name/co/courier-unicode/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "courier-unicode";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2";
-    sha256 = "sha256-tkXS8AqrvGgjIO3mlspQIBJm9xChvOxKxQQmlcmef2k=";
+    hash = "sha256-6Ay88OOmzC56Z+waGDDWxOiqD/aXcy7B0R5UTg5kVw8=";
   };
 
   nativeBuildInputs = [

From e62b630bcfc15e69dd57b4c227cbf93f894de20b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 26 Oct 2025 18:56:33 +0100
Subject: [PATCH 023/258] maildrop: 3.1.8 -> 3.2.1

https://sourceforge.net/p/courier/mailman/message/59250698/

https://www.openwall.com/lists/oss-security/2025/10/26/1

Changes:
```
3.2.1

2025-10-23  Sam Varshavchik  <mrsam@courier-mta.com>

	* Fix MIME parsing bugs

3.2.0

2025-09-09  Sam Varshavchik  <mrsam@courier-mta.com>

	* mailbot: reimplemented in C++ using the new C++ MIME library.

2025-08-31  Sam Varshavchik  <mrsam@courier-mta.com>

	* reformail: reimplemented in C++ using the new C++ MIME library.
	Compare E-mail addresses (for -r, and other options),
	case-insensitively.

2025-08-16  Sam Varshavchik  <mrsam@courier-mta.com>

	* reformime: reimplemented in C++ using the new C++ MIME library.

2025-04-27  Sam Varshavchik  <mrsam@courier-mta.com>

	* all: low level MIME parsing code reimplemented in C++, the
	C code remains in place, with some changes.

	* maildrop: update the low-level message header parsing code, used by
	getaddr() and hasaddr() functions, and the reformail tool.

2024-09-21  Sam Varshavchik  <mrsam@courier-mta.com>

	* packaging: Fix rpm packaging, use a synthesized changelog entry
	with the current date, to set the rpmbuild epoch date.

2024-09-07  Sam Varshavchik  <mrsam@courier-mta.com>

	* packaging: deb packaging fixes.
```
---
 pkgs/by-name/ma/maildrop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix
index 3f222a427293..3dc4970918d7 100644
--- a/pkgs/by-name/ma/maildrop/package.nix
+++ b/pkgs/by-name/ma/maildrop/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "maildrop";
-  version = "3.1.8";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
-    sha256 = "sha256-foJsAxkXRE8berccH82QODWVZEhG4rOyYONSsc4D6VA=";
+    hash = "sha256-PFiQ9NQzItTmPz6Aw6YJzeYF9ylm1iNPyIZBjZSdJLk=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From d10f042142e30aa9c04a7259c804eef8ef455840 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 18:36:57 +0000
Subject: [PATCH 024/258] gfal2-util: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/gfal2-util/default.nix b/pkgs/development/python-modules/gfal2-util/default.nix
index 1813d3bd285e..7485f05c4dc9 100644
--- a/pkgs/development/python-modules/gfal2-util/default.nix
+++ b/pkgs/development/python-modules/gfal2-util/default.nix
@@ -11,13 +11,13 @@
 }:
 (buildPythonPackage rec {
   pname = "gfal2-util";
-  version = "1.9.0";
+  version = "1.9.1";
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-util";
     rev = "v${version}";
-    hash = "sha256-BJR2fPj9nDXYU0X1HO2k3PiGMM2s8lU7+5SLadxw55Y=";
+    hash = "sha256-KKtbxr64FsMUIGXPk3yz66dbQVNCWoGbq3/+q47tS6Q=";
   };
 
   # Replace the ad-hoc python executable finding

From 2b4c4d16a04ca2163a20af434746ad10ea9753f6 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 9 Oct 2025 16:40:32 +0200
Subject: [PATCH 025/258] ares: 145 -> 146

---
 pkgs/by-name/ar/ares/darwin-build-fixes.patch | 14 +++++++-------
 pkgs/by-name/ar/ares/package.nix              | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch
index 96b07f2ee141..4457b36c5e8d 100644
--- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch
+++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch
@@ -24,15 +24,15 @@ index 3777ac98a..07ff17009 100644
      install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
    endif()
 diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
-index 39c339428..dafb58c66 100644
+index 7b594bb4a..18e886fe7 100644
 --- a/ruby/cmake/os-macos.cmake
 +++ b/ruby/cmake/os-macos.cmake
-@@ -43,7 +43,7 @@ target_link_libraries(
+@@ -41,7 +41,7 @@ target_link_libraries(
+ )
+ 
  if(SDL_FOUND)
-   target_link_libraries(
-     ruby
--    PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
-+    PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
-   )
+-  target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>")
++  target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>")
  endif()
  
+ if(librashader_FOUND)
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index 39d4bb316fba..31dbaa0fb4ed 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -3,7 +3,7 @@
   alsa-lib,
   apple-sdk_14,
   cmake,
-  fetchFromGitHub,
+  fetchzip,
   gtk3,
   gtksourceview3,
   libGL,
@@ -29,13 +29,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ares";
-  version = "145";
+  version = "146";
 
-  src = fetchFromGitHub {
-    owner = "ares-emulator";
-    repo = "ares";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-es+K5+qlK7FcJCFEIMcOsXCZSnoXEEmtS0yhpCvaILM";
+  src = fetchzip {
+    url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz";
+    hash = "sha256-D4N0u9NNlhs4nMoUrAY+sg6Ybt1xQPMiH1u0cV0Qixs=";
+    stripRoot = false;
   };
 
   nativeBuildInputs = [
@@ -80,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "ARES_BUILD_LOCAL" false)
     (lib.cmakeBool "ARES_SKIP_DEPS" true)
+    (lib.cmakeBool "ARES_BUILD_OFFICIAL" true)
   ];
 
   postInstall =

From c5f9fa052a5091283335c22d20b8c3602f0741b6 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:30:15 +0000
Subject: [PATCH 026/258] apostrophe: 3.2 -> 3.4

Diff: https://gitlab.gnome.org/World/apostrophe/-/compare/v3.2...v3.4
---
 pkgs/by-name/ap/apostrophe/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix
index 1d63ca61b2ce..63105c63311a 100644
--- a/pkgs/by-name/ap/apostrophe/package.nix
+++ b/pkgs/by-name/ap/apostrophe/package.nix
@@ -20,14 +20,14 @@
 }:
 
 let
-  version = "3.2";
+  version = "3.4";
 
   src = fetchFromGitLab {
     owner = "World";
     repo = "apostrophe";
     domain = "gitlab.gnome.org";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ=";
+    hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI=";
   };
 
   reveal-js = fetchFromGitHub {
@@ -87,6 +87,7 @@ python312Packages.buildPythonApplication {
     pypandoc
     chardet
     levenshtein
+    regex
   ];
 
   dontWrapGApps = true;

From 15986ca7ea82551043917b6339afd6c82092f3b7 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:30:24 +0000
Subject: [PATCH 027/258] biblioteca: 1.6 -> 1.7

Diff: https://github.com/workbenchdev/Biblioteca/compare/v1.6...v1.7
---
 pkgs/by-name/bi/biblioteca/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index df7d93fd492f..d35040b3ad11 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "biblioteca";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "workbenchdev";
     repo = "Biblioteca";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI=";
+    hash = "sha256-PRm/4t0f8AExOFXCcV7S+JIKkJgYP1gego2xTUbj7FY=";
   };
 
   patches = [
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     meson
     ninja
+    blueprint-compiler
     desktop-file-utils
     makeShellWrapper
     gjs
@@ -70,9 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace src/meson.build \
-      --replace-fail "/app/bin/blueprint-compiler" "${lib.getExe blueprint-compiler}" \
-
     patchShebangs .
 
     substituteInPlace build-aux/build-index.js \

From fc390ff82d1c0d7a945f1648005ea568db45e60d Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:31:16 +0000
Subject: [PATCH 028/258] eartag: 0.6.5 -> 1.0.2

Changelog: https://gitlab.gnome.org/World/eartag/-/releases/1.0.2
Diff: https://gitlab.gnome.org/World/eartag/-/compare/0.6.5..1.0.2
---
 pkgs/by-name/ea/eartag/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix
index 46ec9fd4ea5a..4431f6407942 100644
--- a/pkgs/by-name/ea/eartag/package.nix
+++ b/pkgs/by-name/ea/eartag/package.nix
@@ -22,7 +22,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "eartag";
-  version = "0.6.5";
+  version = "1.0.2";
   format = "other";
 
   src = fetchFromGitLab {
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "eartag";
     rev = version;
-    hash = "sha256-sxVivQppX8KdkvHaW6xQ64Wi8Nfv5Rmwf4NADBDpOOo=";
+    hash = "sha256-Iwfk0SqxYF2bzkKZNqGonJh8MQ2c+K1wN0o4GECR/Rw=";
   };
 
   postPatch = ''
@@ -61,6 +61,8 @@ python3Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3Packages; [
+    aiofiles
+    aiohttp
     pygobject3
     eyed3
     pillow
@@ -68,6 +70,7 @@ python3Packages.buildPythonApplication rec {
     pytaglib
     python-magic
     pyacoustid
+    xxhash
   ];
 
   dontWrapGApps = true;
@@ -82,6 +85,7 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/eartag";
     description = "Simple music tag editor";
+    changelog = "https://gitlab.gnome.org/World/eartag/-/releases/${version}";
     # This seems to be using ICU license but we're flagging it to MIT license
     # since ICU license is a modified version of MIT and to prevent it from
     # being incorrectly identified as unfree software.

From b4634379d3350b8c59dade2fa8e0f984a1651092 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:32:33 +0000
Subject: [PATCH 029/258] mangojuice: 0.8.6 -> 0.8.8

Diff: https://github.com/radiolamp/mangojuice/compare/0.8.6...0.8.8
Changelog: https://github.com/radiolamp/mangojuice/releases/tag/0.8.8
---
 pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch | 2 +-
 pkgs/by-name/ma/mangojuice/package.nix             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch
index 194574d7f86f..8581d992b133 100644
--- a/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch
+++ b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch
@@ -6,7 +6,7 @@ index 8c2cbef..46e7f73 100644
      }
  
      async bool check_vkbasalt_installed_async () {
--        string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" };
+-        string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so", "/usr/lib64/vkbasalt/libvkbasalt.so" };
 +        string[] paths = { "@vkbasalt@" };
          foreach (var path in paths) {
              if (FileUtils.test (path, FileTest.EXISTS)) {
diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 4f98f7961fff..5372ee5cf470 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -25,13 +25,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangojuice";
-  version = "0.8.6";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
     tag = finalAttrs.version;
-    hash = "sha256-EVjKO+03o8es2t2/K1QuUIhXey7+2VNF37yXiMrv4o4=";
+    hash = "sha256-M8aKS360AsgoSKCyZXdtD7SbMDvK6OgAuNoGa68NZRQ=";
   };
 
   patches = [

From 99467bc91689d88ed1d43137d34277707997faec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:24:53 +0000
Subject: [PATCH 030/258] python3Packages.gfal2-python: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 4cd4cf2e151e..9447781cfb89 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -13,13 +13,13 @@
 }:
 buildPythonPackage rec {
   pname = "gfal2-python";
-  version = "1.13.0";
+  version = "1.13.1";
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-python";
     rev = "v${version}";
-    hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE=";
+    hash = "sha256-OUpsnKSsFOhiSg0npJW/9Htl4XNt/6zEPuB9nd6b43w=";
   };
   nativeBuildInputs = [
     cmake

From 48d0d593c39242c870c44786c1780d9b5d1f335f Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 28 Oct 2025 22:03:40 -0400
Subject: [PATCH 031/258] fromager: fix tests

Disable a test that relies on a (now private) `wheel.cli` module.
---
 pkgs/by-name/fr/fromager/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix
index f9edb2825bd1..4dcffcea230a 100644
--- a/pkgs/by-name/fr/fromager/package.nix
+++ b/pkgs/by-name/fr/fromager/package.nix
@@ -53,6 +53,11 @@ python3.pkgs.buildPythonApplication rec {
     "fromager"
   ];
 
+  disabledTestPaths = [
+    # Depends on wheel.cli module that is private since wheel 0.46.0
+    "tests/test_wheels.py"
+  ];
+
   meta = {
     description = "Wheel maker";
     homepage = "https://pypi.org/project/fromager/";

From 6f042d66db9c1b51ee7bd0d2e59c815453e8d5a4 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 28 Oct 2025 22:04:24 -0400
Subject: [PATCH 032/258] fromager: 0.59.0 -> 0.68.1

---
 pkgs/by-name/fr/fromager/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix
index 4dcffcea230a..66601939fd7a 100644
--- a/pkgs/by-name/fr/fromager/package.nix
+++ b/pkgs/by-name/fr/fromager/package.nix
@@ -2,18 +2,19 @@
   lib,
   python3,
   fetchFromGitHub,
+  writableTmpDirAsHomeHook,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fromager";
-  version = "0.59.0";
+  version = "0.68.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-wheel-build";
     repo = "fromager";
     tag = version;
-    hash = "sha256-aKoZKpzgJ3e5JRYSSeLmLlji1Fj8omxvwGZfNXDOhLs=";
+    hash = "sha256-7NM8hRsMnnHWxzjwNv/cLIm9iOUsUEzoCwPuFUN8+hk=";
   };
 
   build-system = with python3.pkgs; [
@@ -39,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
     stevedore
     tomlkit
     tqdm
-    virtualenv
+    uv
     wheel
   ];
 
@@ -47,6 +48,8 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
     requests-mock
     twine
+    uv
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [
@@ -58,6 +61,12 @@ python3.pkgs.buildPythonApplication rec {
     "tests/test_wheels.py"
   ];
 
+  disabledTests = [
+    # Accessing pypi.org (not allowed in sandbox)
+    "test_get_build_backend_dependencies"
+    "test_get_build_sdist_dependencies"
+  ];
+
   meta = {
     description = "Wheel maker";
     homepage = "https://pypi.org/project/fromager/";

From 598a65ae09eec76eae37ff61c1c6272804ef85a4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 30 Oct 2025 10:23:24 -0500
Subject: [PATCH 033/258] crystfel: fix cmake4 error

---
 pkgs/applications/science/physics/crystfel/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index 9c3ffb16c186..d495349aa75e 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -185,6 +185,12 @@ let
       })
     ];
 
+    postPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.0.0)" \
+                       "cmake_minimum_required(VERSION 3.10)"
+    '';
+
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       hdf5

From 59e76717eaa398d4c1dc44def16cdde2fd91049a Mon Sep 17 00:00:00 2001
From: r4v3n6101 <raven6107@gmail.com>
Date: Thu, 30 Oct 2025 20:55:50 +0300
Subject: [PATCH 034/258] tarts: 0.1.16-unstable -> 0.1.24

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

diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix
index e6c8cbb5051b..9f75ec1f69ec 100644
--- a/pkgs/by-name/ta/tarts/package.nix
+++ b/pkgs/by-name/ta/tarts/package.nix
@@ -3,18 +3,18 @@
   rustPlatform,
   fetchFromGitHub,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tarts";
-  version = "0.1.16-unstable-2025-05-04";
+  version = "0.1.24";
 
   src = fetchFromGitHub {
     owner = "oiwn";
     repo = "tarts";
-    rev = "8560a63dda8e5ffd5fdd96a1f7687f8f12d36022";
-    hash = "sha256-d06FL0khcI2LUMbrUo3tmQn97pNFIVefPWlxWFSUJ+E=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-whkDHgxrHkmYX6hji+z8mc964lQxllaidV8clJhvDqw=";
   };
 
-  cargoHash = "sha256-DLIBVl7CzhEYjAnkJmLHSlUoXCNos8YPHfSz9rs99/8=";
+  cargoHash = "sha256-IZyjwbx7V0kPkmD9r8qrqp4nrJg8g6tepw5bvWlLZBE=";
 
   meta = {
     description = "Screen saves and visual effects for your terminal";
@@ -23,4 +23,4 @@ rustPlatform.buildRustPackage {
     maintainers = [ lib.maintainers.awwpotato ];
     mainProgram = "tarts";
   };
-}
+})

From 96b912fcc057b73a278134c110f4d317fbd43d4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 19:23:41 +0000
Subject: [PATCH 035/258] python3Packages.azure-storage-queue: 12.14.0 ->
 12.14.1

---
 .../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 11aa7ee0506d..325cd4fb6c46 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.14.0";
+  version = "12.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_queue";
     inherit version;
-    hash = "sha256-WIhM62wQqF3NIuOJreMr46bzbsWHxC5O/AZO/D7yV0M=";
+    hash = "sha256-j3r7MR7xuZBzFuWbs+BkU5fI12BzrbG1lfAnsXwLevE=";
   };
 
   build-system = [ setuptools ];

From e0472106fdd973dacd3850f31b5702fe1b9a7695 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 31 Oct 2025 17:04:34 +0100
Subject: [PATCH 036/258] melonDS: drop qt 6.10 patch

---
 pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch | 15 ---------------
 pkgs/by-name/me/melonDS/package.nix             |  2 --
 2 files changed, 17 deletions(-)
 delete 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
deleted file mode 100644
index a7138372240e..000000000000
--- a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 bde7555c6e54..831f12648b4e 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";
   };
 
-  patches = [ ./fix-build-qt-6.10.patch ];
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From e86da036262bf3656409f1ca8b036e8a77f7e9fb Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:17:31 +0100
Subject: [PATCH 037/258] zandronum: add desktop file

---
 pkgs/by-name/za/zandronum/package.nix | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/by-name/za/zandronum/package.nix b/pkgs/by-name/za/zandronum/package.nix
index eaeddab5c79a..7cf331bc8468 100644
--- a/pkgs/by-name/za/zandronum/package.nix
+++ b/pkgs/by-name/za/zandronum/package.nix
@@ -20,6 +20,9 @@
   gtk2,
   python3,
   game-music-emu,
+  copyDesktopItems,
+  makeDesktopItem,
+  imagemagick,
   serverOnly ? false,
 }:
 
@@ -72,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     makeWrapper
     python3
+    copyDesktopItems
+    imagemagick
   ];
 
   preConfigure = ''
@@ -93,8 +98,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "zandronum";
+      desktopName = "Zandronum";
+      exec = "zandronum";
+      icon = "zandronum";
+      mimeTypes = [ "application/x-doom-wad" ];
+      categories = [ "Game" ];
+      comment = finalAttrs.meta.description;
+    })
+  ];
+
   # 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 = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     mkdir -p $out/lib/zandronum
     cp zandronum${suffix} \
@@ -104,6 +123,16 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}
     wrapProgram $out/bin/zandronum${suffix} \
       --set LC_ALL="C"
+
+    # Upstream only provides an icon file for Windows.
+    # This converts the .ico file to PNGs, which are used by the desktop file.
+    for size in 16 24 32 48 64 128 256; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      magick $src/src/win32/zandronum.ico -background none -resize "$size"x"$size" -flatten \
+        $out/share/icons/hicolor/"$size"x"$size"/apps/zandronum.png
+    done;
+
+    runHook postInstall
   '';
 
   postFixup = lib.optionalString (!serverOnly) ''

From eae6d485746acef58e8e19cf96af9e292e2df77e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:35:47 +0000
Subject: [PATCH 038/258] gotests: 1.6.0 -> 1.9.0

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

diff --git a/pkgs/by-name/go/gotests/package.nix b/pkgs/by-name/go/gotests/package.nix
index d0ad80fbb9da..3e46ef0c4cd9 100644
--- a/pkgs/by-name/go/gotests/package.nix
+++ b/pkgs/by-name/go/gotests/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gotests";
-  version = "1.6.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "cweill";
     repo = "gotests";
     rev = "v${version}";
-    sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw=";
+    sha256 = "sha256-lx8gbVm4s4kmm252khoSukrlj5USQS+StGuJ+419QZw=";
   };
 
-  vendorHash = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw=";
+  vendorHash = "sha256-/dP8uA1yWBrtmFNHUvcicPhA2qr5R2v1uSwYi+ciypg=";
 
   # tests are broken in nix environment
   doCheck = false;

From 7d14d8c13fcd5bc7d2cf02440d98c3054b7e40c5 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 21 Oct 2025 10:55:07 -0700
Subject: [PATCH 039/258] libportal: remove darwin from platforms

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

diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 2ac26a43b3b8..a26b79f2b48d 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -102,5 +102,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ jtojnar ];
     platforms = lib.platforms.unix;
+    # needs memfd_create which is available on some unixes but not darwin
+    badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
   };
 }

From e4d31bd6c5fb691f7cbac93ea6179668349288a6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 21:36:09 -0300
Subject: [PATCH 040/258] robodoc: fix build on darwin

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

diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix
index 4a8bb485a6f6..bfb50edaaf68 100644
--- a/pkgs/by-name/ro/robodoc/package.nix
+++ b/pkgs/by-name/ro/robodoc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
 }:
 
@@ -16,6 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "troff_generator-fix";
+      url = "https://github.com/gumpu/ROBODoc/commit/0f8b35c42523810415bec70bb2200d2ecb41c82f.patch?index=full";
+      hash = "sha256-Pbuc1gHrOeHbR4QT/dZ8wP+vqYQlilayjCGKOJP5wvk=";
+    })
+  ];
+
   postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace Docs/makefile.am \
       --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS ='

From d7c400085f3656d078c4e16a15322904b030daa1 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 21:44:20 -0300
Subject: [PATCH 041/258] robodoc: add maintainer iedame

---
 pkgs/by-name/ro/robodoc/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix
index bfb50edaaf68..69e6ddcc7deb 100644
--- a/pkgs/by-name/ro/robodoc/package.nix
+++ b/pkgs/by-name/ro/robodoc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gumpu";
     repo = "ROBODoc";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
   };
 
@@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace Docs/makefile.am \
-      --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS ='
+      --replace-fail 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS ='
   '';
 
   nativeBuildInputs = [ autoreconfHook ];
 
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gumpu/ROBODoc";
     description = "Documentation Extraction Tool";
     longDescription = ''
@@ -56,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
       Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++,
       Java -- basically any program in which you can use remarks/comments.
     '';
-    license = with licenses; gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ iedame ];
+    platforms = lib.platforms.all;
+    mainProgram = "robodoc";
   };
 })

From a783a81473a7657c76410ad9f99f3ea2b4ed2fce Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 3 Nov 2025 22:33:42 +0900
Subject: [PATCH 042/258] rumdl: 0.0.166 -> 0.0.169

Diff: https://github.com/rvben/rumdl/compare/v0.0.166...v0.0.169

Changelog: https://github.com/rvben/rumdl/blob/v0.0.169/CHANGELOG.md
---
 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 b920521248a0..b056bef021d4 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.166";
+  version = "0.0.169";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg=";
+    hash = "sha256-1ly0bAA8NGGqdF6U/BYGvr+aR6OU0ArbK7A0vAMdtlQ=";
   };
 
-  cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU=";
+  cargoHash = "sha256-qnNm69SM3pt0LAIOvu0xhnTFft+SCD2LmY3hNoturmo=";
 
   cargoBuildFlags = [
     "--bin=rumdl"

From ba23f63886f5778b8cd5b0637199ea369559754b Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 4 Nov 2025 00:54:28 +0900
Subject: [PATCH 043/258] artichoke: drop

The upstream repository was archived in 2025-11.

https://web.archive.org/web/20251103161827/https://github.com/artichoke/artichoke
---
 pkgs/by-name/ar/artichoke/package.nix | 58 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 pkgs/by-name/ar/artichoke/package.nix

diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix
deleted file mode 100644
index d4d1c5e90c95..000000000000
--- a/pkgs/by-name/ar/artichoke/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  llvmPackages,
-  _experimental-update-script-combinators,
-  unstableGitUpdater,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "artichoke";
-  version = "0-unstable-2025-09-07";
-
-  src = fetchFromGitHub {
-    owner = "artichoke";
-    repo = "artichoke";
-    rev = "8227e6dbb298631c67b4ca2cc4c911d0ef87f38a";
-    hash = "sha256-Pyffs4QB/SkayRwlMmIVagNiamznJp4Dt3nqRDJYfqU=";
-  };
-
-  cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg=";
-
-  nativeBuildInputs = [
-    rustPlatform.bindgenHook
-  ];
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    stdout="$("$out/bin/artichoke" -e 'puts "Hello World!"')"
-    [[ "$stdout" == 'Hello World!' ]]
-
-    runHook postInstallCheck
-  '';
-
-  passthru = {
-    updateScript = _experimental-update-script-combinators.sequence [
-      (unstableGitUpdater { })
-      (nix-update-script {
-        # Updating `cargoHash`
-        extraArgs = [ "--version=skip" ];
-      })
-    ];
-  };
-
-  meta = {
-    description = "Ruby implementation written in Rust and Ruby";
-    homepage = "https://www.artichokeruby.org/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      kachick
-    ];
-    mainProgram = "artichoke";
-    platforms = with lib.platforms; unix ++ windows;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..92183487e2f5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -303,6 +303,7 @@ mapAliases {
   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
+  artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04
   artim-dark = aritim-dark; # Added 2025-07-27
   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

From 5c56e48ae020c108c3248ac6eb47d5ac1cac0531 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 17:54:37 +0000
Subject: [PATCH 044/258] git-town: 22.1.0 -> 22.2.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 5270a47e3e06..8386749c2f30 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.1.0";
+  version = "22.2.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU=";
+    hash = "sha256-JY0zWWMln4r2ga1jwxK+RTp8izATyovRHBf4A29pXW4=";
   };
 
   vendorHash = null;

From 81e03be2d437f14688d309cf893827993d2a42bb Mon Sep 17 00:00:00 2001
From: Wim de With <wf@dewith.io>
Date: Mon, 3 Nov 2025 20:21:07 +0100
Subject: [PATCH 045/258] gravit: fix build with SDL_compat 1.2.70

Refer to https://github.com/libsdl-org/sdl12-compat/commit/6595f6e405844cbca4a55e47eaa29ccec0cdd75f
---
 pkgs/by-name/gr/gravit/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index 53b92adac0c4..6701a6f18b63 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -64,6 +64,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  NIX_CFLAGS_COMPILE = [
+    "-DSDL_INCLUDE_GLU_H"
+  ];
+
   meta = {
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
     homepage = "https://github.com/gak/gravit";

From 1245c5754e1a689fbf0c0372b6ff803990c1df30 Mon Sep 17 00:00:00 2001
From: Mori Zen <92977828+71zenith@users.noreply.github.com>
Date: Tue, 4 Nov 2025 10:20:28 +0530
Subject: [PATCH 046/258] spotify-player: 0.21.0 -> 0.21.1

---
 pkgs/by-name/sp/spotify-player/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 62cbb42c21d0..e2c14b916ae9 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -50,24 +50,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${version}";
-    hash = "sha256-nOswrYt9NrzJV6CFBWZCpj/wIJnIgmr3i2TreAKGGPI=";
+    hash = "sha256-yjm5NFW+6vEyv45AVfwx+6w2dJ3lKj/UM2NQhGW5SSs=";
   };
 
-  cargoHash = "sha256-YarKRApcQHom3AQIirqGdmUOuy5B+BRehLijvF/GRPc=";
-
-  patches = [
-    (fetchpatch {
-      name = "fix-build-failure.patch";
-      url = "https://github.com/aome510/spotify-player/commit/77af13b48b2a03e61fef1cffea899929057551dc.patch";
-      hash = "sha256-5q8W0X49iZLYdwrBiZJTESb628VPamrm0zEYwDm8CVk=";
-    })
-  ];
+  cargoHash = "sha256-rqDLkzCl7gn3s/37MPytYaGb0tdtemYi8bgEkrkllDU=";
 
   nativeBuildInputs = [
     pkg-config

From 569f707da65b67e545f59637efe715e61ae113a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 07:09:21 +0000
Subject: [PATCH 047/258] LycheeSlicer: 7.4.5 -> 7.4.6

---
 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 a8237fbd249b..5db8aeb1f0b8 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.5";
+  version = "7.4.6";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-UY8bS3nPhUqyBeMD7Ou6OJZ2LKFi3QbNGeTSmtC1Sbg=";
+    hash = "sha256-4Cqhr++RP8FlWUMQyfpEY7df2Ai3aqrzwX+kZ+SzGCQ=";
   };
 
   desktopItem = makeDesktopItem {

From 935c9109572f820ebe13a4daa7952cd69fc90435 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:54:33 +0000
Subject: [PATCH 048/258] atlas: 0.37.0 -> 0.38.0

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

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 667772b77b84..e7295ec77842 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -9,19 +9,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.37.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9OX2CmL9/5LzIbYHQKvC/wRCifGq9Ycycvr3uYck94Q=";
+    hash = "sha256-OS0UYrE+5spErR/S+7AsYDPcCce3EEWvcBBKh+8FkTo=";
   };
 
   modRoot = "cmd/atlas";
 
   proxyVendor = true;
-  vendorHash = "sha256-wIDPTgfpWD0E9Afi5NHvL684k7YPjYkQIpHotNZeneY=";
+  vendorHash = "sha256-xlKU/hxSjQWSQV++7RHfY4hZhm2tWCPS6DcyaGNnmhc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5049f48dfaea924789d862b9de948ec08dff4924 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Tue, 4 Nov 2025 17:02:28 +0700
Subject: [PATCH 049/258] distrho-ports: add build options

---
 pkgs/by-name/di/distrho-ports/package.nix | 38 ++++++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix
index 366b6960f415..186d87c3d0a6 100644
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@@ -16,12 +16,18 @@
 
   # empty means build all available plugins
   plugins ? [ ],
+
+  buildVST3 ? true,
+  buildLV2 ? true,
+  buildVST2 ? true,
 }:
 
 let
   rpathLibs = [
     fftwFloat
   ];
+
+  mesonPlugins = lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]";
 in
 stdenv.mkDerivation {
   pname = "distrho-ports";
@@ -52,19 +58,27 @@ stdenv.mkDerivation {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
 
-  postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
-    for file in \
-      $out/lib/lv2/vitalium.lv2/vitalium.so \
-      $out/lib/vst/vitalium.so \
-      $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
-    do
-      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
-    done
-  '';
+  postFixup =
+    let
+      files = [
+        (lib.optionalString buildLV2 "$out/lib/lv2/vitalium.lv2/vitalium.so")
+        (lib.optionalString buildVST2 "$out/lib/vst/vitalium.so")
+        (lib.optionalString buildVST3 "$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so")
+      ];
+    in
+    lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
+      for file in ${lib.concatMapStringsSep " \\\n" (x: "${x}") files}
+      do
+        patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
+      done
+    '';
 
-  mesonFlags = lib.optional (plugins != [ ]) (
-    lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]"
-  );
+  mesonFlags = [
+    (lib.mesonBool "build-lv2" buildLV2)
+    (lib.mesonBool "build-vst2" buildVST2)
+    (lib.mesonBool "build-vst3" buildVST3)
+  ]
+  ++ lib.optional (plugins != [ ]) mesonPlugins;
 
   meta = {
     homepage = "http://distrho.sourceforge.net/ports";

From f847b7a54bc439f5d059e2b104d1a853f980b5f8 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Wed, 29 Oct 2025 16:28:53 +0000
Subject: [PATCH 050/258] orbstack: 2.0.3-19876 -> 2.0.4-19887

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

diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index 64e916d49c3f..a449820edc80 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -6,15 +6,15 @@
 }:
 let
   inherit (stdenvNoCC.hostPlatform) system;
-  version = "2.0.3-19876";
+  version = "2.0.4-19887";
   sourceData = {
     aarch64-darwin = {
       arch = "arm64";
-      hash = "sha256-3Ppc0zWEgR/nTS7R9uAkUYYgYu5q2TWmfd3evT+Z8g4=";
+      hash = "sha256-uog0B1Dro5lkSMDWr+FOvmeH/ue3NoNNvIUR/+FZENs=";
     };
     x86_64-darwin = {
       arch = "amd64";
-      hash = "sha256-+JpyynFKmDjHLetvvEpQ0qw4crAVmx0ucWm+bvtZ2Fg=";
+      hash = "sha256-lLj4BlSG01CMYCVBWuASjxCjrczv7mbC1iXM0WgWHtw=";
     };
   };
   sources = lib.mapAttrs (

From 089ac45d3232de6299651806196e8690e87b97c6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 4 Nov 2025 14:15:44 +0100
Subject: [PATCH 051/258] nixosTests.lomiri-music-app: Fix OCR

- Stopped finding the Tracks option in the pop-up menu. Just click where it should be, look for the new menu title afterwards.
- Stopped finding the small listing of the song title. Move the check to the very end, when the song is already opened in the player interface.
---
 nixos/tests/lomiri-music-app.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix
index 7424847b3794..5cf32619d8f7 100644
--- a/nixos/tests/lomiri-music-app.nix
+++ b/nixos/tests/lomiri-music-app.nix
@@ -148,10 +148,9 @@ in
         machine.wait_for_text("Albums")
         machine.succeed("xdotool mousemove 25 45 click 1") # Open categories
         machine.sleep(2)
-        machine.wait_for_text("Tracks")
         machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category
         machine.sleep(2)
-        machine.wait_for_text("${musicFileName}") # the test file
+        machine.wait_for_text("Tracks") # Written in larger text now, easier for OCR
         machine.screenshot("lomiri-music_listing")
 
         # Ensure pause colours isn't present already
@@ -180,8 +179,9 @@ in
 
         machine.screenshot("lomiri-music_paused")
 
-        # Lastly, check if generated cover image got extracted properly
+        # Lastly, check if song details like title & generated cover image got extracted properly
         # if not, indicates an issue with mediascanner / lomiri-thumbnailer
+        machine.wait_for_text("${musicFileName}")
         machine.wait_for_text("${ocrContent}")
 
     machine.succeed("pkill -f lomiri-music-app")

From 0416c521c9e3201792b5a0916375cdfc3055a6e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 21:14:02 +0000
Subject: [PATCH 052/258] kiro: 0.4.0 -> 0.5.9

---
 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 d186b24ecdd4..98f94898129e 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.4.0";
+  version = "0.5.9";
   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 b58ceb2c1e24..9bd3bc43de19 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/202510142329--distro-linux-x64-tar-gz/202510142329-distro-linux-x64.tar.gz",
-    "hash": "sha256-Pi96jAd2qZNCk/LSv9f5n08VzOS3WwaW+eI+8PIwM9I="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202511032205--distro-linux-x64-tar-gz/202511032205-distro-linux-x64.tar.gz",
+    "hash": "sha256-Xm7uRogux3bQMsWjdaamrHELnxNltRmjPLM8Mgt5+5Y="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-x64.dmg",
-    "hash": "sha256-wjUyT9KF3Tg5M6Ad01sxhZlin1WySF0Tci1dAPlvh04="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-x64.dmg",
+    "hash": "sha256-oJ5Xr/wJQIX3R5cLnBCv1kpULLy3ljW53LGqw4zYY5c="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-arm64.dmg",
-    "hash": "sha256-Bsul3QLJ9qbDPBnhUu7Stk4wz1yJkYk9eMrtUyQ4rbU="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-arm64.dmg",
+    "hash": "sha256-dtc/Wfs8GzVPHny58MDRFSr9gG0hwdZC5qz5uIJh6N4="
   }
 }

From eaf47e2fec99204d522f9a2e51d65ab94625d8f4 Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Wed, 5 Nov 2025 11:46:06 +0200
Subject: [PATCH 053/258] burpsuite: fix update script to avoid downgrades

---
 pkgs/by-name/bu/burpsuite/update.sh | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bu/burpsuite/update.sh b/pkgs/by-name/bu/burpsuite/update.sh
index 7d0214045c50..4824a5499471 100755
--- a/pkgs/by-name/bu/burpsuite/update.sh
+++ b/pkgs/by-name/bu/burpsuite/update.sh
@@ -4,17 +4,16 @@ set -eu -o pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 
-curl -s 'https://portswigger.net/burp/releases/data' |
-  jq -r '
-      [[
-        .ResultSet.Results[]
-        | select(
-            (.categories | sort) == (["Professional","Community"] | sort)
-            and .releaseChannels == ["Early Adopter"]
-          )
-      ][0].builds[]
-      | select(.ProductPlatform == "Jar")
-    ]' >latest.json
+curl -s 'https://portswigger.net/burp/releases/data' | jq -r '
+      def verarr: (.Version // "") | split(".") | map(tonumber? // 0);
+      [ .ResultSet.Results[]
+        | select((.categories|sort) == (["Professional","Community"]|sort))
+        | .builds[]
+        | select(.ProductPlatform == "Jar")
+      ] as $all
+      | ($all | max_by( (.Version // "") | split(".") | map(tonumber? // 0) ) | .Version) as $v
+      | $all | map(select(.Version == $v))
+      ' > latest.json
 
 version=$(jq -r '.[0].Version' latest.json)
 

From 3cae4c787d19efb29c706cf5e563c5f723f254ec Mon Sep 17 00:00:00 2001
From: Alexander Nabokikh <alexander.nabokikh@olx.pl>
Date: Wed, 5 Nov 2025 11:31:31 +0100
Subject: [PATCH 054/258] swaynotificationcenter: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
index e29f89e13332..61e505607a8b 100644
--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SwayNotificationCenter";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayNotificationCenter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BtcT2N08BVxVrzEd1Z/s5MXWHaHFt6PqBH4gdH6TEvs=";
+    hash = "sha256-8zVG3mJxT6K0jkqsnaJ4wscPAk3z00YTsmHsJmuKWc8=";
   };
 
   # build pkg-config is required to locate the native `scdoc` input

From 1b80404731003c35c0fa217f000b0f9fc3e453d6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 5 Nov 2025 23:28:47 +0100
Subject: [PATCH 055/258] logrotate: Enable tests

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

diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix
index 3f454af211ab..9db688ab8ac1 100644
--- a/pkgs/by-name/lo/logrotate/package.nix
+++ b/pkgs/by-name/lo/logrotate/package.nix
@@ -7,6 +7,7 @@
   autoreconfHook,
   aclSupport ? stdenv.hostPlatform.isLinux,
   acl,
+  coreutils,
   nixosTests,
 }:
 
@@ -30,6 +31,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ];
 
+  preCheck = ''
+    sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh
+    # Skip this test because it depends on a working root user, which we don't have in the sandbox
+    # Exiting with 77 signals that the test is skipped, and we only place it on line 2 because the shebang is on line 1
+    sed -i '2iexit 77' test/test-0110.sh
+  '';
+  doCheck = true;
+
   passthru.tests = {
     nixos-logrotate = nixosTests.logrotate;
   };

From f720bb2492750ec820dc50f595e94e36954704ff Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:50:19 +0800
Subject: [PATCH 056/258] clash-rs: 0.9.1 -> 0.9.2

---
 pkgs/by-name/cl/clash-rs/Cargo.patch | 26 +++++++++++++-------------
 pkgs/by-name/cl/clash-rs/package.nix |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch
index 9c1141bdb9e9..dac558bce3e0 100644
--- a/pkgs/by-name/cl/clash-rs/Cargo.patch
+++ b/pkgs/by-name/cl/clash-rs/Cargo.patch
@@ -1,24 +1,24 @@
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1250,7 +1250,7 @@
+@@ -1249,7 +1249,7 @@
   "sha2",
   "shadowquic",
   "shadowsocks",
 - "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
-+ "smoltcp 0.12.0",
-  "socket2 0.6.0",
++ "smoltcp",
+  "sock2proc",
+  "socket2 0.6.1",
   "tempfile",
-  "thiserror 2.0.17",
-@@ -4096,7 +4096,7 @@
+@@ -4234,7 +4234,7 @@
   "etherparse 0.16.0",
   "futures",
   "rand 0.8.5",
 - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp 0.12.0",
++ "smoltcp",
   "spin 0.9.8",
   "tokio",
   "tokio-util",
-@@ -6487,20 +6487,6 @@
+@@ -6632,20 +6632,6 @@
  ]
  
  [[package]]
@@ -36,15 +36,15 @@
 -]
 -
 -[[package]]
- name = "socket2"
- version = "0.4.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -8792,7 +8778,7 @@
+ name = "sock2proc"
+ version = "0.1.0"
+ source = "git+https://github.com/Watfaq/sock2proc.git?rev=1097e6b#1097e6ba692025f80567446e0035af1222f5231f"
+@@ -8964,7 +8950,7 @@
   "netstack-lwip",
   "netstack-smoltcp",
   "rand 0.9.2",
 - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp 0.12.0",
-  "socket2 0.6.0",
++ "smoltcp",
+  "socket2 0.6.1",
   "tokio",
   "tracing",
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 05a379a7fb13..4ce8bb9bbd8f 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clash-rs";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "Watfaq";
     repo = "clash-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-asD7veAYdIF5biCbSXYvAyW/qBra3tvON9TQYCw6nB8=";
+    hash = "sha256-FFbRopIaAOpfb+Wbj+EUXRr89EQE108h8OMn+fpL+ew=";
   };
 
-  cargoHash = "sha256-9zCQKxkjiskkBGxfnq2ANpqWobs+UJ5qCsbME2Z7GY4=";
+  cargoHash = "sha256-JYvITscH1K6xLE6XZpMrEFZWcbue7x7xuPxVQW/Vjb0=";
 
   cargoPatches = [ ./Cargo.patch ];
 

From 0fe76d21bdc7c8fa992c359d2bec3b65b1f4661c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 05:19:10 +0000
Subject: [PATCH 057/258] typescript-language-server: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix
index 04a997db0805..018988573a3e 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.1.0";
+  version = "5.1.1";
 
   src = fetchFromGitHub {
     owner = "typescript-language-server";
     repo = "typescript-language-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MpcTyjew/SgmWrpeqXLjQPPdwUuMTWQYyyM9TG5jNbQ=";
+    hash = "sha256-wYpW/HHuMetxnwEgGeQ8ptT6Kd5wp2kqUXnjWSkoDQY=";
   };
 
   patches = [

From 159a5ae316da139ba84e0d2e39623d1ba9e5f015 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 6 Nov 2025 09:58:38 +0100
Subject: [PATCH 058/258] nixos/qtile: enable gnome keyring by default

---
 nixos/modules/services/x11/window-managers/qtile.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
index f1a633c26b24..9af62649c542 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -68,7 +68,11 @@ in
       xserver.windowManager.qtile.finalPackage = cfg.package.override {
         extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs;
       };
+
       displayManager.sessionPackages = [ cfg.finalPackage ];
+
+      # Recommended by upstream for libqtile/widget/imapwidget.py
+      gnome.gnome-keyring.enable = lib.mkDefault true;
     };
 
     environment = {

From 689e6ac84a06e94ba3d854afd0396c05ce0d5409 Mon Sep 17 00:00:00 2001
From: Maciej Zonski <me@zonni.pl>
Date: Thu, 6 Nov 2025 17:23:58 +0100
Subject: [PATCH 059/258] coolercontrol: 3.0.1 -> 3.0.2

---
 .../system/coolercontrol/coolercontrol-ui-data.nix            | 2 +-
 pkgs/applications/system/coolercontrol/coolercontrold.nix     | 2 +-
 pkgs/applications/system/coolercontrol/default.nix            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index d2af32efee38..5a591c01e114 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-MhMHo6wjkaSCyevwzAKCvSsJTmAq9rYFG1ZVUAkRc0Y=";
+  npmDepsHash = "sha256-pXK2wyRujUqnRZNIf/bDXpYdfEYHeia/E/jwLkfWwfo=";
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 50987847a587..1022560eeb1c 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-4aSEEBtxwTyAx5CPa2fDBhx5U+Ql2X/tKPQHLIsm3I0=";
+  cargoHash = "sha256-teKMz6ruTSwQ76dMXoupS3D7n1ashfHPpxMGo3Qm6FI=";
 
   buildInputs = [ libdrm ];
 
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index d11e7f40aa6c..12b176cfdd8b 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -5,13 +5,13 @@
 }:
 
 let
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     rev = version;
-    hash = "sha256-PvEj3xYJVpHNfd5p7kyw+eW9S/g1FB/YiFgWEJDDbus=";
+    hash = "sha256-puWnnNc3T/R+vPp3oyxP2aTHo1rZ5RWyW6KF6wywF1I=";
   };
 
   meta = {

From bd04ef83ceba92e1d51dc797b9bdfff035f219db Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 6 Nov 2025 17:27:50 +0100
Subject: [PATCH 060/258] harper: 0.70.0 -> 0.71.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.71.0
Diff: https://github.com/Automattic/harper/compare/v0.70.0...v0.71.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 2cc632eb5b82..171d6038515f 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-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";
+    hash = "sha256-ldXQKAJX8YQVjtGjKRom14fNuA6ZwDwpPusbjS+4G+I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 1df595fa96ba..3b0158abbb20 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.70.0";
+  version = "0.71.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-ksSr2styk0uDEOGrxAVRqW549oaGdzahejaJ5paYNf0=";
+    hash = "sha256-Hf086Ub0nVGET4qELDMddOErGAhK8B6ohbI5JhnU6z8=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-w4nwOzKV3yshvLzMeJyv32ihFv5yE+r7gNOF01zTYrU=";
+  cargoHash = "sha256-hS8fLWD3OTfEAa+4saeB9pK3zS/EQSnoQSUGIkVWocw=";
 
   passthru.updateScript = nix-update-script { };
 

From 8b0dc86b3b385327ecae480de43c911fa66484c6 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 6 Nov 2025 16:31:17 +0000
Subject: [PATCH 061/258] mergiraf: 0.15.0 -> 0.16.1

Changelog: https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.16.1
Diff: https://codeberg.org/mergiraf/mergiraf/compare/v0.15.0...v0.16.1
---
 pkgs/by-name/me/mergiraf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index ae7522885510..4c40ea86e905 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mergiraf";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aq0xeIj780wV6PlWj6dgDfXxzQHRRg0T6/EWLKVf+3o=";
+    hash = "sha256-vKqvVpGyQ9ayebssupiySjJ7R7gn1W8HTlDuGM4d1Ns=";
   };
 
-  cargoHash = "sha256-nsp+jV9bl3rAFbibvIUD9WT/VZ9b8PXGu4IReOIybuM=";
+  cargoHash = "sha256-vhes4p8e1PW4p5tqqPffAgl3V4dK17+n748VA6Q23lE=";
 
   nativeCheckInputs = [ git ];
 

From 9580e43fd11745d007556394f148edbe65ad6aef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 19:49:10 +0000
Subject: [PATCH 062/258] python3Packages.types-markdown: 3.9.0.20250906 ->
 3.10.0.20251106

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

diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix
index 06d4c059603b..cb0860d93fde 100644
--- a/pkgs/development/python-modules/types-markdown/default.nix
+++ b/pkgs/development/python-modules/types-markdown/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-markdown";
-  version = "3.9.0.20250906";
+  version = "3.10.0.20251106";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_markdown";
     inherit version;
-    hash = "sha256-8C3BotEwsJPeSRDGSy0KgRrnAg8DYk30HGZ4GNL+4FA=";
+    hash = "sha256-EoNvf8vXIh24uusNOi+CC5UFDQgkv6lmXGe00UShr6E=";
   };
 
   build-system = [ setuptools ];

From e2e6826bed8705c78fe96370a0b4bb978451a10a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:16:49 +0000
Subject: [PATCH 063/258] gswatcher: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix
index 02a5c17a29d0..0ca2d810bed9 100644
--- a/pkgs/by-name/gs/gswatcher/package.nix
+++ b/pkgs/by-name/gs/gswatcher/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gswatcher";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "lxndr";
     repo = "gswatcher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qohd18bXr7gDSW51tCyslFX54Caux+YrsuJtoLs9Ofk=";
+    hash = "sha256-0iJTJkG+EhiOYZQiWBsT0TY/NC7fLny2dXbmYYWnuic=";
   };
 
   nativeBuildInputs = [

From 13db03d019ad5f8e2b2d5c02e41d0fffb13befd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 23:00:50 +0000
Subject: [PATCH 064/258] sydbox: 3.41.4 -> 3.42.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 2ae0939f2706..a56a365b84e3 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.4";
+  version = "3.42.0";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RILehKm5DzhCLfhGRUuoXYmrpO/b5TSTnzrVNvhSNrg=";
+    hash = "sha256-mp1FGJpwCYU53nK9sHjy17vIeR0ewst5eF0OA4Pfcl4=";
   };
 
-  cargoHash = "sha256-t9p4RDQnz/C5TLgbDug3vnod+osY7oEPtW+dNzz9pEE=";
+  cargoHash = "sha256-15w2b9kRhDYXjUfKSULXFWzeD60Qmz4ATKEtaDwiDOo=";
 
   nativeBuildInputs = [
     mandoc

From 3fa9c497017ae80086dc7184ce194b59d67a512a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 00:23:54 +0000
Subject: [PATCH 065/258] fabric-ai: 1.4.320 -> 1.4.322

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

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 9fe423d3fa58..b9ccd1e2196c 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.320";
+  version = "1.4.322";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-/K70Gm96TYD8djNZkeFAB1hS3BXWuW/Nqtu583d055o=";
+    hash = "sha256-vOEEBcr74BMgIw+npIN4+s/E0jMjmIWj5uqgHK4puoc=";
   };
 
-  vendorHash = "sha256-V24r/xl/E37OYW59apD/ccXtDIpP3MeUEq9HvHdTSgM=";
+  vendorHash = "sha256-bOA4vKwiRNRCyDWKCmzwLZlhsZwjSVe194Th6MNlwvM=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;

From 2f3e3c587c82f379aa743b6b902789953d8d4566 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:23:02 +0000
Subject: [PATCH 066/258] coder: 2.26.3 -> 2.27.3

---
 pkgs/by-name/co/coder/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index ab969d17d3c7..a864f1b36896 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -15,15 +15,6 @@ let
 
   channels = {
     stable = {
-      version = "2.26.3";
-      hash = {
-        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.3";
       hash = {
         x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA=";
@@ -32,6 +23,15 @@ let
         aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI=";
       };
     };
+    mainline = {
+      version = "2.28.0";
+      hash = {
+        x86_64-linux = "sha256-Z56Q5ETE3wpBJPIaZ9/qgAJ8Tj67L1ScDwuAk0Ijjkc=";
+        x86_64-darwin = "sha256-tydx9Q32TvPF36+meoQ+NBQ7MXUHRPHBI4L7UNBhXQ0=";
+        aarch64-linux = "sha256-x7WErWe3p6Cdr2moKG0X/DEY+dkeMhnaG2RUNWfyoQU=";
+        aarch64-darwin = "sha256-jVK599hDIhWy0HOhJmPevhnZnYLylxmZ59rhrOSRGIU=";
+      };
+    };
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {

From f428216cda05e3efc9af0cb2df35dd9507c0aef7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 06:29:48 +0000
Subject: [PATCH 067/258] python3Packages.json-repair: 0.52.4 -> 0.52.5

---
 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 3b1828f75e73..49df177bdf69 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.4";
+  version = "0.52.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-eO9F2c3hIHhxLC5j2+ZtPaj+zD7Mby44N7ULsxfAQxg=";
+    hash = "sha256-+WWGykTu7hOMgVKr16oay90ZkI9tYnJfluzaETpOcRw=";
   };
 
   build-system = [ setuptools ];

From f646b17f1de30bd5986e335efd9603051b850a4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 07:34:59 +0000
Subject: [PATCH 068/258] libphonenumber: 9.0.17 -> 9.0.18

---
 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 1d891e5fd5ae..508eb3d507df 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.17";
+  version = "9.0.18";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xw159QIBNloMks/888shAEPdfd4WKmIGDRpmJ4h2JsE=";
+    hash = "sha256-u+2QN72ZvsfpKAsU9R94cq+S7aKSwZtIsg+uUz/sDtU=";
   };
 
   patches = [

From e47bfb02b37ea7ed2449ab803c962cd42a06f692 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Fri, 7 Nov 2025 19:47:17 +0800
Subject: [PATCH 069/258] wemeet: 3.26.10.400 -> 3.26.10.401

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

diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
index e7122a299b35..a332c97757d8 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.26.10.400";
+  version = "3.26.10.401";
 
   src = selectSystem {
     x86_64-linux = fetchurl {
-      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=";
+      url = "https://updatecdn.meeting.qq.com/cos/72e0e0023e1d1e6d4123fba28821aea1/TencentMeeting_0300000000_3.26.10.401_x86_64_default.publish.officialwebsite.deb";
+      hash = "sha256-cPN7ApIJwO+RvpgT7r9mUMbLmgD3xxhJAVh3Pi/mrK8=";
     };
     aarch64-linux = fetchurl {
-      url = "https://updatecdn.meeting.qq.com/cos/e5f447f30343e27c49438db8d035ae23/TencentMeeting_0300000000_3.26.10.400_arm64_default.publish.officialwebsite.deb";
-      hash = "sha256-ShxcDwwBThwe2YKNy/5+HmYcnnodPhrMaOwkw3gTq0E=";
+      url = "https://updatecdn.meeting.qq.com/cos/c06d6bc4a3370dbfb2f43bbc6ff8969e/TencentMeeting_0300000000_3.26.10.401_arm64_default.publish.officialwebsite.deb";
+      hash = "sha256-W50E1bmqJLPDU7FY0qNKPlh1z8A9Ez1Gc+NrHQhBwgI=";
     };
   };
 

From c837886460dc4d044e98427a1807eb07b21b9feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 14:58:53 +0000
Subject: [PATCH 070/258] python3Packages.dashscope: 1.24.9 -> 1.25.0

---
 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 eafc7554d17f..bf69f2b71471 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.9";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-Mb36V0yGYPblNXnAYa24yd7YJXsjWTErl+VVvBTZ1j8=";
+    hash = "sha256-l7y7JakSc9tljuL7l5Azcw+hzXjbvivxPNtGMAqQOw4=";
   };
 
   build-system = [ setuptools ];

From b93a33146d1fadc53a77304fdab78d2a05e1f6d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 15:49:43 +0000
Subject: [PATCH 071/258] keychain: 2.9.7 -> 2.9.8

---
 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 35523f15ab94..ee1200809fb4 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.7";
+  version = "2.9.8";
 
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
     rev = version;
-    sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04=";
+    sha256 = "sha256-xk3ooFhBkgv93Po5oC4TZRmMhJJXDv7yekoE102FQd8=";
   };
 
   nativeBuildInputs = [

From 88e4f87dbd5b0789000af0c0d310f8e8d39e4f1f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 16:48:36 -0800
Subject: [PATCH 072/258] python3Packages.redshift-connector: cleanup

---
 .../redshift-connector/default.nix            | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix
index 46aa57ca12da..63621cb51e97 100644
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@@ -1,25 +1,30 @@
 {
-  beautifulsoup4,
-  boto3,
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
-  lib,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  beautifulsoup4,
+  boto3,
+  botocore,
   lxml,
   packaging,
-  pytest-mock,
-  pytestCheckHook,
-  pythonOlder,
   pytz,
   requests,
   scramp,
+
+  # test
+  pytest-mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "redshift-connector";
   version = "2.1.8";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
@@ -33,7 +38,9 @@ buildPythonPackage rec {
     substituteInPlace setup.cfg --replace 'addopts =' 'no-opts ='
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     beautifulsoup4
     boto3
     lxml
@@ -43,6 +50,8 @@ buildPythonPackage rec {
     scramp
   ];
 
+  pythonRelaxDeps = [ "lxml" ];
+
   nativeCheckInputs = [
     pytest-mock
     pytestCheckHook

From ffe7af76eb61e0fc187b00f323bfa5f3cecec7ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 17:12:55 +0000
Subject: [PATCH 073/258] python3Packages.plugwise: 1.8.3 -> 1.9.0

---
 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 f12df2f1e998..39a7af210c85 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.3";
+  version = "1.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-E5SJhhvT6KdkMvGo1mxrsSVRixdMjCl0ED/A6ozqn9o=";
+    hash = "sha256-OKbzN4IWrXCrn0qUd7hL6Oh2dvO9udxymo7pZXPmqA4=";
   };
 
   postPatch = ''

From 2d281d87700c499a36b93da5948f7d10325b5611 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 7 Nov 2025 21:19:39 +0000
Subject: [PATCH 074/258] diffoscope: 307 -> 308

Changes: https://diffoscope.org/news/diffoscope-308-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 7df82ec5f70d..3e99792e4d47 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 = "307";
+  version = "308";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-ccMBoupgrDwbKaWAQa+Tqo6WfB5Qsva17uvpg2UX4jY=";
+    hash = "sha256-ahHy7E2bkNB3IeiY4P8/ksn68O+uXJ2DVscZPw7wGRI=";
   };
 
   outputs = [

From 32a1219b32dd8f2aab9ae34679ca667260eaced4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 7 Nov 2025 19:28:14 -0300
Subject: [PATCH 075/258] microsoft-edge: 142.0.3595.53 -> 142.0.3595.65

---
 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 bd98470847ec..35b07f7afe98 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 = "142.0.3595.53";
+  version = "142.0.3595.65";
 
   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-cSSKWxIkQe8jrv7gL5lX2Cs9roU8eD2MIHuLGQMnycM=";
+    hash = "sha256-aqQH4ttBWTjpzAEeWpheEJiu1FUMKMJu9j8Gu2pldbA=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 0ea279e22f731760d158be32259f958049ff461b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 22:31:04 +0000
Subject: [PATCH 076/258] vscode-extensions.james-yu.latex-workshop: 10.10.2 ->
 10.11.2

---
 .../vscode/extensions/james-yu.latex-workshop/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
index 85f420c67d99..0e3256c382c3 100644
--- a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "latex-workshop";
     publisher = "James-Yu";
-    version = "10.10.2";
-    hash = "sha256-Ls02bUSh5O5mDT2SEnaibvpHw535yelv5NaQ/NRM13k=";
+    version = "10.11.2";
+    hash = "sha256-+vlOfTCsYLqN9fxxdLyHs0Cn7Lwcj4Is2L1SwqIFcJI=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";

From 12a6dd2f30944a0bfc73f9f33857d70ea8f76ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 7 Nov 2025 14:56:17 -0800
Subject: [PATCH 077/258] python3Packages.pymobiledevice3: 5.0.3 -> 5.1.2

Diff: https://github.com/doronz88/pymobiledevice3/compare/v5.0.3...v5.1.2

Changelog: https://github.com/doronz88/pymobiledevice3/releases/tag/v5.0.4
           https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.0
           https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.1
           https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.2
---
 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 5812bdbff51c..582f2da789b0 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.3";
+  version = "5.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "doronz88";
     repo = "pymobiledevice3";
     tag = "v${version}";
-    hash = "sha256-fw7KGijIgIXXFbtNpq1QBrxUP4F6ivLQXQn94YZnQL4=";
+    hash = "sha256-HKkLkkPCu9d7iBy7FEPWR6cnNuYFgxSGN6beMCCiuyo=";
   };
 
   build-system = [

From 50b55e486f8e7baf901dc45508f63f65a6d1fd94 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Nov 2025 17:00:48 -0600
Subject: [PATCH 078/258] yaziPlugins: update on 2025-11-07
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mediainfo: 25.5.31-unstable-2025-08-28 → 25.5.31-unstable-2025-11-04
- recycle-bin: 0-unstable-2025-10-25 → 0-unstable-2025-11-03
- sudo: 0-unstable-2025-09-22 → 0-unstable-2025-11-05

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/sudo/default.nix        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index c5692e7db0cf..8e046356a4a2 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "25.5.31-unstable-2025-08-28";
+  version = "25.5.31-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "2093ab79d47d750c0b74759d2dd93aff8c7ee5c8";
-    hash = "sha256-GObz6kpBTT1HuWgsAWlbbzCw2GxZGKLTWaUKKztiTaw=";
+    rev = "7543154138ffb2bb0c738419af6ff4595152a809";
+    hash = "sha256-qWh/2WA1pBhze+g5aDSl4gHk2zJSgnl4WZr74FfNA74=";
   };
 
   meta = {
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 5de164d5d744..a3e01204d065 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-10-25";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "uhs-robert";
     repo = "recycle-bin.yazi";
-    rev = "8bb62865fdef06ea27c10367595017c118ef2831";
-    hash = "sha256-p7UBJCWvyOHpt2EbjDNJJ0wuPxK425vyy+9lf9al9F0=";
+    rev = "bce0eb110e2447544fd619f30ff82bfee51a6347";
+    hash = "sha256-dj/lKod8I6Fs1Vp2e6AOEmUVSwT12Ck7zT5e4Qsmzt0=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix
index c895b5a30754..22bc4af3eb35 100644
--- a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "sudo.yazi";
-  version = "0-unstable-2025-09-22";
+  version = "0-unstable-2025-11-05";
 
   src = fetchFromGitHub {
     owner = "TD-Sky";
     repo = "sudo.yazi";
-    rev = "8148f9101d0aeb8eed5ba2b7e943d51963f14bd9";
-    hash = "sha256-old+I3UlgMWfG0HuKEdIkAO2/4KNRLAWj0l+lB9+aZU=";
+    rev = "86205aa8044f10b02471be1087f3381bbadc967e";
+    hash = "sha256-mpQLij+Sg88RarCC+0u7JfZ2EqcX4gB7jvy8bfBt90w=";
   };
 
   meta = {

From 5ff1655c9ed8fc42c42737a78b25fb9f11d7939a Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 02:56:37 +0000
Subject: [PATCH 079/258] python3Packages.taxi: disable failing tests

- The `nixpkgs` update of `python3Packages.click` from 8.1.8 to 8.2.1 in
  PR 448189 has made these tests fail. The failures are occurring because
  of interactive inputs in the testing.
---
 pkgs/development/python-modules/taxi/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix
index 6fd45eef85eb..2bc58cc9599e 100644
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@@ -35,6 +35,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "taxi" ];
 
+  # Broken by the update of `click` from version 8.1.8 -> 8.2.1 in
+  # https://github.com/NixOS/nixpkgs/pull/448189.
+  disabledTests = [
+    "test_ignore_date_error_week_day"
+    "test_ignore_date_error_previous_day"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/sephii/taxi/";
     description = "Timesheeting made easy";

From cb181c4fa9d839ac8d566b11d12633982895fa86 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:00 +0000
Subject: [PATCH 080/258] =?UTF-8?q?gnome-session:=2049.0=20=E2=86=92=2049.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-session/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-session/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index 7bc805c8bc09..b449a7b8b0cb 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -34,7 +34,7 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session";
   # Also bump ./ctl.nix when bumping major version.
-  version = "49.0";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
-    hash = "sha256-WnViLmPRt1FFyevmfoKDZ6dfWs5LYjf2TlRmHmpUXvM=";
+    hash = "sha256-F5UQvjc2KNeb56xYk+nTpeqUnAhhfX0uId45DjIN8fY=";
   };
 
   patches = [

From d5b69926e7362db23beab9fbf664c7cbd211cd5a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:03 +0000
Subject: [PATCH 081/258] =?UTF-8?q?gnome-control-center:=2049.0=20?=
 =?UTF-8?q?=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index ff6efb76a0d6..d5256787d8ff 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -76,11 +76,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-control-center";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-pdjc4qAooAR+hnQ8J3J33os1oGPUSDNgSuo+ieqFn5c=";
+    hash = "sha256-VALv+PIxY6dV3sJJNmwbOmXoDw2mDwd0p0DR5YdG+Gk=";
   };
 
   patches = [

From f52ad84f9b70ddb80d07f07b499edf2f42876176 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:03 +0000
Subject: [PATCH 082/258] =?UTF-8?q?gnome-sudoku:=2049.0=20=E2=86=92=2049.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/49.0...49.2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-sudoku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix
index 8ad06d26f85a..3ea2e4d2224e 100644
--- a/pkgs/by-name/gn/gnome-sudoku/package.nix
+++ b/pkgs/by-name/gn/gnome-sudoku/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-sudoku";
-  version = "49.0";
+  version = "49.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
-    hash = "sha256-CzfN4geSLJpKiiIV4s3+nzL0AWHSi2An+aaRMCW1CrU=";
+    hash = "sha256-ymcPrHPZ5cPngz/aNVZxC0Ig22Qz577FCnEFYNp9uEA=";
   };
 
   nativeBuildInputs = [

From c636014b49a70e495a97478ad74d09f2a771d03e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:15 +0000
Subject: [PATCH 083/258] =?UTF-8?q?gnome-maps:=2049.1=20=E2=86=92=2049.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/49.1...49.2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-maps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index df2278c38256..709d32a47fef 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "49.1";
+  version = "49.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QG+qUc5zo/iWpKFTBX+gLqp4y4LUjxHbRECDCUl1a+w=";
+    hash = "sha256-dd4/kCjDInLTbgnbqhG/3myFz3USCGVdO6RIJo08PzA=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;

From c4cefac8dd3cfd2d73999ba705bfc7a863ed4968 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:16 +0000
Subject: [PATCH 084/258] =?UTF-8?q?gnome-system-monitor:=2049.0=20?=
 =?UTF-8?q?=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-system-monitor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix
index 4bb82e4f716b..6a5ea9560478 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/package.nix
+++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-system-monitor";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3MhE3XDkoHfwZlJNvRT5z+BLCYMdcLfWmlGBZyPNSqA=";
+    hash = "sha256-kVtqMhraEuunv1eMIMn+XkH1XVMoR8vRJLvdquwR1w8=";
   };
 
   patches = [

From 569cd32f56b932fd729d4517b03910e1063511fd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:20 +0000
Subject: [PATCH 085/258] =?UTF-8?q?gnome-usage:=2048.rc=20=E2=86=92=2048.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-usage/-/compare/48.rc...48.0

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-usage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix
index 059aadd85b82..9bcbb5d885c0 100644
--- a/pkgs/by-name/gn/gnome-usage/package.nix
+++ b/pkgs/by-name/gn/gnome-usage/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-usage";
-  version = "48.rc";
+  version = "48.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-usage/${lib.versions.major finalAttrs.version}/gnome-usage-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LUbc2QcKkY/sMUdxaaQDI2CdCFa5XHo3wBusqULTk+w=";
+    hash = "sha256-UB3jxtTWU9Wc4NcHdY3M+D3D6oGi7RSS0vMzFi/uChc=";
   };
 
   nativeBuildInputs = [

From 006a6b82db0b5cc51508226f3cc8229c7108e97a Mon Sep 17 00:00:00 2001
From: Aether Chen <15167799+chenjunyu19@users.noreply.github.com>
Date: Sat, 8 Nov 2025 10:58:03 +0800
Subject: [PATCH 086/258] mihomo: 1.19.11 -> 1.19.15

---
 pkgs/by-name/mi/mihomo/package.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 7ac8cdbdb218..917d06708271 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -8,29 +8,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.11";
+  version = "1.19.15";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8=";
+    hash = "sha256-WygZtgXikBq7jhXeppDD74WcV9STxUviQqx8Cz1R0X4=";
   };
 
-  patches = [
-    # https://github.com/MetaCubeX/mihomo/pull/2178
-    (fetchpatch {
-      url = "https://github.com/MetaCubeX/mihomo/commit/63ad95e10f40ffc90ec93497aac562765af7a471.patch";
-      hash = "sha256-ZE2dlr0t//Q1CVy2ql/TWuLEALdF1ZCYTOVK87bKWQg=";
-    })
-    # https://github.com/MetaCubeX/mihomo/pull/2177
-    (fetchpatch {
-      url = "https://github.com/MetaCubeX/mihomo/commit/b06ec5bef810ec8d009f52428188440df0484ce4.patch";
-      hash = "sha256-XQhlST4pa//+Bg5hWc2zADulz8FeEiHwB99Rw9o24b0=";
-    })
-  ];
-
-  vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8=";
+  vendorHash = "sha256-t+v+szM5uXRy173tAtRf+IqiGNHaL6nNRgf6OZmeJyQ=";
 
   excludedPackages = [ "./test" ];
 

From af892a833bbd5b61700f4409bd96afbd708eb9d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 03:03:04 +0000
Subject: [PATCH 087/258] cargo-semver-checks: 0.44.0 -> 0.45.0

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

diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index a9c71a50977f..9c5470d90d9f 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-semver-checks";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "obi1kenobi";
     repo = "cargo-semver-checks";
     tag = "v${version}";
-    hash = "sha256-QU8vLdq129gcGi8/VfjflY6zkIXXam/Ri2zjbO3sPNg=";
+    hash = "sha256-sDx449IXsFUeNL7rXbGC+HUshwqcbpjvGwl0WIJZmwo=";
   };
 
-  cargoHash = "sha256-0oPAIhhBcCwZT8sD2PWJ5ZDuMMFvmwxhyOXJWA9+jZg=";
+  cargoHash = "sha256-meF1qnISB60JXKZyYfnwE2LywGqKEVgZbwzZQEZ1Cmc=";
 
   nativeBuildInputs = [
     cmake

From aaaa9a468d06ebd1191734544f41fe789d05db21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 04:38:09 +0000
Subject: [PATCH 088/258] python3Packages.types-pytz: 2025.2.0.20250809 ->
 2025.2.0.20251108

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

diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index 0c5d3899ac7d..d55626637223 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-pytz";
-  version = "2025.2.0.20250809";
+  version = "2025.2.0.20251108";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_pytz";
     inherit version;
-    hash = "sha256-Ii4y5qKbsohx+INOh4XjgB8txEQccVzSCCsnHuy+IeU=";
+    hash = "sha256-/Kh5F4Nq6EPwcSlWe3TBkp8YcGEGgbTJLLhqPfWBe9s=";
   };
 
   build-system = [ setuptools ];

From 5fc1ba1943818c41d20e03c53b9d342ab0308569 Mon Sep 17 00:00:00 2001
From: Break Yang <breakds@gmail.com>
Date: Mon, 26 May 2025 09:24:31 -0700
Subject: [PATCH 089/258] temporal-ui-server: init at 2.43.2

---
 .../by-name/te/temporal-ui-server/package.nix | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/te/temporal-ui-server/package.nix

diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix
new file mode 100644
index 000000000000..7546e44b7da0
--- /dev/null
+++ b/pkgs/by-name/te/temporal-ui-server/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "temporal-ui-server";
+  version = "2.43.2";
+
+  src = fetchFromGitHub {
+    owner = "temporalio";
+    repo = "ui-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Z7a/21whiCjiQiqKE8aDcptSFw+op82xnqXfzVjGw6o=";
+  };
+
+  vendorHash = "sha256-HmysULH81cYOuMyW9qZRsQhv7chDobD7PnWmu3uCvJw=";
+
+  postInstall = ''
+    mv $out/bin/server $out/bin/temporal-ui-server
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/temporalio/ui-server/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/temporalio/ui-server";
+    description = "Golang Server for Temporal Web UI";
+    longDescription = ''
+      The Temporal Web UI provides users with Workflow Execution state and metadata
+      for debugging purposes. This golang server provides a binary that you can run
+      to serve the compiled temporal ui (https://github.com/temporalio/ui).
+    '';
+    mainProgram = "temporal-ui-server";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ breakds ];
+  };
+})

From 0334adbf01a54ec908e4365114061ef3d666ec0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 05:23:41 +0000
Subject: [PATCH 090/258] python3Packages.asteval: 1.0.6 -> 1.0.7

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

diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index bed12430810d..68aec3379bf4 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "asteval";
-  version = "1.0.6";
+  version = "1.0.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "lmfit";
     repo = "asteval";
     tag = version;
-    hash = "sha256-DzLVe8TlWAPQXzai9CJlDAow6UTSmkA/DW3fT30YfZY=";
+    hash = "sha256-c+gVT947IpJC2gn1SWVth0ScOBh34m89dpgR5AikOHk=";
   };
 
   build-system = [ setuptools-scm ];

From 56d0c9b875b1fd6fb6718cf4149d6ea0687b063f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 05:25:26 +0000
Subject: [PATCH 091/258] stargazer: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix
index 9253987b5589..16277889dffd 100644
--- a/pkgs/by-name/st/stargazer/package.nix
+++ b/pkgs/by-name/st/stargazer/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stargazer";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
     repo = "stargazer";
     rev = version;
-    hash = "sha256-ZkJ0X++QmQIsDKBjLEHRHeWJxFLooqXBBijIwSF6dcQ=";
+    hash = "sha256-9JNOq9SV3sHDlVaPUnZRq/8WNPQ/iF3AdSvAoCEtg7k=";
   };
 
-  cargoHash = "sha256-ufp9ib0wkehJcKHpt2yyV//000isY2+HaOzlPVMz50Y=";
+  cargoHash = "sha256-p1COGfMjHNZeAWYdVzCo/mHM75Tt5klxtYWn8tAuH0g=";
 
   passthru = {
     tests.basic-functionality = nixosTests.stargazer;

From 971d873fd2c62c153780639afba789c984338fc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 05:44:25 +0000
Subject: [PATCH 092/258] llama-cpp: 6908 -> 6981

---
 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 5aa3e6002e84..864ca4e10c8e 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 = "6908";
+  version = "6981";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A=";
+    hash = "sha256-0WtiHDlMeb+m2XcMwkPFY1mtwVTwRJUoxQSwzpiRbts=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 19751496f4668dc6a35214ec0d2f756041f9a427 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sun, 19 Oct 2025 18:20:45 +0900
Subject: [PATCH 093/258] perlPackages.FinanceQuote: 1.66 -> 1.67

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index beba321f8b99..26a964e72138 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14233,10 +14233,10 @@ with self;
 
   FinanceQuote = buildPerlPackage rec {
     pname = "Finance-Quote";
-    version = "1.66";
+    version = "1.67";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
-      hash = "sha256-GOkdcI+Ah6JvvL+zsKYe0UcdKks855jecwTzBIGkZ+k=";
+      hash = "sha256-uqip/AS5o4+nh77gAWvNTMMwHMmi8KbDeBGaNdre6zA=";
     };
     buildInputs = [
       DateManip

From 559becaabf0aa69a177b487aea5b9fe630467eec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 06:55:02 +0000
Subject: [PATCH 094/258] python3Packages.msticpy: 2.17.1 -> 2.17.2

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

diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix
index 2284c91ac90a..2f4fee074cca 100644
--- a/pkgs/development/python-modules/msticpy/default.nix
+++ b/pkgs/development/python-modules/msticpy/default.nix
@@ -50,7 +50,7 @@
 
 buildPythonPackage rec {
   pname = "msticpy";
-  version = "2.17.1";
+  version = "2.17.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "msticpy";
     tag = "v${version}";
-    hash = "sha256-2p06WKqs0lApEjWhSrq2BL95OxbyBg0Jn2ziwxsNEEE=";
+    hash = "sha256-tzAfynPyIqvWHxzLZ67r/Q5hNBKZAJhllhEVJ69L43k=";
   };
 
   pythonRelaxDeps = [

From 55fd45273a60fa488c934092d8f7bb13e503a1e7 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Sat, 8 Nov 2025 10:35:29 +0100
Subject: [PATCH 095/258] qwen-code: 0.1.4 -> 0.2.0

---
 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 9b8245cbf7c2..e2424f9b31d7 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.4";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8=";
+    hash = "sha256-nav99mAXwgJfyHr8dLGjUMAJMmyWhjt4TN9IVGHSyJs=";
   };
 
-  npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4=";
+  npmDepsHash = "sha256-gWGPrbHzWfH6bwHXySbDN6EzxULQZ3eWPaFBKsa5JUk=";
 
   nativeBuildInputs = [
     jq

From 7e0359f671eadec6fdd61613807a57f934653754 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 10:12:47 +0000
Subject: [PATCH 096/258] bashunit: 0.25.0 -> 0.26.0

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

diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
index 2a02ddd9d390..bce78ee9efeb 100644
--- a/pkgs/by-name/ba/bashunit/package.nix
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bashunit";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "TypedDevs";
     repo = "bashunit";
     tag = finalAttrs.version;
-    hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
+    hash = "sha256-cZ2fcm4OxA3Ly8QRkOQSjaSZW80/Pu2z10+iN4pDFOs=";
     forceFetchGit = true; # needed to include the tests directory for the check phase
   };
 

From 2f72afeaadf3af84c329692d00cd0a9efe60dad9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 11:02:37 +0000
Subject: [PATCH 097/258] python3Packages.hcloud: 2.9.0 -> 2.10.0

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 98e8494cd0a2..8f01aef21a2b 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.9.0";
+  version = "2.10.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MkYvojUd20ehps6whNcMg1hRgiTkS04Bl/LlwPZ62O8=";
+    hash = "sha256-EIO8s47temWK/pgm/8Gi2xgQyoOQoi9LjEN4cTjosbo=";
   };
 
   build-system = [ setuptools ];

From 27d375fe0c579f7106e8d81e7905d88676a54a9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 11:10:55 +0000
Subject: [PATCH 098/258] terraform-providers.checkly_checkly: 1.15.0 -> 1.16.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 cc611a0c2f23..91d65c3c54dd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -145,13 +145,13 @@
     "vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
   },
   "checkly_checkly": {
-    "hash": "sha256-UfaiZe5qSbnoyoYx1E1yXG8cQyBbG+wbJiBXR7jm0bE=",
+    "hash": "sha256-V5k+UdniG7v8obDXAtvRxTHgJa4I9rbjDsG/QrCxYTo=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.15.0",
+    "rev": "v1.16.0",
     "spdx": null,
-    "vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0="
+    "vendorHash": "sha256-E0XnwBMCfyP6sbBFkh+ulNa3fSaAGa5lSUD/PIfKvhE="
   },
   "ciscodevnet_aci": {
     "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=",

From 1690f91c4c4d3d5490bc64b3239650d69d4b4ea2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 11:39:49 +0000
Subject: [PATCH 099/258] cwltool: 3.1.20250925164626 -> 3.1.20251031082601

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

diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix
index 847d3484f7cf..d70d708e2fc6 100644
--- a/pkgs/by-name/cw/cwltool/package.nix
+++ b/pkgs/by-name/cw/cwltool/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cwltool";
-  version = "3.1.20250925164626";
+  version = "3.1.20251031082601";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwltool";
     tag = version;
-    hash = "sha256-esY/p7wm0HvLiX+jZENBye4NblYveYAXevYRQxk+u44=";
+    hash = "sha256-avRNOdL4Ig2cYQWh8SqX/KWfgXyVg0TVfVFrlqzUCLA=";
   };
 
   postPatch = ''

From dc84194c7f1dd21c102c7639bf26ef6cf6442491 Mon Sep 17 00:00:00 2001
From: daimond113 <contact@daimond113.com>
Date: Tue, 4 Nov 2025 20:35:57 +0000
Subject: [PATCH 100/258] coredns: fix compile errors with externalPlugins

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

diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index dc2618a6bc7f..fe8733125926 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -77,6 +77,7 @@ buildGoModule (finalAttrs: {
     diff -u plugin.cfg.orig plugin.cfg || true
     for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
     GOOS= GOARCH= go generate
+    go mod tidy
     go mod vendor
   '';
 

From ed09228baeedcb2db0911a9557a45efeccf2e1a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 12:30:02 +0000
Subject: [PATCH 101/258] pv: 1.9.44 -> 1.10.0

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index b612e525a7e8..35611cd72ff6 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.9.44";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4TDJ4Ysebp4u+VvsYRfHLLm+J6G4/+l/ynh+TI4BRWI=";
+    hash = "sha256-mY5xdBnALuc1rqC41X+cvhES9A9LlHo5uiYRpBW2TaA=";
   };
 
   meta = {

From 237843684513162e73f642df94a7a77aa3235039 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Sat, 8 Nov 2025 06:48:34 -0600
Subject: [PATCH 102/258] knossosnet: add desktop file

---
 pkgs/by-name/kn/knossosnet/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index 5024caa554e4..3b016a4583a8 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -4,6 +4,8 @@
   lib,
   openal,
   dotnetCorePackages,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
 
 buildDotnetModule rec {
@@ -25,6 +27,23 @@ buildDotnetModule rec {
 
   runtimeDeps = [ openal ];
 
+  nativeBuildInputs = [ copyDesktopItems ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "knossos";
+      exec = "Knossos.NET";
+      icon = "knossos";
+      desktopName = "Knossos.NET";
+      comment = "Multi-platform launcher for Freespace 2 Open";
+      categories = [ "Game" ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 $src/packaging/linux/knossos-512.png $out/share/icons/hicolor/512x512/apps/knossos.png
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/KnossosNET/Knossos.NET";
     description = "Multi-platform launcher for Freespace 2 Open";

From 3137ea162853059f50baa75a8e1994fe6473f885 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Nov 2025 13:16:47 +0000
Subject: [PATCH 103/258] weblate: 5.14 -> 5.14.3

Diff:
https://github.com/WeblateOrg/weblate/compare/weblate-5.14...weblate-5.14.3

Changelog:
https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.14.3
---
 pkgs/by-name/we/weblate/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 8a34ea867162..10f23f721c9b 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -22,7 +22,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.14";
+  version = "5.14.3";
 
   pyproject = true;
 
@@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-XIaVM9bsgv6qJ1Q/6wzfO7D04WsUEkxNnJlyLd5+bY4=";
+    hash = "sha256-DwoJ24yGLJt+bItN/9SW0ruf+Lz3A9JxvD4QjlKaqzw=";
   };
 
   build-system = with python.pkgs; [ setuptools ];
@@ -176,5 +176,6 @@ python.pkgs.buildPythonApplication rec {
     ];
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ erictapen ];
+    mainProgram = "weblate";
   };
 }

From 21861636298936d3c72b913c7a2cbc12910a5f37 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 8 Nov 2025 08:40:41 -0500
Subject: [PATCH 104/258] erlang_26: 26.2.5.15 -> 26.2.5.16

Changelog: https://github.com/erlang/otp/releases/tag/OTP-26.2.5.16
---
 pkgs/development/interpreters/erlang/26.nix              | 4 ++--
 pkgs/development/interpreters/erlang/generic-builder.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index c5b66de84d69..dca49d4fba01 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "26.2.5.15";
-  hash = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE=";
+  version = "26.2.5.16";
+  hash = "sha256-3WxURI1o/CqN0KK+voUMk6al2mtsrqoniBJpDxKpxPo=";
 }
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 4b38d0d1ed20..1ab41c655cad 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -164,6 +164,7 @@ stdenv.mkDerivation {
     homepage = "https://www.erlang.org/";
     downloadPage = "https://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
+    changelog = "https://github.com/erlang/otp/releases/tag/OTP-${version}";
 
     longDescription = ''
       Erlang is a programming language used to build massively scalable

From 841fb3a98c55ce90cab95852daa2d03816ee256b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 8 Nov 2025 08:43:22 -0500
Subject: [PATCH 105/258] erlang_27: 27.3.4.4 -> 27.3.4.5

Changelog: https://github.com/erlang/otp/releases/tag/OTP-27.3.4.5
---
 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 fd4acce3596b..7d220ff7aa65 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.4";
-  hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM=";
+  version = "27.3.4.5";
+  hash = "sha256-6kFixIy74ACvNBhPWoUQDCH6N2KJ++5xAEqPQ9jvJ8o=";
 }

From 6e20cb326ce21b0631d9c90ea78d907ef056c1d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 14:46:55 +0000
Subject: [PATCH 106/258] iosevka: 33.3.3 -> 33.3.4

---
 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 23ae4b93842b..0f79808b6021 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.3.3";
+  version = "33.3.4";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-/e65hFA8GabDrHjQ+9MthSTxUku9af0LT4W1ENI+LYc=";
+    hash = "sha256-CH9OGj9dfxY3vfLX4ipbML4rIOlXBKIOgwz3K54o1No=";
   };
 
-  npmDepsHash = "sha256-QJ3h8NdhCG+lkZ5392akKk+pVHiqmnt+DsC3imixNnw=";
+  npmDepsHash = "sha256-xNd/DGIYbjR0v+iUgj12T1jsUpIuOG0avNGnEYVdK3Q=";
 
   nativeBuildInputs = [
     remarshal

From 2505ca46231c79e18e6a5ec96ded819040d74718 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 8 Nov 2025 23:35:37 +0800
Subject: [PATCH 107/258] polari: Switch to girepository-2.0

Fails to launch with gjs-1.85: cannot register existing type 'GIRepository'
---
 pkgs/by-name/po/polari/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix
index 7703671c9319..70ee17118cf9 100644
--- a/pkgs/by-name/po/polari/package.nix
+++ b/pkgs/by-name/po/polari/package.nix
@@ -3,6 +3,7 @@
   lib,
   itstool,
   fetchurl,
+  fetchpatch,
   gdk-pixbuf,
   telepathy-glib,
   gjs,
@@ -42,6 +43,13 @@ stdenv.mkDerivation rec {
     # If we wrap it in a shell script, gjs can no longer run it.
     # Let’s change the code to run the script directly by making it executable and having gjs in shebang.
     ./make-thumbnailer-wrappable.patch
+
+    # Switch to girepository-2.0
+    # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/356
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/polari/-/commit/d7946c7fe39f112cd3f751bb95b170446022980d.patch";
+      hash = "sha256-naRzZ5Iple11HJ+d8DL9oJy3C4VKLkz+FdMuhO7sc7k=";
+    })
   ];
 
   propagatedUserEnvPkgs = [ telepathy-idle ];

From 17b131092da3d09c7b562d3df60896b539970668 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 16:15:43 +0000
Subject: [PATCH 108/258] python3Packages.openai-harmony: 0.0.4 -> 0.0.8

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

diff --git a/pkgs/development/python-modules/openai-harmony/default.nix b/pkgs/development/python-modules/openai-harmony/default.nix
index 74251b28ad4e..7de7f6ed6468 100644
--- a/pkgs/development/python-modules/openai-harmony/default.nix
+++ b/pkgs/development/python-modules/openai-harmony/default.nix
@@ -16,19 +16,19 @@
 
 buildPythonPackage rec {
   pname = "openai-harmony";
-  version = "0.0.4";
+  version = "0.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "harmony";
     rev = "v${version}";
-    hash = "sha256-2LOrMLrNR1D3isbjiv5w+1Ni9IMwMEPPTOnG1rm//ag=";
+    hash = "sha256-CaEldCrjBkjwsVeTzpiAFl/llAnUwJGTlU8Pt8YTV1E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-tQq6PFMYghIfJu8CddbXFKXxr41GJaElbCCQuSpnaqk=";
+    hash = "sha256-HeUK/S9nUDRTVkLf8CPrHfjBbyGZezZGu5P8XkfStVQ=";
   };
 
   nativeBuildInputs = [

From 05298556c4ec9509f9d536454d42437b86820096 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 16:46:33 +0000
Subject: [PATCH 109/258] faugus-launcher: 1.9.9 -> 1.9.10

---
 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 60a97b2d1c24..f9b726490655 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.9";
+  version = "1.9.10";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = version;
-    hash = "sha256-4ySI6j74DmeHAKtIYuAp+dnmyz9/gc6cQomcfP6V5IM=";
+    hash = "sha256-XYEqC+vqB8dHGxDZQnyYEG2FgxfOakXB0u0OrIwsf0k=";
   };
 
   nativeBuildInputs = [

From 6557f662943a6f0039878dd68fd9805392c9bdd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 16:55:25 +0000
Subject: [PATCH 110/258] python3Packages.apscheduler: 3.11.0 -> 3.11.1

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

diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix
index 028df647f83a..f11fe2e37d8e 100644
--- a/pkgs/development/python-modules/apscheduler/default.nix
+++ b/pkgs/development/python-modules/apscheduler/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "apscheduler";
-  version = "3.11.0";
+  version = "3.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "apscheduler";
     tag = version;
-    hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w=";
+    hash = "sha256-3KSW1RdiUXlDTr30Wrc8fYb4rRnlOn6lVhBgz3r1D/4=";
   };
 
   postPatch = ''

From f2f501c50ceabfb676b32dc5842d55edb6d75d22 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 8 Nov 2025 12:12:16 -0500
Subject: [PATCH 111/258] zfs_2_2: remove

Will likely go out of support during 25.11 as zfs-2.4.0-rc3 is already out
---
 nixos/tests/zfs.nix                |  5 -----
 pkgs/os-specific/linux/zfs/2_2.nix | 33 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  4 ----
 pkgs/top-level/linux-kernels.nix   |  4 ----
 5 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/2_2.nix

diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 470d256ba515..0f0f40e00020 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -204,11 +204,6 @@ let
 in
 {
 
-  series_2_2 = makeZfsTest {
-    zfsPackage = pkgs.zfs_2_2;
-    kernelPackages = pkgs.linuxPackages;
-  };
-
   series_2_3 = makeZfsTest {
     zfsPackage = pkgs.zfs_2_3;
     kernelPackages = pkgs.linuxPackages;
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
deleted file mode 100644
index 487435ca5f48..000000000000
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  callPackage,
-  lib,
-  nixosTests,
-  stdenv,
-  ...
-}@args:
-
-callPackage ./generic.nix args {
-  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
-  # this attribute is the correct one for this package.
-  kernelModuleAttribute = "zfs_2_2";
-
-  kernelMinSupportedMajorMinor = "4.18";
-  kernelMaxSupportedMajorMinor = "6.15";
-
-  # this package should point to the latest release.
-  version = "2.2.8";
-
-  tests = {
-    inherit (nixosTests.zfs) series_2_2;
-  }
-  // lib.optionalAttrs stdenv.isx86_64 {
-    inherit (nixosTests.zfs) installer;
-  };
-
-  maintainers = with lib.maintainers; [
-    adamcstephens
-    amarshall
-  ];
-
-  hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo=";
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 61b6b6f12bdd..fd31fabdc97f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1651,6 +1651,7 @@ mapAliases {
   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
+  zfs_2_2 = throw "'zfs_2_2' has been removed, upgrade to a newer version instead"; # Added 2025-11-08
   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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e075871330c..6e60e4329f24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10342,9 +10342,6 @@ with pkgs;
 
   inherit
     ({
-      zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
-        configFile = "user";
-      };
       zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
         configFile = "user";
       };
@@ -10352,7 +10349,6 @@ with pkgs;
         configFile = "user";
       };
     })
-    zfs_2_2
     zfs_2_3
     zfs_unstable
     ;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 5b649e3be8ae..121f344a22b1 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -656,10 +656,6 @@ in
 
         zenpower = callPackage ../os-specific/linux/zenpower { };
 
-        zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
-          configFile = "kernel";
-          inherit pkgs kernel;
-        };
         zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
           configFile = "kernel";
           inherit pkgs kernel;

From 3901ded5d641ee4fa34abf4b42643af33dcfbbaf Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Sat, 8 Nov 2025 16:12:57 +0100
Subject: [PATCH 112/258] ossec-agent,ossec-server: drop

The package build is broken on linux since #270218 from 2023.

It looks like it's building on darwin, dropping it anyway since
noone cared to bump it to the current state which also contains
security related improvements.
---
 pkgs/tools/security/ossec/agent.nix     |  82 -------
 pkgs/tools/security/ossec/no-root.patch | 297 ------------------------
 pkgs/tools/security/ossec/server.nix    |  82 -------
 pkgs/top-level/aliases.nix              |   2 +
 pkgs/top-level/all-packages.nix         |   4 -
 5 files changed, 2 insertions(+), 465 deletions(-)
 delete mode 100644 pkgs/tools/security/ossec/agent.nix
 delete mode 100644 pkgs/tools/security/ossec/no-root.patch
 delete mode 100644 pkgs/tools/security/ossec/server.nix

diff --git a/pkgs/tools/security/ossec/agent.nix b/pkgs/tools/security/ossec/agent.nix
deleted file mode 100644
index 28f29c9c045e..000000000000
--- a/pkgs/tools/security/ossec/agent.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  which,
-  pcre2,
-  zlib,
-  ncurses,
-  openssl,
-}:
-let
-  version = "unstable-2023-08-09";
-in
-stdenv.mkDerivation {
-  pname = "ossec-agent";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "ossec";
-    repo = "ossec-hids";
-    rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2";
-    sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE=";
-  };
-
-  # clear is used during the build process
-  nativeBuildInputs = [ ncurses ];
-
-  buildInputs = [
-    which
-    pcre2
-    zlib
-    openssl
-  ];
-
-  # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files
-  patches = [ ./no-root.patch ];
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of
-  #     `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  buildPhase = ''
-        mkdir $out
-        export USER_DIR="$out" # just to satisy the script
-        ./install.sh <<EOF
-    en
-
-    agent
-    127.0.0.1
-    yes
-    yes
-    yes
-    EOF
-
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share
-    mv $out/active-response/bin/* $out/bin
-    mv $out/etc $out/share
-    mv $out/queue $out/share
-    mv $out/var $out/share
-    mv $out/agentless $out/share
-    mv $out/.ssh $out/share
-    rm -r $out/active-response
-    rm -r $out/tmp
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Open source host-based instrusion detection system";
-    homepage = "https://www.ossec.net";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ happysalada ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/tools/security/ossec/no-root.patch b/pkgs/tools/security/ossec/no-root.patch
deleted file mode 100644
index ef2f28560070..000000000000
--- a/pkgs/tools/security/ossec/no-root.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/install.sh b/install.sh
-index 387bde1a..cb6dcbf2 100755
---- a/install.sh
-+++ b/install.sh
-@@ -126,14 +126,14 @@ Install()
-     # Generate the /etc/ossec-init.conf
-     VERSION_FILE="./src/VERSION"
-     VERSION=`cat ${VERSION_FILE}`
--    chmod 700 ${OSSEC_INIT} > /dev/null 2>&1
--    echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT}
--    echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT}
--    echo "DATE=\"`date`\"" >> ${OSSEC_INIT}
--    echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT}
--    chmod 600 ${OSSEC_INIT}
--    cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT}
--    chmod 640 ${INSTALLDIR}${OSSEC_INIT}
-+    # chmod 700 ${OSSEC_INIT} > /dev/null 2>&1
-+    # echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT}
-+    # echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT}
-+    # echo "DATE=\"`date`\"" >> ${OSSEC_INIT}
-+    # echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT}
-+    # chmod 600 ${OSSEC_INIT}
-+    # cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT}
-+    # chmod 640 ${INSTALLDIR}${OSSEC_INIT}
- 
- 
-     # If update_rules is set, we need to tweak
-@@ -148,12 +148,12 @@ Install()
-     fi
- 
-     # Calling the init script  to start ossec hids during boot
--    if [ "X${update_only}" = "X" ]; then
--        runInit
--        if [ $? = 1 ]; then
--            notmodified="yes"
--        fi
--    fi
-+    # if [ "X${update_only}" = "X" ]; then
-+    #     runInit
-+    #     if [ $? = 1 ]; then
-+    #         notmodified="yes"
-+    #     fi
-+    # fi
- 
- }
- 
-@@ -965,10 +965,10 @@ main()
-         catError "0x1-location";
-     fi
- 
--    # Must be root
--    if [ ! "X$ME" = "Xroot" ]; then
--        catError "0x2-beroot";
--    fi
-+    # # Must be root
-+    # if [ ! "X$ME" = "Xroot" ]; then
-+    #     catError "0x2-beroot";
-+    # fi
- 
-     # Checking dependencies
-     checkDependencies
-diff --git a/src/Makefile b/src/Makefile
-index 7fc04c0b..0eb27a0a 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -144,7 +144,7 @@ endif
- ifeq (${uname_S},AIX)
-         INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3)
- else
--        INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
-+        INSTALL_CMD?=install
- endif
- 
- ifdef DEBUGAD
-@@ -404,10 +404,10 @@ endif
- install: install-${TARGET}
- 
- install-agent: install-common
--	$(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-agentd ${PREFIX}/bin
-+	$(call INSTALL_CMD) agent-auth ${PREFIX}/bin
- 
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/rids
- 
- install-local: install-server-generic
- 
-@@ -416,133 +416,126 @@ install-hybrid: install-server-generic
- install-server: install-server-generic
- 
- install-common: build
--	./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX}
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
--	$(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log
--
--	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
-+	$(call INSTALL_CMD) -d ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-logcollector ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-syscheckd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-execd ${PREFIX}/bin
-+	$(call INSTALL_CMD) manage_agents ${PREFIX}/bin
-+	$(call INSTALL_CMD) ../contrib/util.sh ${PREFIX}/bin/
-+	$(call INSTALL_CMD) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
- 
- ifeq (${LUA_ENABLE},yes)
--	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua
--	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native
--	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled
--	$(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
-+	$(call INSTALL_CMD) -d ${PREFIX}/lua
-+	$(call INSTALL_CMD) -d ${PREFIX}/lua/native
-+	$(call INSTALL_CMD) -d ${PREFIX}/lua/compiled
-+	$(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
-+	$(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
- endif
- 
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue
--	$(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/alerts
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/ossec
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/syscheck
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/diff
- 
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc
-+	$(call INSTALL_CMD) -d ${PREFIX}/etc
- ifeq (${INSTALL_LOCALTIME},yes)
--	$(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc
-+	$(call INSTALL_CMD) /etc/localtime ${PREFIX}/etc
- endif
- ifeq (${INSTALL_RESOLVCONF},yes)
--	$(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/resolv.conf ${PREFIX}/etc
-+	$(call INSTALL_CMD) /etc/resolv.conf ${PREFIX}/etc
- endif
- 
--	$(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp
-+	$(call INSTALL_CMD) -d ${PREFIX}/tmp
- 
- ifneq (,$(wildcard /etc/TIMEZONE))
--	$(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/
-+	$(call INSTALL_CMD) /etc/TIMEZONE ${PREFIX}/etc/
- endif
- # Solaris Needs some extra files
- ifeq (${uname_S},SunOS)
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/
-+	$(call INSTALL_CMD) -d ${PREFIX}/usr/share/lib/zoneinfo/
- 	cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/
- endif
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/
-+	$(call INSTALL_CMD) -b ../etc/internal_options.conf ${PREFIX}/etc/
- ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf))
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
-+	$(call INSTALL_CMD) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
- endif
- ifeq (,$(wildcard ${PREFIX}/etc/client.keys))
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys
-+	$(call INSTALL_CMD) /dev/null ${PREFIX}/etc/client.keys
- endif
- ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf))
- ifneq (,$(wildcard ../etc/ossec.mc))
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
-+	$(call INSTALL_CMD) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
- else
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
-+	$(call INSTALL_CMD) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
- endif
- endif
- 
--	$(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared
--	$(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/
-+	$(call INSTALL_CMD) -d ${PREFIX}/etc/shared
-+	$(call INSTALL_CMD) rootcheck/db/*.txt ${PREFIX}/etc/shared/
- 
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/
-+	$(call INSTALL_CMD) -d ${PREFIX}/active-response
-+	$(call INSTALL_CMD) -d ${PREFIX}/active-response/bin
-+	$(call INSTALL_CMD) -d ${PREFIX}/agentless
-+	$(call INSTALL_CMD) agentlessd/scripts/* ${PREFIX}/agentless/
- 
--	$(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh
-+	$(call INSTALL_CMD) -d ${PREFIX}/.ssh
- 
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
-+	$(call INSTALL_CMD) ../active-response/*.sh ${PREFIX}/active-response/bin/
-+	$(call INSTALL_CMD) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
- 
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var
--	$(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run
--
--	./init/fw-check.sh execute
-+	$(call INSTALL_CMD) -d ${PREFIX}/var
-+	$(call INSTALL_CMD) -d ${PREFIX}/var/run
- 
- 
- 
- install-server-generic: install-common
--	$(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall
--
--	$(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin
--	$(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/
--	$(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/
--
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats
--	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules
-+	$(call INSTALL_CMD) /dev/null ${PREFIX}/logs/active-responses.log
-+	$(call INSTALL_CMD) -d ${PREFIX}/logs/archives
-+	$(call INSTALL_CMD) -d ${PREFIX}/logs/alerts
-+	$(call INSTALL_CMD) -d ${PREFIX}/logs/firewall
-+
-+	$(call INSTALL_CMD) ossec-agentlessd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-analysisd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-monitord ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-reportd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-maild ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-remoted ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-logtest ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-csyslogd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-authd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-dbd ${PREFIX}/bin
-+	$(call INSTALL_CMD) ossec-makelists ${PREFIX}/bin
-+	$(call INSTALL_CMD) verify-agent-conf ${PREFIX}/bin/
-+	$(call INSTALL_CMD) clear_stats ${PREFIX}/bin/
-+	$(call INSTALL_CMD) list_agents ${PREFIX}/bin/
-+	$(call INSTALL_CMD) ossec-regex ${PREFIX}/bin/
-+	$(call INSTALL_CMD) syscheck_update ${PREFIX}/bin/
-+	$(call INSTALL_CMD) agent_control ${PREFIX}/bin/
-+	$(call INSTALL_CMD) syscheck_control ${PREFIX}/bin/
-+	$(call INSTALL_CMD) rootcheck_control ${PREFIX}/bin/
-+
-+	$(call INSTALL_CMD) -d ${PREFIX}/stats
-+	$(call INSTALL_CMD) -d ${PREFIX}/rules
- ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml))
- 	cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
-+	$(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules
-+	$(call INSTALL_CMD) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
- 	rm ${PREFIX}/rules/local_rules.xml.installbackup
- else
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
-+	$(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules
- endif
- 
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/fts
- 
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/rootcheck
- 
--	$(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info
--	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/agent-info
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/agentless
- 
--	$(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
-+	$(call INSTALL_CMD) -d ${PREFIX}/queue/rids
- 
--	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/
-+	$(call INSTALL_CMD) ../etc/decoder.xml ${PREFIX}/etc/
- 
- 	rm -f ${PREFIX}/etc/shared/merged.mg
- 
diff --git a/pkgs/tools/security/ossec/server.nix b/pkgs/tools/security/ossec/server.nix
deleted file mode 100644
index 29587552cfe7..000000000000
--- a/pkgs/tools/security/ossec/server.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  which,
-  pcre2,
-  zlib,
-  ncurses,
-  openssl,
-}:
-let
-  version = "unstable-2023-08-09";
-in
-stdenv.mkDerivation {
-  pname = "ossec-server";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "ossec";
-    repo = "ossec-hids";
-    rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2";
-    sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE=";
-  };
-
-  # clear is used during the build process
-  nativeBuildInputs = [ ncurses ];
-
-  buildInputs = [
-    which
-    pcre2
-    zlib
-    openssl
-  ];
-
-  # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files
-  patches = [ ./no-root.patch ];
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of
-  #     `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  buildPhase = ''
-        mkdir -p $out/logs
-        export USER_DIR="$out" # just to satisy the script
-        ./install.sh <<EOF
-    en
-
-    server
-    n
-    n
-    EOF
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share
-    mv $out/active-response/bin/* $out/bin
-    mv $out/etc $out/share
-    mv $out/queue $out/share
-    mv $out/var $out/share
-    mv $out/agentless $out/share
-    mv $out/.ssh $out/share
-    mv $out/logs $out/share
-    mv $out/rules $out/share
-    mv $out/stats $out/share
-    rm -r $out/active-response
-    rm -r $out/tmp
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Open source host-based instrusion detection system";
-    homepage = "https://www.ossec.net";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ happysalada ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7b648852e189..d3e8d796ebc8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1176,6 +1176,8 @@ mapAliases {
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
   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
+  ossec-agent = throw "'ossec-agent' has been removed due to lack of maintenance"; # Added 2025-11-08
+  ossec-server = throw "'ossec-server' has been removed due to lack of maintenance"; # Added 2025-11-08
   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 = throw "'pacup' has been renamed to/replaced by 'perlPackages.pacup'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ffccb2ce3ad..a720d2c5e1fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3653,10 +3653,6 @@ with pkgs;
     llvm = llvm_19;
   };
 
-  ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
-
-  ossec-server = callPackage ../tools/security/ossec/server.nix { };
-
   p4c = callPackage ../development/compilers/p4c {
     protobuf = protobuf_21;
   };

From b7e8a33ae0ce94f99973e6a27b3e0fa4cd7a07ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sat, 8 Nov 2025 17:54:39 +0000
Subject: [PATCH 113/258] claude-code: 2.0.35 -> 2.0.36

---
 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 eebf0b81eb5b..7179d9c5e136 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.35",
+  "version": "2.0.36",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.35",
+      "version": "2.0.36",
       "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 370e33bc8d25..eeca6d40bee7 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.35";
+  version = "2.0.36";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8=";
+    hash = "sha256-6tbbCaF1HIgdk1vpbgQnBKWghaKKphGIGZoXtmnhY2I=";
   };
 
-  npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk=";
+  npmDepsHash = "sha256-hgIWGAXqT517B+v/M15acseSf9NJGeHk2G4gZozFssw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 35bbdb28111c191a4166b5f0e5436a22bd4ed287 Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Sat, 8 Nov 2025 20:14:49 +0200
Subject: [PATCH 114/258] burpsuite: 2025.10.1 -> 2025.10.3

---
 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 8d250a144294..ecd564619781 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.1";
+  version = "2025.10.3";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-aLP8jVHuKmp4yzcd1KsgidAhWUxoJo0beGwq/6I4n4A=";
+        hash = "sha256-4XGIFjklYfHBJ/HIdJ7C1eTpLAq0nC3VSP6O/R3tdJw=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-HiYdJrnTg0HkCt+lXKkhfGawp/NZQmhH4sGytlpiLU8=";
+        hash = "sha256-28dsTC0AEHT6IO9he1Rc3xglnf8epdXJitZ1BdCLrYE=";
       };
 
   src = fetchurl {

From 4a0ac9806f3a25b3e656813b6b7aff74215bead6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 8 Nov 2025 20:15:45 +0200
Subject: [PATCH 115/258] or-tools: downgrade highs to 1.10.0 again

This is a local revert of 58daf511687f191829238fc7f571e08dc9dedf56,
working around https://github.com/google/or-tools/issues/4911.
---
 pkgs/by-name/or/or-tools/package.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix
index 3d13cdf0b797..c8e9ba327ff1 100644
--- a/pkgs/by-name/or/or-tools/package.nix
+++ b/pkgs/by-name/or/or-tools/package.nix
@@ -35,6 +35,25 @@ let
   python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; };
   pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; };
 
+  # local revert of 58daf511687f191829238fc7f571e08dc9dedf56,
+  # working around https://github.com/google/or-tools/issues/4911
+  _highs = highs.overrideAttrs (old: rec {
+    version = "1.10.0";
+    src = fetchFromGitHub {
+      owner = "ERGO-Code";
+      repo = "HiGHS";
+      rev = "v${version}";
+      hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
+    };
+    # 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
+    '';
+  });
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "or-tools";
@@ -124,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     glpk
     gbenchmark
     gtest
-    highs
+    _highs
     python3.pkgs.absl-py
     python3.pkgs.pybind11
     python3.pkgs.pybind11-abseil
@@ -138,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   propagatedBuildInputs = [
     abseil-cpp
-    highs
+    _highs
     protobuf
     python-protobuf
     python3.pkgs.immutabledict

From 368a919d928ef9b89293b4af9aa7a24c4b20b9a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 18:30:34 +0000
Subject: [PATCH 116/258] python3Packages.tencentcloud-sdk-python: 3.0.1483 ->
 3.0.1484

---
 .../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 e639430287ce..cb0a9cd40ebc 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.1483";
+  version = "3.0.1484";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-yidKh50qnikyhBeuMKxiVD4xdqRO2ReJp1SuD266lHM=";
+    hash = "sha256-nAfQTg4sufpyKAH37/TaUzklvIY5UPTLKf0t3chUAcI=";
   };
 
   build-system = [ setuptools ];

From 498ffd776e42ed651d53ac48187590409a25bc58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 18:37:15 +0000
Subject: [PATCH 117/258] p2pool: 4.11 -> 4.12

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

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 262a38bf5c11..fe56cad06d58 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "p2pool";
-  version = "4.11";
+  version = "4.12";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qoz7wMI6hheF+Pecfq3pPZRc2H3nkrxKRMWR2qmJdsI=";
+    hash = "sha256-Yrc36tibHanXZcE3I+xcmkCzBALE09zi1Zg0Lz3qS2g=";
     fetchSubmodules = true;
   };
 

From 39750bff983510df1efc705f17acf2f16e4699d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 18:56:21 +0000
Subject: [PATCH 118/258] sarasa-gothic: 1.0.33 -> 1.0.34

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

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 9514d0a2a102..48192fa2eb07 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.33";
+  version = "1.0.34";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-aIZWTrG1NimE6cPzs1drrTfvbHAuObUOjlPgZv3PaSg=";
+    hash = "sha256-wCUKEGq6qL+rsRXEuLOqfRLWsWkMd8khfQ+rFKfEkRQ=";
   };
 
   sourceRoot = ".";

From ee911c1f6ae59ce519046a07d5696da9217331c5 Mon Sep 17 00:00:00 2001
From: "Commentator2.0" <46420447+CommentatorForAll@users.noreply.github.com>
Date: Sat, 8 Nov 2025 20:01:04 +0100
Subject: [PATCH 119/258] frigate: fix broken string escape

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

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index efe9abd37a01..d937eb60bdea 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -578,7 +578,7 @@ in
               add_header Cache-Control "public";
             '';
           };
-          "~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = {
+          "~ ^/.*-([A-Za-z0-9]+)\\.webmanifest$" = {
             root = cfg.package.web;
             extraConfig = ''
               access_log off;

From d07a7548f64a1d0a0d904b0e16a419915e02ece7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 19:12:12 +0000
Subject: [PATCH 120/258] hyprutils: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index b949294ee968..8bece943d05b 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=";
+    hash = "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=";
   };
 
   nativeBuildInputs = [

From dc249fa9b321804460c82356fce126f2e4702f3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 19:21:43 +0000
Subject: [PATCH 121/258] cursor-cli: 0-unstable-2025-10-28 ->
 0-unstable-2025-11-06

---
 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 bdb8015ce19e..558e212344f1 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.28-0a91dc2/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-mZ0T7rrKzwvaNUbrHBy3XO04vZSO6RQ4RmJmrdfaoJA=";
+      url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-otTYUTmGqqXT4Jx+r1RlFjJD7FYU62QRl+y69eo/khs=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-bchHYPQ0O/0YWiPdj3wnq43p/fKFoP4KXpeSVWpLYpE=";
+      url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-jPqgGdtjLg4qZWktz1/X1LI0+e6RYcCtuLw91k1Xofg=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-PWx5QAs84gWNOHYZL20uFnW+m4rApRT6g4LtabjL+lw=";
+      url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-UVR+iomdZzmPfj4o4N4FfUSCa9ttJre7Ipso5weIn1k=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-VW76Lx2VKspiGkphp74ib4+F5FCdu8793f+xvD67OpM=";
+      url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-t5s9TfLLA/VLCYNF+fsf9wgfk2W96eQSIbW/cdUKMuY=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2025-10-28";
+  version = "0-unstable-2025-11-06";
 
   src = sources.${hostPlatform.system};
 

From 9477be20e1b1963c347cd2c44b03190a4099cd0a Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 8 Nov 2025 20:24:26 +0100
Subject: [PATCH 122/258] mods: remove maintainer delafthi

---
 pkgs/by-name/mo/mods/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix
index da9250260f89..34d96d91b44e 100644
--- a/pkgs/by-name/mo/mods/package.nix
+++ b/pkgs/by-name/mo/mods/package.nix
@@ -77,7 +77,6 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       dit7ya
       caarlos0
-      delafthi
     ];
     mainProgram = "mods";
   };

From 6bc521cbc067a3852e7caa4acf8b3062de7135cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 19:31:32 +0000
Subject: [PATCH 123/258] mprisence: 1.2.9 -> 1.2.10

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

diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix
index bf407184a86e..e97587d61cdd 100644
--- a/pkgs/by-name/mp/mprisence/package.nix
+++ b/pkgs/by-name/mp/mprisence/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mprisence";
-  version = "1.2.9";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "lazykern";
     repo = "mprisence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qF0jG9tc3tp2ChGCGE3YUZoTaQoTmLLd39iBWeSS7wU=";
+    hash = "sha256-M0UfdUw65PD3HuKAh6PbbuNzyHVbYUfMuQT8em6OnaM=";
   };
 
-  cargoHash = "sha256-32zBqZJoo0C+4ogEbEz4rxyATG9dbibp7NxMXYYJNsE=";
+  cargoHash = "sha256-STvMAkCFrMjekz2wk2UtEi6nsEVFnuIhFinxWWbcIto=";
 
   nativeBuildInputs = [ pkg-config ];
 

From a77aa2b0c1c1d669ecaf263276bb5a17536b0c1f Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Sat, 8 Nov 2025 19:16:48 +0100
Subject: [PATCH 124/258] hop: drop

The package hasn't been build succesfully since 2024-12.

Co-authored-by: Tom <github@thunze.de>
---
 pkgs/by-name/ho/hop/package.nix | 43 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/ho/hop/package.nix

diff --git a/pkgs/by-name/ho/hop/package.nix b/pkgs/by-name/ho/hop/package.nix
deleted file mode 100644
index cdf9785287e7..000000000000
--- a/pkgs/by-name/ho/hop/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  bigloo,
-}:
-
-# Compute the “release” version of bigloo (before the first dash, if any)
-let
-  bigloo-release =
-    let
-      inherit (lib) head splitString;
-    in
-    head (splitString "-" (builtins.parseDrvName bigloo.name).version);
-in
-
-stdenv.mkDerivation rec {
-  pname = "hop";
-  version = "3.4.4";
-  src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz";
-    sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I=";
-  };
-
-  postPatch = ''
-    substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")'
-  '';
-
-  buildInputs = [ bigloo ];
-
-  configureFlags = [
-    "--bigloo=${bigloo}/bin/bigloo"
-    "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
-  ];
-
-  meta = with lib; {
-    description = "Multi-tier programming language for the Web 2.0 and the so-called diffuse Web";
-    homepage = "http://hop.inria.fr/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ vbgl ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 61b6b6f12bdd..c22396988d2b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -703,6 +703,7 @@ mapAliases {
   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
+  hop = throw "'hop' has been removed due to lack of maintenance"; # Added 2025-11-08
   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

From 83928d8a193ea875fd43ce6578db86b931b6a6b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 19:38:26 +0000
Subject: [PATCH 125/258] terraform-providers.hashicorp_awscc: 1.62.0 -> 1.63.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 cc611a0c2f23..5725d39370af 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-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",
+    "hash": "sha256-eaFzTQehn1nIq0Zl/8r2AtmPQnhh7X44q/6JVzIzX2A=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.62.0",
+    "rev": "v1.63.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="
+    "vendorHash": "sha256-wP7A2k0sXfbfQjKkDx+rOC8vgBhSQXak3gdera8inzY="
   },
   "hashicorp_azuread": {
     "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",

From 2e80303fbb2aeac984737d933a864f2891fe9922 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 19:58:14 +0000
Subject: [PATCH 126/258] vsce: 3.6.2 -> 3.7.0

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

diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index 9fb128393e93..4002ec7f627d 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "vsce";
-  version = "3.6.2";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-vsce";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TcBzXDNpjJvI+0ir80d+HFp6mF/Ecle4vhOMcACvF7M=";
+    hash = "sha256-dNSO+PoUNQUtvS6NZJ/InOYqI4vav+WNg6kCA+CaWL8=";
   };
 
-  npmDepsHash = "sha256-G09pn6JX389GMbIzYmmLutH7qwiaDb8V9zCGAOFaDdk=";
+  npmDepsHash = "sha256-rqwb1bz/OFHzL8GgqMZtuqYkeST5qlFybDRSFOx7LtU=";
 
   postPatch = ''
     substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'

From d51ca62a5d927a6193c4c560d10b8aba57467756 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 7 Nov 2025 15:28:22 -0800
Subject: [PATCH 127/258] miro: 0.7.0 -> 0.7.2

bump
---
 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 2b54d70c09a3..3543f9f9baec 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.7.0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "vincent-uden";
     repo = "miro";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tkZSyxdcHeumBMlinwA3DT2Y/FgLzbeuVbsFbTfvINg=";
+    hash = "sha256-2RyBjWeb94bxiZ7hy//654YP1bc6bl13slNxRwrhtyk=";
   };
 
-  cargoHash = "sha256-4NE9nMmOTQpWvMsGexW6GpBGao4yQoofrzGaaM4+rWE=";
+  cargoHash = "sha256-wRlze8VZ9I4O/eycWvlNPUsa/ucBeZ8SWtD9eJ+Uxvs=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From f9d65f372b638162f2e8174ef135bb0878c43994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Nov 2025 20:55:02 +0100
Subject: [PATCH 128/258] ipp-usb: fix man page being installed into double
 PREFIX, use --replace-fail everywhere

(cherry picked from commit 4ed34a26057d00ebcdb0b482f7ca3971f8a519ba)
---
 pkgs/by-name/ip/ipp-usb/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix
index c2350842ee2f..1adee0a56ffd 100644
--- a/pkgs/by-name/ip/ipp-usb/package.nix
+++ b/pkgs/by-name/ip/ipp-usb/package.nix
@@ -21,11 +21,13 @@ buildGoModule rec {
   postPatch = ''
     # rebuild with patched paths
     rm ipp-usb.8
-    substituteInPlace Makefile --replace "install: all" "install: man"
-    substituteInPlace systemd-udev/ipp-usb.service --replace "/sbin" "$out/bin"
-    for i in Makefile paths.go ipp-usb.8.md; do
-      substituteInPlace $i --replace "/usr" "$out"
-      substituteInPlace $i --replace "/var/ipp-usb" "/var/lib/ipp-usb"
+    substituteInPlace Makefile \
+      --replace-fail "install: all" "install: man" \
+      --replace-fail "/usr/" "/"
+    substituteInPlace systemd-udev/ipp-usb.service --replace-fail "/sbin" "$out/bin"
+    for i in paths.go ipp-usb.8.md; do
+      substituteInPlace $i --replace-fail "/usr" "$out"
+      substituteInPlace $i --replace-fail "/var/ipp-usb" "/var/lib/ipp-usb"
     done
   '';
 
@@ -43,7 +45,7 @@ buildGoModule rec {
   doInstallCheck = true;
 
   postInstall = ''
-    # to accomodate the makefile
+    # to accommodate the makefile
     cp $out/bin/ipp-usb .
     make install DESTDIR=$out
   '';

From f3443782eae965d291c5a330ac9c859776d75d94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 20:07:47 +0000
Subject: [PATCH 129/258] solvespace: 3.1 -> 3.2

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

diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 92b397f8d071..589da2f5d793 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "solvespace";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "solvespace";
     repo = "solvespace";
     rev = "v${version}";
-    hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA=";
+    hash = "sha256-+ZSAC7wDOaN51RjbSAqaQOp10JzxSME3g0ln4VdkwcA=";
     fetchSubmodules = true;
   };
 

From 1478dc2ae23d5aedcd98138b8e54b818257e715d Mon Sep 17 00:00:00 2001
From: flurie <alex@flurie.net>
Date: Sat, 8 Nov 2025 13:09:20 -0500
Subject: [PATCH 130/258] SDL_audiolib: unbundle fmt to fix build on darwin

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

diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix
index 6ee67a1faeec..22f782e32fc9 100644
--- a/pkgs/by-name/sd/SDL_audiolib/package.nix
+++ b/pkgs/by-name/sd/SDL_audiolib/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   stdenv,
   flac,
+  fmt,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,10 +30,20 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     flac
+    fmt
   ];
 
   strictDeps = true;
 
+  postPatch = ''
+    # Remove the bundled fmt directory
+    rm -rf 3rdparty/fmt
+
+    # Patch CMakeLists.txt to replace bundled fmt with provided library
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_bundled_fmtlib()' 'find_package(fmt REQUIRED)'
+  '';
+
   cmakeFlags = [
     (lib.cmakeBool "USE_DEC_ADLMIDI" false)
     (lib.cmakeBool "USE_DEC_BASSMIDI" false)

From 5708ecc352bad209cf2e1db7dd6aa130f1eac328 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 20:12:41 +0000
Subject: [PATCH 131/258] terraform-providers.ciscodevnet_aci: 2.17.0 -> 2.18.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 cc611a0c2f23..2c8a8119e117 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -154,11 +154,11 @@
     "vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0="
   },
   "ciscodevnet_aci": {
-    "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=",
+    "hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=",
     "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
     "owner": "CiscoDevNet",
     "repo": "terraform-provider-aci",
-    "rev": "v2.17.0",
+    "rev": "v2.18.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 28f11e5316770efa1df306e3b5c78eadf647938d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 17:07:54 -0800
Subject: [PATCH 132/258] python3Packages.redshift-connector: disable broken
 tests

---
 .../python-modules/redshift-connector/default.nix    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix
index 63621cb51e97..249a9807bfe5 100644
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@@ -60,6 +60,18 @@ buildPythonPackage rec {
   # integration tests require a Redshift cluster
   enabledTestPaths = [ "test/unit" ];
 
+  disabledTests = [
+    # AttributeError: 'itertools._tee' object has no attribute 'status_code'
+    # This is due to a broken pytest_mock.
+    # TODO Remove once pytest-mock 3.15.1 lands.
+    "test_form_based_authentication_uses_user_set_login_to_rp"
+    "test_form_based_authentication_payload_is_correct"
+    "test_form_based_authentication_login_fails_should_fail"
+    "test_azure_oauth_based_authentication_payload_is_correct"
+    "test_okta_authentication_payload_is_correct"
+    "test_set_cluster_identifier_calls_describe_custom_domain_associations"
+  ];
+
   __darwinAllowLocalNetworking = true; # required for tests
 
   meta = {

From e1604ac22848b472463e5ffd4d4a4945eef35251 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 17:01:50 -0800
Subject: [PATCH 133/258] python3Packages.redshift-connector: 2.1.8 -> 2.1.9

---
 .../python-modules/redshift-connector/default.nix            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix
index 249a9807bfe5..50da7338b7e7 100644
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "redshift-connector";
-  version = "2.1.8";
+  version = "2.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-redshift-python-driver";
     tag = "v${version}";
-    hash = "sha256-q8TQYiPmm3w9Bh4+gvVW5XAa4FZ3+/MZqZL0RCgl77E=";
+    hash = "sha256-x0VhICEtZZz4Q7btCl7nP0D+YHPIKqbEUWnrEekJpt0=";
   };
 
   # remove addops as they add test directory and coverage parameters to pytest
@@ -43,6 +43,7 @@ buildPythonPackage rec {
   dependencies = [
     beautifulsoup4
     boto3
+    botocore
     lxml
     packaging
     pytz

From e317c4d283e4cf784c49900908f4639df00a4459 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Sat, 8 Nov 2025 20:14:40 +0000
Subject: [PATCH 134/258] nixosTests: fix evaluation errors

Pass lib to NixOS test functions that need it following 03bb7d81954d
(all-packages: do not export lib functions from pkgs, 2025-10-30)
/ #455775.
---
 nixos/tests/all-tests.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 80b652004d52..15f15e2fc212 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -818,7 +818,10 @@ in
   ksm = runTest ./ksm.nix;
   kthxbye = runTest ./kthxbye.nix;
   kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
-  kubo = import ./kubo { inherit runTest; };
+  kubo = import ./kubo {
+    inherit runTest;
+    inherit (pkgs) lib;
+  };
   lact = runTest ./lact.nix;
   ladybird = runTest ./ladybird.nix;
   languagetool = runTest ./languagetool.nix;
@@ -963,7 +966,10 @@ in
   mopidy = runTest ./mopidy.nix;
   morph-browser = runTest ./morph-browser.nix;
   mosquitto = runTest ./mosquitto.nix;
-  movim = import ./web-apps/movim { inherit runTest; };
+  movim = import ./web-apps/movim {
+    inherit runTest;
+    inherit (pkgs) lib;
+  };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = runTest ./mtp.nix;

From 3974c53827d125d006662ea3ccda8391b9a11932 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Thu, 16 Oct 2025 16:27:15 -0700
Subject: [PATCH 135/258] croncpp: init at 2023.03.30

---
 pkgs/by-name/cr/croncpp/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/cr/croncpp/package.nix

diff --git a/pkgs/by-name/cr/croncpp/package.nix b/pkgs/by-name/cr/croncpp/package.nix
new file mode 100644
index 000000000000..db6430949da0
--- /dev/null
+++ b/pkgs/by-name/cr/croncpp/package.nix
@@ -0,0 +1,28 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "croncpp";
+  version = "2023.03.30";
+
+  src = fetchFromGitHub {
+    owner = "mariusbancila";
+    repo = "croncpp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SBjNzy54OGEMemBp+c1gaH90Dc7ySL915z4E64cBWTI=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "C++11/14/17 header-only cross-platform library for handling CRON expressions";
+    homepage = "https://github.com/mariusbancila/croncpp";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ typedrat ];
+  };
+})

From b3605e26ae5becc3706698342bde34b5ffc54dbf Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Thu, 16 Oct 2025 16:27:31 -0700
Subject: [PATCH 136/258] uni-algo: init at 1.2.0

---
 pkgs/by-name/un/uni-algo/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/un/uni-algo/package.nix

diff --git a/pkgs/by-name/un/uni-algo/package.nix b/pkgs/by-name/un/uni-algo/package.nix
new file mode 100644
index 000000000000..fcb105180de9
--- /dev/null
+++ b/pkgs/by-name/un/uni-algo/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uni-algo";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "uni-algo";
+    repo = "uni-algo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IyQrL/DWDj87GplSGJC4iQJAzNURLh9TRko5l+EIfuU=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "Unicode Algorithms Implementation for C/C++";
+    homepage = "https://github.com/uni-algo/uni-algo";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ typedrat ];
+  };
+})

From c3f511b9e6780f7d7c920ab173420539d8fa8ef8 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Thu, 16 Oct 2025 19:19:55 -0700
Subject: [PATCH 137/258] dragonflydb: 0.1.0 -> 1.34.2

---
 .../dr/dragonflydb/external-libs.patch        | 115 ++++
 pkgs/by-name/dr/dragonflydb/fixes.patch       | 132 -----
 pkgs/by-name/dr/dragonflydb/glog.patch        | 553 ------------------
 .../dr/dragonflydb/helio-third-party.patch    | 150 +++++
 pkgs/by-name/dr/dragonflydb/package.nix       | 244 ++++++--
 5 files changed, 460 insertions(+), 734 deletions(-)
 create mode 100644 pkgs/by-name/dr/dragonflydb/external-libs.patch
 delete mode 100644 pkgs/by-name/dr/dragonflydb/fixes.patch
 delete mode 100644 pkgs/by-name/dr/dragonflydb/glog.patch
 create mode 100644 pkgs/by-name/dr/dragonflydb/helio-third-party.patch

diff --git a/pkgs/by-name/dr/dragonflydb/external-libs.patch b/pkgs/by-name/dr/dragonflydb/external-libs.patch
new file mode 100644
index 000000000000..368c0b2a139e
--- /dev/null
+++ b/pkgs/by-name/dr/dragonflydb/external-libs.patch
@@ -0,0 +1,115 @@
+diff --git a/src/external_libs.cmake b/src/external_libs.cmake
+index 62e6e879..8934777f 100644
+--- a/src/external_libs.cmake
++++ b/src/external_libs.cmake
+@@ -1,7 +1,6 @@
+ add_third_party(
+   lua
+-  GIT_REPOSITORY https://github.com/dragonflydb/lua
+-  GIT_TAG Dragonfly-5.4.6a
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lua/. <SOURCE_DIR>
+   CONFIGURE_COMMAND echo
+   BUILD_IN_SOURCE 1
+   BUILD_COMMAND ${DFLY_TOOLS_MAKE} all
+@@ -19,18 +18,16 @@ endif()
+ 
+ add_third_party(
+   dconv
+-  URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz
+-  PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d"
+-                <SOURCE_DIR>/double-conversion/string-to-double.cc
+-  COMMAND ${SED_REPL} "/std::use_facet</d" <SOURCE_DIR>/double-conversion/string-to-double.cc
+-  COMMAND ${SED_REPL} "s/cType.tolower/std::tolower/g" <SOURCE_DIR>/double-conversion/string-to-double.cc
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/dconv/. <SOURCE_DIR>
++  PATCH_COMMAND echo
++  CMAKE_PASS_FLAGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+   LIB libdouble-conversion.a
+ )
+ 
+ add_third_party(
+   reflex
+-  URL https://github.com/Genivia/RE-flex/archive/refs/tags/v5.2.2.tar.gz
+-  PATCH_COMMAND autoreconf -fi
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/reflex/. <SOURCE_DIR>
++  PATCH_COMMAND echo
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex
+           CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
+ )
+@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
+ 
+ add_third_party(
+   jsoncons
+-  GIT_REPOSITORY https://github.com/dragonflydb/jsoncons
+-  GIT_TAG Dragonfly.178
+-  GIT_SHALLOW 1
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON"
+   LIB "none"
+ )
+ 
+ add_third_party(
+   lz4
+-  URL https://github.com/lz4/lz4/archive/refs/tags/v1.10.0.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lz4/. <SOURCE_DIR>
+ 
+   BUILD_IN_SOURCE 1
+   CONFIGURE_COMMAND echo skip
+@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")
+ file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR})
+ 
+ ExternalProject_Add(mimalloc2_project
+-  URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.2.4.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/mimalloc224/. <SOURCE_DIR>
+   DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2
+   SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2
+   # INSTALL_DIR ${MIMALLOC_ROOT_DIR}
+@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO
+ 
+ add_third_party(
+   croncpp
+-  URL https://github.com/mariusbancila/croncpp/archive/refs/tags/v2023.03.30.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/croncpp/. <SOURCE_DIR>
+   LIB "none"
+ )
+ 
+ if (WITH_SEARCH)
+   add_third_party(
+     uni-algo
+-    URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz
++    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. <SOURCE_DIR>
+ 
+     CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17"
+   )
+ 
+   add_third_party(
+     hnswlib
+-    URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz
++    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. <SOURCE_DIR>
+ 
+     BUILD_COMMAND echo SKIP
+     INSTALL_COMMAND cp -R <SOURCE_DIR>/hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/
+@@ -142,21 +137,20 @@ endif()
+ 
+ add_third_party(
+   fast_float
+-  URL https://github.com/fastfloat/fast_float/archive/refs/tags/v5.2.0.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/fast_float/. <SOURCE_DIR>
+   LIB "none"
+ )
+ 
+ add_third_party(
+   flatbuffers
+-  URL https://github.com/google/flatbuffers/archive/refs/tags/v23.5.26.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/flatbuffers/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_LIBCXX_WITH_CLANG=OFF
+                     -DFLATBUFFERS_BUILD_FLATC=OFF"
+ )
+ 
+ add_third_party(
+   hdr_histogram
+-  GIT_REPOSITORY https://github.com/HdrHistogram/HdrHistogram_c/
+-  GIT_TAG 652d51bcc36744fd1a6debfeb1a8a5f58b14022c
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hdr_histogram/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DHDR_LOG_REQUIRED=OFF -DHDR_HISTOGRAM_BUILD_PROGRAMS=OFF
+                     -DHDR_HISTOGRAM_INSTALL_SHARED=OFF"
+   LIB libhdr_histogram_static.a
diff --git a/pkgs/by-name/dr/dragonflydb/fixes.patch b/pkgs/by-name/dr/dragonflydb/fixes.patch
deleted file mode 100644
index d2992fbbaf82..000000000000
--- a/pkgs/by-name/dr/dragonflydb/fixes.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
-index aeb78d9..e9d4e6b 100644
---- a/helio/cmake/third_party.cmake
-+++ b/helio/cmake/third_party.cmake
-@@ -143,7 +143,7 @@ endfunction()
- 
- FetchContent_Declare(
-   gtest
--  URL https://github.com/google/googletest/archive/release-1.11.0.zip
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_GetProperties(gtest)
-@@ -154,7 +154,7 @@ endif ()
- 
- FetchContent_Declare(
-   benchmark
--  URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_GetProperties(benchmark)
-@@ -169,7 +169,7 @@ endif ()
- 
- FetchContent_Declare(
-   abseil_cpp
--  URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
-+  DOWNLOAD_COMMAND true
-   PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch"
- )
- 
-@@ -183,11 +183,7 @@ endif()
- 
- FetchContent_Declare(
-   glog
--  GIT_REPOSITORY https://github.com/romange/glog
--  GIT_TAG Absl
--
--  GIT_PROGRESS    TRUE
--  GIT_SHALLOW     TRUE
-+  DOWNLOAD_COMMAND true
- )
- 
- FetchContent_GetProperties(glog)
-@@ -233,10 +229,7 @@ endif()
- 
- add_third_party(
-   gperf
--  URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz
--  #GIT_REPOSITORY https://github.com/gperftools/gperftools
--  #GIT_TAG gperftools-2.9.1
--  GIT_SHALLOW TRUE
-+  DOWNLOAD_COMMAND true
-   PATCH_COMMAND autoreconf -i   # update runs every time for some reason
-   # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \
-   #                   -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF  \
-@@ -260,11 +253,12 @@ else()
- endif()
- 
- add_third_party(mimalloc
--  URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz
-+  DOWNLOAD_COMMAND true
- 
-   # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
-   CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \
--                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g"
-+                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \
-+                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib"
- 
-   BUILD_COMMAND make -j4 mimalloc-static
-   INSTALL_COMMAND make install
-@@ -274,7 +268,7 @@ add_third_party(mimalloc
- )
- 
- add_third_party(jemalloc
--  URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-+  URL REPLACEJEMALLOCURL
-   PATCH_COMMAND ./autogen.sh
-   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
- )
-@@ -282,24 +276,23 @@ add_third_party(jemalloc
- 
- add_third_party(
-   xxhash
--  URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz
-+  DOWNLOAD_COMMAND true
-   SOURCE_SUBDIR cmake_unofficial
--  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF"
-+  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \
-+                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib"
- )
- 
- 
- add_third_party(
-   uring
--  GIT_REPOSITORY https://github.com/axboe/liburing.git
--  GIT_TAG liburing-2.1
-+  DOWNLOAD_COMMAND true
-   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
-   BUILD_IN_SOURCE 1
- )
- 
- add_third_party(
-   rapidjson
--  GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
--  GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5
-+  DOWNLOAD_COMMAND true
-   CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
-                     -DRAPIDJSON_BUILD_DOC=OFF"
-   LIB "none"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0dc0824..d5b38b3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,6 +1,6 @@
- add_third_party(
-   lua
--  URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz
-+  URL REPLACELUAURL
-   PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch"
-   CONFIGURE_COMMAND echo
-   BUILD_IN_SOURCE 1
-@@ -11,7 +11,8 @@ add_third_party(
- 
- add_third_party(
-   dconv
--  URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz
-+  DOWNLOAD_COMMAND true
-+  CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib"
-   LIB libdouble-conversion.a
- )
- 
diff --git a/pkgs/by-name/dr/dragonflydb/glog.patch b/pkgs/by-name/dr/dragonflydb/glog.patch
deleted file mode 100644
index 2fb9c0733b87..000000000000
--- a/pkgs/by-name/dr/dragonflydb/glog.patch
+++ /dev/null
@@ -1,553 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 846b4448..b4900ead 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,7 @@ option (PRINT_UNSYMBOLIZED_STACK_TRACES
-   "Print file offsets in traces instead of symbolizing" OFF)
- option (WITH_CUSTOM_PREFIX "Enable support for user-generated message prefixes" ON)
- option (WITH_GFLAGS "Use gflags" ON)
-+option (WITH_ABSL "Use absl flags" OFF)
- option (WITH_GTEST "Use Google Test" ON)
- option (WITH_PKGCONFIG "Enable pkg-config support" ON)
- option (WITH_SYMBOLIZE "Enable symbolize module" ON)
-@@ -87,6 +88,13 @@ if (WITH_GFLAGS)
-   endif (gflags_FOUND)
- endif (WITH_GFLAGS)
- 
-+if (WITH_ABSL)
-+  set (HAVE_ABSL_FLAGS 1)
-+  set (ac_cv_have_abslflags 1)
-+else (WITH_ABSL)
-+set (ac_cv_have_abslflags 0)
-+endif (WITH_ABSL)
-+
- find_package (Threads)
- find_package (Unwind)
- 
-@@ -1025,7 +1033,7 @@ write_basic_package_version_file (
-   ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
-   COMPATIBILITY SameMajorVersion)
- 
--export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
-+# export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
- export (PACKAGE glog)
- 
- get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
-diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h
-index bcb12dea..1c9d9294 100644
---- a/src/base/commandlineflags.h
-+++ b/src/base/commandlineflags.h
-@@ -57,6 +57,25 @@
- 
- #include <gflags/gflags.h>
- 
-+#else
-+#ifdef HAVE_ABSL_FLAGS
-+#include <absl/flags/flag.h>
-+
-+#define FLAG(name) absl::GetFlag(FLAGS_##name)
-+
-+#define DEFINE_bool(name, value, meaning) \
-+  ABSL_FLAG(bool, name, value, meaning)
-+
-+#define DEFINE_int32(name, value, meaning) \
-+  ABSL_FLAG(GOOGLE_NAMESPACE::int32, name, value, meaning)
-+
-+#define DEFINE_uint32(name, value, meaning) \
-+  ABSL_FLAG(GOOGLE_NAMESPACE::uint32, name, value, meaning)
-+
-+#define DEFINE_string(name, value, meaning) \
-+  ABSL_FLAG(std::string, name, value, meaning)
-+
-+
- #else
- 
- #include <glog/logging.h>
-@@ -108,6 +127,7 @@
-   }                                                           \
-   using fLS::FLAGS_##name
- 
-+#endif
- #endif  // HAVE_LIB_GFLAGS
- 
- // Define GLOG_DEFINE_* using DEFINE_* . By using these macros, we
-diff --git a/src/base/mutex.h b/src/base/mutex.h
-index e82c597f..a58c1412 100644
---- a/src/base/mutex.h
-+++ b/src/base/mutex.h
-@@ -319,11 +319,6 @@ class WriterMutexLock {
-   void operator=(const WriterMutexLock&);
- };
- 
--// Catch bug where variable name is omitted, e.g. MutexLock (&mu);
--#define MutexLock(x) COMPILE_ASSERT(0, mutex_lock_decl_missing_var_name)
--#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
--#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
--
- }  // namespace MUTEX_NAMESPACE
- 
- using namespace MUTEX_NAMESPACE;
-diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in
-index b225b7ec..a4c58c96 100644
---- a/src/config.h.cmake.in
-+++ b/src/config.h.cmake.in
-@@ -34,6 +34,8 @@
- /* define if you have google gflags library */
- #cmakedefine HAVE_LIB_GFLAGS
- 
-+#cmakedefine HAVE_ABSL_FLAGS
-+
- /* define if you have google gmock library */
- #cmakedefine HAVE_LIB_GMOCK
- 
-diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
-index 95a573b1..54cd838f 100644
---- a/src/glog/logging.h.in
-+++ b/src/glog/logging.h.in
-@@ -89,6 +89,10 @@
- #include <gflags/gflags.h>
- #endif
- 
-+#if @ac_cv_have_abslflags@
-+#include <absl/flags/declare.h>
-+#endif
-+
- #if @ac_cv_cxx11_atomic@ && __cplusplus >= 201103L
- #include <atomic>
- #elif defined(GLOG_OS_WINDOWS)
-@@ -395,6 +399,14 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo
- #undef DECLARE_uint32
- #endif
- 
-+#if @ac_cv_have_abslflags@
-+#define DECLARE_VARIABLE 1
-+#define DECLARE_bool(name) ABSL_DECLARE_FLAG(bool, name)
-+#define DECLARE_int32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::int32, name)
-+#define DECLARE_uint32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::uint32, name)
-+#define DECLARE_string(name) ABSL_DECLARE_FLAG(std::string, name)
-+#endif
-+
- #ifndef DECLARE_VARIABLE
- #define DECLARE_VARIABLE(type, shorttype, name, tn)                     \
-   namespace fL##shorttype {                                             \
-diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in
-index 7526fc34..16e60f46 100644
---- a/src/glog/vlog_is_on.h.in
-+++ b/src/glog/vlog_is_on.h.in
-@@ -64,6 +64,14 @@
- #include <glog/log_severity.h>
- 
- #if defined(__GNUC__)
-+
-+#if @ac_cv_have_abslflags@
-+  extern int32_t absl_proxy_v;
-+  #define VLEVEL (@ac_google_namespace@::absl_proxy_v)
-+#else
-+  #define VLEVEL (FLAGS_v)
-+#endif
-+
- // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site.
- // (Normally) the first time every VLOG_IS_ON(n) site is hit,
- // we determine what variable will dynamically control logging at this site:
-@@ -74,7 +82,7 @@
-   __extension__  \
-   ({ static @ac_google_namespace@::SiteFlag vlocal__ = {NULL, NULL, 0, NULL};       \
-      @ac_google_namespace@::int32 verbose_level__ = (verboselevel);                    \
--     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
-+     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &VLEVEL, \
-                         __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \
-   })
- #else
-diff --git a/src/logging.cc b/src/logging.cc
-index 4028ccc0..fc618d3a 100644
---- a/src/logging.cc
-+++ b/src/logging.cc
-@@ -103,7 +103,9 @@ using std::fdopen;
- #endif
- 
- // There is no thread annotation support.
-+#ifndef EXCLUSIVE_LOCKS_REQUIRED
- #define EXCLUSIVE_LOCKS_REQUIRED(mu)
-+#endif
- 
- static bool BoolFromEnv(const char *varname, bool defval) {
-   const char* const valstr = getenv(varname);
-@@ -351,8 +353,9 @@ static const char* GetAnsiColorCode(GLogColor color) {
- 
- // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0
- static uint32 MaxLogSize() {
--  return (FLAGS_max_log_size > 0 && FLAGS_max_log_size < 4096
--              ? FLAGS_max_log_size
-+  uint32 maxlogsize = FLAG(max_log_size);
-+  return (maxlogsize > 0 && maxlogsize < 4096
-+              ? maxlogsize
-               : 1);
- }
- 
-@@ -721,7 +724,7 @@ inline void LogDestination::SetStderrLogging(LogSeverity min_severity) {
-   // Prevent any subtle race conditions by wrapping a mutex lock around
-   // all this stuff.
-   MutexLock l(&log_mutex);
--  FLAGS_stderrthreshold = min_severity;
-+  absl::SetFlag(&FLAGS_stderrthreshold, min_severity);
- }
- 
- inline void LogDestination::LogToStderr() {
-@@ -747,8 +750,8 @@ static void ColoredWriteToStderrOrStdout(FILE* output, LogSeverity severity,
-                                          const char* message, size_t len) {
-   bool is_stdout = (output == stdout);
-   const GLogColor color = (LogDestination::terminal_supports_color() &&
--                           ((!is_stdout && FLAGS_colorlogtostderr) ||
--                            (is_stdout && FLAGS_colorlogtostdout)))
-+                           ((!is_stdout && FLAG(colorlogtostderr)) ||
-+                            (is_stdout && FLAG(colorlogtostdout))))
-                               ? SeverityToColor(severity)
-                               : COLOR_DEFAULT;
- 
-@@ -789,7 +792,7 @@ static void ColoredWriteToStdout(LogSeverity severity, const char* message,
-   FILE* output = stdout;
-   // We also need to send logs to the stderr when the severity is
-   // higher or equal to the stderr threshold.
--  if (severity >= FLAGS_stderrthreshold) {
-+  if (severity >= FLAG(stderrthreshold)) {
-     output = stderr;
-   }
-   ColoredWriteToStderrOrStdout(output, severity, message, len);
-@@ -808,7 +811,7 @@ static void WriteToStderr(const char* message, size_t len) {
- 
- inline void LogDestination::MaybeLogToStderr(LogSeverity severity,
- 					     const char* message, size_t message_len, size_t prefix_len) {
--  if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) {
-+  if ((severity >= FLAG(stderrthreshold)) || FLAG(alsologtostderr)) {
-     ColoredWriteToStderr(severity, message, message_len);
- #ifdef GLOG_OS_WINDOWS
-     (void) prefix_len;
-@@ -835,8 +838,8 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity,
- inline void LogDestination::MaybeLogToEmail(LogSeverity severity,
- 					    const char* message, size_t len) {
-   if (severity >= email_logging_severity_ ||
--      severity >= FLAGS_logemaillevel) {
--    string to(FLAGS_alsologtoemail);
-+      severity >= FLAG(logemaillevel)) {
-+    string to(FLAG(alsologtoemail));
-     if (!addresses_.empty()) {
-       if (!to.empty()) {
-         to += ",";
-@@ -862,7 +865,7 @@ inline void LogDestination::MaybeLogToLogfile(LogSeverity severity,
-                                               time_t timestamp,
- 					      const char* message,
- 					      size_t len) {
--  const bool should_flush = severity > FLAGS_logbuflevel;
-+  const bool should_flush = severity > FLAG(logbuflevel);
-   LogDestination* destination = log_destination(severity);
-   destination->logger_->Write(should_flush, timestamp, message, len);
- }
-@@ -871,9 +874,9 @@ inline void LogDestination::LogToAllLogfiles(LogSeverity severity,
-                                              time_t timestamp,
-                                              const char* message,
-                                              size_t len) {
--  if (FLAGS_logtostdout) {  // global flag: never log to file
-+  if (FLAG(logtostdout)) {  // global flag: never log to file
-     ColoredWriteToStdout(severity, message, len);
--  } else if (FLAGS_logtostderr) {  // global flag: never log to file
-+  } else if (FLAG(logtostderr)) {  // global flag: never log to file
-     ColoredWriteToStderr(severity, message, len);
-   } else {
-     for (int i = severity; i >= 0; --i) {
-@@ -1032,25 +1035,25 @@ void LogFileObject::FlushUnlocked(){
-     bytes_since_flush_ = 0;
-   }
-   // Figure out when we are due for another flush.
--  const int64 next = (FLAGS_logbufsecs
-+  const int64 next = (FLAG(logbufsecs)
-                       * static_cast<int64>(1000000));  // in usec
-   next_flush_time_ = CycleClock_Now() + UsecToCycles(next);
- }
- 
- bool LogFileObject::CreateLogfile(const string& time_pid_string) {
-   string string_filename = base_filename_;
--  if (FLAGS_timestamp_in_logfile_name) {
-+  if (FLAG(timestamp_in_logfile_name)) {
-     string_filename += time_pid_string;
-   }
-   string_filename += filename_extension_;
-   const char* filename = string_filename.c_str();
-   //only write to files, create if non-existant.
-   int flags = O_WRONLY | O_CREAT;
--  if (FLAGS_timestamp_in_logfile_name) {
-+  if (FLAG(timestamp_in_logfile_name)) {
-     //demand that the file is unique for our timestamp (fail if it exists).
-     flags = flags | O_EXCL;
-   }
--  int fd = open(filename, flags, FLAGS_logfile_mode);
-+  int fd = open(filename, flags, FLAG(logfile_mode));
-   if (fd == -1) return false;
- #ifdef HAVE_FCNTL
-   // Mark the file close-on-exec. We don't really care if this fails
-@@ -1083,7 +1086,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) {
-   file_ = fdopen(fd, "a");  // Make a FILE*.
-   if (file_ == NULL) {  // Man, we're screwed!
-     close(fd);
--    if (FLAGS_timestamp_in_logfile_name) {
-+    if (FLAG(timestamp_in_logfile_name)) {
-       unlink(filename);  // Erase the half-baked evidence: an unusable log file, only if we just created it.
-     }
-     return false;
-@@ -1125,8 +1128,8 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) {
- 
-     // Make an additional link to the log file in a place specified by
-     // FLAGS_log_link, if indicated
--    if (!FLAGS_log_link.empty()) {
--      linkpath = FLAGS_log_link + "/" + linkname;
-+    if (!FLAG(log_link).empty()) {
-+      linkpath = FLAG(log_link) + "/" + linkname;
-       unlink(linkpath.c_str());                  // delete old one if it exists
-       if (symlink(filename, linkpath.c_str()) != 0) {
-         // silently ignore failures
-@@ -1165,7 +1168,7 @@ void LogFileObject::Write(bool force_flush,
-     rollover_attempt_ = 0;
- 
-     struct ::tm tm_time;
--    if (FLAGS_log_utc_time) {
-+    if (FLAG(log_utc_time)) {
-       gmtime_r(&timestamp, &tm_time);
-     } else {
-       localtime_r(&timestamp, &tm_time);
-@@ -1253,14 +1256,14 @@ void LogFileObject::Write(bool force_flush,
-                        << ' '
-                        << setw(2) << tm_time.tm_hour << ':'
-                        << setw(2) << tm_time.tm_min << ':'
--                       << setw(2) << tm_time.tm_sec << (FLAGS_log_utc_time ? " UTC\n" : "\n")
-+                       << setw(2) << tm_time.tm_sec << (FLAG(log_utc_time) ? " UTC\n" : "\n")
-                        << "Running on machine: "
-                        << LogDestination::hostname() << '\n';
- 
-     if(!g_application_fingerprint.empty()) {
-       file_header_stream << "Application fingerprint: " << g_application_fingerprint << '\n';
-     }
--    const char* const date_time_format = FLAGS_log_year_in_prefix
-+    const char* const date_time_format = FLAG(log_year_in_prefix)
-                                              ? "yyyymmdd hh:mm:ss.uuuuuu"
-                                              : "mmdd hh:mm:ss.uuuuuu";
-     file_header_stream << "Running duration (h:mm:ss): "
-@@ -1284,7 +1287,7 @@ void LogFileObject::Write(bool force_flush,
-     // greater than 4096, thereby indicating an error.
-     errno = 0;
-     fwrite(message, 1, message_len, file_);
--    if ( FLAGS_stop_logging_if_full_disk &&
-+    if ( FLAG(stop_logging_if_full_disk) &&
-          errno == ENOSPC ) {  // disk full, stop writing to disk
-       stop_writing = true;  // until the disk is
-       return;
-@@ -1307,7 +1310,7 @@ void LogFileObject::Write(bool force_flush,
-     FlushUnlocked();
- #ifdef GLOG_OS_LINUX
-     // Only consider files >= 3MiB
--    if (FLAGS_drop_log_memory && file_length_ >= (3U << 20U)) {
-+    if (FLAG(drop_log_memory) && file_length_ >= (3U << 20U)) {
-       // Don't evict the most recent 1-2MiB so as not to impact a tailer
-       // of the log file and to avoid page rounding issue on linux < 4.7
-       uint32 total_drop_length =
-@@ -1348,7 +1351,7 @@ void LogCleaner::Disable() {
- }
- 
- void LogCleaner::UpdateCleanUpTime() {
--  const int64 next = (FLAGS_logcleansecs
-+  const int64 next = (FLAG(logcleansecs)
-                       * 1000000);  // in usec
-   next_cleanup_time_ = CycleClock_Now() + UsecToCycles(next);
- }
-@@ -1664,7 +1667,7 @@ void LogMessage::Init(const char* file,
-   //    I20201018 160715 f5d4fbb0 logging.cc:1153]
-   //    (log level, GMT year, month, date, time, thread_id, file basename, line)
-   // We exclude the thread_id for the default thread.
--  if (FLAGS_log_prefix && (line != kNoLogPrefix)) {
-+  if (FLAG(log_prefix) && (line != kNoLogPrefix)) {
-       std::ios saved_fmt(NULL);
-       saved_fmt.copyfmt(stream());
-       stream().fill('0');
-@@ -1672,7 +1675,7 @@ void LogMessage::Init(const char* file,
-       if (custom_prefix_callback == NULL) {
-     #endif
-           stream() << LogSeverityNames[severity][0];
--          if (FLAGS_log_year_in_prefix) {
-+          if (FLAG(log_year_in_prefix)) {
-             stream() << setw(4) << 1900 + logmsgtime_.year();
-           }
-           stream() << setw(2) << 1 + logmsgtime_.month()
-@@ -1703,11 +1706,11 @@ void LogMessage::Init(const char* file,
-   }
-   data_->num_prefix_chars_ = data_->stream_.pcount();
- 
--  if (!FLAGS_log_backtrace_at.empty()) {
-+  if (!FLAG(log_backtrace_at).empty()) {
-     char fileline[128];
-     snprintf(fileline, sizeof(fileline), "%s:%d", data_->basename_, line);
- #ifdef HAVE_STACKTRACE
--    if (FLAGS_log_backtrace_at == fileline) {
-+    if (FLAG(log_backtrace_at) == fileline) {
-       string stacktrace;
-       DumpStackTraceToString(&stacktrace);
-       stream() << " (stacktrace:\n" << stacktrace << ") ";
-@@ -1746,7 +1749,7 @@ ostream& LogMessage::stream() {
- // Flush buffered message, called by the destructor, or any other function
- // that needs to synchronize the log.
- void LogMessage::Flush() {
--  if (data_->has_been_flushed_ || data_->severity_ < FLAGS_minloglevel) {
-+  if (data_->has_been_flushed_ || data_->severity_ < FLAG(minloglevel)) {
-     return;
-   }
- 
-@@ -1808,7 +1811,7 @@ static char fatal_message[256];
- void ReprintFatalMessage() {
-   if (fatal_message[0]) {
-     const size_t n = strlen(fatal_message);
--    if (!FLAGS_logtostderr) {
-+    if (!FLAG(logtostderr)) {
-       // Also write to stderr (don't color to avoid terminal checks)
-       WriteToStderr(fatal_message, n);
-     }
-@@ -1837,8 +1840,8 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) {
-   // global flag: never log to file if set.  Also -- don't log to a
-   // file if we haven't parsed the command line flags to get the
-   // program name.
--  if (FLAGS_logtostderr || FLAGS_logtostdout || !IsGoogleLoggingInitialized()) {
--    if (FLAGS_logtostdout) {
-+  if (FLAG(logtostderr) || FLAG(logtostdout) || !IsGoogleLoggingInitialized()) {
-+    if (FLAG(logtostdout)) {
-       ColoredWriteToStdout(data_->severity_, data_->message_text_,
-                            data_->num_chars_to_log_);
-     } else {
-@@ -1891,7 +1894,7 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) {
-       fatal_time = logmsgtime_.timestamp();
-     }
- 
--    if (!FLAGS_logtostderr && !FLAGS_logtostdout) {
-+    if (!FLAG(logtostderr) && !FLAG(logtostdout)) {
-       for (int i = 0; i < NUM_SEVERITIES; ++i) {
-         if (LogDestination::log_destinations_[i]) {
-           LogDestination::log_destinations_[i]->logger_->Write(true, 0, "", 0);
-@@ -2238,7 +2241,7 @@ static bool SendEmailInternal(const char*dest, const char *subject,
-               subject, body, dest);
-     }
- 
--    string logmailer = FLAGS_logmailer;
-+    string logmailer = FLAG(logmailer);
-     if (logmailer.empty()) {
-         logmailer = "/bin/mail";
-     }
-@@ -2338,9 +2341,9 @@ const vector<string>& GetLoggingDirectories() {
-   if (logging_directories_list == NULL) {
-     logging_directories_list = new vector<string>;
- 
--    if ( !FLAGS_log_dir.empty() ) {
-+    if ( !FLAG(log_dir).empty() ) {
-       // A dir was specified, we should use it
--      logging_directories_list->push_back(FLAGS_log_dir);
-+      logging_directories_list->push_back(FLAG(log_dir));
-     } else {
-       GetTempDirectories(logging_directories_list);
- #ifdef GLOG_OS_WINDOWS
-@@ -2654,7 +2657,7 @@ LogMessageTime::LogMessageTime(std::tm t) {
- 
- LogMessageTime::LogMessageTime(std::time_t timestamp, WallTime now) {
-   std::tm t;
--  if (FLAGS_log_utc_time)
-+  if (FLAG(log_utc_time))
-     gmtime_r(&timestamp, &t);
-   else
-     localtime_r(&timestamp, &t);
-@@ -2673,7 +2676,7 @@ void LogMessageTime::init(const std::tm& t, std::time_t timestamp,
- void LogMessageTime::CalcGmtOffset() {
-   std::tm gmt_struct;
-   int isDst = 0;
--  if ( FLAGS_log_utc_time ) {
-+  if ( FLAG(log_utc_time )) {
-     localtime_r(&timestamp_, &gmt_struct);
-     isDst = gmt_struct.tm_isdst;
-     gmt_struct = time_struct_;
-diff --git a/src/raw_logging.cc b/src/raw_logging.cc
-index 43159832..8532362b 100644
---- a/src/raw_logging.cc
-+++ b/src/raw_logging.cc
-@@ -123,8 +123,8 @@ static char crash_buf[kLogBufSize + 1] = { 0 };  // Will end in '\0'
- GLOG_ATTRIBUTE_FORMAT(printf, 4, 5)
- void RawLog__(LogSeverity severity, const char* file, int line,
-               const char* format, ...) {
--  if (!(FLAGS_logtostdout || FLAGS_logtostderr ||
--        severity >= FLAGS_stderrthreshold || FLAGS_alsologtostderr ||
-+  if (!(FLAG(logtostdout) || FLAG(logtostderr) ||
-+        severity >= FLAG(stderrthreshold) || FLAG(alsologtostderr) ||
-         !IsGoogleLoggingInitialized())) {
-     return;  // this stderr log message is suppressed
-   }
-diff --git a/src/utilities.cc b/src/utilities.cc
-index a332f1a1..a9d5102a 100644
---- a/src/utilities.cc
-+++ b/src/utilities.cc
-@@ -141,7 +141,7 @@ static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) {
-   int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count+1);
-   for (int i = 0; i < depth; i++) {
- #if defined(HAVE_SYMBOLIZE)
--    if (FLAGS_symbolize_stacktrace) {
-+    if (FLAG(symbolize_stacktrace)) {
-       DumpPCAndSymbol(writerfn, arg, stack[i], "    ");
-     } else {
-       DumpPC(writerfn, arg, stack[i], "    ");
-diff --git a/src/vlog_is_on.cc b/src/vlog_is_on.cc
-index e478a366..4b7a5cae 100644
---- a/src/vlog_is_on.cc
-+++ b/src/vlog_is_on.cc
-@@ -43,14 +43,24 @@
- #include <glog/logging.h>
- #include <glog/raw_logging.h>
- #include "base/googleinit.h"
-+#include "config.h"
- 
- // glog doesn't have annotation
- #define ANNOTATE_BENIGN_RACE(address, description)
- 
- using std::string;
- 
-+#ifdef HAVE_ABSL_FLAGS
-+
-+ABSL_FLAG(int32_t, v, 0, "Show all VLOG(m) messages for m <= this."
-+" Overridable by --vmodule.").OnUpdate([] {
-+      GOOGLE_NAMESPACE::absl_proxy_v = absl::GetFlag(FLAGS_v);
-+    });
-+
-+#else
- GLOG_DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this."
- " Overridable by --vmodule.");
-+#endif
- 
- GLOG_DEFINE_string(vmodule, "", "per-module verbose level."
- " Argument is a comma-separated list of <module name>=<log level>."
-@@ -60,6 +70,8 @@ GLOG_DEFINE_string(vmodule, "", "per-module verbose level."
- 
- _START_GOOGLE_NAMESPACE_
- 
-+int32_t absl_proxy_v = 0;
-+
- namespace glog_internal_namespace_ {
- 
- // Used by logging_unittests.cc so can't make it static here.
-@@ -132,7 +144,8 @@ static void VLOG2Initializer() {
-   // Can now parse --vmodule flag and initialize mapping of module-specific
-   // logging levels.
-   inited_vmodule = false;
--  const char* vmodule = FLAGS_vmodule.c_str();
-+  string vmodule_str = FLAG(vmodule);
-+  const char* vmodule = vmodule_str.c_str();
-   const char* sep;
-   VModuleInfo* head = NULL;
-   VModuleInfo* tail = NULL;
-@@ -164,7 +177,7 @@ static void VLOG2Initializer() {
- 
- // This can be called very early, so we use SpinLock and RAW_VLOG here.
- int SetVLOGLevel(const char* module_pattern, int log_level) {
--  int result = FLAGS_v;
-+  int result = FLAG(v);
-   size_t const pattern_len = strlen(module_pattern);
-   bool found = false;
-   {
diff --git a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch
new file mode 100644
index 000000000000..c10bd8e89871
--- /dev/null
+++ b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch
@@ -0,0 +1,150 @@
+diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
+index 810a8fa..8b11922 100644
+--- a/helio/cmake/third_party.cmake
++++ b/helio/cmake/third_party.cmake
+@@ -151,7 +151,7 @@ endfunction()
+ 
+ FetchContent_Declare(
+   gtest
+-  URL https://github.com/google/googletest/archive/v1.15.2.tar.gz
++  DOWNLOAD_COMMAND true
+ )
+ 
+ FetchContent_GetProperties(gtest)
+@@ -162,7 +162,7 @@ endif ()
+ 
+ FetchContent_Declare(
+   benchmark
+-  URL https://github.com/google/benchmark/archive/v1.9.1.tar.gz
++  DOWNLOAD_COMMAND true
+ )
+ 
+ FetchContent_GetProperties(benchmark)
+@@ -181,7 +181,7 @@ endif ()
+ 
+ FetchContent_Declare(
+   abseil_cpp
+-  URL https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz
++  DOWNLOAD_COMMAND true
+   PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20250512.1.patch"
+ )
+ 
+@@ -204,11 +204,7 @@ if (LEGACY_GLOG)
+ 
+   FetchContent_Declare(
+     glog
+-    GIT_REPOSITORY https://github.com/romange/glog
+-    GIT_TAG Absl
+-
+-    GIT_PROGRESS    TRUE
+-    GIT_SHALLOW     TRUE
++    DOWNLOAD_COMMAND true
+   )
+ 
+   FetchContent_GetProperties(glog)
+@@ -278,7 +274,7 @@ if (WITH_GPERF)
+ 
+   add_third_party(
+     gperf
+-    URL https://github.com/gperftools/gperftools/archive/gperftools-2.16.tar.gz
++    DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/gperf/. <SOURCE_DIR>
+ 
+     # GIT_SHALLOW TRUE
+     # Remove building the unneeded programs (they fail on macos)
+@@ -312,9 +308,7 @@ set(MIMALLOC_INCLUDE_DIR ${THIRD_PARTY_LIB_DIR}/mimalloc/include)
+ set (MIMALLOC_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/mimalloc/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/mimalloc-v2.1.6.patch)
+ 
+ add_third_party(mimalloc
+-   #GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
+-   #GIT_TAG 0f6d8293c74796fa913e4b5eb4361f1e4734f7c6
+-   URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz
++   DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/mimalloc216/. <SOURCE_DIR>
+    PATCH_COMMAND "${MIMALLOC_PATCH_COMMAND}"
+    # -DCMAKE_BUILD_TYPE=Release
+    # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
+@@ -328,7 +322,7 @@ add_third_party(mimalloc
+ )
+ 
+ add_third_party(jemalloc
+-  URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/jemalloc/. <SOURCE_DIR>
+   PATCH_COMMAND ./autogen.sh
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
+ )
+@@ -336,7 +330,7 @@ add_third_party(jemalloc
+ 
+ add_third_party(
+   xxhash
+-  URL https://github.com/Cyan4973/xxHash/archive/v0.8.3.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/xxhash/. <SOURCE_DIR>
+ 
+   # A bug in xxhash 0.8.1 that searches for a file that doesn't exist
+   PATCH_COMMAND touch <SOURCE_DIR>/xxhsum.1
+@@ -347,7 +341,7 @@ add_third_party(
+ 
+ add_third_party(
+   uring
+-  URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.8.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/uring/. <SOURCE_DIR>
+ 
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
+   BUILD_COMMAND make -C src
+@@ -356,7 +350,7 @@ add_third_party(
+ 
+ add_third_party(
+   pugixml
+-  URL https://github.com/zeux/pugixml/archive/refs/tags/v1.15.tar.gz
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/pugixml/. <SOURCE_DIR>
+ )
+ 
+ if (WITH_AWS)
+@@ -364,9 +358,7 @@ if (WITH_AWS)
+ 
+   add_third_party(
+     aws
+-    GIT_REPOSITORY https://github.com/aws/aws-sdk-cpp.git
+-    GIT_TAG 3e51fa016655eeb6b6610bdf8fe7cf33ebbf3e00
+-    GIT_SHALLOW TRUE
++    DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/aws-sdk-cpp/. <SOURCE_DIR>
+     PATCH_COMMAND "${AWS_PATCH_COMMAND}"
+     CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF  -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+     LIB libaws-cpp-sdk-s3.a libaws-cpp-sdk-core.a libaws-crt-cpp.a libaws-c-mqtt.a libaws-c-event-stream.a libaws-c-s3.a libaws-c-auth.a  libaws-c-http.a libaws-c-io.a libs2n.a libaws-c-compression.a libaws-c-cal.a libaws-c-sdkutils.a libaws-checksums.a libaws-c-common.a
+@@ -376,8 +368,7 @@ endif()
+ if (WITH_GCP)
+   add_third_party(
+     rapidjson
+-    GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+-    GIT_TAG ab1842a
++    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. <SOURCE_DIR>
+     CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
+                       -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+     LIB "none"
+@@ -386,24 +377,23 @@ endif()
+ 
+ add_third_party(
+   cares
+-  URL https://codeload.github.com/c-ares/c-ares/tar.gz/refs/tags/v1.34.5
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/cares/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DCARES_SHARED:BOOL=OFF -DCARES_STATIC:BOOL=ON -DCARES_STATIC_PIC:BOOL=ON \
+                     -DCMAKE_INSTALL_LIBDIR=lib"
+ )
+ 
+ add_third_party(
+   zstd
+-  URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.zst
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/zstd/. <SOURCE_DIR>
+   SOURCE_SUBDIR "build/cmake"
+-  
++
+   # for debug pass : "CFLAGS=-fPIC -O0 -ggdb"
+   CMAKE_PASS_FLAGS "-DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_PROGRAMS=OFF -DZSTD_BUILD_TESTS=OFF"
+ )
+ 
+ add_third_party(
+   expected
+-  GIT_REPOSITORY https://github.com/martinmoene/expected-lite.git
+-  GIT_TAG f17940fabae07063cabb67abf2c8d164d3146044 # Important fixes for monadic functions
++  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/expected/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DEXPECTED_LITE_OPT_BUILD_TESTS=0"
+   LIB "none"
+ )
diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix
index 18ffa5379a97..79cfba633713 100644
--- a/pkgs/by-name/dr/dragonflydb/package.nix
+++ b/pkgs/by-name/dr/dragonflydb/package.nix
@@ -1,109 +1,252 @@
 {
   fetchFromGitHub,
-  fetchurl,
   lib,
   stdenv,
+
+  # Dependencies
+  abseil-cpp,
+  c-ares,
+  croncpp,
   double-conversion,
-  gperftools,
-  mimalloc,
-  rapidjson,
-  liburing,
-  xxHash,
+  expected-lite,
+  fast-float,
+  flatbuffers_23,
   gbenchmark,
-  glog,
+  gperftools,
   gtest,
+  hdrhistogram_c,
+  hnswlib,
   jemalloc,
-  gcc-unwrapped,
+  liburing,
+  lz4,
+  pcre2,
+  pugixml,
+  rapidjson,
+  re2,
+  re-flex,
+  uni-algo,
+  xxHash,
+  zstd,
+
+  # Build tools
   autoconf,
   autoconf-archive,
-  automake,
+  automake116x,
+  bison,
   cmake,
+  gcc-unwrapped,
   ninja,
+
+  # Runtime dependencies
   boost,
-  libunwind,
   libtool,
+  libunwind,
   openssl,
+  zlib,
+
+  # Options
+  withAws ? true,
+  withGcp ? true,
+  withGperf ? true,
+  withPcre ? true,
+  withRe2 ? true,
+  withSearch ? true,
+  withAsan ? false,
+  withUsan ? false,
 }:
 
 let
   pname = "dragonflydb";
-  version = "0.1.0";
+  version = "1.34.2";
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = "dragonflydb";
     repo = "dragonfly";
     tag = "v${version}";
-    hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs=";
+    hash = "sha256-n70IB32tZDe665hVLrKC0BSSJutmYhtPJvfNa48xaqA=";
     fetchSubmodules = true;
   };
 
-  # Needed exactly 5.4.4 for patch to work
-  lua = fetchurl {
-    url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz";
-    hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA=";
+  aws-sdk-cpp-1-11-162 = fetchFromGitHub {
+    owner = "aws";
+    repo = "aws-sdk-cpp";
+    tag = "1.11.162";
+    hash = "sha256-NxVE7H8BOetpbBkB2PTVBoHSXYm6cTp41F1LJmhtBbs=";
+    fetchSubmodules = true;
   };
 
-  # Needed exactly 20211102.0 for patch to work
-  abseil-cpp_202111 = fetchFromGitHub {
-    owner = "abseil";
-    repo = "abseil-cpp";
-    rev = "20211102.0";
-    sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk=";
+  glog-absl = fetchFromGitHub {
+    owner = "romange";
+    repo = "glog";
+    rev = "Absl";
+    hash = "sha256-68Hx3kIPgyMSdHCUpYr68Cw8V4Umtyd+4VLZc3zUb1s=";
   };
+
+  jsoncons-dragonfly = fetchFromGitHub {
+    owner = "dragonflydb";
+    repo = "jsoncons";
+    rev = "Dragonfly.178";
+    hash = "sha256-cxM95DFFo5z+eImgZzJw+ykaeSDtBF+hw5qo6gnL53s=";
+  };
+
+  lua-dragonfly = fetchFromGitHub {
+    owner = "dragonflydb";
+    repo = "lua";
+    rev = "Dragonfly-5.4.6a";
+    hash = "sha256-uLNe+hLihu4wMW/wstGnYdPa2bGPC5UiNE+VyNIYY2c=";
+  };
+
+  mimalloc216 = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "mimalloc";
+    tag = "v2.1.6";
+    hash = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M=";
+  };
+
+  mimalloc224 = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "mimalloc";
+    tag = "v2.2.4";
+    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
+  };
+
+  withUnwind = !stdenv.targetPlatform.isAarch64;
 in
 stdenv.mkDerivation {
   inherit pname version src;
 
+  patches = [
+    ./external-libs.patch
+    ./helio-third-party.patch
+  ];
+
   postPatch = ''
-    mkdir -p ./build/{third_party,_deps}
-    ln -s ${double-conversion.src} ./build/third_party/dconv
-    ln -s ${mimalloc.src} ./build/third_party/mimalloc
-    ln -s ${rapidjson.src} ./build/third_party/rapidjson
-    ln -s ${gbenchmark.src} ./build/_deps/benchmark-src
-    ln -s ${gtest.src} ./build/_deps/gtest-src
-    cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf
-    cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring
-    cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash
-    cp -R --no-preserve=mode,ownership ${abseil-cpp_202111} ./build/_deps/abseil_cpp-src
-    cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src
-    chmod u+x ./build/third_party/uring/configure
-    cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash
-    patch -p1 -d ./build/_deps/glog-src < ${./glog.patch}
-    sed '
-    s@REPLACEJEMALLOCURL@file://${jemalloc.src}@
-    s@REPLACELUAURL@file://${lua}@
-    ' ${./fixes.patch} | patch -p1
+    chmod +x helio/blaze.sh
+  '';
+
+  preConfigure = ''
+    # Create directory for nixpkgs dependencies
+    mkdir -p build/_deps build/deps-nixpkgs
+
+    # Copy FetchContent dependencies (in helio/cmake/third_party.cmake)
+    # These go to build/_deps/ where FetchContent expects them
+    cp -r --no-preserve=mode,ownership ${abseil-cpp.src} build/_deps/abseil_cpp-src
+    cp -r --no-preserve=mode,ownership ${gbenchmark.src} build/_deps/benchmark-src
+    cp -r --no-preserve=mode,ownership ${glog-absl} build/_deps/glog-src
+    cp -r --no-preserve=mode,ownership ${gtest.src} build/_deps/gtest-src
+
+    # Copy add_third_party dependencies to deps-nixpkgs
+    cp -r --no-preserve=mode,ownership ${croncpp.src} build/deps-nixpkgs/croncpp
+    cp -r --no-preserve=mode,ownership ${double-conversion.src} build/deps-nixpkgs/dconv
+    cp -r --no-preserve=mode,ownership ${expected-lite.src} build/deps-nixpkgs/expected
+    cp -r --no-preserve=mode,ownership ${fast-float.src} build/deps-nixpkgs/fast_float
+    cp -r --no-preserve=mode,ownership ${flatbuffers_23.src} build/deps-nixpkgs/flatbuffers
+    cp -r --no-preserve=mode,ownership ${hdrhistogram_c.src} build/deps-nixpkgs/hdr_histogram
+    cp -r --no-preserve=mode,ownership ${jemalloc.src} build/deps-nixpkgs/jemalloc
+    cp -r --no-preserve=mode,ownership ${jsoncons-dragonfly} build/deps-nixpkgs/jsoncons
+    cp -r --no-preserve=mode,ownership ${liburing.src} build/deps-nixpkgs/uring
+    cp -r --no-preserve=mode,ownership ${lua-dragonfly} build/deps-nixpkgs/lua
+    cp -r --no-preserve=mode,ownership ${lz4.src} build/deps-nixpkgs/lz4
+    cp -r --no-preserve=mode,ownership ${mimalloc216} build/deps-nixpkgs/mimalloc216
+    cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224
+    cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml
+    cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex
+    cp -r --no-preserve=mode,ownership ${xxHash.src} build/deps-nixpkgs/xxhash
+    cp -r --no-preserve=mode,ownership ${zstd.src} build/deps-nixpkgs/zstd
+
+    # c-ares is provided as a tarball, extract it
+    mkdir -p build/deps-nixpkgs/cares
+    tar -xzf ${c-ares.src} -C build/deps-nixpkgs/cares --strip-components=1
+
+    ${
+      if withAws then
+        ''
+          cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-162} build/deps-nixpkgs/aws-sdk-cpp
+        ''
+      else
+        ""
+    }
+
+    ${
+      if withGcp then
+        ''
+          cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson
+        ''
+      else
+        ""
+    }
+
+    ${
+      if withGperf then
+        ''
+          cp -r --no-preserve=mode,ownership ${gperftools.src} build/deps-nixpkgs/gperf
+        ''
+      else
+        ""
+    }
+
+    ${
+      if withSearch then
+        ''
+          cp -r --no-preserve=mode,ownership ${hnswlib.src} build/deps-nixpkgs/hnswlib
+          cp -r --no-preserve=mode,ownership ${uni-algo.src} build/deps-nixpkgs/uni-algo
+        ''
+      else
+        ""
+    }
+
+    # Fix permissions
+    chmod -R u+w build/deps-nixpkgs build/_deps
+    chmod u+x build/deps-nixpkgs/reflex/configure
+    chmod u+x build/deps-nixpkgs/uring/configure
+    touch build/deps-nixpkgs/xxhash/xxhsum.1
   '';
 
   nativeBuildInputs = [
     autoconf
     autoconf-archive
-    automake
+    automake116x
+    bison
     cmake
     ninja
   ];
 
   buildInputs = [
     boost
-    libunwind
     libtool
     openssl
-  ];
+    zlib
+  ]
+  ++ lib.optional withPcre pcre2
+  ++ lib.optional withRe2 re2
+  ++ lib.optional withUnwind libunwind;
 
   cmakeFlags = [
-    "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
-    "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
+    (lib.cmakeFeature "CMAKE_AR" "${gcc-unwrapped}/bin/gcc-ar")
+    (lib.cmakeFeature "CMAKE_RANLIB" "${gcc-unwrapped}/bin/gcc-ranlib")
+    (lib.cmakeBool "ENABLE_GIT_VERSION" false)
+    (lib.cmakeBool "WITH_ASAN" withAsan)
+    (lib.cmakeBool "WITH_AWS" withAws)
+    (lib.cmakeBool "WITH_GCP" withGcp)
+    (lib.cmakeBool "WITH_GPERF" withGperf)
+    (lib.cmakeBool "WITH_SEARCH" withSearch)
+    (lib.cmakeBool "WITH_USAN" withUsan)
   ];
 
   ninjaFlags = [ "dragonfly" ];
 
+  # dragonflydb's tests rely heavily on outdated Python packages we don't
+  # have in nixpkgs, and it would be a highly non-trivial endeavor to
+  # recreate all of them locally to get them to run properly.
   doCheck = false;
-  dontUseNinjaInstall = true;
 
+  dontUseNinjaInstall = true;
   installPhase = ''
     runHook preInstall
+
     mkdir -p $out/bin
-    cp ./dragonfly $out/bin
+    install -Dm755 ./dragonfly $out/bin/dragonfly
+
     runHook postInstall
   '';
 
@@ -112,6 +255,9 @@ stdenv.mkDerivation {
     homepage = "https://dragonflydb.io/";
     license = licenses.bsl11;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ yureien ];
+    maintainers = with maintainers; [
+      typedrat
+      yureien
+    ];
   };
 }

From 5f938a94bcfa4151f24652359745504f4786a449 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Fri, 31 Oct 2025 21:23:34 -0700
Subject: [PATCH 138/258] dragonflydb: add release notes mention

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

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5192f7a7d48b..75336f597b3a 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -353,6 +353,8 @@
 
 - `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.
 
+- `dragonflydb` has been updated from version 0.1.0 to version 1.34.2.
+
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From 2a5661fe789ba584a17a22b3fe3c85670a0b136a Mon Sep 17 00:00:00 2001
From: flurie <alex@flurie.net>
Date: Sat, 8 Nov 2025 16:14:48 -0500
Subject: [PATCH 139/258] aeron-cpp: fix build on darwin

---
 pkgs/by-name/ae/aeron-cpp/package.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix
index 015ff45435e7..5b084c51c9a6 100644
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@@ -4,6 +4,7 @@
   cmake,
   fetchFromGitHub,
   fetchMavenArtifact,
+  fixDarwinDylibNames,
   jdk11,
   lib,
   libbsd,
@@ -54,11 +55,16 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    autoPatchelfHook
     cmake
     jdk11
     makeWrapper
     patchelf
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    autoPatchelfHook
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    fixDarwinDylibNames
   ];
 
   configurePhase = ''
@@ -113,6 +119,12 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for lib in $out/lib/*.dylib; do
+      install_name_tool -change "@rpath/$(basename $lib)" "$lib" "$out/bin/aeronmd"
+    done
+  '';
+
   meta = with lib; {
     description = "Aeron Messaging C++ Library";
     homepage = "https://aeron.io/";

From de16317b4be8f19de69e5c04cdbcb01063b946ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:20:21 +0100
Subject: [PATCH 140/258] python312Packages.mypy-boto3-controltower: 1.40.60 ->
 1.40.69

---
 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 16cddd338585..54b9d5812fec 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.60"
-      "sha256-1xHVUCYTzIWYU7RLk8MzqF3/5qfItTeIXC7um4ZgIwI=";
+    buildMypyBoto3Package "controltower" "1.40.69"
+      "sha256-kjvZbq00bwjGVPkPcSypkkMC0vIKURAJDI3RUpCPL2I=";
 
   mypy-boto3-cur =
     buildMypyBoto3Package "cur" "1.40.58"

From d09aa3bc2624a90716cafd0237d8eb49980b5261 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:20:29 +0100
Subject: [PATCH 141/258] python312Packages.mypy-boto3-ec2: 1.40.64 -> 1.40.69

---
 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 54b9d5812fec..202ea5f16e83 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.64"
-      "sha256-6+jjuG6iqXLjjuztY1FX/exSl5BjdKsrg1EOQM1w0Io=";
+    buildMypyBoto3Package "ec2" "1.40.69"
+      "sha256-WUUBMnOX+mCVBrmWCy9fBIPuLOnk71djASEli0pKPZ8=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.57"

From 34247b4e3ce12b443cee53f3bd6cf08b021eb914 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:20:51 +0100
Subject: [PATCH 142/258] python312Packages.mypy-boto3-kms: 1.40.63 -> 1.40.69

---
 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 202ea5f16e83..05b889364b5e 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.63"
-      "sha256-TI+hBy1rbDzEaxb4aTQ5PbZyhGNChowdlmjDvVKltIU=";
+    buildMypyBoto3Package "kms" "1.40.69"
+      "sha256-bLWUM5Ol9WZGqReXlyeduBlXFmnSZorLL4HmbBpBZBM=";
 
   mypy-boto3-lakeformation =
     buildMypyBoto3Package "lakeformation" "1.40.55"

From f32f9f4986d16aa9453ed9935094850dbca6f6d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:21:06 +0100
Subject: [PATCH 143/258] python312Packages.mypy-boto3-opensearch: 1.40.61 ->
 1.40.69

---
 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 05b889364b5e..53f03cd81889 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-hjgvlTcA18OeMpJIgpl+ml4zSc73HXrUrM0adOzScl4=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.40.61"
-      "sha256-B5yKX/xElj3pjsLItXJNm5eV+KPmU/ivVz6MR6g88s0=";
+    buildMypyBoto3Package "opensearch" "1.40.69"
+      "sha256-ql9SD9ZZ2k54A2oZkSS3wWFfswetl5/oVoGyzYb29wI=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.40.58"

From 85677d4fd822d94dbd8e4a6a9059431b78c2e963 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:21:35 +0100
Subject: [PATCH 144/258] python312Packages.mypy-boto3-vpc-lattice: 1.40.59 ->
 1.40.69

---
 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 53f03cd81889..dc27ac602e39 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.59"
-      "sha256-39fPl4F2Xiz6+AN8HeGi33Yjj9mfxvU3ZmklLY0STMk=";
+    buildMypyBoto3Package "vpc-lattice" "1.40.69"
+      "sha256-pzWCGZbQ6idUKwNWxGyg45Z4rRzdReADX1u+934VmEs=";
 
   mypy-boto3-waf =
     buildMypyBoto3Package "waf" "1.40.64"

From 5f42e29bd506c3032282b6b8db53084175c057b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:21:42 +0100
Subject: [PATCH 145/258] python313Packages.botocore-stubs: 1.40.67 -> 1.40.69

---
 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 24206df5f31c..caae8ea2628b 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.67";
+  version = "1.40.69";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-hk+f7UJy1+YrSlHaOxRe30J0AsH5l4YSpETtHo/fncc=";
+    hash = "sha256-MdG7mlFA35uoPW1NZraJmHZyeYUN5Q4oyq3jFSRLCng=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4c05d5ce9dcbbe6e8223ad5495a329951f4f0b1d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:21:47 +0100
Subject: [PATCH 146/258] python313Packages.boto3-stubs: 1.40.64 -> 1.40.69

---
 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 f9f690d775ab..470f3220f7de 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.64";
+  version = "1.40.69";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-r0p/tnvaDBJ3r81FolBlYFVn0mCor9NLvfF5nSSSM08=";
+    hash = "sha256-JEEhZyxhS1hCbxYw9Whagh9KjP9J3u1ZoofZ2Rx6TWQ=";
   };
 
   build-system = [ setuptools ];

From 95ae2ac1388dfc7993dd5710d6f9264fab34fed0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:23:42 +0100
Subject: [PATCH 147/258] python313Packages.asteval: modernize

---
 pkgs/development/python-modules/asteval/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index 68aec3379bf4..20949f3e581d 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
 }:
 
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "1.0.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "lmfit";
     repo = "asteval";
@@ -39,7 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "AST evaluator of Python expression using ast module";
     homepage = "https://github.com/lmfit/asteval";
-    changelog = "https://github.com/lmfit/asteval/releases/tag/${version}";
+    changelog = "https://github.com/lmfit/asteval/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From ce24f735858513b63840b3bab216ee1e4ec76773 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 8 Nov 2025 22:24:42 +0100
Subject: [PATCH 148/258] yaziPlugins.bookmarks: init at
 0.2.5-unstable-2025-07-09

---
 .../ya/yazi/plugins/bookmarks/default.nix     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix
new file mode 100644
index 000000000000..bb97c06b595e
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "bookmarks.yazi";
+  version = "0.2.5-unstable-2025-07-09";
+
+  src = fetchFromGitHub {
+    owner = "dedukun";
+    repo = "bookmarks.yazi";
+    rev = "9ef1254d8afe88aba21cd56a186f4485dd532ab8";
+    hash = "sha256-GQFBRB2aQqmmuKZ0BpcCAC4r0JFKqIANZNhUC98SlwY=";
+  };
+
+  meta = {
+    description = "Yazi plugin that adds the basic functionality of vi-like marks";
+    homepage = "https://github.com/dedukun/bookmarks.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ eljamm ];
+  };
+}

From a4f1c91d195f826b466e035ac58e8deafb52f9f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:31:26 +0100
Subject: [PATCH 149/258] python313Packages.iamdata: 0.1.202511061 ->
 0.1.202511081

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511061...v0.1.202511081

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511081
---
 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 b553f1be0878..fde5b9ed486e 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.202511061";
+  version = "0.1.202511081";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-SEbER6oe5BK/6HpvMh+UD7rvGyPNJ1zxLD9LNis8QJw=";
+    hash = "sha256-0yV5yZ0gElw2p8UjwU6ujkXu1DV2cmOPlG9XgObUNUA=";
   };
 
   __darwinAllowLocalNetworking = true;

From ce4d7b5e2d194f77a27f43a4b10d82088dfbd79c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 21:51:24 +0000
Subject: [PATCH 150/258] rebels-in-the-sky: 1.1.0 -> 1.1.2

---
 pkgs/by-name/re/rebels-in-the-sky/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 67574890a98b..633a78f640e3 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebels-in-the-sky";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "ricott1";
     repo = "rebels-in-the-sky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wkYzYKFoMn+cKZUaQn9GRxYXXe60ea6UFjamdrxjJFs=";
+    hash = "sha256-37sStLh2gZm5aV2czvV7lU+aCUyed8/ZKPRUb02AQQw=";
   };
 
-  cargoHash = "sha256-6qLIrUa5wvh4TQhl/JQLV0QKtgSQZNT4l6Z+2121BmY=";
+  cargoHash = "sha256-qj9Utd8mICP7Ulx86PWNusV/7OvfaI4u3qvbp69kYP0=";
 
   patches = lib.optionals (!withRadio) [
     ./disable-radio.patch

From 52696ff186b66fc6cdfe95c257c9bfc35f1bdf9f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:57:55 +0100
Subject: [PATCH 151/258] python313Packages.meshtastic: 2.7.3 -> 2.7.4

Diff: https://github.com/meshtastic/python/compare/2.7.3...2.7.4

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 2c321fa6e721..d3a95fba1bd7 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.7.3";
+  version = "2.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-9p9tDc74WpH0+8orI69bW2Yj7Cow4v7M3cotIbk/mcw=";
+    hash = "sha256-fIr80k++BwA3UFgeS9Fgq6fpOOIcK4jj7bjfjqkc6ug=";
   };
 
   pythonRelaxDeps = [

From 84c49e758cd3539d25581b5fe5b1e1845d06a27d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:34:57 +0000
Subject: [PATCH 152/258] supercell-wx: 0.4.9 -> 0.5.3, cleanup

Diff:
https://github.com/dpaulat/supercell-wx/compare/v0.4.9-release...v0.5.3-release

Changelog:
https://github.com/dpaulat/supercell-wx/releases/tag/v0.5.3-release

Co-authored-by: aware70 <7832566+aware70@users.noreply.github.com>
---
 pkgs/by-name/su/supercell-wx/package.nix      | 176 ++++++++++--------
 .../patches/explicit-link-aws-crt.patch       |   6 +-
 .../patches/fix-cmake-install.patch           |  27 +--
 .../patches/fix-find-opengl.patch             |  27 +++
 .../patches/skip-git-versioning.patch         |   8 +-
 .../patches/use-find-package.patch            |  34 ++--
 6 files changed, 165 insertions(+), 113 deletions(-)
 create mode 100644 pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch

diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 587444f6e36b..1f4f94076ee6 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -1,44 +1,50 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  aws-sdk-cpp,
-  bzip2,
+  replaceVars,
+  tracy,
+
+  # nativeBuildInputs
   cmake,
   ninja,
-  zlib,
-  openssl,
-  curl,
-  glew,
-  geos,
+  qt6,
+
+  # buildInputs
+  aws-sdk-cpp,
   boost,
-  spdlog,
-  stb,
+  bzip2,
+  geos,
+  geographiclib,
+  glew,
+  glm,
+  gtest,
+  howard-hinnant-date,
+  libSM,
   libcpr,
   libpng,
-  libSM,
-  geographiclib,
-  howard-hinnant-date,
-  re2,
-  gtest,
-  glm,
-  qt6,
   onetbb,
-  tracy,
-  replaceVars,
+  openssl,
   python3,
+  range-v3,
+  re2,
+  spdlog,
+  stb,
+  zlib,
 }:
 let
   gtestSkip = [
     # Skip tests requiring network access
-    "AwsLevel*DataProvider.FindKeyNow"
     "AwsLevel*DataProvider.FindKeyFixed"
-    "AwsLevel*DataProvider.LoadObjectByKey"
-    "AwsLevel*DataProvider.Refresh"
+    "AwsLevel*DataProvider.FindKeyNow"
     "AwsLevel*DataProvider.GetAvailableProducts"
     "AwsLevel*DataProvider.GetTimePointsByDate"
+    "AwsLevel*DataProvider.LoadObjectByKey"
     "AwsLevel*DataProvider.Prune"
+    "AwsLevel*DataProvider.Refresh"
+    "IemApiProviderTest.*"
+    "NtpClient.*"
+    "NwsApiProviderTest.*"
     "UpdateManagerTest.CheckForUpdates"
     "WarningsProvider*\"https"
 
@@ -50,47 +56,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "supercell-wx";
-  version = "0.4.9";
+  version = "0.5.3";
+
   src = fetchFromGitHub {
     owner = "dpaulat";
     repo = "supercell-wx";
-    rev = "refs/tags/v${finalAttrs.version}-release";
-    sha256 = "sha256-3fVUxbGosN4Y4h8BJXUV7DNv7VZTma+IsV94+Zt8DCA=";
+    tag = "v${finalAttrs.version}-release";
     fetchSubmodules = true;
+    hash = "sha256-1n1WXBLco2TpyhS8KA1tk6HzRIXLqS6YV3aYagoQiTM=";
   };
 
-  meta = {
-    homepage = "https://supercell-wx.rtfd.io";
-    downloadPage = "https://github.com/dpaulat/supercell-wx/releases";
-    description = "Live visualization of NEXRAD weather data and alerts";
-    longDescription = ''
-      Supercell Wx is a free, open source application to visualize live and
-      archive NEXRAD Level 2 and Level 3 data, and severe weather alerts.
-      It displays continuously updating weather data on top of a responsive
-      map, providing the capability to monitor weather events using
-      reflectivity, velocity, and other products.
-    '';
-    license = lib.licenses.mit;
-    mainProgram = "supercell-wx";
-    platforms = [
-      "x86_64-linux"
-      #     "aarch64-linux"
-    ];
-    maintainers = with lib.maintainers; [ aware70 ];
-  };
-
-  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;
-
-  # These tests aren't built by 'all', but ctest still tries to run them.
-  cmakeFlags = [
-    "-DCMAKE_CTEST_ARGUMENTS=-E;'test_mln_core|test_mln_widgets'"
-    "-DSTB_INCLUDE_DIR=${stb}/include/stb"
-    "-DFETCHCONTENT_SOURCE_DIR_TRACY=${tracy.src}"
-  ];
-
   patches = [
     # These are for Nix compatibility {{{
     ./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions
@@ -105,6 +80,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
+    ./patches/fix-find-opengl.patch
     # }}}
   ];
 
@@ -114,6 +90,28 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "CMAKE_SOURCE_DIR" "PROJECT_SOURCE_DIR"
   '';
 
+  env = {
+    CXXFLAGS = lib.concatStringsSep " " [
+      "-Wno-error=deprecated-declarations"
+      "-Wno-error=maybe-uninitialized"
+      "-Wno-error=restrict"
+      "-Wno-error=stringop-overflow"
+      "-DQT_NO_USE_NODISCARD_FILE_OPEN"
+    ];
+    GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
+  };
+
+  cmakeFlags = [
+    # CMake Error at external/aws-sdk-cpp/crt/aws-crt-cpp/cmake/EnforceSubmoduleVersions.cmake:18 (message):
+    # ENFORCE_SUBMODULE_VERSIONS is ON but Git was not found.
+    (lib.cmakeBool "ENFORCE_SUBMODULE_VERSIONS" false)
+
+    # These tests aren't built by 'all', but ctest still tries to run them.
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;'test_mln_core|test_mln_widgets'")
+    (lib.cmakeFeature "STB_INCLUDE_DIR" "${stb}/include/stb")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TRACY" "${tracy.src}")
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -121,36 +119,37 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    zlib
-    openssl
-    qt6.qtbase
-    qt6.qttools
-    qt6.qtmultimedia
-    qt6.qtpositioning
-    qt6.qtimageformats
     aws-sdk-cpp
-    howard-hinnant-date
     boost
-    onetbb
-    glew
+    bzip2
     geos
-    spdlog
-    stb
-    libcpr
-    libpng
-    libSM
-    re2
-    openssl
     # FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
     (geographiclib.overrideAttrs {
       outputs = [ "out" ];
     })
-    gtest
+    glew
     glm
-    bzip2
+    gtest
+    howard-hinnant-date
+    libSM
+    libcpr
+    libpng
+    onetbb
+    openssl
     (python3.withPackages (ps: [
       ps.geopandas
+      ps.jinja2
     ]))
+    qt6.qtbase
+    qt6.qtimageformats
+    qt6.qtmultimedia
+    qt6.qtpositioning
+    qt6.qttools
+    re2
+    range-v3
+    spdlog
+    stb
+    zlib
   ];
 
   # Currently crashes on wayland; must force X11
@@ -158,10 +157,33 @@ stdenv.mkDerivation (finalAttrs: {
     "--set QT_QPA_PLATFORM xcb"
   ];
 
+  doCheck = true;
+
   # Install .desktop file and icons
   postInstall = ''
     install -m0644 -D "$src/scwx-qt/res/linux/supercell-wx.desktop" "$out/share/applications/supercell-wx.desktop"
     install -m0644 -D "$src/scwx-qt/res/icons/scwx-256.png"  "$out/share/icons/hicolor/256x256/apps/supercell-wx.png"
     install -m0644 -D "$src/scwx-qt/res/icons/scwx-64.png"  "$out/share/icons/hicolor/64x64/apps/supercell-wx.png"
   '';
+
+  meta = {
+    homepage = "https://supercell-wx.rtfd.io";
+    downloadPage = "https://github.com/dpaulat/supercell-wx/releases";
+    description = "Live visualization of NEXRAD weather data and alerts";
+    changelog = "https://github.com/dpaulat/supercell-wx/releases/tag/${finalAttrs.src.tag}";
+    longDescription = ''
+      Supercell Wx is a free, open source application to visualize live and
+      archive NEXRAD Level 2 and Level 3 data, and severe weather alerts.
+      It displays continuously updating weather data on top of a responsive
+      map, providing the capability to monitor weather events using
+      reflectivity, velocity, and other products.
+    '';
+    license = lib.licenses.mit;
+    mainProgram = "supercell-wx";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with lib.maintainers; [ aware70 ];
+  };
 })
diff --git a/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch b/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch
index ecd9471dd7de..3fca9577a889 100644
--- a/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch
+++ b/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch
@@ -1,12 +1,12 @@
 diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
-index 47ada181..a1beea15 100644
+index 36911947..451efc13 100644
 --- a/wxdata/wxdata.cmake
 +++ b/wxdata/wxdata.cmake
-@@ -280,6 +280,7 @@ endif()
+@@ -320,6 +320,7 @@ endif()
  
  target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
                                      aws-cpp-sdk-s3
 +                                    aws-crt-cpp
                                      cpr::cpr
                                      LibXml2::LibXml2
-                                     re2::re2
+                                     OpenSSL::Crypto
diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch b/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch
index 88e38047756f..4db8401e3e94 100644
--- a/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch
+++ b/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch
@@ -1,22 +1,24 @@
 diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
-index cda6c7f..32d807a 100644
+index 648b6578..4833b9c2 100644
 --- a/scwx-qt/scwx-qt.cmake
 +++ b/scwx-qt/scwx-qt.cmake
-@@ -601,6 +601,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
-                                      Boost::json
+@@ -776,6 +776,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                       Boost::timer
+                                      Boost::atomic
                                       QMapLibre::Core
 +                                     QMapLibre::Widgets
                                       $<$<CXX_COMPILER_ID:MSVC>:opengl32>
+                                      $<$<CXX_COMPILER_ID:MSVC>:SetupAPI>
                                       Fontconfig::Fontconfig
-                                      GeographicLib::GeographicLib
-@@ -615,40 +616,13 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
+@@ -793,18 +794,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
  target_link_libraries(supercell-wx PRIVATE scwx-qt
                                             wxdata)
  
--# Set DT_RUNPATH for Linux targets
--set_target_properties(MLNQtCore    PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
--set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+-if (LINUX)
+-    # Set DT_RUNPATH for Linux targets
+-    set_target_properties(MLNQtCore    PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
+-    set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+-endif()
 -
  install(TARGETS supercell-wx
 -                MLNQtCore # QMapLibre::Core
@@ -26,7 +28,8 @@ index cda6c7f..32d807a 100644
 -                               "^(/usr)?/lib/.*\\.so(\\..*)?"
          RUNTIME
            COMPONENT supercell-wx
-         LIBRARY
+         BUNDLE
+@@ -819,24 +809,6 @@ install(TARGETS supercell-wx
            COMPONENT supercell-wx
            OPTIONAL)
  
@@ -48,6 +51,6 @@ index cda6c7f..32d807a 100644
 -install(SCRIPT ${deploy_script_scwx}
 -        COMPONENT supercell-wx)
 -
- if (MSVC)
-     set(CPACK_PACKAGE_NAME                "Supercell Wx")
-     set(CPACK_PACKAGE_VENDOR              "Dan Paulat")
+ if (APPLE)
+     # Install additional script to fix up the bundle
+     install(CODE [[
diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch b/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch
new file mode 100644
index 000000000000..f3aebc9c99e0
--- /dev/null
+++ b/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch
@@ -0,0 +1,27 @@
+diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
+index 648b6578..3f1d8070 100644
+--- a/scwx-qt/scwx-qt.cmake
++++ b/scwx-qt/scwx-qt.cmake
+@@ -18,7 +18,7 @@ find_package(Fontconfig)
+ find_package(geographiclib)
+ find_package(geos)
+ find_package(glm)
+-find_package(OpenGL)
++find_package(OpenGL REQUIRED)
+ find_package(Python COMPONENTS Interpreter)
+ find_package(SQLite3)
+ 
+@@ -759,12 +759,7 @@ if (LINUX)
+     target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient)
+ endif()
+ 
+-if (LINUX)
+-    find_package(mesa-glu REQUIRED)
+-    target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu)
+-else()
+-    target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
+-endif()
++target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
+ 
+ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
+                                      Qt${QT_VERSION_MAJOR}::OpenGLWidgets
diff --git a/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch b/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch
index 7f7ce9a50ad8..842d4118256a 100644
--- a/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch
+++ b/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch
@@ -1,5 +1,5 @@
 diff --git a/scwx-qt/tools/generate_versions.py b/scwx-qt/tools/generate_versions.py
-index c6c94020..3fcdcf08 100644
+index c6c94020..000f6e6e 100644
 --- a/scwx-qt/tools/generate_versions.py
 +++ b/scwx-qt/tools/generate_versions.py
 @@ -1,6 +1,5 @@
@@ -9,7 +9,7 @@ index c6c94020..3fcdcf08 100644
  import json
  import os
  import pathlib
-@@ -110,27 +109,22 @@ def ParseArguments():
+@@ -110,27 +109,23 @@ def ParseArguments():
                          required = True)
      return parser.parse_args()
  
@@ -25,7 +25,7 @@ index c6c94020..3fcdcf08 100644
      print("Collecting version info")
  
      versionInfo = VersionInfo()
--
+ 
 -    repo = git.Repo(args.gitRepo_, search_parent_directories = True)
 -
 -    commitString = str(repo.head.commit)[:10]
@@ -43,7 +43,7 @@ index c6c94020..3fcdcf08 100644
 -    versionInfo.copyrightYear_ = copyrightYear
 -    versionInfo.resourceDir_   = resourceDir
 +    versionInfo.commitString_  = "@rev@"
-+    versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / 'LICENSE.txt')
++    versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / "LICENSE.txt")
 +    versionInfo.resourceDir_   = str(args.gitRepo_).replace("\\", "\\\\")
      versionInfo.versionString_ = args.version_
  
diff --git a/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch b/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch
index 945a58c6c80d..58f1eba3baa9 100644
--- a/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch
+++ b/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch
@@ -1,63 +1,63 @@
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 2137ae62..041cb87d 100644
+index 1039e96e..16f2c84a 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
-@@ -14,7 +14,7 @@ set_property(DIRECTORY
+@@ -15,7 +15,7 @@ set_property(DIRECTORY
               units.cmake
               qt6ct.cmake)
  
 -include(aws-sdk-cpp.cmake)
 +find_package(AWSSDK CONFIG REQUIRED)
  include(date.cmake)
+ include(glad.cmake)
  include(hsluv-c.cmake)
- include(imgui.cmake)
 diff --git a/external/stb.cmake b/external/stb.cmake
-index 570af425..f9817226 100644
+index 570af425..f2e7b2c8 100644
 --- a/external/stb.cmake
 +++ b/external/stb.cmake
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
  cmake_minimum_required(VERSION 3.24)
  set(PROJECT_NAME scwx-stb)
-
+ 
 -set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
 +# Nix: set STB_INCLUDE_DIR in cmake flags
 diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
-index 09ea6fe3..c20a2cb6 100644
+index 4833b9c2..641fc637 100644
 --- a/scwx-qt/scwx-qt.cmake
 +++ b/scwx-qt/scwx-qt.cmake
-@@ -11,14 +11,15 @@ set(CMAKE_AUTORCC ON)
- set(CMAKE_CXX_STANDARD 20)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -13,14 +13,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ OPTION(SCWX_DISABLE_CONSOLE "Disables the Windows console in release mode" ON)
  
 -find_package(Boost)
-+find_package(Boost REQUIRED COMPONENTS json timer)
++find_package(Boost REQUIRED COMPONENTS json timer atomic)
  find_package(Fontconfig)
 -find_package(geographiclib)
 +find_package(GeographicLib)
  find_package(geos)
- find_package(GLEW)
  find_package(glm)
+ find_package(OpenGL)
  find_package(Python COMPONENTS Interpreter)
  find_package(SQLite3)
 +find_package(PNG)
  
  find_package(QT NAMES Qt6
               COMPONENTS Gui
-@@ -699,6 +700,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
-                                      imgui
+@@ -789,6 +790,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                       qt6ct-common
+                                      qt6ct-widgets
                                       SQLite::SQLite3
 +                                     PNG::PNG
                                       wxdata)
  
  target_link_libraries(supercell-wx PRIVATE scwx-qt
 diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
-index 94b0e3a7..a36c2c81 100644
+index 451efc13..86cbb42b 100644
 --- a/wxdata/wxdata.cmake
 +++ b/wxdata/wxdata.cmake
-@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.24)
+@@ -4,7 +4,8 @@ project(scwx-data)
  
- project(scwx-data)
+ include(CheckCXXSymbolExists)
  
 -find_package(Boost)
 +find_package(Boost REQUIRED COMPONENTS iostreams)

From 3e7615cdc26a664ecc4dea0770f57af443fe7a6c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 22:59:45 +0100
Subject: [PATCH 153/258] circup: 2.1.2 -> 2.3.0

Changelog: https://github.com/adafruit/circup/releases/tag/2.3.0
---
 pkgs/by-name/ci/circup/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix
index 2f4ac456ecbb..c7399218c2c4 100644
--- a/pkgs/by-name/ci/circup/package.nix
+++ b/pkgs/by-name/ci/circup/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "circup";
-  version = "2.1.2";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "circup";
     tag = version;
-    hash = "sha256-lmuxqkZVByJwnfHj4yljWQwTvdLnguq3hZm6a7LN6Xo=";
+    hash = "sha256-o42gzdv69+BO5kTconZaMQBv89GzuFprf/UoZjF29oI=";
   };
 
   pythonRelaxDeps = [ "semver" ];
@@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec {
   disabledTests = [
     # Test requires network access
     "test_libraries_from_imports_bad"
+    "test_install_auto_file_bad"
   ];
 
   meta = with lib; {

From de3b605591b43dc5a6d01d1a7c9a3b5ecb8e58ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Nov 2025 23:01:22 +0100
Subject: [PATCH 154/258] python313Packages.meshtastic: modernize

---
 pkgs/development/python-modules/meshtastic/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index d3a95fba1bd7..872ce7fda7bc 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -23,7 +23,6 @@
   pyserial,
   pytap2,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   requests,
   riden,
@@ -37,8 +36,6 @@ buildPythonPackage rec {
   version = "2.7.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "python";
@@ -126,7 +123,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API for talking to Meshtastic devices";
     homepage = "https://github.com/meshtastic/python";
-    changelog = "https://github.com/meshtastic/python/releases/tag/${version}";
+    changelog = "https://github.com/meshtastic/python/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 0df801e2760f5224e429efdbcb5b13aa46eb8b44 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 8 Nov 2025 14:02:29 -0800
Subject: [PATCH 155/258] python-aliases: correct error message for gpapi

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

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7cf00fbaa665..6031507b5b91 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -183,7 +183,7 @@ mapAliases {
   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
-  gpapi = throw "'gpapi' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09
+  gpapi = throw "'gpapi' has been superseded by google-api-python-client"; # Added 2025-11-09
   gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09
   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

From 713fb409041ed94038f23420a205ee939990a6aa Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Sat, 8 Nov 2025 22:28:23 +0100
Subject: [PATCH 156/258] lmms: fix cmake 4 compatibility

---
 pkgs/applications/audio/lmms/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index d4c45a283603..1f550fd09771 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -70,7 +70,21 @@ mkDerivation rec {
     })
   ];
 
-  cmakeFlags = [ "-DWANT_QT5=ON" ];
+  prePatch = ''
+    # Update CMake minimum required version and policies
+    substituteInPlace CMakeLists.txt --replace 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'
+    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0026 OLD)' 'CMAKE_POLICY(SET CMP0026 NEW)'
+    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0050 OLD)' 'CMAKE_POLICY(SET CMP0050 NEW)'
+    substituteInPlace CMakeLists.txt --replace 'GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)' 'SET(BIN2RES $<TARGET_FILE:bin2res>)'
+  '';
+
+  cmakeFlags = [
+    "-DWANT_QT5=ON"
+  ]
+  ++ lib.optionals (lib.versionOlder version "11.4") [
+    # Fix the build with CMake 4.
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+  ];
 
   meta = with lib; {
     description = "DAW similar to FL Studio (music production software)";

From da03bcff091fbd8d3d018a4dc60548ba2904e793 Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Sat, 8 Nov 2025 22:54:16 +0100
Subject: [PATCH 157/258] lmms: reenable all architectures

---
 pkgs/applications/audio/lmms/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 1f550fd09771..416dd6c06174 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -91,10 +91,7 @@ mkDerivation rec {
     mainProgram = "lmms";
     homepage = "https://lmms.io";
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    platforms = platforms.linux;
     maintainers = [ ];
   };
 }

From fb8e1da05b9208836512e79d29a1fa2f035e2cbf Mon Sep 17 00:00:00 2001
From: Oleksandr Usov <a.s.usov@gmail.com>
Date: Fri, 17 Oct 2025 20:50:48 +0100
Subject: [PATCH 158/258] mrtg: gcc14 broke detection of print format
 specifiers

---
 .../mrtg/configure-long-long-format-gcc14.patch | 10 ++++++++++
 pkgs/by-name/mr/mrtg/package.nix                | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch

diff --git a/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch b/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch
new file mode 100644
index 000000000000..6159854d4d91
--- /dev/null
+++ b/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch
@@ -0,0 +1,10 @@
+--- mrtg-2.17.10/configure.bak	2025-10-17 20:44:24.878718603 +0100
++++ mrtg-2.17-10/configure	2025-10-17 20:44:40.343747835 +0100
+@@ -3664,6 +3664,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdio.h>
++#include <stdlib.h>
+             int main()
+             {
+                 long long b, a = -0x3AFAFAFAFAFAFAFALL;
diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix
index 9c5e89f7bd74..7cc2b9095fa4 100644
--- a/pkgs/by-name/mr/mrtg/package.nix
+++ b/pkgs/by-name/mr/mrtg/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  makeWrapper,
   fetchurl,
   perl,
   gd,
@@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [
     # add support for ipv6 snmp:
     # https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341
@@ -32,6 +35,20 @@ stdenv.mkDerivation rec {
     rrdtool
   ];
 
+  patches = [
+    # gcc14 broke detection of printf format specifiers
+    # building from master seems to be fixed upstream, so next release can (likely) drop the patch
+    # just keep the CFLAGS below
+    ./configure-long-long-format-gcc14.patch
+  ];
+  env.NIX_CFLAGS_COMPILE = "-Werror";
+  env.NIX_CFLAGS_LINK = "-lm";
+
+  postInstall = ''
+    # mrtg wants plain C locale
+    wrapProgram $out/bin/mrtg  --set LANG C
+  '';
+
   meta = with lib; {
     description = "Multi Router Traffic Grapher";
     homepage = "https://oss.oetiker.ch/mrtg/";

From d1911335cc7475921fe7d46aed0f66a4747f0f4d Mon Sep 17 00:00:00 2001
From: Oleksandr Usov <a.s.usov@gmail.com>
Date: Sat, 8 Nov 2025 22:31:21 +0000
Subject: [PATCH 159/258] maintainers: add usovalx

---
 maintainers/maintainer-list.nix  | 5 +++++
 pkgs/by-name/mr/mrtg/package.nix | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 535ef1d43934..77b2ee7f6571 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27146,6 +27146,11 @@
     githubId = 120451;
     name = "Urban Skudnik";
   };
+  usovalx = {
+    name = "Oleksandr Usov";
+    github = "usovalx";
+    githubId = 1041626;
+  };
   usrfriendly = {
     name = "Arin Lares";
     email = "arinlares@gmail.com";
diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix
index 7cc2b9095fa4..c7cb5d605fba 100644
--- a/pkgs/by-name/mr/mrtg/package.nix
+++ b/pkgs/by-name/mr/mrtg/package.nix
@@ -53,7 +53,10 @@ stdenv.mkDerivation rec {
     description = "Multi Router Traffic Grapher";
     homepage = "https://oss.oetiker.ch/mrtg/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ robberer ];
+    maintainers = with maintainers; [
+      robberer
+      usovalx
+    ];
     platforms = platforms.unix;
   };
 }

From 1f31b6d00cff70435dce480978a2e93d42773040 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Sat, 8 Nov 2025 22:48:09 +0100
Subject: [PATCH 160/258] nix-output-monitor: 2.1.6 -> 2.1.8

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

diff --git a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
index e97ec3c342b0..d4875a9f860e 100644
--- a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
+++ b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
@@ -38,10 +38,10 @@
 }:
 mkDerivation {
   pname = "nix-output-monitor";
-  version = "2.1.6";
+  version = "2.1.8";
   src = fetchzip {
-    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.6.tar.gz";
-    sha256 = "0v291s6lx9rxlw38a3329gc37nyl2x24blyrf9rv8lzxc1q4bz31";
+    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.8.tar.gz";
+    sha256 = "09zpz9dbllaqngkg6hz0vl4sx3kbvlp4cdk6lqa0kgszrwsdwl9r";
   };
   isLibrary = true;
   isExecutable = true;

From 4730c5d4033e41eee8faf0210d877c946c5e0676 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Nov 2025 23:06:25 +0000
Subject: [PATCH 161/258] python3Packages.whisperx: relax av dependency

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

diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index 5d6455de1321..235bca7af2fe 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -60,6 +60,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   pythonRelaxDeps = [
+    "av"
     "numpy"
     "pandas"
     "pyannote-audio"

From 73a427b2c7199e7458375ed6f0b9a0dfd555ae2e Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 4 Nov 2025 19:22:03 +0000
Subject: [PATCH 162/258] melos: 7.1.1 -> 7.3.0

Diff: https://github.com/invertase/melos/compare/melos-v7.1.1...melos-v7.3.0
---
 pkgs/by-name/me/melos/add-generic-main.patch | 73 +++++++++++++++-----
 pkgs/by-name/me/melos/package.nix            |  8 +--
 pkgs/by-name/me/melos/pubspec.lock.json      | 36 +++++++---
 3 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch
index a00de578ce6d..8e90ac427171 100644
--- a/pkgs/by-name/me/melos/add-generic-main.patch
+++ b/pkgs/by-name/me/melos/add-generic-main.patch
@@ -1,11 +1,13 @@
 diff --git a/bin/melos.dart b/bin/melos.dart
-index 0db7013..218276f 100644
+index 2476436..bd79fad 100644
 --- a/packages/melos/bin/melos.dart
 +++ b/packages/melos/bin/melos.dart
-@@ -1,11 +1,37 @@
-+import 'dart:io';
+@@ -1,11 +1,72 @@
  import 'package:cli_launcher/cli_launcher.dart';
  import 'package:melos/src/command_runner.dart';
++import 'dart:io';
++import 'package:yaml/yaml.dart';
++import 'package:path/path.dart' as path;
  
 -Future<void> main(List<String> arguments) async => launchExecutable(
 -  arguments,
@@ -15,12 +17,13 @@ index 0db7013..218276f 100644
 -    entrypoint: melosEntryPoint,
 -  ),
 -);
-+Future<void> main(List<String> arguments) async {
-+  final melosYamlPath = findMelosYaml();
++final ExecutableName executableName = ExecutableName('melos');
 +
-+  if (melosYamlPath == null) {
-+    print('Error: melos.yaml not found in the project.');
-+    // Handle the error as needed
++Future<void> main(List<String> arguments) async {
++  final workspaceRoot = _findLocalInstallation(Directory.current);
++
++  if (workspaceRoot == null) {
++    print("Error: Could not find your work  ");
 +    return;
 +  }
 +
@@ -29,22 +32,54 @@ index 0db7013..218276f 100644
 +    LaunchContext(
 +      directory: Directory.current,
 +      localInstallation: ExecutableInstallation(
-+        name: ExecutableName('melos'),
++        name: executableName,
 +        isSelf: false,
-+        packageRoot: melosYamlPath,
++        packageRoot: workspaceRoot,
 +      ),
 +    ),
 +  );
 +}
 +
-+Directory? findMelosYaml() {
-+  var directory = Directory.current;
-+  while (directory.path != directory.parent.path) {
-+    final melosYamlPath = '${directory.path}/melos.yaml';
-+    if (File(melosYamlPath).existsSync()) {
-+      return directory;
-+    }
-+    directory = directory.parent;
++// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249
++Directory? _findLocalInstallation(
++  Directory start,
++) {
++  if (path.equals(start.path, start.parent.path)) {
++    return null;
 +  }
-+  return null;
++
++  final pubspecFile = File(path.join(start.path, 'pubspec.yaml'));
++  if (pubspecFile.existsSync()) {
++    final pubspecString = pubspecFile.readAsStringSync();
++    String? name;
++    YamlMap? dependencies;
++    YamlMap? devDependencies;
++
++    try {
++      final pubspecYaml = loadYamlDocument(
++        pubspecString,
++        sourceUrl: pubspecFile.uri,
++      );
++      final pubspec = pubspecYaml.contents as YamlMap;
++      name = pubspec['name'] as String?;
++      dependencies = pubspec['dependencies'] as YamlMap?;
++      devDependencies = pubspec['dev_dependencies'] as YamlMap?;
++    } catch (error, stackTrace) {
++      throw StateError(
++        'Could not parse pubspec.yaml at ${start.path}.\n$error\n$stackTrace',
++      );
++    }
++
++    final isSelf = name == executableName.package;
++
++    if ((isSelf) ||
++        (dependencies != null &&
++            dependencies.containsKey(executableName.package)) ||
++        (devDependencies != null &&
++            devDependencies.containsKey(executableName.package))) {
++      return start;
++    }
++  }
++
++  return _findLocalInstallation(start.parent);
 +}
diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix
index 791b674f1cda..6aad5b405e11 100644
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -4,12 +4,12 @@
   buildDartApplication,
 }:
 let
-  version = "7.1.1";
+  version = "7.3.0";
   src = fetchFromGitHub {
     owner = "invertase";
     repo = "melos";
     tag = "melos-v${version}";
-    hash = "sha256-i75fbo0lqDszo2pDtkWXQMt+3IoWsK7t05YU2IjqTmw=";
+    hash = "sha256-XTEhH8F54BoXJ1QNhUIZszHQoDwP0Za1LPQ6Dv9sR08=";
   };
 in
 buildDartApplication {
@@ -17,8 +17,8 @@ buildDartApplication {
   inherit version src;
 
   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
+    # Patch melos entrypoint to bypass cli_launcher which throws because it does not find melos in the "classic" folders eg : .dart_tool or pub cache.
+    # https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L236
     ./add-generic-main.patch
   ];
 
diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json
index 35aba4873f96..744a351566ba 100644
--- a/pkgs/by-name/me/melos/pubspec.lock.json
+++ b/pkgs/by-name/me/melos/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "90.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "8.4.1"
     },
     "ansi_styles": {
       "dependency": "transitive",
@@ -184,11 +184,11 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.0.7"
     },
     "dart_style": {
       "dependency": "transitive",
@@ -364,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "mustache_template",
-        "sha256": "d9aa84d114368b7f1727b7014b85bb0b234daeafe1518824c82d32703b3964f6",
+        "sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.0.2"
     },
     "node_preamble": {
       "dependency": "transitive",
@@ -400,6 +400,16 @@
       "source": "hosted",
       "version": "1.9.1"
     },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
     "platform": {
       "dependency": "transitive",
       "description": {
@@ -690,6 +700,16 @@
       "source": "hosted",
       "version": "1.2.1"
     },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.6.1"
+    },
     "yaml": {
       "dependency": "direct dev",
       "description": {

From 0a9b910a0d2a09ca50542fba8a7e3bee7ac3905f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 8 Nov 2025 18:21:29 -0500
Subject: [PATCH 163/258] gridtracker2: 2.250914.1 -> 2.251106.7, remove
 in-tree lockfile, add update script

---
 .../by-name/gr/gridtracker2/package-lock.json | 6721 -----------------
 pkgs/by-name/gr/gridtracker2/package.nix      |   18 +-
 2 files changed, 7 insertions(+), 6732 deletions(-)
 delete mode 100644 pkgs/by-name/gr/gridtracker2/package-lock.json

diff --git a/pkgs/by-name/gr/gridtracker2/package-lock.json b/pkgs/by-name/gr/gridtracker2/package-lock.json
deleted file mode 100644
index 3bdeac72dadd..000000000000
--- a/pkgs/by-name/gr/gridtracker2/package-lock.json
+++ /dev/null
@@ -1,6721 +0,0 @@
-{
-  "name": "GridTracker2",
-  "version": "2.250914.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "GridTracker2",
-      "version": "2.250914.1",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@electron-toolkit/preload": "^3.0.1",
-        "@electron-toolkit/utils": "^3.0.0",
-        "@electron/remote": "^2.1.2",
-        "electron-log": "^5.2.0",
-        "electron-updater": "6.6.5",
-        "mqtt": "^5.10.1"
-      },
-      "devDependencies": {
-        "@electron-toolkit/eslint-config": "^1.0.2",
-        "@electron-toolkit/eslint-config-prettier": "^2.0.0",
-        "electron": "35.7.5",
-        "electron-builder": "26.0.12",
-        "eslint": "^8.57.0",
-        "eslint_d": "^14.0.4",
-        "prettier": "^3.3.2"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "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/@develar/schema-utils": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz",
-      "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.0",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/@electron-toolkit/eslint-config": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config/-/eslint-config-1.0.2.tgz",
-      "integrity": "sha512-GJVuMsxBHfVARfmUoSTCHT0e/QfWlVbXcGk3tgoku0ad6tLjydbv2LpvKi02+Sy2WiEz9L9SkGSw090ukT/F0A==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "eslint": ">= 8.0.0"
-      }
-    },
-    "node_modules/@electron-toolkit/eslint-config-prettier": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config-prettier/-/eslint-config-prettier-2.0.0.tgz",
-      "integrity": "sha512-L+uG1FvJcAZkPZpSi6B1pmdpyJFyOxWDTjr1Vs47vSryxv/EX1Ch6o4HVsachlDq3fMEkDgojuP2F3ZvVZMoLw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.0.1"
-      },
-      "peerDependencies": {
-        "eslint": ">= 8.0.0",
-        "prettier": ">= 3.0.0"
-      }
-    },
-    "node_modules/@electron-toolkit/preload": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz",
-      "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "electron": ">=13.0.0"
-      }
-    },
-    "node_modules/@electron-toolkit/utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@electron-toolkit/utils/-/utils-3.0.0.tgz",
-      "integrity": "sha512-GaXHDhiT7KCvMJjXdp/QqpYinq69T/Pdl49Z1XLf8mKGf63dnsODMWyrmIjEQ0z/vG7dO8qF3fvmI6Eb2lUNZA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "electron": ">=13.0.0"
-      }
-    },
-    "node_modules/@electron/asar": {
-      "version": "3.2.18",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.18.tgz",
-      "integrity": "sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^5.0.0",
-        "glob": "^7.1.6",
-        "minimatch": "^3.0.4"
-      },
-      "bin": {
-        "asar": "bin/asar.js"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/@electron/asar/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@electron/fuses": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz",
-      "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.1",
-        "fs-extra": "^9.0.1",
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "electron-fuses": "dist/bin.js"
-      }
-    },
-    "node_modules/@electron/fuses/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==",
-      "dev": true,
-      "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/@electron/fuses/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/fuses/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/get": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
-      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "got": "^11.8.5",
-        "progress": "^2.0.3",
-        "semver": "^6.2.0",
-        "sumchecker": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "global-agent": "^3.0.0"
-      }
-    },
-    "node_modules/@electron/node-gyp": {
-      "version": "10.2.0-electron.1",
-      "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
-      "integrity": "sha512-4MSBTT8y07YUDqf69/vSh80Hh791epYqGtWHO3zSKhYFwQg+gx9wi1PqbqP6YqC4WMsNxZ5l9oDmnWdK5pfCKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^8.1.0",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^10.2.1",
-        "nopt": "^6.0.0",
-        "proc-log": "^2.0.1",
-        "semver": "^7.3.5",
-        "tar": "^6.2.1",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@electron/node-gyp/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/@electron/node-gyp/node_modules/glob": {
-      "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",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@electron/node-gyp/node_modules/minimatch": {
-      "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": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/node-gyp/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/notarize": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
-      "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "fs-extra": "^9.0.1",
-        "promise-retry": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/notarize/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==",
-      "dev": true,
-      "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/@electron/notarize/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/notarize/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/osx-sign": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz",
-      "integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "compare-version": "^0.1.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^10.0.0",
-        "isbinaryfile": "^4.0.8",
-        "minimist": "^1.2.6",
-        "plist": "^3.0.5"
-      },
-      "bin": {
-        "electron-osx-flat": "bin/electron-osx-flat.js",
-        "electron-osx-sign": "bin/electron-osx-sign.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@electron/osx-sign/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/osx-sign/node_modules/isbinaryfile": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
-      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
-      }
-    },
-    "node_modules/@electron/osx-sign/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/osx-sign/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/rebuild": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.0.tgz",
-      "integrity": "sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "chalk": "^4.0.0",
-        "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.7.0",
-        "node-abi": "^3.45.0",
-        "node-api-version": "^0.2.0",
-        "ora": "^5.1.0",
-        "read-binary-file-arch": "^1.0.6",
-        "semver": "^7.3.5",
-        "tar": "^6.0.5",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "electron-rebuild": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/rebuild/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/remote": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.3.tgz",
-      "integrity": "sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "electron": ">= 13.0.0"
-      }
-    },
-    "node_modules/@electron/universal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz",
-      "integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@electron/asar": "^3.2.7",
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "debug": "^4.3.1",
-        "dir-compare": "^4.2.0",
-        "fs-extra": "^11.1.1",
-        "minimatch": "^9.0.3",
-        "plist": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=16.4"
-      }
-    },
-    "node_modules/@electron/universal/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/@electron/universal/node_modules/fs-extra": {
-      "version": "11.3.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
-      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@electron/universal/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/universal/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"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@electron/universal/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/windows-sign": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
-      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "cross-dirname": "^0.1.0",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.1.1",
-        "minimist": "^1.2.8",
-        "postject": "^1.0.0-alpha.6"
-      },
-      "bin": {
-        "electron-windows-sign": "bin/electron-windows-sign.js"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/fs-extra": {
-      "version": "11.3.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
-      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "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.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"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "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==",
-      "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/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
-      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.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==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@eslint/core": "^0.15.2",
-        "levn": "^0.4.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@gar/promisify": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "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.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.4.0"
-      },
-      "engines": {
-        "node": ">=18.18.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
-      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.3",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@humanwhocodes/retry": {
-      "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"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@isaacs/balanced-match": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@isaacs/balanced-match": "^4.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "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": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "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": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "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/@malept/cross-spawn-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
-      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/malept"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
-        }
-      ],
-      "license": "Apache-2.0",
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/@malept/flatpak-bundler": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz",
-      "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "fs-extra": "^9.0.0",
-        "lodash": "^4.17.15",
-        "tmp-promise": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@malept/flatpak-bundler/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==",
-      "dev": true,
-      "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/@malept/flatpak-bundler/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@malept/flatpak-bundler/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "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": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 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": {
-        "node": ">= 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": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
-      "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@gar/promisify": "^1.1.3",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@npmcli/fs/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/move-file": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
-      "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
-      "deprecated": "This functionality has been moved to @npmcli/fs",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@pkgr/core": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/pkgr"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "license": "MIT",
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
-      }
-    },
-    "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/estree": {
-      "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/fs-extra": {
-      "version": "9.0.13",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
-      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
-      "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,
-      "license": "MIT"
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "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": "22.18.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.3.tgz",
-      "integrity": "sha512-gTVM8js2twdtqM+AE2PdGEe9zGQY4UvmFjan9rZcVb6FGdStfjWoWejdmy4CfWVO9rh5MiYQGZloKAGkJt8lMw==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
-    "node_modules/@types/plist": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*",
-        "xmlbuilder": ">=11.0.1"
-      }
-    },
-    "node_modules/@types/readable-stream": {
-      "version": "4.0.21",
-      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.21.tgz",
-      "integrity": "sha512-19eKVv9tugr03IgfXlA9UVUVRbW6IuqRO5B92Dl4a6pT7K8uaGrNS0GkxiZD0BOk6PLuXl5FhWl//eX/pzYdTQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/responselike": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/verror": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.11.tgz",
-      "integrity": "sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/@types/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@xmldom/xmldom": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
-      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/7zip-bin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
-      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "license": "MIT",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "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-jsx": {
-      "version": "5.3.2",
-      "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"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/agentkeepalive": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
-      "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.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/ajv": {
-      "version": "6.12.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",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "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/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"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/app-builder-bin": {
-      "version": "5.0.0-alpha.12",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz",
-      "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/app-builder-lib": {
-      "version": "26.0.12",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.0.12.tgz",
-      "integrity": "sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@develar/schema-utils": "~2.6.5",
-        "@electron/asar": "3.2.18",
-        "@electron/fuses": "^1.8.0",
-        "@electron/notarize": "2.5.0",
-        "@electron/osx-sign": "1.3.1",
-        "@electron/rebuild": "3.7.0",
-        "@electron/universal": "2.0.1",
-        "@malept/flatpak-bundler": "^0.4.0",
-        "@types/fs-extra": "9.0.13",
-        "async-exit-hook": "^2.0.1",
-        "builder-util": "26.0.11",
-        "builder-util-runtime": "9.3.1",
-        "chromium-pickle-js": "^0.2.0",
-        "config-file-ts": "0.2.8-rc1",
-        "debug": "^4.3.4",
-        "dotenv": "^16.4.5",
-        "dotenv-expand": "^11.0.6",
-        "ejs": "^3.1.8",
-        "electron-publish": "26.0.11",
-        "fs-extra": "^10.1.0",
-        "hosted-git-info": "^4.1.0",
-        "is-ci": "^3.0.0",
-        "isbinaryfile": "^5.0.0",
-        "js-yaml": "^4.1.0",
-        "json5": "^2.2.3",
-        "lazy-val": "^1.0.5",
-        "minimatch": "^10.0.0",
-        "plist": "3.1.0",
-        "resedit": "^1.7.0",
-        "semver": "^7.3.8",
-        "tar": "^6.1.12",
-        "temp-file": "^3.4.0",
-        "tiny-async-pool": "1.3.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "dmg-builder": "26.0.12",
-        "electron-builder-squirrel-windows": "26.0.12"
-      }
-    },
-    "node_modules/app-builder-lib/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/app-builder-lib/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/app-builder-lib/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/app-builder-lib/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "license": "Python-2.0"
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/async-exit-hook": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "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"
-    },
-    "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==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 4.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==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/bl": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.3.tgz",
-      "integrity": "sha512-nHB8B5roHlGX5TFsWeiQJijdddZIOHuv1eL2cM2kHnG3qR91CYLsysGe+CvxQfEd23EKD0eJf4lto0frTbddKA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/readable-stream": "^4.0.0",
-        "buffer": "^6.0.3",
-        "inherits": "^2.0.4",
-        "readable-stream": "^4.2.0"
-      }
-    },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "license": "MIT",
-      "optional": true
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/broker-factory": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.9.tgz",
-      "integrity": "sha512-MzvndyD6EcbkBtX4NXm/HfdO1+cOR5ONNdMCXEKfHpxGdMtuDz7+o+nJf7HMtyPH1sUVf/lEIP+DMluC5PgaBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "fast-unique-numbers": "^9.0.23",
-        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.45"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "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==",
-      "license": "MIT"
-    },
-    "node_modules/builder-util": {
-      "version": "26.0.11",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.0.11.tgz",
-      "integrity": "sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/debug": "^4.1.6",
-        "7zip-bin": "~5.2.0",
-        "app-builder-bin": "5.0.0-alpha.12",
-        "builder-util-runtime": "9.3.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.6",
-        "debug": "^4.3.4",
-        "fs-extra": "^10.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
-        "is-ci": "^3.0.0",
-        "js-yaml": "^4.1.0",
-        "sanitize-filename": "^1.6.3",
-        "source-map-support": "^0.5.19",
-        "stat-mode": "^1.0.0",
-        "temp-file": "^3.4.0",
-        "tiny-async-pool": "1.3.0"
-      }
-    },
-    "node_modules/builder-util-runtime": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz",
-      "integrity": "sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/builder-util/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/builder-util/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/builder-util/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
-      "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/fs": "^2.1.0",
-        "@npmcli/move-file": "^2.0.0",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.1.0",
-        "glob": "^8.0.1",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^7.7.1",
-        "minipass": "^3.1.6",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "mkdirp": "^1.0.4",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^9.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^2.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/cacache/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/cacache/node_modules/glob": {
-      "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",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/cacache/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==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cacache/node_modules/minimatch": {
-      "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": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
-      "license": "MIT",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "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/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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chromium-pickle-js": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
-      "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "license": "MIT",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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": {
-        "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==",
-      "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": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/commist": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz",
-      "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==",
-      "license": "MIT"
-    },
-    "node_modules/compare-version": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
-      "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.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/concat-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-      "engines": [
-        "node >= 6.0"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.0.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-stream/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/config-file-ts": {
-      "version": "0.2.8-rc1",
-      "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz",
-      "integrity": "sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob": "^10.3.12",
-        "typescript": "^5.4.3"
-      }
-    },
-    "node_modules/config-file-ts/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/config-file-ts/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==",
-      "dev": true,
-      "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/config-file-ts/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"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/config-file-ts/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "buffer": "^5.1.0"
-      }
-    },
-    "node_modules/cross-dirname": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
-      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "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",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "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/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "license": "MIT",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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"
-    },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz",
-      "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/dir-compare": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
-      "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimatch": "^3.0.5",
-        "p-limit": "^3.1.0 "
-      }
-    },
-    "node_modules/dir-compare/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/dmg-builder": {
-      "version": "26.0.12",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.0.12.tgz",
-      "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "app-builder-lib": "26.0.12",
-        "builder-util": "26.0.11",
-        "builder-util-runtime": "9.3.1",
-        "fs-extra": "^10.1.0",
-        "iconv-lite": "^0.6.2",
-        "js-yaml": "^4.1.0"
-      },
-      "optionalDependencies": {
-        "dmg-license": "^1.0.11"
-      }
-    },
-    "node_modules/dmg-builder/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/dmg-builder/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/dmg-builder/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/dmg-license": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
-      "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "@types/plist": "^3.0.1",
-        "@types/verror": "^1.10.3",
-        "ajv": "^6.10.0",
-        "crc": "^3.8.0",
-        "iconv-corefoundation": "^1.1.7",
-        "plist": "^3.0.4",
-        "smart-buffer": "^4.0.2",
-        "verror": "^1.10.0"
-      },
-      "bin": {
-        "dmg-license": "bin/dmg-license.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/dotenv-expand": {
-      "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
-      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dotenv": "^16.4.5"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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/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"
-    },
-    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/electron": {
-      "version": "35.7.5",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz",
-      "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "@electron/get": "^2.0.0",
-        "@types/node": "^22.7.7",
-        "extract-zip": "^2.0.1"
-      },
-      "bin": {
-        "electron": "cli.js"
-      },
-      "engines": {
-        "node": ">= 12.20.55"
-      }
-    },
-    "node_modules/electron-builder": {
-      "version": "26.0.12",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.0.12.tgz",
-      "integrity": "sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "app-builder-lib": "26.0.12",
-        "builder-util": "26.0.11",
-        "builder-util-runtime": "9.3.1",
-        "chalk": "^4.1.2",
-        "dmg-builder": "26.0.12",
-        "fs-extra": "^10.1.0",
-        "is-ci": "^3.0.0",
-        "lazy-val": "^1.0.5",
-        "simple-update-notifier": "2.0.0",
-        "yargs": "^17.6.2"
-      },
-      "bin": {
-        "electron-builder": "cli.js",
-        "install-app-deps": "install-app-deps.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/electron-builder-squirrel-windows": {
-      "version": "26.0.12",
-      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.12.tgz",
-      "integrity": "sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "app-builder-lib": "26.0.12",
-        "builder-util": "26.0.11",
-        "electron-winstaller": "5.4.0"
-      }
-    },
-    "node_modules/electron-builder/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/electron-builder/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/electron-builder/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/electron-log": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz",
-      "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/electron-publish": {
-      "version": "26.0.11",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.0.11.tgz",
-      "integrity": "sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/fs-extra": "^9.0.11",
-        "builder-util": "26.0.11",
-        "builder-util-runtime": "9.3.1",
-        "chalk": "^4.1.2",
-        "form-data": "^4.0.0",
-        "fs-extra": "^10.1.0",
-        "lazy-val": "^1.0.5",
-        "mime": "^2.5.2"
-      }
-    },
-    "node_modules/electron-publish/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/electron-publish/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/electron-publish/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/electron-updater": {
-      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.6.5.tgz",
-      "integrity": "sha512-jnk38WfByl2Pb0cje02xls/pJkvkq3AQZI7usDCLriU23adkerLTkRrugbCPuUxUOa79nY1g/rokHPWHZFBKyA==",
-      "license": "MIT",
-      "dependencies": {
-        "builder-util-runtime": "9.3.2",
-        "fs-extra": "^10.1.0",
-        "js-yaml": "^4.1.0",
-        "lazy-val": "^1.0.5",
-        "lodash.escaperegexp": "^4.1.2",
-        "lodash.isequal": "^4.5.0",
-        "semver": "^7.6.3",
-        "tiny-typed-emitter": "^2.1.0"
-      }
-    },
-    "node_modules/electron-updater/node_modules/builder-util-runtime": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.2.tgz",
-      "integrity": "sha512-7QDXJ1FwT6d9ZhG4kuObUUPY8/ENBS/Ky26O4hR5vbeoRGavgekS2Jxv+8sCn/v23aPGU2DXRWEeJuijN2ooYA==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/electron-updater/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/electron-updater/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/electron-updater/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/electron-updater/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/electron-winstaller": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz",
-      "integrity": "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@electron/asar": "^3.2.1",
-        "debug": "^4.1.1",
-        "fs-extra": "^7.0.1",
-        "lodash": "^4.17.21",
-        "temp": "^0.9.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@electron/windows-sign": "^1.1.2"
-      }
-    },
-    "node_modules/electron-winstaller/node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "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/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "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/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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==",
-      "devOptional": true,
-      "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==",
-      "devOptional": true,
-      "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "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/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "license": "MIT",
-      "optional": true
-    },
-    "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": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
-      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
-      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.1",
-        "@humanwhocodes/config-array": "^0.13.0",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint_d": {
-      "version": "14.3.0",
-      "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.3.0.tgz",
-      "integrity": "sha512-Y8IRgZsOlYrSipIeaHpmuFu5+TEUDNZcgNKx2ARSUJp3DZCsFW9+V2bBhXCDQmBSolqjn2jZVZ5FBuhy0s3z2w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.7",
-        "eslint": "^9.8.0",
-        "supports-color": "^7.2.0"
-      },
-      "bin": {
-        "eslint_d": "bin/eslint_d.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/eslint_d/node_modules/@eslint/eslintrc": {
-      "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",
-        "espree": "^10.0.1",
-        "globals": "^14.0.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint_d/node_modules/@eslint/js": {
-      "version": "9.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.35.0.tgz",
-      "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      }
-    },
-    "node_modules/eslint_d/node_modules/eslint": {
-      "version": "9.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.35.0.tgz",
-      "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@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/eslintrc": "^3.3.1",
-        "@eslint/js": "9.35.0",
-        "@eslint/plugin-kit": "^0.3.5",
-        "@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",
-        "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.4.0",
-        "eslint-visitor-keys": "^4.2.1",
-        "espree": "^10.4.0",
-        "esquery": "^1.5.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "jiti": "*"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint_d/node_modules/eslint-scope": {
-      "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"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint_d/node_modules/eslint-visitor-keys": {
-      "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"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint_d/node_modules/espree": {
-      "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.15.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint_d/node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/eslint_d/node_modules/flat-cache": {
-      "version": "4.0.1",
-      "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"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/eslint_d/node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint_d/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-config-prettier": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz",
-      "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz",
-      "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.7"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint-plugin-prettier"
-      },
-      "peerDependencies": {
-        "@types/eslint": ">=8.0.0",
-        "eslint": ">=8.0.0",
-        "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
-        "prettier": ">=3.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/eslint": {
-          "optional": true
-        },
-        "eslint-config-prettier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "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"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "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": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "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": {
-        "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==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "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==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
-      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT",
-      "optional": true
-    },
-    "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"
-    },
-    "node_modules/fast-diff": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true,
-      "license": "Apache-2.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-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"
-    },
-    "node_modules/fast-unique-numbers": {
-      "version": "9.0.23",
-      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-9.0.23.tgz",
-      "integrity": "sha512-jcRIaHo46nfvyvKRMaFSKXmez4jALQ3Qw49gxM5F4siz8HqkyKPPEexpCOYwBSJI1HovrDr4fEedM8QAJ7oX3w==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "tslib": "^2.8.1"
-      },
-      "engines": {
-        "node": ">=18.2.0"
-      }
-    },
-    "node_modules/fastq": {
-      "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"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/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/filelist/node_modules/minimatch": {
-      "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": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "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.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-      "dev": true,
-      "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/foreground-child/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": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "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==",
-      "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.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "dev": true,
-      "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/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",
-      "dev": true,
-      "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/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"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "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"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/global-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "es6-error": "^4.1.1",
-        "matcher": "^3.0.0",
-        "roarr": "^2.15.3",
-        "semver": "^7.3.2",
-        "serialize-error": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=10.0"
-      }
-    },
-    "node_modules/global-agent/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",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/got": {
-      "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-      "license": "MIT",
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "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",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "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"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/help-me": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
-      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
-      "license": "MIT"
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
-      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
-      "license": "BSD-2-Clause"
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "license": "MIT",
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
-    "node_modules/iconv-corefoundation": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
-      "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "node-addon-api": "^1.6.3"
-      },
-      "engines": {
-        "node": "^8.11.2 || >=10"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "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.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/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "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/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "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.",
-      "dev": true,
-      "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/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-ci": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ci-info": "^3.2.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "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"
-      }
-    },
-    "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": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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/isbinaryfile": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.6.tgz",
-      "integrity": "sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
-      }
-    },
-    "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/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "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/jake": {
-      "version": "10.9.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
-      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "async": "^3.2.6",
-        "filelist": "^1.0.4",
-        "picocolors": "^1.1.1"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
-      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "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,
-      "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,
-      "license": "MIT"
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "license": "ISC",
-      "optional": true
-    },
-    "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": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "license": "MIT",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/lazy-val": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
-      "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
-      "license": "MIT"
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "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"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.escaperegexp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
-      "license": "MIT"
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
-      "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,
-      "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/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=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": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-fetch-happen": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
-      "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "agentkeepalive": "^4.2.1",
-        "cacache": "^16.1.0",
-        "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^7.7.1",
-        "minipass": "^3.1.6",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^2.0.3",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^7.0.0",
-        "ssri": "^9.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/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/make-fetch-happen/node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/make-fetch-happen/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/make-fetch-happen/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==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/matcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
-      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
-      "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.1.6",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mqtt": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.14.1.tgz",
-      "integrity": "sha512-NxkPxE70Uq3Ph7goefQa7ggSsVzHrayCD0OyxlJgITN/EbzlZN+JEPmaAZdxP1LsIT5FamDyILoQTF72W7Nnbw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/readable-stream": "^4.0.21",
-        "@types/ws": "^8.18.1",
-        "commist": "^3.2.0",
-        "concat-stream": "^2.0.0",
-        "debug": "^4.4.1",
-        "help-me": "^5.0.0",
-        "lru-cache": "^10.4.3",
-        "minimist": "^1.2.8",
-        "mqtt-packet": "^9.0.2",
-        "number-allocator": "^1.0.14",
-        "readable-stream": "^4.7.0",
-        "rfdc": "^1.4.1",
-        "socks": "^2.8.6",
-        "split2": "^4.2.0",
-        "worker-timers": "^8.0.23",
-        "ws": "^8.18.3"
-      },
-      "bin": {
-        "mqtt": "build/bin/mqtt.js",
-        "mqtt_pub": "build/bin/pub.js",
-        "mqtt_sub": "build/bin/sub.js"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/mqtt-packet": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
-      "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^6.0.8",
-        "debug": "^4.3.4",
-        "process-nextick-args": "^2.0.1"
-      }
-    },
-    "node_modules/mqtt/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/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/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/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/node-abi": {
-      "version": "3.77.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz",
-      "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-abi/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
-      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/node-api-version": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz",
-      "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.3.5"
-      }
-    },
-    "node_modules/node-api-version/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/nopt": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "abbrev": "^1.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/number-allocator": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz",
-      "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.1",
-        "js-sdsl": "4.3.0"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.4",
-      "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",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/ora/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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "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"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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/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==",
-      "dev": true,
-      "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"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/path-scurry/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/pe-library": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz",
-      "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12",
-        "npm": ">=6"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/jet2jet"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "license": "MIT"
-    },
-    "node_modules/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/plist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
-      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@xmldom/xmldom": "^0.8.8",
-        "base64-js": "^1.5.1",
-        "xmlbuilder": "^15.1.1"
-      },
-      "engines": {
-        "node": ">=10.4.0"
-      }
-    },
-    "node_modules/postject": {
-      "version": "1.0.0-alpha.6",
-      "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
-      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "commander": "^9.4.0"
-      },
-      "bin": {
-        "postject": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/postject/node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
-    "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.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-diff": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/proc-log": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz",
-      "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "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/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "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/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": [
-        {
-          "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/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-binary-file-arch": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz",
-      "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "bin": {
-        "read-binary-file-arch": "cli.js"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
-      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
-      "license": "MIT",
-      "dependencies": {
-        "abort-controller": "^3.0.0",
-        "buffer": "^6.0.3",
-        "events": "^3.3.0",
-        "process": "^0.11.10",
-        "string_decoder": "^1.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/readable-stream/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "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/resedit": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",
-      "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pe-library": "^0.4.1"
-      },
-      "engines": {
-        "node": ">=12",
-        "npm": ">=6"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/jet2jet"
-      }
-    },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "license": "MIT"
-    },
-    "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/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "license": "MIT",
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "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",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "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",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/roarr": {
-      "version": "2.15.4",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "detect-node": "^2.0.4",
-        "globalthis": "^1.0.1",
-        "json-stringify-safe": "^5.0.1",
-        "semver-compare": "^1.0.0",
-        "sprintf-js": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "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": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "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/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/sanitize-filename": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
-      "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
-      "dev": true,
-      "license": "WTFPL OR ISC",
-      "dependencies": {
-        "truncate-utf8-bytes": "^1.0.0"
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "license": "ISC"
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "type-fest": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/serialize-error/node_modules/type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "license": "(MIT OR CC0-1.0)",
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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"
-      },
-      "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/simple-update-notifier": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
-      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/simple-update-notifier/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==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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/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": "7.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/socks-proxy-agent/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/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-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/split2": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-      "license": "ISC",
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "license": "BSD-3-Clause",
-      "optional": true
-    },
-    "node_modules/ssri": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
-      "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/stat-mode": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
-      "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "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/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",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/sumchecker": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
-      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "debug": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 8.0"
-      }
-    },
-    "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": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/synckit": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
-      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@pkgr/core": "^0.2.9"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/synckit"
-      }
-    },
-    "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==",
-      "dev": true,
-      "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==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/temp": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
-      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1",
-        "rimraf": "~2.6.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/temp-file": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
-      "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "async-exit-hook": "^2.0.1",
-        "fs-extra": "^10.0.0"
-      }
-    },
-    "node_modules/temp-file/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/temp-file/node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/temp-file/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/temp/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/temp/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "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/tiny-async-pool": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz",
-      "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^5.5.0"
-      }
-    },
-    "node_modules/tiny-async-pool/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/tiny-typed-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
-      "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==",
-      "license": "MIT"
-    },
-    "node_modules/tmp": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
-      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/tmp-promise": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
-      "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tmp": "^0.2.0"
-      }
-    },
-    "node_modules/truncate-utf8-bytes": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
-      "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
-      "dev": true,
-      "license": "WTFPL",
-      "dependencies": {
-        "utf8-byte-length": "^1.0.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-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"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "license": "MIT"
-    },
-    "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/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "license": "MIT"
-    },
-    "node_modules/unique-filename": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
-      "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "unique-slug": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
-      "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "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"
-      }
-    },
-    "node_modules/utf8-byte-length": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
-      "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
-      "dev": true,
-      "license": "(WTFPL OR MIT)"
-    },
-    "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/verror": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
-      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "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": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.5",
-      "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"
-      }
-    },
-    "node_modules/worker-factory": {
-      "version": "7.0.45",
-      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.45.tgz",
-      "integrity": "sha512-FFPCiSv7MD6ZDEfiik/ErM8IrIAWajaXhezLyCo3v0FjhUWud6GXnG2BiTE91jLywXGAVCT8IF48Hhr+D/omMw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "fast-unique-numbers": "^9.0.23",
-        "tslib": "^2.8.1"
-      }
-    },
-    "node_modules/worker-timers": {
-      "version": "8.0.24",
-      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.24.tgz",
-      "integrity": "sha512-Ydu/7TRHlxIRjYSGDge1F92L7y9kzInpwR4CkocRVObPE0eRqC6d+0GFh52Hm+m520RHVKiytOERtCUu5sQDVQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "tslib": "^2.8.1",
-        "worker-timers-broker": "^8.0.10",
-        "worker-timers-worker": "^9.0.10"
-      }
-    },
-    "node_modules/worker-timers-broker": {
-      "version": "8.0.10",
-      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.10.tgz",
-      "integrity": "sha512-xvo/9GiuduENbJNdWnvZtkriIkjBKKVbMyw7GXvrBu3n1JHemzZgxqaCcCBNlpfXnRXXF4ekqvXWLh1gb65b8w==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "broker-factory": "^3.1.9",
-        "fast-unique-numbers": "^9.0.23",
-        "tslib": "^2.8.1",
-        "worker-timers-worker": "^9.0.10"
-      }
-    },
-    "node_modules/worker-timers-worker": {
-      "version": "9.0.10",
-      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.10.tgz",
-      "integrity": "sha512-cfCmAkuoN+nGGJShta/g7CQVP3h7rvQA642EQg72fOHCWP5S2P83rLxDiaGv811Hd+19Cgdqt/tpRBIZ5kj/dw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.28.3",
-        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.45"
-      }
-    },
-    "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/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",
-        "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/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "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"
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
-}
diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index 5efab3b56bf1..c299a65b464d 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -7,22 +7,20 @@
   fetchFromGitLab,
   makeBinaryWrapper,
   makeDesktopItem,
+  nix-update-script,
 }:
-let
-  version = "2.250914.1";
-in
 buildNpmPackage (finalAttrs: {
   pname = "gridtracker2";
-  inherit version;
+  version = "2.251106.7";
 
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker2";
-    tag = "v${version}";
-    hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-g1njDFodCHvILZZNrI/exAqWLZsbNBGHy3jlzo3uLJ8=";
   };
 
-  npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo=";
+  npmDepsHash = "sha256-8bhOfLLsNSK+/mXku5ukLr65bfk+RwC3SyOGRHndqVQ=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
@@ -50,10 +48,6 @@ buildNpmPackage (finalAttrs: {
     })
   ];
 
-  postPatch = ''
-    install -Dvm644 ${./package-lock.json} package-lock.json
-  '';
-
   buildPhase = ''
     runHook preBuild
   ''
@@ -108,6 +102,8 @@ buildNpmPackage (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Warehouse of amateur radio information";
     homepage = "https://gridtracker.org/";

From a592a5733f9a48fb4f6a9901f3f3149e630dd38d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 9 Nov 2025 00:36:01 +0100
Subject: [PATCH 164/258] python3Packages.cron-converter: disable failing test

I bisected this one to 0b3b48fb5f6, which makes no sense, so I don't
currently have an idea why it fails.
---
 .../python-modules/cron-converter/default.nix         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cron-converter/default.nix b/pkgs/development/python-modules/cron-converter/default.nix
index e6c6f9afe1f0..0865b9cefd6b 100644
--- a/pkgs/development/python-modules/cron-converter/default.nix
+++ b/pkgs/development/python-modules/cron-converter/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  unittestCheckHook,
   setuptools,
   python-dateutil,
   python,
@@ -19,13 +18,21 @@ buildPythonPackage rec {
     hash = "sha256-XpkpEMurRrhq1S4XnhPRW5CCBk+HzljOSQfZ98VJ7UE=";
   };
 
+  postPatch = ''
+    # Timezone does not match
+    substituteInPlace tests/integration/tests_cron_seeker.py \
+      --replace-fail "test_timezone" "dont_test_timezone"
+  '';
+
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-dateutil ];
+  dependencies = [ python-dateutil ];
 
   checkPhase = ''
+    runHook preCheck
     ${python.interpreter} -m unittest discover -s tests/unit -v
     ${python.interpreter} -m unittest discover -s tests/integration -v
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "cron_converter" ];

From be4be0370ffc3dd852fd4c062f971b6eac47f8f4 Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Sat, 8 Nov 2025 16:25:37 -0800
Subject: [PATCH 165/258] nixosTests.nix-config: fix build by unsetting
 NIX_PATH

This fixes the build failure of `nixosTests.nix-config`.
The test was failing because NIX_PATH overrides the contents of config.
See also: https://github.com/NixOS/nix/issues/13849
---
 nixos/tests/nix-config.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/nix-config.nix b/nixos/tests/nix-config.nix
index b39baf3f6b50..005dd71b2f63 100644
--- a/nixos/tests/nix-config.nix
+++ b/nixos/tests/nix-config.nix
@@ -14,7 +14,8 @@
     start_all()
     machine.wait_for_unit("nix-daemon.socket")
     # regression test for the workaround for https://github.com/NixOS/nix/issues/9487
-    print(machine.succeed("nix-instantiate --find-file extra"))
-    print(machine.succeed("nix-instantiate --find-file nonextra"))
+    # unset NIX_PATH because environtment overrides the config
+    print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file extra"))
+    print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file nonextra"))
   '';
 }

From f4de2b7d91b52775798eb759125b59a30e0b89c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 00:28:53 +0000
Subject: [PATCH 166/258] codebook: 0.3.16 -> 0.3.17

---
 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 45d274a0adec..b6424d909826 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.16";
+  version = "0.3.17";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o=";
+    hash = "sha256-5LTblBxYuz/ErESSLPZ4EHlLID8XvhCDQkKxUyEWcmM=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E=";
+  cargoHash = "sha256-jkYtXrNJTaxrAWpB7ZYsj/LA2tUWVReAnF2cb4TpwE0=";
 
   # Integration tests require internet access for dictionaries
   doCheck = false;

From 02fa87d7f0d37c62bd8c34c0898f1378a5a3fe4e Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 8 Nov 2025 18:16:43 -0500
Subject: [PATCH 167/258] golly: fix build failure (missing distutils)

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

diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 5c291cdaf216..4372f564c8c2 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -31,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    (python3.withPackages (ps: [ ps.setuptools ]))
+    (python3.withPackages (ps: [
+      ps.setuptools
+      ps.distutils
+    ]))
     wrapGAppsHook3
   ];
 

From 9127923bde3691c7515cdc456ec1266f5d988f9c Mon Sep 17 00:00:00 2001
From: Leon Hubrich <git@leon-hubrich.de>
Date: Sat, 8 Nov 2025 16:09:55 +0100
Subject: [PATCH 168/258] technitium-dns-server: 13.6.0 -> 14.0.0

---
 .../nuget-deps.json                           | 19 +++++++++++++++++--
 .../technitium-dns-server-library/package.nix |  7 ++++---
 .../te/technitium-dns-server/nuget-deps.json  | 19 +++++++++++++++++--
 .../te/technitium-dns-server/package.nix      |  8 ++++----
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json
index 9291a64bd73b..27256167cce8 100644
--- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json
+++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json
@@ -1,7 +1,22 @@
 [
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.5.1",
-    "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
+    "version": "2.6.2",
+    "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
+  {
+    "pname": "QRCoder",
+    "version": "1.7.0",
+    "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   }
 ]
diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix
index 5a66e52496fe..5d826f5dfb69 100644
--- a/pkgs/by-name/te/technitium-dns-server-library/package.nix
+++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix
@@ -7,23 +7,24 @@
 }:
 buildDotnetModule rec {
   pname = "technitium-dns-server-library";
-  version = "dns-server-v13.6.0";
+  version = "dns-server-v14.0.0";
 
   src = fetchFromGitHub {
     owner = "TechnitiumSoftware";
     repo = "TechnitiumLibrary";
     tag = version;
-    hash = "sha256-P1LVn//4xL/MZoy7thw+zYlAZVTfjSivyAiuhixAoHs=";
+    hash = "sha256-vQAYNXSXWWuEMLj+zWQIM5A4BYcyiUlfp7+Ttk4R+MA=";
     name = "${pname}-${version}";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
 
   nugetDeps = ./nuget-deps.json;
 
   projectFile = [
     "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj"
     "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj"
+    "TechnitiumLibrary.Security.OTP/TechnitiumLibrary.Security.OTP.csproj"
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json
index 9291a64bd73b..27256167cce8 100644
--- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json
+++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json
@@ -1,7 +1,22 @@
 [
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.5.1",
-    "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
+    "version": "2.6.2",
+    "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
+  {
+    "pname": "QRCoder",
+    "version": "1.7.0",
+    "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   }
 ]
diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix
index dcf44fab3ee5..dcfe49aa3060 100644
--- a/pkgs/by-name/te/technitium-dns-server/package.nix
+++ b/pkgs/by-name/te/technitium-dns-server/package.nix
@@ -10,18 +10,18 @@
 }:
 buildDotnetModule rec {
   pname = "technitium-dns-server";
-  version = "13.6.0";
+  version = "14.0.0";
 
   src = fetchFromGitHub {
     owner = "TechnitiumSoftware";
     repo = "DnsServer";
     tag = "v${version}";
-    hash = "sha256-2OSuLGWdaiiPxyW0Uvq736wHKa7S3CHv79cmZZ86GRE=";
+    hash = "sha256-h7lcm9gKaCIPccg4Mxp78qSgygAuFyRPd1jPfmkoarU=";
     name = "${pname}-${version}";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
 
   nugetDeps = ./nuget-deps.json;
 

From 7663f1c46cbef7ea42cf58af6699486c7790052c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 01:19:27 +0000
Subject: [PATCH 169/258] hyprlandPlugins.hyprsplit: 0.51.1 -> 0.52.0

---
 .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 7e1ed6968617..5849a4f07741 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -8,13 +8,13 @@
 }:
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hyprsplit";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7cnfq7fXgJHkmHyvRwx8UsUdUwUEN4A1vUGgsSb4SmI=";
+    hash = "sha256-XlOZr7BKii0ch24ZtOqjeVl1+uGewW5XQTSteKxXg9c=";
   };
 
   nativeBuildInputs = [

From 14826cc558d7023da18fbc3701c4a8ca44a20d59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 01:31:23 +0000
Subject: [PATCH 170/258] remnote: 1.21.24 -> 1.22.0

---
 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 aeeaaf4751df..24592f216214 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.24";
+  version = "1.22.0";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-jJ7I5Xgq6RHZ4pT8VTMikX1f38C9FqLtJaSSgc2rWHA=";
+    hash = "sha256-4zIUPAQV814fmvIrHP+Dvn9eNeSY/Zmn0G2nr7llto8=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From 6c8850d1e17ac78caac46eb52abb7c40bd4cdce4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 01:49:22 +0000
Subject: [PATCH 171/258] hyprgraphics: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix
index d6f1b1ea5bd0..6350cc6553aa 100644
--- a/pkgs/by-name/hy/hyprgraphics/package.nix
+++ b/pkgs/by-name/hy/hyprgraphics/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprgraphics";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprgraphics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=";
+    hash = "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=";
   };
 
   nativeBuildInputs = [

From a65655104f1ae81512718bbab3246d001faa91de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 17:43:14 -0800
Subject: [PATCH 172/258] python3Packages.aioamazondevices: 6.5.6 -> 8.0.1

Diff: https://github.com/chemelli74/aioamazondevices/compare/v6.5.6...v8.0.1

Changelog: https://github.com/chemelli74/aioamazondevices/blob/v8.0.1/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 c6380fc0d7fe..8be76a60d0b3 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.5.6";
+  version = "8.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-OgcOsRKqSU3k4myfHmOYaXW259LDgYWj0gXPLwabVIM=";
+    hash = "sha256-q8wmBBXZSu69BAZ1wY4/tlW/usiWwlwVCnAEOOZs5TE=";
   };
 
   build-system = [ poetry-core ];

From 663028e7ed243ab046775db889d610bf60d1984a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 17:43:38 -0800
Subject: [PATCH 173/258] python3Packages.onedrive-personal-sdk: 0.0.15 ->
 0.0.16

Diff: https://github.com/zweckj/onedrive-personal-sdk/compare/v0.0.15...v0.0.16

Changelog: https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.16
---
 .../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 6fecc2fdcfba..a14ec083152b 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.15";
+  version = "0.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII=";
+    hash = "sha256-zGzJtfgOuEfAaL+26jnEZzhKJLhRpBTYPBWzIHqwtXw=";
   };
 
   build-system = [ setuptools ];

From fe2a7f9f1a504b13a29357b4dd24ce463214d436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 17:52:35 -0800
Subject: [PATCH 174/258] python3Packages.tuya-device-sharing-sdk: 0.2.4 ->
 0.2.5

Diff: https://github.com/tuya/tuya-device-sharing-sdk/compare/e29d52f65e0db5f64b0ea7064a177cf6a0c4d51e...b2156585daefa39fcd2feff964e9be53124697f1
---
 .../tuya-device-sharing-sdk/default.nix       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
index 733d0adffe24..a2d7027b1a45 100644
--- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   requests,
   paho-mqtt,
@@ -9,22 +9,21 @@
 }:
 let
   pname = "tuya-device-sharing-sdk";
-  version = "0.2.4";
+  version = "0.2.5";
 in
 buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-4RwsuFg2ukvM0rplCZKJx85DbJTpJnhkCVDnfT4r4A8=";
+  src = fetchFromGitHub {
+    owner = "tuya";
+    repo = "tuya-device-sharing-sdk";
+    # no tags on GitHub: https://github.com/tuya/tuya-device-sharing-sdk/issues/2
+    # no sdist on PyPI: https://github.com/tuya/tuya-device-sharing-sdk/issues/41
+    rev = "b2156585daefa39fcd2feff964e9be53124697f1";
+    hash = "sha256-ypAS8tzO4Wyc8pVjSiGaNNl+2fkFNcC3Ftql3l2B8k8=";
   };
 
-  # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10
-  postPatch = ''
-    touch requirements.txt
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [

From b1d47aef4104eaaf1aef2855c11b93c70644f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 17:22:17 -0800
Subject: [PATCH 175/258] home-assistant.intents: 2025.10.28 -> 2025.11.7

Diff: https://github.com/OHF-Voice/intents-package/compare/2025.10.28...2025.11.7

Changelog: https://github.com/OHF-Voice/intents-package/releases/tag/2025.11.7
---
 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 9c13d0fa3359..b9783b457519 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.28";
+  version = "2025.11.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     repo = "intents-package";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-Svnw9Jd0E4pMFfa/Do7YsFzdXLzsGmhu8amo+zYDvus=";
+    hash = "sha256-F6QctdjF6xoQ3d49MdOUb/8CHgV84wxZHUrGGmiYYcs=";
   };
 
   build-system = [

From b6d0b748168ab4d6d34d419cd54c18d311e080aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 17:13:39 -0800
Subject: [PATCH 176/258] home-assistant: 2025.11.0 -> 2025.11.1

Diff: https://github.com/home-assistant/core/compare/2025.11.0...2025.11.1

Changelog: https://github.com/home-assistant/core/releases/tag/2025.11.1
---
 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 17bbdd7bf250..9b0fb0e4f36b 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.11.0";
+  version = "2025.11.1";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index af962a1d269f..c38d38cd4b74 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -299,7 +299,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.11.0";
+  hassVersion = "2025.11.1";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -320,13 +320,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-+syn/y2ukZKsnCniZxodRWVcCE3AcvUKt80L2XslKKI=";
+    hash = "sha256-39OY9lKlqnv3QdIdJ698cMTBrF41SxbqQfz6N32mD5s=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-JSWr+yGvpXYc6Bw3B+xVLpYokVM11dsJZBWYy+W4bH4=";
+    hash = "sha256-W9xuWfz9lCQXaPg+O313mzMxvBfY64CrU7vwNjra/3k=";
   };
 
   build-system = with python.pkgs; [

From 0f211302be6d9635d5b40a718a0d58bdb017df1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 18:00:33 -0800
Subject: [PATCH 177/258] home-assistant: update OUR_VERSION_IS_NEWER_THAN

---
 pkgs/servers/home-assistant/update-component-packages.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py
index 471e576a6150..ab29b720baad 100755
--- a/pkgs/servers/home-assistant/update-component-packages.py
+++ b/pkgs/servers/home-assistant/update-component-packages.py
@@ -69,7 +69,9 @@ EXTRA_COMPONENT_DEPS = {
 OUR_VERSION_IS_NEWER_THAN = {
     "blinkstick": "1.2.0",
     "gps3": "0.33.3",
+    "proxmoxer": "2.2.0",
     "pybluez": "0.22",
+    "pyps4-2ndscreen": "1.3.1",
 }
 
 

From 95acb919e1f4daf5d6e694c1719a2e80c55129da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 18:45:09 -0800
Subject: [PATCH 178/258] python3Packages.apscheduler: add meta.changelog

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

diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix
index f11fe2e37d8e..df2323ee730f 100644
--- a/pkgs/development/python-modules/apscheduler/default.nix
+++ b/pkgs/development/python-modules/apscheduler/default.nix
@@ -69,10 +69,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "apscheduler" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/agronholm/apscheduler/releases/tag/${src.tag}";
     description = "Library that lets you schedule your Python code to be executed";
     homepage = "https://github.com/agronholm/apscheduler";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 75820299368f1af3209cbd0772e2350956621ecf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 03:07:17 +0000
Subject: [PATCH 179/258] python3Packages.onedrive-personal-sdk: 0.0.15 ->
 0.0.16

---
 .../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 6fecc2fdcfba..a14ec083152b 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.15";
+  version = "0.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII=";
+    hash = "sha256-zGzJtfgOuEfAaL+26jnEZzhKJLhRpBTYPBWzIHqwtXw=";
   };
 
   build-system = [ setuptools ];

From 0ee005db2ae9cc55d2d9b3f6bc40f9e5954907b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 03:13:50 +0000
Subject: [PATCH 180/258] amp-cli: 0.0.1762056193-g37ad2e ->
 0.0.1762646500-gac8d42

---
 pkgs/by-name/am/amp-cli/package-lock.json | 9 +++++----
 pkgs/by-name/am/amp-cli/package.nix       | 6 +++---
 2 files changed, 8 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 7a393abfde79..07772645fe4e 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.1762056193-g37ad2e"
+        "@sourcegraph/amp": "^0.0.1762646500-gac8d42"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,10 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1762056193-g37ad2e",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762056193-g37ad2e.tgz",
-      "integrity": "sha512-dWhc7ajnw1QGCYwrOGwCbpyzedf5n2RoTCM97ibpzgpphDLCdyGTXh2XTC6mrxM2CNQLp5jJaWxvcDk9nM80Vg==",
+      "version": "0.0.1762646500-gac8d42",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762646500-gac8d42.tgz",
+      "integrity": "sha512-+1w32tuDcCTUSULBwWeVrOLYGIvS1z/hNWSG4p9v5TC40asudJ6DVHSgIEO4alY4v8lJ3NnDQ1t8FrdwClZi6g==",
+      "license": "Sourcegraph Commercial License",
       "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 0dfeb0d3eac1..887211dc4916 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.1762056193-g37ad2e";
+  version = "0.0.1762646500-gac8d42";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-so/nlX4N9qhNLsK0OllmpfiqzyEBtPrt7KD/MoAChGc=";
+    hash = "sha256-jChd6cb2IBmEBu/gbCywaHJpN2Mj3EUp8YSKQ9HQd0A=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-xhN5XJs8E7yCRQWRPlH9iZyh5FocUjFMto5QweaV8aI=";
+  npmDepsHash = "sha256-uuGqTutlApLDDFHlK+ACrox5B2KpJGYJP6M4CeCj2v0=";
 
   propagatedBuildInputs = [
     ripgrep

From 29121bd2f0a0fa528c0116c2f9a74df9aa9966a0 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Sat, 8 Nov 2025 19:14:56 -0800
Subject: [PATCH 181/258] treemd: init at 0.1.2

---
 pkgs/by-name/tr/treemd/package.nix | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/tr/treemd/package.nix

diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix
new file mode 100644
index 000000000000..8b2344206f12
--- /dev/null
+++ b/pkgs/by-name/tr/treemd/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "treemd";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "Epistates";
+    repo = "treemd";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PloG2eYelsp0Y3bG2ZNgSuwwPnKufBWwLW2TMQBGu1M=";
+  };
+
+  cargoHash = "sha256-jX2X90Kk8iAVVNm/r37v+0X1WSXje/GRr0Tv0ZzuwWI=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI/CLI markdown navigator with tree-based structural navigation";
+    homepage = "https://github.com/Epistates/treemd";
+    changelog = "https://github.com/Epistates/treemd/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "treemd";
+  };
+})

From 344ea83a38708440d091f953ea67677f166cc363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 19:16:22 -0800
Subject: [PATCH 182/258] python3Packages.homeassistant-stubs: 2025.11.0 ->
 2025.11.1

Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.11.0...2025.11.1

Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.11.1
---
 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 ebeca4ab7b43..33a2bd1a11a8 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.11.0";
+  version = "2025.11.1";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-/A/25x0FMu4MXMHhOZ1MF9Qpw+UgA2OUc/HZaJm9bsQ=";
+    hash = "sha256-OuW2hsYQ/KvCiu1Hfq6g/nryQ5R0Th5GmoR574DMXfU=";
   };
 
   build-system = [

From 577e746964d8b1be603ee45560a0f1b317fd8c53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 03:29:31 +0000
Subject: [PATCH 183/258] stratis-cli: 3.8.2 -> 3.8.3

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

diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix
index 952a0ba60d21..39d024528dc9 100644
--- a/pkgs/by-name/st/stratis-cli/package.nix
+++ b/pkgs/by-name/st/stratis-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "stratis-cli";
-  version = "3.8.2";
+  version = "3.8.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = "stratis-cli";
     tag = "v${version}";
-    hash = "sha256-0evuBr3ziiWKkR0FDjZ9BXrfRpQR7JtHsm/sYE8pIbg=";
+    hash = "sha256-wkFInG/sbHxyi5UIjIANxsTd9BrIHuyAfYG4DvqLsmU=";
   };
 
   build-system = with python3Packages; [

From a3f9f17062f89dbab9af4e42b23211788eacfbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 19:41:12 -0800
Subject: [PATCH 184/258] python3Packages.sse-starlette: 3.0.2 -> 3.0.3

Diff: https://github.com/sysid/sse-starlette/compare/v3.0.2...v3.0.3

Changelog: https://github.com/sysid/sse-starlette/blob/v3.0.3/CHANGELOG.md
---
 .../python-modules/sse-starlette/default.nix  | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix
index 7298d302a41b..97227795ec1c 100644
--- a/pkgs/development/python-modules/sse-starlette/default.nix
+++ b/pkgs/development/python-modules/sse-starlette/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
+  aiosqlite,
   anyio,
   asgi-lifespan,
   async-timeout,
   buildPythonPackage,
+  daphne,
   fastapi,
   fetchFromGitHub,
+  granian,
   httpx,
   portend,
   psutil,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  requests,
   setuptools,
+  sqlalchemy,
   starlette,
   tenacity,
   testcontainers,
@@ -22,27 +24,33 @@
 
 buildPythonPackage rec {
   pname = "sse-starlette";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "sysid";
     repo = "sse-starlette";
     tag = "v${version}";
-    hash = "sha256-9NI6CUcK5AqITKxtCMz9Z1+Ke87u2y2E0LlwsFUDhgw=";
+    hash = "sha256-2QCagK4OIVJJ54uedJFVjcGyRo2j1415iNjDIa67/mo=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     anyio
-    starlette
   ];
 
   optional-dependencies = {
-    examples = [ fastapi ];
+    daphne = [ daphne ];
+    examples = [
+      aiosqlite
+      fastapi
+      sqlalchemy
+      starlette
+      uvicorn
+    ]
+    ++ sqlalchemy.optional-dependencies.asyncio;
+    granian = [ granian ];
     uvicorn = [ uvicorn ];
   };
 
@@ -55,7 +63,6 @@ buildPythonPackage rec {
     psutil
     pytest-asyncio
     pytestCheckHook
-    requests
     tenacity
     testcontainers
     uvicorn
@@ -66,9 +73,6 @@ buildPythonPackage rec {
   disabledTests = [
     # AssertionError
     "test_stop_server_with_many_consumers"
-    "test_stop_server_conditional"
-    # require network access
-    "test_sse_multiple_consumers"
     # require docker
     "test_sse_server_termination"
   ];

From c55fb54628a8a300b99af2e6a7ba79aee3c89c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 19:58:55 -0800
Subject: [PATCH 185/258] python3Packages.httpx-sse: tests depend on starlette

---
 pkgs/development/python-modules/httpx-sse/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix
index af17e3a88124..1e12ec115c3e 100644
--- a/pkgs/development/python-modules/httpx-sse/default.nix
+++ b/pkgs/development/python-modules/httpx-sse/default.nix
@@ -9,6 +9,7 @@
   setuptools-scm,
   setuptools,
   sse-starlette,
+  starlette,
 }:
 
 buildPythonPackage rec {
@@ -37,6 +38,7 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytestCheckHook
     sse-starlette
+    starlette
   ];
 
   meta = with lib; {

From ff9b57943db332fd5fb85131b15e84b23fa25bb0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:35 +0000
Subject: [PATCH 186/258] =?UTF-8?q?epiphany:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/epiphany/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/ep/epiphany/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix
index 30eedb952f62..832e3fbbd13b 100644
--- a/pkgs/by-name/ep/epiphany/package.nix
+++ b/pkgs/by-name/ep/epiphany/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "epiphany";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Jx7HNbmDa5dEnjJ5PTVKivtrn40tPXWCGIXV4VVweSk=";
+    hash = "sha256-12fFy7niVmvJkD1BG2iWFh40P3EqozMFNlc52N7axSE=";
   };
 
   nativeBuildInputs = [

From 5246109d9d89466401292264694c83971e9eb807 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:42 +0000
Subject: [PATCH 187/258] =?UTF-8?q?gnome-notes:=2040.1=20=E2=86=92=2040.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/bijiben/-/compare/40.1...40.2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>

gnome-notes: 40.1 → 40.2

https://gitlab.gnome.org/GNOME/bijiben/-/compare/BIJIBEN_40_1...BIJIBEN_40_2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-notes/package.nix | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix
index 85a6238d34d1..2b9bb48cfce2 100644
--- a/pkgs/by-name/gn/gnome-notes/package.nix
+++ b/pkgs/by-name/gn/gnome-notes/package.nix
@@ -5,7 +5,6 @@
   ninja,
   gettext,
   fetchurl,
-  fetchpatch,
   pkg-config,
   wrapGAppsHook3,
   itstool,
@@ -29,29 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-notes";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz";
-    hash = "sha256-BaBvsGbpgC9fJKtnsNL3FFGGY2O6Pjn593X9SadYe78=";
+    hash = "sha256-siERvAaVa+81mqzx1u3h5So1sADIgROTZjL4rGztzmc=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch";
-      hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4=";
-    })
-
-    # build: Depend on webkit2gtk-4.1
-    # https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch";
-      hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o=";
-    })
-  ];
-
   doCheck = true;
 
   postPatch = ''

From 71b3212b8c1f06ee3e743bc64448fc2093464919 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:34:51 +0000
Subject: [PATCH 188/258] =?UTF-8?q?loupe:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/loupe/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/lo/loupe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index 852bef596c32..38a902de5a81 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -25,17 +25,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loupe";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
-    hash = "sha256-os5VTo5eHRa4NuRvFlJ2fbK7O9T33KqH8laa8QuGOTg=";
+    hash = "sha256-MAmLyXmhyHouyye0patyWr+QC9cQu5wrzAyULVFcUcU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "loupe-deps-${finalAttrs.version}";
-    hash = "sha256-56yU5h+ZMSX6PH2jkboBwV0IMlcJI9i1sJZx4nNYJe4=";
+    hash = "sha256-GqPHvUBA5aRUnRSP+PpdOCC9sL8axnEdfqtHFp2KYJc=";
   };
 
   postPatch = ''

From aef9f18282573046b0e76f1244ceddc199d6c6ef Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:02 +0000
Subject: [PATCH 189/258] =?UTF-8?q?gnome-music:=2049.0.2=20=E2=86=92=2049.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-music/-/compare/49.0.2...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-music/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix
index 6ccdb0a3ebce..5869783e519c 100644
--- a/pkgs/by-name/gn/gnome-music/package.nix
+++ b/pkgs/by-name/gn/gnome-music/package.nix
@@ -31,13 +31,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "49.0.2";
+  version = "49.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
-    hash = "sha256-m5dJQgC7qoew7YhJJVQw1WwVjVG03qe+aIn3dWGpVKc=";
+    hash = "sha256-uoga4LVeNOYmn9LT342L+jxex+N7rIlFrseLf/IHvGc=";
   };
 
   nativeBuildInputs = [

From f3cf107adb0d1e814bfd0612e38ab71ea8c04ebf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:02 +0000
Subject: [PATCH 190/258] =?UTF-8?q?simple-scan:=2049.0.1=20=E2=86=92=2049.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/simple-scan/-/compare/49.0.1...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/si/simple-scan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index 9e54bf337c77..215b758c5119 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "49.0.1";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz";
-    hash = "sha256-4ZdiQiZj70v1059udfTWGo3hgTcpqW5X4E6Bdk4B6uI=";
+    hash = "sha256-mujUFR7K+VhF65+ZtDbVecg48s8Cdj+6O8A3gCUb4zQ=";
   };
 
   nativeBuildInputs = [

From ce0b8d308b0f8cd2d160ab5fddc6220e3b549e68 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:04 +0000
Subject: [PATCH 191/258] =?UTF-8?q?accerciser:=203.46.2=20=E2=86=92=203.48?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/accerciser/-/compare/3.46.2...3.48.0

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/ac/accerciser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix
index d3c133575abb..bc41b5d9be94 100644
--- a/pkgs/by-name/ac/accerciser/package.nix
+++ b/pkgs/by-name/ac/accerciser/package.nix
@@ -19,13 +19,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "accerciser";
-  version = "3.46.2";
+  version = "3.48.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz";
-    hash = "sha256-r/RpRR8k5YdpPE9/en+GpQU8ZrIDOndDrZ2DhHSWdw4=";
+    hash = "sha256-kCiOiQCidKOu4gUw6zkWRZlK6YZyIJFroPXEZ3v+n00=";
   };
 
   nativeBuildInputs = [

From 2a9d77efa07a7ed2cf45208822b1630701521942 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:06 +0000
Subject: [PATCH 192/258] =?UTF-8?q?gnome-console:=2049.0=20=E2=86=92=2049.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/console/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-console/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix
index e6c37c1433de..dca8e48b97ec 100644
--- a/pkgs/by-name/gn/gnome-console/package.nix
+++ b/pkgs/by-name/gn/gnome-console/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-console";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-no6WRvRz0B9LSnvOLEetImtK6D+r8ky7tKyU9qxdXMI=";
+    hash = "sha256-/KOf0EHgXufKbSpcggAZN9Aq4VE/PzZRvTeuDi72bj4=";
   };
 
   nativeBuildInputs = [

From b9b05f7f6d4a45bab6cc73f7b7627c4419943ef3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:14 +0000
Subject: [PATCH 193/258] =?UTF-8?q?file-roller:=2044.5=20=E2=86=92=2044.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/file-roller/-/compare/44.5...44.6

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/fi/file-roller/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix
index 92fadc299300..d55680d17cf9 100644
--- a/pkgs/by-name/fi/file-roller/package.nix
+++ b/pkgs/by-name/fi/file-roller/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "file-roller";
-  version = "44.5";
+  version = "44.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
-    hash = "sha256-369LuYnAuJhr6L2un//quNDzBmmuOmJ+jD35TyOIgzk=";
+    hash = "sha256-noc7UAW8QleZqM1LI34f/0MOyNazSpksYDPx38bjdk4=";
   };
 
   nativeBuildInputs = [

From 5944c5d5baa7f42cb6aca1f7e5a2b8f3bdd2144f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:19 +0000
Subject: [PATCH 194/258] =?UTF-8?q?gnome-software:=2049.0=20=E2=86=92=2049?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-software/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-software/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index 780f34638a5b..ac0b3685c4b4 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NpzXVD8KS+mjNzPeCvFWNIJmw7XKyqTkc3lZ59FOBB8=";
+    hash = "sha256-Sd/sp3kogBdW0MU4bB0gRUygd2AKXR7WbsRu4zoyxm0=";
   };
 
   patches = [

From 3cf743aa8475fee5dbe340f9aae624ce57701e9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:39 +0000
Subject: [PATCH 195/258] =?UTF-8?q?gnome-calculator:=2049.0.1=20=E2=86=92?=
 =?UTF-8?q?=2049.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/49.0.1...49.1.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-calculator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index a46838c3c8f8..3f00285d5e00 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "49.0.1";
+  version = "49.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz";
-    hash = "sha256-7L4g5jBXX7i8I3kNNfOGrBd5ADxA3FyHfTzS2g/HRT8=";
+    hash = "sha256-hA00We1p8nh6lmn5b2s/nv8Wy0hpAMcZrCUsQkVjRj0=";
   };
 
   nativeBuildInputs = [

From 62deb34be473fe793fa20714d280a014af52006a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:43 +0000
Subject: [PATCH 196/258] =?UTF-8?q?gnome-characters:=2049.0=20=E2=86=92=20?=
 =?UTF-8?q?49.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-characters/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix
index a619b7aa49eb..a1145af29341 100644
--- a/pkgs/by-name/gn/gnome-characters/package.nix
+++ b/pkgs/by-name/gn/gnome-characters/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-characters";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz";
-    hash = "sha256-G25UioLiaqTsmv5AnWmiVwk2LAN/pcUzGG1qHbKa9uM=";
+    hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw=";
   };
 
   nativeBuildInputs = [

From aa8f8b02910720b111444342911cf85a90e51088 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:44 +0000
Subject: [PATCH 197/258] =?UTF-8?q?d-spy:=2049.1=20=E2=86=92=2049.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/d-spy/-/compare/49.1...49.2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/d-/d-spy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix
index 449742760ca2..705bf5078e5d 100644
--- a/pkgs/by-name/d-/d-spy/package.nix
+++ b/pkgs/by-name/d-/d-spy/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "d-spy";
-  version = "49.1";
+  version = "49.2";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4m4YEg5k1FG2HyAs+qORNienAxwqlUrs85HIPYPQnYo=";
+    hash = "sha256-uBT/J9goqrzacvLGLxtB1iA190PQb9mn48XJhsSHmmk=";
   };
 
   nativeBuildInputs = [

From d32f3d9035e0bb1102af70b0a83f3ec79a89bf18 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:49 +0000
Subject: [PATCH 198/258] =?UTF-8?q?gnome-nibbles:=204.4.1=20=E2=86=92=204.?=
 =?UTF-8?q?4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-nibbles/-/compare/4.4.1...4.4.2

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-nibbles/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix
index 63fa0ce5c04b..def763a92046 100644
--- a/pkgs/by-name/gn/gnome-nibbles/package.nix
+++ b/pkgs/by-name/gn/gnome-nibbles/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-nibbles";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uIK4n2v9bRX96yr5edkYui8cHMjto5yviCe1Z9N/r5U=";
+    hash = "sha256-FuBgKHBkamZTh2y8Ye4j92NAwmsSyeicfDASCEUEQVU=";
   };
 
   nativeBuildInputs = [

From 95916d50b65a305a46aae48278eaf0658bc3ee1a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:35:53 +0000
Subject: [PATCH 199/258] =?UTF-8?q?gnome-podcasts:=2025.2=20=E2=86=92=2025?=
 =?UTF-8?q?.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/podcasts/-/releases/25.3
https://gitlab.gnome.org/World/podcasts/-/compare/25.2...25.3


Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-podcasts/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix
index 599e5401935c..8db622714de6 100644
--- a/pkgs/by-name/gn/gnome-podcasts/package.nix
+++ b/pkgs/by-name/gn/gnome-podcasts/package.nix
@@ -25,19 +25,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-podcasts";
-  version = "25.2";
+  version = "25.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "podcasts";
     tag = finalAttrs.version;
-    hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck=";
+    hash = "sha256-SblEHmKB/WZwT3T3vnlB4yJjY9JhftDkO21/yY//BRM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM=";
+    hash = "sha256-Ii5M6W5v5t+qppQNZI1ypHGMM5urUMv7e3Fef3FjfAA=";
   };
 
   nativeBuildInputs = [

From ddb679abbbaacc594ec597337b24e93c5f8dd057 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:00 +0000
Subject: [PATCH 200/258] =?UTF-8?q?quadrapassel:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/quadrapassel/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/qu/quadrapassel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix
index 87259d17b568..b88d2343b3b7 100644
--- a/pkgs/by-name/qu/quadrapassel/package.nix
+++ b/pkgs/by-name/qu/quadrapassel/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quadrapassel";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VFMe3w+apmk2qjQHmvzCpcAAJfQBaMr7frsduPJC7uE=";
+    hash = "sha256-ttejtndabcTxmAvZN4MkZmF6iX7KoQmPOixZvhdhZQk=";
   };
 
   nativeBuildInputs = [

From 3ae918c439d945a208f94fd38ab6f1d23ce5856a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:07 +0000
Subject: [PATCH 201/258] =?UTF-8?q?orca:=2049.1=20=E2=86=92=2049.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/orca/-/compare/49.1...49.4

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/or/orca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 95c5142cb46b..a76c4f54d48b 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -29,13 +29,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "orca";
-  version = "49.1";
+  version = "49.4";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
-    hash = "sha256-ZTKWhs0V9iq05MDQDOuYTUmbKOwsURdQjDuCiQ1i5+M=";
+    hash = "sha256-trpMxYeEEcNKfVt+6bLFybHQSt0Qv9IPbiMx1ZQWUgc=";
   };
 
   patches = [

From a64cde4d709b8b65ddb4cb98156ac3e5815efaa8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:08 +0000
Subject: [PATCH 202/258] =?UTF-8?q?gnome-builder:=2049.0=20=E2=86=92=2049.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-builder/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix
index fa090a43883e..cba93a657428 100644
--- a/pkgs/by-name/gn/gnome-builder/package.nix
+++ b/pkgs/by-name/gn/gnome-builder/package.nix
@@ -43,7 +43,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-builder";
-  version = "49.0";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1FmQ22gfle4id75PqfKWSYJwfb3zATCgvecCNLN59WI=";
+    hash = "sha256-O55HmDiPlZ4QMsas5KX7e05Yi2M5/OTCLsJqvoafiis=";
   };
 
   patches = [

From 4eee38cb143f905ecc263f02d6784a24d344484d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:23 +0000
Subject: [PATCH 203/258] =?UTF-8?q?gnome-user-docs:=2049.0=20=E2=86=92=204?=
 =?UTF-8?q?9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index bbaac9a44a11..1f37e38bdbc1 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-7BGNRNoYZuQXONoZz128PZpCklovO/SO5sN+bj5G3fM=";
+    hash = "sha256-DlC4u0/OqpEoNnzTRY5e24YclieMGqmnOm7AQCt7xhc=";
   };
 
   nativeBuildInputs = [

From 15708618cf4b495895d73729d507383ba834ce52 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:30 +0000
Subject: [PATCH 204/258] =?UTF-8?q?gnome-remote-desktop:=2049.0=20?=
 =?UTF-8?q?=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-remote-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index c8d154bf25af..ba5b3f8d9703 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-remote-desktop";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
-    hash = "sha256-1HrdnZcPIkrMd+/lohZIbUBFHivCG4W/7FOX1CD9oYo=";
+    hash = "sha256-eADziDAe64FHsL5V6Pp8vXUhBmpIoGEVzA6tnwzqGIo=";
   };
 
   nativeBuildInputs = [

From 7d5f01d8b13cad48e0564cac3cea7d687f6bddf4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:36:45 +0000
Subject: [PATCH 205/258] =?UTF-8?q?evolution:=203.58.0=20=E2=86=92=203.58.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution/-/compare/3.58.0...3.58.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../networking/mailreaders/evolution/evolution/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 98adbb9c6a3b..ad0b17c1d5df 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -46,11 +46,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.58.0";
+  version = "3.58.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-Nz/hdFow9x8RN1XvKvwwp6F2imA2GVpk2wUplacaGr8=";
+    hash = "sha256-A9jQzM0QKqGnPDHZ4vN0yz24Os3fwRJskYavY9psvsw=";
   };
 
   nativeBuildInputs = [

From 0be75b3b6b1a4cd595b2359457eff87d61fab543 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:37:04 +0000
Subject: [PATCH 206/258] =?UTF-8?q?nautilus:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/nautilus/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/na/nautilus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index e969fca3aaf2..8d3924e4ee8d 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus";
-  version = "49.0";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sxKScENPx8Uz+X7X+MRCcE8AoC0nopCALY0Wq0Kha/g=";
+    hash = "sha256-rdKg5BD9ItooUd3QxbPSLJ6djDMRFRHzNpYeO0YbU14=";
   };
 
   patches = [

From 62dab70a8a60e0128c65bb6c30b895457bfe1a97 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:37:05 +0000
Subject: [PATCH 207/258] =?UTF-8?q?gnome-shell:=2049.0=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index bccf4720c97a..6be3cf5d3bc4 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "49.0";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/whrnDIYCZQw2RhSQ7Z3ajaiy3vLcFqYxhLyz0dCcIo=";
+    hash = "sha256-tC0HMYnkAK+U/Dna66vlo2e7D2z3hOxc6VFodZXvvOs=";
   };
 
   patches = [

From 713e0df3779c072a5fffd9179816639a1223a67d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:37:14 +0000
Subject: [PATCH 208/258] =?UTF-8?q?libshumate:=201.5.0.1=20=E2=86=92=201.5?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.5.0.1...1.5.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/li/libshumate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix
index 995772bcd923..e65a9f14dc52 100644
--- a/pkgs/by-name/li/libshumate/package.nix
+++ b/pkgs/by-name/li/libshumate/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.5.0.1";
+  version = "1.5.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qW/nqWN86BnaEh6D4m61M83HjBRvpRqWC73K1VdAnlg=";
+    hash = "sha256-2q34twATQ4jH6TPgtiNYaqp/L76LOmJZOHUTMDuYduY=";
   };
 
   depsBuildBuild = [

From cfef993ec6088385850f97bbc02224bef794dab2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:18 +0000
Subject: [PATCH 209/258] =?UTF-8?q?gom:=200.5.4=20=E2=86=92=200.5.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gom/-/compare/0.5.4...0.5.5

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/go/gom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix
index 68bd96cde8cf..d54564dcadc2 100644
--- a/pkgs/by-name/go/gom/package.nix
+++ b/pkgs/by-name/go/gom/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gom";
-  version = "0.5.4";
+  version = "0.5.5";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
-    sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U=";
+    sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ=";
   };
 
   patches = [

From fb4672baa20082d7a72c5f168a105302007666f1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:19 +0000
Subject: [PATCH 210/258] =?UTF-8?q?vte:=200.82.0=20=E2=86=92=200.82.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/vte/-/compare/0.82.0...0.82.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/vt/vte/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 87e264851ba7..6dc2f3aaecba 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -38,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.82.0";
+  version = "0.82.1";
 
   outputs = [
     "out"
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sHGNsyVHMHAbQ79eETy/jNssFHFdMu4einB9xutwU18=";
+    hash = "sha256-eTdtcEAtJx4tOEJEGOGupyNXk00nLjIeOQa3Fwanjjo=";
   };
 
   patches = [

From 1dd0abc625955fa945c013a98f8d0d7022a9db39 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:30 +0000
Subject: [PATCH 211/258] =?UTF-8?q?localsearch:=203.10.0=20=E2=86=92=203.1?=
 =?UTF-8?q?0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/localsearch/-/compare/3.10.0...3.10.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/lo/localsearch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix
index 4366c8073d33..a234bedc5f7f 100644
--- a/pkgs/by-name/lo/localsearch/package.nix
+++ b/pkgs/by-name/lo/localsearch/package.nix
@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "localsearch";
-  version = "3.10.0";
+  version = "3.10.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz";
-    hash = "sha256-WNZupEruFknI2YH5NDc7g+GrSkoahLoDBPWvOR5+AIA=";
+    hash = "sha256-XK7zgWDgSV2tj9FVWmmZ9NTVNtnX66GP1J7BdzOMXcI=";
   };
 
   patches = [

From e3e23f101349bc2dda1ededf9fe9d3009f71dfa7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:39 +0000
Subject: [PATCH 212/258] =?UTF-8?q?mutter:=2049.0=20=E2=86=92=2049.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/mutter/-/compare/49.0...49.1.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/mu/mutter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index af9e46e70de3..105fb476ba33 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -71,7 +71,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "49.0";
+  version = "49.1.1";
 
   outputs = [
     "out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8Q727SA2ZzcwRhQz4R4L46vHRg0yOz6HCTtsOXLBYzU=";
+    hash = "sha256-EykM/0l0EA4r/XsPrlwG+X+nXSH9xA8fXn5ILzPL0Cc=";
   };
 
   mesonFlags = [

From 248141b507aac252dce2c5e5eb972625aa3c0e2e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:45 +0000
Subject: [PATCH 213/258] =?UTF-8?q?gdm:=2049.0.1=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gdm/-/compare/49.0.1...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gd/gdm/fix-paths.patch | 12 ++++--------
 pkgs/by-name/gd/gdm/package.nix     |  6 ++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch
index bd4e92e4aadb..2de3f651a327 100644
--- a/pkgs/by-name/gd/gdm/fix-paths.patch
+++ b/pkgs/by-name/gd/gdm/fix-paths.patch
@@ -1,13 +1,9 @@
 diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
-index 513b9733d..0c1c8007f 100644
+index ad2e65cf7..61fb78db8 100644
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
-@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration {
-         const char *session_type;
- } display_server_configuration[] = {
- #ifdef ENABLE_WAYLAND_SUPPORT
--        { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
-+        { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
+@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration {
+         { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" },
  #endif
  #ifdef ENABLE_X11_SUPPORT
 -        { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
@@ -16,7 +12,7 @@ index 513b9733d..0c1c8007f 100644
          { NULL, NULL, NULL },
  };
 diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index 9568e963f..b1bc8800a 100644
+index 457dcf88d..a71b89ba8 100644
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
 @@ -154,7 +154,7 @@ plymouth_is_running (void)
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index 128d00c7bec8..b47e16314df3 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -27,7 +27,6 @@
   plymouth,
   coreutils,
   xorgserver,
-  xwayland,
   dbus,
   nixos-icons,
   runCommand,
@@ -44,7 +43,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdm";
-  version = "49.0.1";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo=";
+    hash = "sha256-adpdExncLGit9c05StWb7Jm7LiTyhARaG7Ss13QAROU=";
   };
 
   mesonFlags = [
@@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
         coreutils
         plymouth
         xorgserver
-        xwayland
         dbus
         ;
     })

From 480fb5479f8a1898e878e4f5cc65295ce08ba3bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:38:46 +0000
Subject: [PATCH 214/258] =?UTF-8?q?glycin-loaders:=202.0.2=20=E2=86=92=202?=
 =?UTF-8?q?.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.2...2.0.4

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gl/glycin-loaders/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix
index 3c6ff4114f26..97a6e6374acd 100644
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -25,17 +25,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glycin-loaders";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZYAOhWs37byNXDM1rVNBUFgc4/LwhFTdAwKiZHC9nRM=";
+    hash = "sha256-w4FHIA9YBKJXNBZ46LzjFLz/eadvmGqMMnnZ2Ej4v/c=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "glycin-loaders-deps-${finalAttrs.version}";
-    hash = "sha256-9cpvRNqymxkOi6L5oZDGyvB68rzEt97qB8uqzhUYsao=";
+    hash = "sha256-r0TmBggpLG3wwZSWJr1bwyG5RHP/nvDGEJ/JFVAzEFA=";
     dontConfigure = true;
   };
 

From 7e1ef1c8938b8004c6c4bf6afc83cb6145060370 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:39:06 +0000
Subject: [PATCH 215/258] =?UTF-8?q?evolution-data-server:=203.58.0=20?=
 =?UTF-8?q?=E2=86=92=203.58.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.58.0...3.58.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index eed95cc14c07..42bd77f70832 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-data-server";
-  version = "3.58.0";
+  version = "3.58.1";
 
   outputs = [
     "out"
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-orWguNsRtyjtwdbxwincJxGWK3qHwDhCIdrI2WAAzvc=";
+    hash = "sha256-qRSSiBTviH8Jebp46o17zJj5bPB8u3CwBRmAvZDsNfA=";
   };
 
   patches = [

From 63074f1ddb3498ba3e6c390fbc3bb07dd6216080 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:39:22 +0000
Subject: [PATCH 216/258] =?UTF-8?q?gnome-settings-daemon:=2049.0=20?=
 =?UTF-8?q?=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/49.0...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-settings-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
index 0a00160237ac..dc464bb6fb39 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -42,11 +42,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-IBvUrAxHFHkYLvN15ZneYApRo8CwSehXFaIkRx5bMiY=";
+    hash = "sha256-KplX/E+Rw7kSe0lIQXm+9IUSDZwcII5E1E5qdG5swcE=";
   };
 
   patches = [

From 274c2018d9c4f78f2b20b751b976e10d1fd2e89a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:39:24 +0000
Subject: [PATCH 217/258] =?UTF-8?q?gnome-online-accounts:=203.56.0=20?=
 =?UTF-8?q?=E2=86=92=203.56.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.56.0...3.56.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index ced147c71e03..231cfb389e9a 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
-  version = "3.56.0";
+  version = "3.56.1";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MdagF9Fxsn/5NkeP2weSogDIFC6vwYslUHPOnftBdXI=";
+    hash = "sha256-ZEWTYKNTHrft7i4DvVq3fslfEFG1aeEaR5tPlPQFxT8=";
   };
 
   mesonFlags = [

From f2d8fa29653eb4cecf9c90c945d62c2c07dd88a2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:39:36 +0000
Subject: [PATCH 218/258] =?UTF-8?q?libglycin:=202.0.2=20=E2=86=92=202.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.2...2.0.4

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/li/libglycin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 0d99435f4056..53ec905db98e 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -27,14 +27,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglycin";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "glycin";
     tag = finalAttrs.version;
-    hash = "sha256-HLvdDQ1rXm2JTUwot07qOIzNaK/sK6zLswips8oIp9c=";
+    hash = "sha256-KPhyL7uP621pxxDGlzbF9WG7A0AcyaS95VstfN/FoQ8=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-IaiQ1OdmlBcIYyruG6p/rrOxq7x8csF/W3ONerh2lAA=";
+    hash = "sha256-bYUA8WrCWGTs5P1zT7zMSESkHhsyfBBRUvM2D63OBbA=";
   };
 
   buildInputs = [

From 141dd8dcaeb6833deae29f8488c2ef0ebb8ad028 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 02:39:41 +0000
Subject: [PATCH 219/258] =?UTF-8?q?libpanel:=201.10.2=20=E2=86=92=201.10.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.10.2...1.10.3

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/li/libpanel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix
index 933bdd7a3a1f..9cf2460f3f25 100644
--- a/pkgs/by-name/li/libpanel/package.nix
+++ b/pkgs/by-name/li/libpanel/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpanel";
-  version = "1.10.2";
+  version = "1.10.3";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zBLo4Q8eSXe9Eq0/+u3NUqwXY0i0r2/l2mhrljJb/gE=";
+    hash = "sha256-QqAbr4uURA8ZTqg0KyRL1pkt+wJMoxYMlHf/SY7DorY=";
   };
 
   strictDeps = true;

From 82aa30fde2fd5984a2e5b0a16413c46a71a91438 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sun, 9 Nov 2025 04:44:52 +0000
Subject: [PATCH 220/258] linuxPackages.rtl8814au: mark broken on kernel
 versions < 5.2 and > 6.14

- On Hydra, builds for kernel version  5_10, 5_15, 6_1, 6_6 and 6_12
  succeed, but the build for the latest latest kernel version 6_17 is
  failing.

- The upstream provider of the driver only supports kernel versions
  between version 5.2 and 6.14, inclusive. This is partly because a
  driver has been up-streamed into the kernel, so the package is not
  needed for recent drivers.

  [Reference](https://github.com/morrownr/8814au.)

- Because of this, mark the driver as broken on the relevant kernel
  versions.
---
 pkgs/os-specific/linux/rtl8814au/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
index dd8968e0f541..cc1e5f91b398 100644
--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -42,5 +42,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/morrownr/8814au";
     license = licenses.gpl2Only;
     maintainers = [ maintainers.lassulus ];
+    broken = kernel.kernelOlder "5.2" || kernel.kernelAtLeast "6.15";
   };
 }

From 6ef8723d29ebd80d79477f619f164d2db6c651d0 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 9 Nov 2025 14:05:14 +0900
Subject: [PATCH 221/258] ox: remove kachick from maintainers

---
 pkgs/by-name/ox/ox/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 25faedde1b69..d9252d2d35a0 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       moni
-      kachick
     ];
     mainProgram = "ox";
   };

From e2bef78bfecfd3bad84a93dab2ee6c1fbb507a10 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 9 Nov 2025 14:06:12 +0900
Subject: [PATCH 222/258] morewaita-icon-theme: remove kachick from maintainers

The temporary workarounds were removed in 5e0368d0ce41a10c1f2ca7b4474745f6775c8835.
---
 pkgs/by-name/mo/morewaita-icon-theme/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 409e80bb3d52..b587cd65ee6f 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -45,7 +45,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       pkosel
-      kachick
     ];
   };
 })

From 9047f20197ed658976dd46626dbe613a031f6d46 Mon Sep 17 00:00:00 2001
From: Tomas Leypold <tomas@leypold.cz>
Date: Sat, 8 Nov 2025 17:21:18 +0100
Subject: [PATCH 223/258] mpv: backport fix high CPU usage with Wayland
 clipboard

---
 pkgs/applications/video/mpv/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 0ea229fa5f45..8636de913fbf 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -121,6 +121,20 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch";
       hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg=";
     })
+    # clipboard-wayland: prevent reading from hung up fd:
+    #   https://github.com/mpv-player/mpv/pull/16140
+    (fetchpatch {
+      name = "clipboard-wayland-prevent-hung-up-fd.patch";
+      url = "https://github.com/mpv-player/mpv/commit/d20ded876d27497d3fe6a9494add8106b507a45c.patch";
+      hash = "sha256-sll4BpeVW6OA+/vbH7ZfIh0/vePfPEX87vzUu/GCj44=";
+    })
+    # clipboard-wayland: read already sent data when the fd is hung up:
+    #   https://github.com/mpv-player/mpv/pull/16236
+    (fetchpatch {
+      name = "clipboard-wayland-read-sent-data-on-hangup.patch";
+      url = "https://github.com/mpv-player/mpv/commit/896b3400f3cad286533dbb9cc3658ce18ed9966c.patch";
+      hash = "sha256-GU0VdYC/Q0RCS/I2h4gBVNhScDLSAB2KxN3Ca6CGBMM=";
+    })
   ];
 
   postPatch = lib.concatStringsSep "\n" [

From 79fcd29323b1b01f78b5b3a70adcceec55797848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 8 Nov 2025 21:21:22 -0800
Subject: [PATCH 224/258] python3Packages.pysaml2: 7.5.2 -> 7.5.4

Diff: https://github.com/IdentityPython/pysaml2/compare/v7.5.2...v7.5.4

Changelog: https://github.com/IdentityPython/pysaml2/blob/v7.5.4/CHANGELOG.md
---
 .../python-modules/pysaml2/default.nix        |  23 +-
 .../replace-pyopenssl-with-cryptography.patch | 334 ++++++++++++++++++
 2 files changed, 341 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 188bf2e3f80e..9d355760333c 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -4,16 +4,12 @@
   cryptography,
   defusedxml,
   fetchFromGitHub,
-  fetchpatch,
   paste,
   poetry-core,
   pyasn1,
   pymongo,
-  pyopenssl,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
-  pytz,
   repoze-who,
   requests,
   responses,
@@ -26,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "pysaml2";
-  version = "7.5.2";
+  version = "7.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "IdentityPython";
     repo = "pysaml2";
     tag = "v${version}";
-    hash = "sha256-2mvAXTruZqoSBUgfT2VEAnWQXVdviG0e49y7LPK5x00=";
+    hash = "sha256-DDs0jWONZ78995p7bbyIyZTWHnCI93SsbECqyeo0se8=";
   };
 
   patches = [
@@ -41,10 +37,8 @@ buildPythonPackage rec {
       inherit xmlsec;
     })
     # Replaces usages of deprecated/removed pyopenssl APIs
-    (fetchpatch {
-      url = "https://github.com/IdentityPython/pysaml2/pull/977/commits/930a652a240c8cd1489429a7d70cf5fa7ef1606a.patch";
-      hash = "sha256-kBNvGk5pwVmpW1wsIWVH9wapu6kjFavaTt4e3Llaw2c=";
-    })
+    # https://github.com/IdentityPython/pysaml2/pull/977
+    ./replace-pyopenssl-with-cryptography.patch
   ];
 
   postPatch = ''
@@ -54,18 +48,14 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "xmlschema" ];
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cryptography
     defusedxml
-    pyopenssl
-    python-dateutil
-    pytz
     requests
-    setuptools
     xmlschema
   ];
 
@@ -81,6 +71,7 @@ buildPythonPackage rec {
     pyasn1
     pymongo
     pytestCheckHook
+    python-dateutil
     responses
   ];
 
diff --git a/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch b/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch
new file mode 100644
index 000000000000..3453f3a68164
--- /dev/null
+++ b/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch
@@ -0,0 +1,334 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 87068b18..03f30491 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -22,8 +22,6 @@ requires-python = ">= 3.9"
+ dependencies = [
+   "cryptography >=3.1",
+   "defusedxml",
+-  "pyopenssl <24.3.0",
+-  "python-dateutil",
+   "requests >=2.0.0,<3.0.0",  # ^2 means compatible with 2.x
+   "xmlschema >=2.0.0,<3.0.0"
+ ]
+diff --git a/src/saml2/cert.py b/src/saml2/cert.py
+index e90651e4..926aec8a 100644
+--- a/src/saml2/cert.py
++++ b/src/saml2/cert.py
+@@ -3,11 +3,13 @@ __author__ = "haho0032"
+ import base64
+ from os import remove
+ from os.path import join
+-from datetime import datetime
+-from datetime import timezone
++from datetime import datetime, timedelta, timezone
+ 
+-from OpenSSL import crypto
+-import dateutil.parser
++from cryptography import x509
++from cryptography.exceptions import InvalidSignature
++from cryptography.hazmat.primitives import hashes, serialization
++from cryptography.hazmat.primitives.asymmetric import rsa
++from cryptography.x509.oid import NameOID
+ 
+ import saml2.cryptography.pki
+ 
+@@ -36,7 +38,6 @@ class OpenSSLWrapper:
+         valid_to=315360000,
+         sn=1,
+         key_length=1024,
+-        hash_alg="sha256",
+         write_to_file=False,
+         cert_dir="",
+         cipher_passphrase=None,
+@@ -87,8 +88,6 @@ class OpenSSLWrapper:
+                                   is 1.
+         :param key_length:        Length of the key to be generated. Defaults
+                                   to 1024.
+-        :param hash_alg:          Hash algorithm to use for the key. Default
+-                                  is sha256.
+         :param write_to_file:     True if you want to write the certificate
+                                   to a file. The method will then return
+                                   a tuple with path to certificate file and
+@@ -131,49 +130,68 @@ class OpenSSLWrapper:
+             k_f = join(cert_dir, key_file)
+ 
+         # create a key pair
+-        k = crypto.PKey()
+-        k.generate_key(crypto.TYPE_RSA, key_length)
++        k = rsa.generate_private_key(
++            public_exponent=65537,
++            key_size=key_length,
++        )
+ 
+         # create a self-signed cert
+-        cert = crypto.X509()
++        builder = x509.CertificateBuilder()
+ 
+         if request:
+-            cert = crypto.X509Req()
++            builder = x509.CertificateSigningRequestBuilder()
+ 
+         if len(cert_info["country_code"]) != 2:
+             raise WrongInput("Country code must be two letters!")
+-        cert.get_subject().C = cert_info["country_code"]
+-        cert.get_subject().ST = cert_info["state"]
+-        cert.get_subject().L = cert_info["city"]
+-        cert.get_subject().O = cert_info["organization"]  # noqa: E741
+-        cert.get_subject().OU = cert_info["organization_unit"]
+-        cert.get_subject().CN = cn
++        subject_name = x509.Name([
++            x509.NameAttribute(NameOID.COUNTRY_NAME,
++                               cert_info["country_code"]),
++            x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME,
++                               cert_info["state"]),
++            x509.NameAttribute(NameOID.LOCALITY_NAME,
++                               cert_info["city"]),
++            x509.NameAttribute(NameOID.ORGANIZATION_NAME,
++                               cert_info["organization"]),
++            x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME,
++                               cert_info["organization_unit"]),
++            x509.NameAttribute(NameOID.COMMON_NAME, cn),
++        ])
++        builder = builder.subject_name(subject_name)
+         if not request:
+-            cert.set_serial_number(sn)
+-            cert.gmtime_adj_notBefore(valid_from)  # Valid before present time
+-            cert.gmtime_adj_notAfter(valid_to)  # 3 650 days
+-            cert.set_issuer(cert.get_subject())
+-        cert.set_pubkey(k)
+-        cert.sign(k, hash_alg)
++            now = datetime.now(timezone.utc)
++            builder = builder.serial_number(
++                sn,
++            ).not_valid_before(
++                now + timedelta(seconds=valid_from),
++            ).not_valid_after(
++                now + timedelta(seconds=valid_to),
++            ).issuer_name(
++                subject_name,
++            ).public_key(
++                k.public_key(),
++            )
++        cert = builder.sign(k, hashes.SHA256())
+ 
+         try:
+-            if request:
+-                tmp_cert = crypto.dump_certificate_request(crypto.FILETYPE_PEM, cert)
+-            else:
+-                tmp_cert = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
+-            tmp_key = None
++            tmp_cert = cert.public_bytes(serialization.Encoding.PEM)
++            key_encryption = None
+             if cipher_passphrase is not None:
+                 passphrase = cipher_passphrase["passphrase"]
+                 if isinstance(cipher_passphrase["passphrase"], str):
+                     passphrase = passphrase.encode("utf-8")
+-                tmp_key = crypto.dump_privatekey(crypto.FILETYPE_PEM, k, cipher_passphrase["cipher"], passphrase)
++                key_encryption = serialization.BestAvailableEncryption(passphrase)
+             else:
+-                tmp_key = crypto.dump_privatekey(crypto.FILETYPE_PEM, k)
++                key_encryption = serialization.NoEncryption()
++            tmp_key = k.private_bytes(
++                encoding=serialization.Encoding.PEM,
++                format=serialization.PrivateFormat.TraditionalOpenSSL,
++                encryption_algorithm=key_encryption,
++            )
+             if write_to_file:
+-                with open(c_f, "w") as fc:
+-                    fc.write(tmp_cert.decode("utf-8"))
+-                with open(k_f, "w") as fk:
+-                    fk.write(tmp_key.decode("utf-8"))
++                with open(c_f, "wb") as fc:
++                    fc.write(tmp_cert)
++                with open(k_f, "wb") as fk:
++                    fk.write(tmp_key)
+                 return c_f, k_f
+             return tmp_cert, tmp_key
+         except Exception as ex:
+@@ -198,7 +216,6 @@ class OpenSSLWrapper:
+         sign_cert_str,
+         sign_key_str,
+         request_cert_str,
+-        hash_alg="sha256",
+         valid_from=0,
+         valid_to=315360000,
+         sn=1,
+@@ -222,8 +239,6 @@ class OpenSSLWrapper:
+                                   the requested certificate. If you only have
+                                   a file use the method read_str_from_file
+                                   to get a string representation.
+-        :param hash_alg:          Hash algorithm to use for the key. Default
+-                                  is sha256.
+         :param valid_from:        When the certificate starts to be valid.
+                                   Amount of seconds from when the
+                                   certificate is generated.
+@@ -237,27 +252,29 @@ class OpenSSLWrapper:
+         :return:                  String representation of the signed
+                                   certificate.
+         """
+-        ca_cert = crypto.load_certificate(crypto.FILETYPE_PEM, sign_cert_str)
+-        ca_key = None
+-        if passphrase is not None:
+-            ca_key = crypto.load_privatekey(crypto.FILETYPE_PEM, sign_key_str, passphrase)
+-        else:
+-            ca_key = crypto.load_privatekey(crypto.FILETYPE_PEM, sign_key_str)
+-        req_cert = crypto.load_certificate_request(crypto.FILETYPE_PEM, request_cert_str)
+-
+-        cert = crypto.X509()
+-        cert.set_subject(req_cert.get_subject())
+-        cert.set_serial_number(sn)
+-        cert.gmtime_adj_notBefore(valid_from)
+-        cert.gmtime_adj_notAfter(valid_to)
+-        cert.set_issuer(ca_cert.get_subject())
+-        cert.set_pubkey(req_cert.get_pubkey())
+-        cert.sign(ca_key, hash_alg)
+-
+-        cert_dump = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
+-        if isinstance(cert_dump, str):
+-            return cert_dump
+-        return cert_dump.decode("utf-8")
++        if isinstance(sign_cert_str, str):
++            sign_cert_str = sign_cert_str.encode("utf-8")
++        ca_cert = x509.load_pem_x509_certificate(sign_cert_str)
++        ca_key = serialization.load_pem_private_key(
++            sign_key_str, password=passphrase)
++        req_cert = x509.load_pem_x509_csr(request_cert_str)
++
++        now = datetime.now(timezone.utc)
++        cert = x509.CertificateBuilder().subject_name(
++            req_cert.subject,
++        ).serial_number(
++            sn,
++        ).not_valid_before(
++            now + timedelta(seconds=valid_from),
++        ).not_valid_after(
++            now + timedelta(seconds=valid_to),
++        ).issuer_name(
++            ca_cert.subject,
++        ).public_key(
++            req_cert.public_key(),
++        ).sign(ca_key, hashes.SHA256())
++
++        return cert.public_bytes(serialization.Encoding.PEM).decode("utf-8")
+ 
+     def verify_chain(self, cert_chain_str_list, cert_str):
+         """
+@@ -276,13 +293,6 @@ class OpenSSLWrapper:
+                 cert_str = tmp_cert_str
+             return (True, "Signed certificate is valid and correctly signed by CA " "certificate.")
+ 
+-    def certificate_not_valid_yet(self, cert):
+-        starts_to_be_valid = dateutil.parser.parse(cert.get_notBefore())
+-        now = datetime.now(timezone.utc)
+-        if starts_to_be_valid < now:
+-            return False
+-        return True
+-
+     def verify(self, signing_cert_str, cert_str):
+         """
+         Verifies if a certificate is valid and signed by a given certificate.
+@@ -303,34 +313,34 @@ class OpenSSLWrapper:
+                                  Message = Why the validation failed.
+         """
+         try:
+-            ca_cert = crypto.load_certificate(crypto.FILETYPE_PEM, signing_cert_str)
+-            cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_str)
+-
+-            if self.certificate_not_valid_yet(ca_cert):
++            if isinstance(signing_cert_str, str):
++                signing_cert_str = signing_cert_str.encode("utf-8")
++            if isinstance(cert_str, str):
++                cert_str = cert_str.encode("utf-8")
++            ca_cert = x509.load_pem_x509_certificate(signing_cert_str)
++            cert = x509.load_pem_x509_certificate(cert_str)
++            now = datetime.now(timezone.utc)
++
++            if ca_cert.not_valid_before_utc >= now:
+                 return False, "CA certificate is not valid yet."
+ 
+-            if ca_cert.has_expired() == 1:
++            if ca_cert.not_valid_after_utc < now:
+                 return False, "CA certificate is expired."
+ 
+-            if cert.has_expired() == 1:
++            if cert.not_valid_after_utc < now:
+                 return False, "The signed certificate is expired."
+ 
+-            if self.certificate_not_valid_yet(cert):
++            if cert.not_valid_before_utc >= now:
+                 return False, "The signed certificate is not valid yet."
+ 
+-            if ca_cert.get_subject().CN == cert.get_subject().CN:
++            if ca_cert.subject.get_attributes_for_oid(NameOID.COMMON_NAME) == \
++               cert.subject.get_attributes_for_oid(NameOID.COMMON_NAME):
+                 return False, ("CN may not be equal for CA certificate and the " "signed certificate.")
+ 
+-            cert_algorithm = cert.get_signature_algorithm()
+-            cert_algorithm = cert_algorithm.decode("ascii")
+-            cert_str = cert_str.encode("ascii")
+-
+-            cert_crypto = saml2.cryptography.pki.load_pem_x509_certificate(cert_str)
+-
+             try:
+-                crypto.verify(ca_cert, cert_crypto.signature, cert_crypto.tbs_certificate_bytes, cert_algorithm)
++                cert.verify_directly_issued_by(ca_cert)
+                 return True, "Signed certificate is valid and correctly signed by CA certificate."
+-            except crypto.Error as e:
++            except (ValueError, TypeError, InvalidSignature) as e:
+                 return False, f"Certificate is incorrectly signed: {str(e)}"
+         except Exception as e:
+             return False, f"Certificate is not valid for an unknown reason. {str(e)}"
+@@ -352,8 +362,14 @@ def read_cert_from_file(cert_file, cert_type="pem"):
+         data = fp.read()
+ 
+     try:
+-        cert = saml2.cryptography.pki.load_x509_certificate(data, cert_type)
+-        pem_data = saml2.cryptography.pki.get_public_bytes_from_cert(cert)
++        cert = None
++        if cert_type == "pem":
++            cert = x509.load_pem_x509_certificate(data)
++        elif cert_type == "der":
++            cert = x509.load_der_x509_certificate(data)
++        else:
++            raise ValueError(f"cert-type {cert_type} not supported")
++        pem_data = cert.public_bytes(serialization.Encoding.PEM).decode("utf-8")
+     except Exception as e:
+         raise CertificateError(e)
+ 
+diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
+index 738ac04b..60c83718 100644
+--- a/src/saml2/sigver.py
++++ b/src/saml2/sigver.py
+@@ -18,8 +18,9 @@ from time import mktime
+ from urllib import parse
+ from uuid import uuid4 as gen_random_key
+ 
+-from OpenSSL import crypto
+-import dateutil
++from urllib import parse
++
++from cryptography import x509
+ 
+ from saml2 import ExtensionElement
+ from saml2 import SamlBase
+@@ -373,14 +374,14 @@ def active_cert(key):
+     """
+     try:
+         cert_str = pem_format(key)
+-        cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_str)
++        cert = x509.load_pem_x509_certificate(cert_str)
+     except AttributeError:
+         return False
+ 
+-    now = datetime.now(timezone.utc)
+-    valid_from = dateutil.parser.parse(cert.get_notBefore())
+-    valid_to = dateutil.parser.parse(cert.get_notAfter())
+-    active = not cert.has_expired() and valid_from <= now < valid_to
++    now = datetime.datetime.now(datetime.timezone.utc)
++    valid_from = cert.not_valid_before_utc
++    valid_to = cert.not_valid_after_utc
++    active = valid_from <= now < valid_to
+     return active
+ 
+ 

From 889e2ca41f944b4b7961ff6f057baa8d7061b09d Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sun, 9 Nov 2025 00:31:02 -0500
Subject: [PATCH 225/258] orjail: remove

Maintainer @onny gave the thumbs up to the suggestion of removing since
the project seems unmaintained and the build is broken on the latest
firejail release: https://github.com/NixOS/nixpkgs/pull/429616#issuecomment-3254177901
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 pkgs/by-name/or/orjail/package.nix            | 57 -------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/by-name/or/orjail/package.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 65001eb9b172..96659c6cbdd0 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -281,6 +281,8 @@
 
 - `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream.
 
+- `orjail` package has been removed as it is broken by the latest firejail release and seems unmaintained.
+
 - `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).
diff --git a/pkgs/by-name/or/orjail/package.nix b/pkgs/by-name/or/orjail/package.nix
deleted file mode 100644
index 52e189b131d4..000000000000
--- a/pkgs/by-name/or/orjail/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  tor,
-  firejail,
-  iptables,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "orjail";
-  version = "1.1";
-
-  src = fetchFromGitHub {
-    owner = "orjail";
-    repo = "orjail";
-    rev = "v${version}";
-    sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postPatch = ''
-    patchShebangs make-helper.bsh
-    mkdir bin
-    mv usr/sbin/orjail bin/orjail
-    rm -r usr
-  '';
-
-  makeFlags = [
-    "DESTDIR=${placeholder "out"}"
-  ];
-
-  postInstall = ''
-    # Specify binary paths: tor, firejail, iptables
-    # mktemp fails with /tmp path prefix, will work without it anyway
-    # https://github.com/orjail/orjail/issues/78
-    # firejail will fail reading /etc/hosts, therefore remove --hostname arg
-    # https://github.com/netblue30/firejail/issues/2758
-    substituteInPlace $out/bin/orjail \
-      --replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \
-      --replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \
-      --replace 'iptables -' '${iptables}/bin/iptables -' \
-      --replace 'mktemp /tmp/' 'mktemp ' \
-      --replace '--hostname=host ' ""
-  '';
-
-  meta = with lib; {
-    description = "Force programs to exclusively use tor network";
-    mainProgram = "orjail";
-    homepage = "https://github.com/orjail/orjail";
-    license = licenses.wtfpl;
-    maintainers = with maintainers; [ onny ];
-    platforms = platforms.linux;
-  };
-}

From 1c8425f8fd7e5e773cf86b30d74db5f9efffa227 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 05:58:12 +0000
Subject: [PATCH 226/258] 
 terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.51 -> 1.36.52

---
 .../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 306afcfc4a30..49b71983d706 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-VrhloC601pG6jcBbrKc/ldhtWwzJzhkLdHj1/UPOUqk=",
+    "hash": "sha256-gwHugaLKjLIp7LHHbo4F25P3ncgjGavKYcIfSjXs7KM=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.51",
+    "rev": "v1.36.52",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw="
+    "vendorHash": "sha256-0RE5ZqB16JPoFPZYgwupNyYZiXQnC3Sq4f+CLNjD6BM="
   },
   "opsgenie_opsgenie": {
     "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",

From e21fb87fdfebbba8571d570f85d5ef42aab1657c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 06:45:01 +0000
Subject: [PATCH 227/258] cloud-hypervisor: 48.0 -> 49.0

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

diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 8557b1659f40..61934b2a2bb4 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloud-hypervisor";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = "cloud-hypervisor";
     rev = "v${version}";
-    hash = "sha256-cfS3sO1GQIxF9UlzKP9iE/UuJwGVIkNBN7GDF/ltn4Q=";
+    hash = "sha256-bPPs/4XMcvOH4BGfQrjQdvgjGWae4UEZjzPKjalDN3w=";
   };
 
-  cargoHash = "sha256-QvW1loljt9KzY0h2pG7n9NCkJJOYr/VxftsyqATm9DA=";
+  cargoHash = "sha256-5EK9V9yiF/UjmlYSKBIJgQOA1YU33ezicLikWYnKFAo=";
 
   separateDebugInfo = true;
 

From aab9d753894933c292188ee5cbf583a1c9a9f8d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 07:10:37 +0000
Subject: [PATCH 228/258] terraform-providers.newrelic_newrelic: 3.74.0 ->
 3.75.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 306afcfc4a30..63bbde99dad4 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-1OpvSayWq194591u/z9oHz80ZmPA9fSZpKSBwDHL/tk=",
+    "hash": "sha256-OdvDvo40fjuKoRjI1r1re/h2i5JopssRF5dQye4AsSM=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.74.0",
+    "rev": "v3.75.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7zUUV3cqVesItNnE/EcO5/l+nafV04JdoNkmTxnulio="
+    "vendorHash": "sha256-LBOxoSGvJ5AWS71UINBbVgDxLZqDpNgq7lY8LaPZsvs="
   },
   "ns1-terraform_ns1": {
     "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",

From 7fa73c524b6ed52df0d3cf8aa8dd86f5996e49d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 07:14:55 +0000
Subject: [PATCH 229/258] dprint-plugins.dprint-plugin-biome: 0.11.1 -> 0.11.3

---
 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 f7d97d9acbfa..4688cbc353ea 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-kelyuSZpbah1l+qVZMIK9VhWLr7DWjZIm9HwD64bCTw=";
+  hash = "sha256-WEabcffl/sARrVc00Qr6QdEjFG4BZgHRrk3eeEfFV4g=";
   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.11.1.wasm";
-  version = "0.11.1";
+  url = "https://plugins.dprint.dev/biome-0.11.3.wasm";
+  version = "0.11.3";
 }

From fca1a39d24c5ce505cee33e7e98d44e45d9284f1 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 8 Nov 2025 22:25:01 +0100
Subject: [PATCH 230/258] yaziPlugins.compress: init at
 0.5.0-unstable-2025-08-15

---
 .../ya/yazi/plugins/compress/default.nix      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/compress/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/compress/default.nix b/pkgs/by-name/ya/yazi/plugins/compress/default.nix
new file mode 100644
index 000000000000..137c33a13201
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/compress/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "compress.yazi";
+  version = "0.5.0-unstable-2025-08-15";
+
+  src = fetchFromGitHub {
+    owner = "KKV9";
+    repo = "compress.yazi";
+    rev = "c2646395394f22b6c40bff64dc4c8c922d210570";
+    hash = "sha256-qAuMD4YojLfVaywurk5uHLywRRF77U2F7ql+gR8B/lo=";
+  };
+
+  meta = {
+    description = "Yazi plugin that compresses selected files to an archive";
+    homepage = "https://github.com/KKV9/compress.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ eljamm ];
+  };
+}

From 19d01345848650537fed8397dc124fc5c4523ea0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 09:00:44 +0000
Subject: [PATCH 231/258] emmylua-ls: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 71fe171f0465..3fbeb620266c 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_ls";
-  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_ls";
 
-  cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
+  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 9a17278a5cebec1d39d68055fbca320ac805a498 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sun, 9 Nov 2025 10:27:10 +0100
Subject: [PATCH 232/258] zoom-us: simplify updater script

This uses pkgsCross to help the general
update script find and update the various
zoom versions for the various architectures.
That way, we no longer need to calculate
the source hashes in the update script.

Credits:
The commit at hand is inspired by
https://github.com/NixOS/nixpkgs/blob/c656e00a21df6c42d6b57e9f8abf6cdf20e7b1ce/pkgs/by-name/ch/chataigne/update.sh#L24
(note: not merged into nixpkgs yet, so that link might disappear),
after a friendly note by axelkar
https://github.com/NixOS/nixpkgs/pull/429215#discussion_r2255114820
and a helpful hint by magistau
https://github.com/NixOS/nixpkgs/pull/429215#discussion_r2506957507
Thanks to both of you!
---
 pkgs/by-name/zo/zoom-us/update.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh
index d307058ceb5d..25e8d58eb9a2 100755
--- a/pkgs/by-name/zo/zoom-us/update.sh
+++ b/pkgs/by-name/zo/zoom-us/update.sh
@@ -14,21 +14,10 @@ version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data")
 version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data")
 version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data")
 
-echo >&2 "=== Downloading packages and computing hashes..."
-# We precalculate the hashes before calling update-source-version
-# because it attempts to calculate each architecture's package's hash
-# by running `nix-build --system <architecture> -A zoom-us.src` which
-# causes cross compiling headaches; using nix-prefetch-url with
-# hard-coded URLs is simpler.  Keep these URLs in sync with the ones
-# in package.nix where `srcs` is defined.
-hash_aarch64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64"))
-hash_x86_64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg"))
-hash_x86_64_linux=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz"))
-
 echo >&2 "=== Updating package.nix ..."
 # update-source-version expects to be at the root of nixpkgs
-(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin)
-(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin)
-(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux --source-key=unpacked.src)
+(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.aarch64-darwin pkgsCross.aarch64-darwin.zoom-us "$version_aarch64_darwin")
+(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-darwin pkgsCross.x86_64-darwin.zoom-us "$version_x86_64_darwin")
+(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-linux pkgsCross.gnu64.zoom-us "$version_x86_64_linux" --source-key=unpacked.src)
 
 echo >&2 "=== Done!"

From ce5cc48a42f6e9f0aa5ad947756ed22de78bb471 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 9 Nov 2025 11:43:28 +0100
Subject: [PATCH 233/258] scion: update meta.homepage

Previous homepage shows a message that it has moved
---
 pkgs/by-name/sc/scion/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix
index cad28b77aa4f..4b0fd2a7eabb 100644
--- a/pkgs/by-name/sc/scion/package.nix
+++ b/pkgs/by-name/sc/scion/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Future Internet architecture utilizing path-aware networking";
-    homepage = "https://scion-architecture.net/";
+    homepage = "https://www.scion.org/";
     platforms = lib.platforms.unix;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [

From 1e532f3dcf17b110687e52eeef1959548ba3afc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 11:11:11 +0000
Subject: [PATCH 234/258] ghostfolio: 2.214.0 -> 2.215.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 29918109ef51..617b155a0f38 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.214.0";
+  version = "2.215.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-x8GUlC1/TxA40rDQu3Ae2P5v5LFtberOQWtx5GJ7rMw=";
+    hash = "sha256-j7UmjyayVbun4PrNSPwOi2+EGUhyTFuLQLSIZp8l95g=";
     # 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-hHfT4gsf0D5XPY4RuQCKWNWp+iav9B75YMs70xayqtc=";
+  npmDepsHash = "sha256-58e/LBgB4MQIp3xUdQXVvmq7krQ8+i0ku9xineC1HRU=";
 
   nativeBuildInputs = [
     prisma

From f251c167806936b8f97613d0af29fcc241aad668 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 11:39:06 +0000
Subject: [PATCH 235/258] libretro.puae: 0-unstable-2025-08-19 ->
 0-unstable-2025-11-02

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

diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index 505289eec8a1..62c9a4f8b0d7 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "puae";
-  version = "0-unstable-2025-08-19";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-uae";
-    rev = "9e2aa770a9b6b0a4e1f4fc05eb0db6c8e7aba8ee";
-    hash = "sha256-YTS0OgYJCGawpsDHvU79dDA+iePna5Fcab2Le3vdVSk=";
+    rev = "0043cf9c061bd9b81dbc1869c2761017139cfc63";
+    hash = "sha256-xi/7zT+4LNfSMwfA+rvxdvsgpQRHceK6Heqrcy84RVk=";
   };
 
   makefile = "Makefile";

From fa819afd505d9d7dbadf79d62ac7ab9d751896ce Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Sat, 8 Nov 2025 22:01:54 +0100
Subject: [PATCH 236/258] evil-winrm-py: init at 1.5.0

---
 pkgs/by-name/ev/evil-winrm-py/package.nix | 57 +++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/ev/evil-winrm-py/package.nix

diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix
new file mode 100644
index 000000000000..8b54b252b938
--- /dev/null
+++ b/pkgs/by-name/ev/evil-winrm-py/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  libkrb5,
+  versionCheckHook,
+  nix-update-script,
+  enableKerberos ? true,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "evil-winrm-py";
+  version = "1.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "adityatelange";
+    repo = "evil-winrm-py";
+    tag = "v${version}";
+    hash = "sha256-IACFPPlkgyJh78p6Jy740CQqcySkMTV/8VVPSRJKTPI=";
+  };
+
+  # Removes the additional binary ewp
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail '"ewp = evil_winrm_py.evil_winrm_py:main",' ""
+  '';
+
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies =
+    with python3Packages;
+    [
+      pypsrp
+      prompt-toolkit
+      tqdm
+    ]
+    ++ lib.optionals enableKerberos pypsrp.optional-dependencies.kerberos;
+
+  # Add the C library if Kerberos is enabled
+  buildInputs = lib.optionals enableKerberos [ libkrb5 ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Execute commands interactively on remote Windows machines using the WinRM protocol";
+    homepage = "https://github.com/adityatelange/evil-winrm-py";
+    changelog = "https://github.com/adityatelange/evil-winrm-py/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ letgamer ];
+    mainProgram = "evil-winrm-py";
+  };
+}

From 3c1c5dbd251594188a12fdf0d07ebf099bacb745 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 11:56:06 +0000
Subject: [PATCH 237/258] equicord: 2025-11-02 -> 2025-11-09

---
 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 fae5e5d0a724..e70c6365bc34 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-11-02";
+  version = "2025-11-09";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = "${finalAttrs.version}";
-    hash = "sha256-SThWYUi4h3OpsP28ouHW1f8+m1dr+wMAYhA/90LBYPg=";
+    hash = "sha256-tddAMGNcaFj1hygrkQZfutWtgI+JHdYN5BHeW37562w=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From 175492b610151d1a2341bfec913b19cacf4c33dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 12:10:30 +0000
Subject: [PATCH 238/258] vscode-extensions.wgsl-analyzer.wgsl-analyzer:
 0.11.94 -> 0.11.130

---
 .../vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
index 85aa7eb9f808..9114b98200b0 100644
--- a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "wgsl-analyzer";
     publisher = "wgsl-analyzer";
-    version = "0.11.94";
-    hash = "sha256-FfQnNFAEh1PwT2M25km+7nEO70mDDQ75p0KHjBlAcLE=";
+    version = "0.11.130";
+    hash = "sha256-bwtyLkMo9+3XQwUzKqSHOlCrSPqJMqKAPF17aeyr4QI=";
   };
 
   nativeBuildInputs = [

From 6a3505d256aab5be0ff2c604c2a3447d3d0cfaf0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 9 Nov 2025 12:45:40 +0000
Subject: [PATCH 239/258] python3Packages.pygerber: skip failing test on darwin

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

diff --git a/pkgs/development/python-modules/pygerber/default.nix b/pkgs/development/python-modules/pygerber/default.nix
index 41484bbede36..fa4a9331517e 100644
--- a/pkgs/development/python-modules/pygerber/default.nix
+++ b/pkgs/development/python-modules/pygerber/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+
   # build-system
   poetry-core,
 
@@ -38,8 +39,6 @@ buildPythonPackage rec {
   version = "2.4.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Argmaster";
     repo = "pygerber";
@@ -92,6 +91,11 @@ buildPythonPackage rec {
     "test/gerberx3/test_language_server/tests.py"
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # FileNotFoundError: [Errno 2] No such file or directory: 'open'
+    "test_project_render_with_file_type_tags"
+  ];
+
   pytestFlags = [ "--override-ini=required_plugins=" ];
 
   pythonImportsCheck = [ "pygerber" ];

From 9c8f04498d91e86e5eea20efb081a5c2f1dce27e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Nov 2025 13:15:55 +0000
Subject: [PATCH 240/258] python3Packages.pueblo: 0.0.11 -> 0.0.12

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

diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix
index 926b16e96e26..6a38aa69eec2 100644
--- a/pkgs/development/python-modules/pueblo/default.nix
+++ b/pkgs/development/python-modules/pueblo/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pueblo";
-  version = "0.0.11";
+  version = "0.0.12";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # should work for us as well.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IQ5NFn1EMh5oLgRlth7VWQmSyMx2/7cmC/U1VW1B4OE=";
+    hash = "sha256-oo2RNJQUVDqxhfBI6h1KCAgsMjDe7ns3F9qD4eKLVic=";
   };
 
   build-system = [

From eb8cfea79d7cee6287e4752452824c00963a5f87 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Sun, 9 Nov 2025 13:11:14 +0000
Subject: [PATCH 241/258] ci: fix "needs: reviewer" label being removed after
 self review

---
 ci/github-script/bot.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 2b52955307ae..65db03ffaee5 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -210,7 +210,7 @@ module.exports = async ({ github, context, core, dry }) => {
       }
     }
 
-    // Check for any human reviews other than GitHub actions and other GitHub apps.
+    // Check for any human reviews other than the PR author, 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, {
@@ -218,7 +218,11 @@ module.exports = async ({ github, context, core, dry }) => {
         pull_number,
       })
     ).filter(
-      (r) => r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
+      (r) =>
+        r.user &&
+        !r.user.login.endsWith('[bot]') &&
+        r.user.type !== 'Bot' &&
+        r.user.id !== pull_request.user?.id,
     )
 
     const approvals = new Set(

From 5d858facb2af0b04c90ab65cd1c72bb553bdcd45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 9 Nov 2025 14:42:09 +0100
Subject: [PATCH 242/258] nixos/nix-channel: default to channels.nixos.org

Infra is interested in deprecating the redirect over the domain apex
eventually, since it is just a redirect to channels.nixos.org, which
we can more reliably redistribute with a CDN.

The nixos.org domain currently offers no IPv6 due to issues we've had
with our DNS hoster. (cf. nixos/infra#873)
---
 nixos/modules/config/nix-channel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix
index 23b414f8194b..b05505687193 100644
--- a/nixos/modules/config/nix-channel.nix
+++ b/nixos/modules/config/nix-channel.nix
@@ -71,7 +71,7 @@ in
       defaultChannel = mkOption {
         internal = true;
         type = types.str;
-        default = "https://nixos.org/channels/nixos-unstable";
+        default = "https://channels.nixos.org/nixos-unstable";
         description = "Default NixOS channel to which the root user is subscribed.";
       };
     };

From c0886dcd92cf588822859d60dce39ee29c710fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 9 Nov 2025 14:46:54 +0100
Subject: [PATCH 243/258] joplin-desktop: update electron 36 -> 37

Fixes the build, as electron_36 is EOL and use of it results in eval
error.
---
 pkgs/by-name/jo/joplin-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index ec93ead2a33d..683875115f42 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -13,7 +13,7 @@
   cairo,
   pixman,
   libsecret,
-  electron_36,
+  electron_37,
   xcbuild,
   buildPackages,
   callPackage,
@@ -23,7 +23,7 @@
 }:
 
 let
-  electron = electron_36;
+  electron = electron_37;
   yarn-berry = yarn-berry_4;
 
   releaseData = lib.importJSON ./release-data.json;

From 29cc731fac78f8de726f9bba867f6f96f8274a74 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 9 Nov 2025 15:01:11 +0100
Subject: [PATCH 244/258] frigate: use python 3.13

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

diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 0d6bfc29aa1d..56dc274ae585 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   callPackage,
-  python312Packages,
+  python313Packages,
   fetchFromGitHub,
   fetchurl,
   ffmpeg-headless,
@@ -27,7 +27,7 @@ let
     inherit version src;
   };
 
-  python = python312Packages.python.override {
+  python = python313Packages.python.override {
     packageOverrides = self: super: {
       joserfc = super.joserfc.overridePythonAttrs (oldAttrs: {
         version = "1.1.0";
@@ -141,7 +141,6 @@ python3Packages.buildPythonApplication rec {
     distlib
     fastapi
     filelock
-    future
     importlib-metadata
     importlib-resources
     google-generativeai

From 47b8be7fe54379048eb856a07fae0172e3fb24b0 Mon Sep 17 00:00:00 2001
From: "Katja Ramona Sophie Kwast (zaphyra)" <git@zaphyra.eu>
Date: Sat, 8 Nov 2025 23:54:55 +0100
Subject: [PATCH 245/258] gomuks-web: 0.4.0-unstable-2025-04-22 ->
 0.2025.11-unstable-2025-11-01

---
 maintainers/maintainer-list.nix        |  12 +-
 pkgs/by-name/go/gomuks-web/package.nix | 145 ++++++++++++++-----------
 2 files changed, 89 insertions(+), 68 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 535ef1d43934..1213e167aa29 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5417,12 +5417,6 @@
     githubId = 202474;
     name = "Jens Reimann";
   };
-  ctucx = {
-    email = "katja@ctu.cx";
-    github = "katjakwast";
-    githubId = 176372446;
-    name = "Katja Kwast";
-  };
   cupcakearmy = {
     name = "Niccolo Borgioli";
     email = "nix@nicco.io";
@@ -29002,6 +28996,12 @@
     githubId = 450885;
     name = "Francesco Zanini";
   };
+  zaphyra = {
+    email = "katja@zaphyra.eu";
+    github = "katjakwast";
+    githubId = 176372446;
+    name = "Katja Kwast";
+  };
   zareix = {
     email = "contact@raphael-catarino.fr";
     github = "zareix";
diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix
index 487b90b5d8e4..f1fa466e1325 100644
--- a/pkgs/by-name/go/gomuks-web/package.nix
+++ b/pkgs/by-name/go/gomuks-web/package.nix
@@ -1,74 +1,95 @@
 {
   lib,
   fetchFromGitHub,
+  fetchNpmDeps,
   buildGoModule,
-  buildNpmPackage,
-  stdenv,
-  olm,
+  nodejs,
+  npmHooks,
   unstableGitUpdater,
-  withGoolm ? false,
 }:
 
-let
-  cppStdLib = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
+buildGoModule (
+  finalAttrs:
+  let
+    ver = "0.2025.11";
+    revDate = "2025-11-01";
+    rev = "be0d4487871c196d0c47bb1b6ac7ce9252d424de";
+    srcHash = "sha256-x7M7d8obnt8mpH1ZRev8c39PE5ZlgssgusGvrLaF/vg=";
+    vendorHash = "sha256-TDvTZ0n324pNPAPMZMhWq0LdDUqFrzBXNVNdfMlxqeQ=";
+    npmDepsHash = "sha256-4Ir4uq9Hg6Hwj21P/H7xWdVPzYrDrXiouEtjnLJj4Ko=";
 
-in
-buildGoModule (finalAttrs: {
-  pname = "gomuks-web";
-  version = "0.4.0-unstable-2025-04-22";
+  in
+  {
+    pname = "gomuks-web";
+    version = "${ver}-unstable-${revDate}";
 
-  src = fetchFromGitHub {
-    owner = "tulir";
-    repo = "gomuks";
-    rev = "fd257ed74c9df42e5b6d14d3c6a283f557f61666";
-    hash = "sha256-jMDLfiwkUme2bxE+ZEtUoNMwZ7GuGGzCV2dH1V87YtQ=";
-  };
+    inherit vendorHash;
 
-  frontend = buildNpmPackage {
-    name = "${finalAttrs.pname}_${finalAttrs.version}-frontend";
-    src = "${finalAttrs.src}/web";
-    inherit (finalAttrs) version;
-
-    npmDepsHash = "sha256-Mt2gJ1lLT3oQ3RKr3XTVFXkS/Xmjy0gahbdaxxrO+6g=";
-
-    installPhase = ''
-      cp -r dist $out
-    '';
-  };
-
-  vendorHash = "sha256-qeSxxd9ml2ENAYSPkdd1OWqy2DULnwLUVkKje47uT/I=";
-
-  buildInputs = [
-    (if withGoolm then stdenv.cc.cc.lib else olm)
-  ];
-
-  CGO_LDFLAGS = lib.optional withGoolm cppStdLib;
-
-  tags = lib.optional withGoolm "goolm";
-
-  subPackages = [ "cmd/gomuks" ];
-
-  preBuild = ''
-    cp -r ${finalAttrs.frontend} ./web/dist
-  '';
-
-  postInstall = ''
-    mv $out/bin/gomuks $out/bin/gomuks-web
-  '';
-
-  passthru.updateScript = {
-    inherit (finalAttrs) frontend;
-    updateScript = unstableGitUpdater {
-      branch = "main";
+    src = fetchFromGitHub {
+      owner = "gomuks";
+      repo = "gomuks";
+      hash = srcHash;
+      inherit rev;
     };
-  };
 
-  meta = {
-    mainProgram = "gomuks-web";
-    description = "Matrix client written in Go";
-    homepage = "https://github.com/tulir/gomuks";
-    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ ctucx ];
-    platforms = lib.platforms.unix;
-  };
-})
+    nativeBuildInputs = [
+      nodejs
+      npmHooks.npmConfigHook
+    ];
+
+    env = {
+      npmRoot = "web";
+      npmDeps = fetchNpmDeps {
+        src = "${finalAttrs.src}/web";
+        hash = npmDepsHash;
+      };
+    };
+
+    postPatch = ''
+      substituteInPlace ./web/build-wasm.sh \
+        --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=v${ver}" \
+        --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=${rev}"
+    '';
+
+    doCheck = false;
+
+    tags = [ "goolm" ];
+
+    ldflags = [
+      "-X 'go.mau.fi/gomuks/version.Tag=v${ver}'"
+      "-X 'go.mau.fi/gomuks/version.Commit=${rev}'"
+      "-X \"go.mau.fi/gomuks/version.BuildTime=$(date -Iseconds)\""
+      "-X \"maunium.net/go/mautrix.GoModVersion=$(cat go.mod | grep 'maunium.net/go/mautrix ' | head -n1 | awk '{ print $2 })\""
+    ];
+
+    subPackages = [
+      "cmd/gomuks"
+      "cmd/gomuks-terminal"
+      "cmd/archivemuks"
+    ];
+
+    preBuild = ''
+      CGO_ENABLED=0 go generate ./web
+    '';
+
+    postInstall = ''
+      mv $out/bin/gomuks $out/bin/gomuks-web
+    '';
+
+    passthru.updateScript = {
+      inherit (finalAttrs) frontend;
+      updateScript = unstableGitUpdater {
+        branch = "main";
+      };
+    };
+
+    meta = {
+      mainProgram = "gomuks-web";
+      description = "Matrix client written in Go";
+      homepage = "https://github.com/tulir/gomuks";
+      license = lib.licenses.agpl3Only;
+      maintainers = [ lib.maintainers.zaphyra ];
+      platforms = lib.platforms.unix;
+    };
+  }
+)

From 5b7feb5518db2b3728962c59405241473d80b12d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 03:49:47 +0000
Subject: [PATCH 246/258] =?UTF-8?q?python3.pkgs.pyatspi:=202.46.1=20?=
 =?UTF-8?q?=E2=86=92=202.58.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/pyatspi2/-/compare/PYATSPI_2_46_1...2.58.0

Was ported to Meson.

Also clean up, and fix license:

- Library is LGPL-2.0-only.
- Examples are LGPL-2.1-or-later.
- Some tests are LGPL-2.0-or-later, some are GPL-2.0-or-later, and some are PSF-2.0.

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../python-modules/pyatspi/default.nix        | 34 +++++++++----------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index df80e01731ee..9e69b571c7fd 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,54 +1,52 @@
 {
   lib,
   fetchurl,
+  meson,
+  ninja,
   pkg-config,
   buildPythonPackage,
   isPy3k,
   at-spi2-core,
   pygobject3,
   gnome,
-  python,
 }:
 
 buildPythonPackage rec {
   pname = "pyatspi";
-  version = "2.46.1";
-  format = "other";
+  version = "2.58.0";
+
+  pyproject = false;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "+R9qV0NOnAfRPVxL+BndeOjuYFqsKuRdjGTCgRT7BBs=";
+    url = "mirror://gnome/sources/pyatspi/${lib.versions.majorMinor version}/pyatspi-${version}.tar.xz";
+    sha256 = "6dKQ1TzH4wZtly/RilDuiF77i+CqJSYvGe9/iE/qDv8=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     at-spi2-core
     pygobject3
   ];
 
-  configureFlags = [ "PYTHON=${python.pythonOnBuildForHost.interpreter}" ];
-
-  postPatch = ''
-    # useless python existence check for us
-    substituteInPlace configure \
-      --replace '&& ! which' '&& false'
-  '';
-
   disabled = !isPy3k;
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "python3.pkgs.${pname}";
+      packageName = "pyatspi";
+      attrPath = "python3.pkgs.pyatspi";
       versionPolicy = "odd-unstable";
     };
   };
 
   meta = with lib; {
     description = "Python client bindings for D-Bus AT-SPI";
-    homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus";
-    license = licenses.gpl2;
+    homepage = "https://gitlab.gnome.org/GNOME/pyatspi2";
+    license = licenses.lgpl2Only;
     maintainers = with maintainers; [ jtojnar ];
     platforms = with platforms; unix;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a18977fe4ac..3a8a74599032 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12745,7 +12745,7 @@ self: super: with self; {
 
   pyatome = callPackage ../development/python-modules/pyatome { };
 
-  pyatspi = callPackage ../development/python-modules/pyatspi { };
+  pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs.buildPackages) meson; };
 
   pyatv = callPackage ../development/python-modules/pyatv { };
 

From b36fa015c5c7d5d68db896fbe46f06b796b66d66 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Nov 2025 00:28:22 +0100
Subject: [PATCH 247/258] papers: add update script

---
 pkgs/by-name/pa/papers/package.nix | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index c3dbc70c1983..399cef8184f0 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -33,6 +33,9 @@
   exempi,
   cargo,
   rustPlatform,
+  _experimental-update-script-combinators,
+  common-updater-scripts,
+  gnome,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -133,6 +136,36 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput "share/doc" "$devdoc"
   '';
 
+  passthru = {
+    updateScript =
+      let
+        updateSource = gnome.updateScript {
+          packageName = "papers";
+        };
+
+        updateLockfile = {
+          command = [
+            "sh"
+            "-c"
+            ''
+              PATH=${
+                lib.makeBinPath [
+                  common-updater-scripts
+                ]
+              }
+              update-source-version papers --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
+            ''
+          ];
+          # Experimental feature: do not copy!
+          supportedFeatures = [ "silent" ];
+        };
+      in
+      _experimental-update-script-combinators.sequence [
+        updateSource
+        updateLockfile
+      ];
+  };
+
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/GNOME/papers";
     changelog = "https://gitlab.gnome.org/GNOME/papers/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";

From 62cdfd7e2fb7fa20320e1ba3065b67e29a399455 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Nov 2025 23:29:05 +0000
Subject: [PATCH 248/258] =?UTF-8?q?papers:=2048.5=20=E2=86=92=2049.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/papers/-/compare/48.5...49.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/pa/papers/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index 399cef8184f0..5285fd828211 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -6,6 +6,7 @@
   ninja,
   pkg-config,
   appstream,
+  blueprint-compiler,
   desktop-file-utils,
   gtk4,
   glib,
@@ -40,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papers";
-  version = "48.5";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DMjXLHHT2KqxvhCuGUGkzZLNHip+gwq3aA4sgt+xnAs=";
+    hash = "sha256-SrI6Z4l73da+LWKYIQ//YCz+wPNWiLxb/ycDYLB4TCk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       pname
       version
       ;
-    hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ=";
+    hash = "sha256-Pjhpo44Zau2z6aWEQEcIPy3aUYplwdF/XIkO/1Zl+kg=";
   };
 
   nativeBuildInputs = [
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
     yelp-tools
     cargo
+    blueprint-compiler
     rustPlatform.cargoSetupHook
   ];
 
@@ -112,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
 
   postPatch = ''
-    substituteInPlace shell/src/meson.build --replace-fail \
+    substituteInPlace shell/src/meson.build thumbnailer/meson.build --replace-fail \
       "meson.current_build_dir() / rust_target / meson.project_name()" \
       "meson.current_build_dir() / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
   '';

From 404b8ce70d2a695625e1fa79ccf14ecb40851f91 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Nov 2025 07:34:49 +0100
Subject: [PATCH 249/258] nixos/gnome: Replace evince with papers

https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/a392cd2c8b3d027e0595da24f655085c9b61bc17
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/920445bde786b2793840db748b3d6086627bf3d1
---
 nixos/doc/manual/release-notes/rl-2511.section.md | 1 +
 nixos/modules/services/desktop-managers/gnome.nix | 2 +-
 2 files changed, 2 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 8b228d409752..98d4f5085e5b 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -27,6 +27,7 @@
   - Removes X11 session support. Though you can still run X11 apps using XWayland.
   - gnome-session’s custom service manager was removed in favour of using systemd.
   - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058).
+  - `papers` document viewer is now installed by default, replacing `evince`. Though we still include `evince` transitively by `sushi` (quick previewer used by Files/Nautilus) You can disable either using [](#opt-environment.gnome.excludePackages) and restore `evince` with [](#opt-programs.evince.enable).
 
   Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details.
 
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index 62b6df1ed4e4..b2966715e737 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -465,6 +465,7 @@ in
         pkgs.gnome-weather
         pkgs.loupe
         pkgs.nautilus
+        pkgs.papers
         pkgs.gnome-connections
         pkgs.simple-scan
         pkgs.snapshot
@@ -476,7 +477,6 @@ in
       # Since some of these have a corresponding package, we only
       # enable that program module if the package hasn't been excluded
       # through `environment.gnome.excludePackages`
-      programs.evince.enable = notExcluded pkgs.evince;
       programs.file-roller.enable = notExcluded pkgs.file-roller;
       programs.geary.enable = notExcluded pkgs.geary;
       programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;

From 3cd66c4c52f51853fa26e8a6a1c334a9968e31f0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Nov 2025 07:46:20 +0100
Subject: [PATCH 250/258] showtime: Add gnome team to maintainers

It became core app in GNOME 49.
---
 pkgs/by-name/sh/showtime/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix
index 3cc0e1f47a82..de7831564880 100644
--- a/pkgs/by-name/sh/showtime/package.nix
+++ b/pkgs/by-name/sh/showtime/package.nix
@@ -73,6 +73,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://apps.gnome.org/Showtime";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ getchoo ];
+    teams = [ lib.teams.gnome ];
     mainProgram = "showtime";
   };
 }

From d3d005fe7dcfbb8f43d06243e8cb02ff6c09d2e4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Nov 2025 07:48:10 +0100
Subject: [PATCH 251/258] =?UTF-8?q?showtime:=2048.1=20=E2=86=92=2049.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/showtime/-/compare/48.1...49.0

Adding `pkg-config` to `depsBuildBuild` as well, since it is required to find `blueprint-compiler` from `nativeBuildInputs` with `strictDeps`.

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/sh/showtime/package.nix | 39 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix
index de7831564880..85fed910f701 100644
--- a/pkgs/by-name/sh/showtime/package.nix
+++ b/pkgs/by-name/sh/showtime/package.nix
@@ -3,15 +3,16 @@
   appstream,
   blueprint-compiler,
   desktop-file-utils,
-  fetchFromGitLab,
+  fetchurl,
+  fetchpatch,
   glib,
+  gnome,
   gobject-introspection,
   gst_all_1,
   gtk4,
   libadwaita,
   meson,
   ninja,
-  nix-update-script,
   pkg-config,
   python3Packages,
   wrapGAppsHook4,
@@ -19,20 +20,29 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "showtime";
-  version = "48.1";
+  version = "49.0";
   pyproject = false;
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    group = "GNOME";
-    owner = "Incubator";
-    repo = "showtime";
-    rev = "refs/tags/${version}";
-    hash = "sha256-uk3KgiLsYjqBhlKssnkWO6D4ufwJb/o+rQYSA7pa1lU=";
+  src = fetchurl {
+    url = "mirror://gnome/sources/showtime/${lib.versions.major version}/showtime-${version}.tar.xz";
+    hash = "sha256-Wryvl6telTADgoKEhYjozmwmFztzA+9nVr69sLIO05g=";
   };
 
+  patches = [
+    # Fix startup crash when missing state directory.
+    # https://gitlab.gnome.org/GNOME/showtime/-/merge_requests/80
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/showtime/-/commit/a5d57a6b023664c9dc5aeb55a3467a8b56e1b7bc.patch";
+      hash = "sha256-IUkopJ3J381+9MnvaItx7dn9NAVrqO9y4LjgPh8MU/M=";
+    })
+  ];
+
   strictDeps = true;
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     appstream
     blueprint-compiler
@@ -64,8 +74,15 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "showtime" ];
 
+  preInstallCheck = ''
+    export XDG_DATA_DIRS="${glib.makeSchemaDataDirPath "$out" "$name"}:$XDG_DATA_DIRS"
+    export HOME="$TEMPDIR"
+  '';
+
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = gnome.updateScript {
+      packageName = "showtime";
+    };
   };
 
   meta = {

From 809e79828ad66d37fffb0d7dec4798dce9062dac Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Nov 2025 07:44:47 +0100
Subject: [PATCH 252/258] nixos/gnome: Replace totem with showtime

https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/1889a6c96b4ae777f2321f9909e3f666b4811f9b
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/ee7940d7b4842d9eee20c2a0d383e8eb08a859c0
---
 nixos/doc/manual/release-notes/rl-2511.section.md | 1 +
 nixos/modules/services/desktop-managers/gnome.nix | 4 ++--
 2 files changed, 3 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 98d4f5085e5b..7263c13f4bd6 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -28,6 +28,7 @@
   - gnome-session’s custom service manager was removed in favour of using systemd.
   - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058).
   - `papers` document viewer is now installed by default, replacing `evince`. Though we still include `evince` transitively by `sushi` (quick previewer used by Files/Nautilus) You can disable either using [](#opt-environment.gnome.excludePackages) and restore `evince` with [](#opt-programs.evince.enable).
+  - `showtime` video player is now installed by default, replacing `totem`. You can disable it using [](#opt-environment.gnome.excludePackages) and restore `totem` with [](#opt-environment.systemPackages).
 
   Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details.
 
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index b2966715e737..faa5085cc9e7 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -232,7 +232,7 @@ in
 
     environment.gnome.excludePackages = mkOption {
       default = [ ];
-      example = literalExpression "[ pkgs.totem ]";
+      example = literalExpression "[ pkgs.showtime ]";
       type = types.listOf types.package;
       description = "Which packages gnome should exclude from the default environment";
     };
@@ -467,9 +467,9 @@ in
         pkgs.nautilus
         pkgs.papers
         pkgs.gnome-connections
+        pkgs.showtime
         pkgs.simple-scan
         pkgs.snapshot
-        pkgs.totem
         pkgs.yelp
       ] config.environment.gnome.excludePackages;
 

From b757b4e03e68b56a79e49ff17b8490f978e8df81 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Nov 2025 02:36:53 +0000
Subject: [PATCH 253/258] =?UTF-8?q?ghex:=2048.1=20=E2=86=92=2048.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/ghex/-/compare/48.1...48.3

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gh/ghex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index e1aeacd674dc..61cc33efbcf8 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghex";
-  version = "48.1";
+  version = "48.3";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI=";
+    hash = "sha256-y8hEJ7Kt6pQDUCoSXzZrnyiIE/cugb9rGRVGBvFZ3Tk=";
   };
 
   nativeBuildInputs = [

From f0855fd392c369181374fd324ea51bd54ea5d620 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Nov 2025 02:49:34 +0000
Subject: [PATCH 254/258] =?UTF-8?q?glycin-loaders:=202.0.4=20=E2=86=92=202?=
 =?UTF-8?q?.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.4...2.0.5

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/gl/glycin-loaders/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix
index 97a6e6374acd..2b4f70aeafba 100644
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -25,17 +25,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glycin-loaders";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-w4FHIA9YBKJXNBZ46LzjFLz/eadvmGqMMnnZ2Ej4v/c=";
+    hash = "sha256-hK431LVux1WH/TtDs00Jw64T9sBu2LKWobOyCgGOf80=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "glycin-loaders-deps-${finalAttrs.version}";
-    hash = "sha256-r0TmBggpLG3wwZSWJr1bwyG5RHP/nvDGEJ/JFVAzEFA=";
+    hash = "sha256-U5Ro3ahrYK+B+82bchkdoXR4BwtCBn18oKcqeXl39ag=";
     dontConfigure = true;
   };
 

From ecb7f93013c869a2769b43634cafde1ff642dc56 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Nov 2025 02:50:06 +0000
Subject: [PATCH 255/258] =?UTF-8?q?zenity:=204.2.0=20=E2=86=92=204.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/zenity/-/compare/4.2.0...4.2.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/ze/zenity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix
index 0f612d9468e1..85c9ba21641a 100644
--- a/pkgs/by-name/ze/zenity/package.nix
+++ b/pkgs/by-name/ze/zenity/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zenity";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
-    hash = "sha256-X5gzQMb6VfT6tal2nQdxss3xNl4sFYrBHMFv/Ykva80=";
+    hash = "sha256-Wp/Y2DFvkMsuGlqPDUEeufyvhZV6ginqPoA+gQBKHr0=";
   };
 
   nativeBuildInputs = [

From e5f2e4e70bf63ed073c96dc7f656cc6fb839f703 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Nov 2025 02:50:43 +0000
Subject: [PATCH 256/258] =?UTF-8?q?libglycin:=202.0.4=20=E2=86=92=202.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.4...2.0.5

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/li/libglycin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 53ec905db98e..88bed1c78d5b 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -27,14 +27,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglycin";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "glycin";
     tag = finalAttrs.version;
-    hash = "sha256-KPhyL7uP621pxxDGlzbF9WG7A0AcyaS95VstfN/FoQ8=";
+    hash = "sha256-RrklQ1+9v2iEIv0/gQLEyYV7ELazcm+vSn/6gyXA6mo=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-bYUA8WrCWGTs5P1zT7zMSESkHhsyfBBRUvM2D63OBbA=";
+    hash = "sha256-u1zHQwqrPT22Utl7Woah/JdKJSe65Q2Jc7cuh7b+R5Q=";
   };
 
   buildInputs = [

From 20d5f1deb9e1bd3d2b1ea82ddd0c71e2cca99e63 Mon Sep 17 00:00:00 2001
From: Gwendal Beaumont <gwendal.beaumont@imt-atlantique.fr>
Date: Wed, 5 Nov 2025 14:05:43 +0100
Subject: [PATCH 257/258] =?UTF-8?q?calls:=2048.2=20=E2=86=92=2049.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/calls/-/compare/v48.2...v49.1.1

Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/by-name/ca/calls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/calls/package.nix b/pkgs/by-name/ca/calls/package.nix
index c785ae2d70ba..5c21a92baee2 100644
--- a/pkgs/by-name/ca/calls/package.nix
+++ b/pkgs/by-name/ca/calls/package.nix
@@ -36,7 +36,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calls";
-  version = "48.2";
+  version = "49.1.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "calls";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-S1YWFkwK1tcIUOfyOxlEFtKcLlRDiSKf4iUGnb+VlG8=";
+    hash = "sha256-fqvfzdk1szNFm4aRRGNDaA/AmjJdQjBsMhvEolEetE0=";
   };
 
   outputs = [

From 4b04af0c21c4d0243b57c66092e415acf09e5372 Mon Sep 17 00:00:00 2001
From: Nona <bloodstainedqueen@outlook.com>
Date: Sun, 9 Nov 2025 16:27:15 +0100
Subject: [PATCH 258/258] blueprint-compiler: update src to point to GNOME
 gitlab

jwestman/blueprint-compiler has been moved to GNOME/blueprint-compiler.
updates the package src (fetchFromGitLab) and homepage URLs to point to
the new URL.
---
 pkgs/by-name/bl/blueprint-compiler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix
index ff9b8ab44a22..8de33e20aa1b 100644
--- a/pkgs/by-name/bl/blueprint-compiler/package.nix
+++ b/pkgs/by-name/bl/blueprint-compiler/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
-    owner = "jwestman";
+    owner = "GNOME";
     repo = "blueprint-compiler";
     rev = "v${finalAttrs.version}";
     hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo=";
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Markup language for GTK user interface files";
     mainProgram = "blueprint-compiler";
-    homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";
+    homepage = "https://gitlab.gnome.org/GNOME/blueprint-compiler";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [
       benediktbroich