From 81b35731ebd8302f6d91f511015c2ba4e2704218 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Tue, 29 Jul 2025 01:30:09 +0530
Subject: [PATCH 001/166] nixos/proxmox-image: add cloudImage build output

Refactor proxmox image module to support both VMA and cloud-init
compatible images. Extract common configuration into pveBaseConfigs
and add system.build.cloudImage for cloud-init use case.
---
 .../modules/virtualisation/proxmox-image.nix  | 141 ++++++++++--------
 nixos/release.nix                             |  21 ++-
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix
index d3babb785fdd..9f94738d32f6 100644
--- a/nixos/modules/virtualisation/proxmox-image.nix
+++ b/nixos/modules/virtualisation/proxmox-image.nix
@@ -231,6 +231,72 @@ with lib;
         || partitionTableType == "legacy+gpt";
       hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid";
       hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
+      postVM =
+        let
+          # Build qemu with PVE's patch that adds support for the VMA format
+          vma =
+            (pkgs.qemu_kvm.override {
+              alsaSupport = false;
+              pulseSupport = false;
+              sdlSupport = false;
+              jackSupport = false;
+              gtkSupport = false;
+              vncSupport = false;
+              smartcardSupport = false;
+              spiceSupport = false;
+              ncursesSupport = false;
+              libiscsiSupport = false;
+              tpmSupport = false;
+              numaSupport = false;
+              seccompSupport = false;
+              guestAgentSupport = false;
+            }).overrideAttrs
+              (super: rec {
+                # Check https://github.com/proxmox/pve-qemu/tree/master for the version
+                # of qemu and patch to use
+                version = "9.0.0";
+                src = pkgs.fetchurl {
+                  url = "https://download.qemu.org/qemu-${version}.tar.xz";
+                  hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
+                };
+                patches = [
+                  # Proxmox' VMA tool is published as a particular patch upon QEMU
+                  "${
+                    pkgs.fetchFromGitHub {
+                      owner = "proxmox";
+                      repo = "pve-qemu";
+                      rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
+                      hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
+                    }
+                  }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
+                ];
+
+                buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
+                nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
+
+              });
+        in
+        ''
+          ${vma}/bin/vma create "${config.image.baseName}.vma" \
+            -c ${
+              cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
+            }/qemu-server.conf drive-virtio0=$diskImage
+          rm $diskImage
+          ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
+          mv "${config.image.fileName}" $out/
+
+          mkdir -p $out/nix-support
+          echo "file vma $out/${config.image.fileName}" > $out/nix-support/hydra-build-products
+        '';
+      pveBaseConfigs = {
+        name = "proxmox-${cfg.filenameSuffix}";
+        baseName = config.image.baseName;
+        inherit (cfg) partitionTableType;
+        inherit (cfg.qemuConf) additionalSpace bootSize;
+        inherit (config.virtualisation) diskSize;
+        format = "raw";
+        inherit config lib pkgs;
+      };
     in
     {
       assertions = [
@@ -253,72 +319,15 @@ with lib;
       ];
       image.baseName = lib.mkDefault "vzdump-qemu-${cfg.filenameSuffix}";
       image.extension = "vma.zst";
-      system.build.image = config.system.build.VMA;
-      system.build.VMA = import ../../lib/make-disk-image.nix {
-        name = "proxmox-${cfg.filenameSuffix}";
-        baseName = config.image.baseName;
-        inherit (cfg) partitionTableType;
-        postVM =
-          let
-            # Build qemu with PVE's patch that adds support for the VMA format
-            vma =
-              (pkgs.qemu_kvm.override {
-                alsaSupport = false;
-                pulseSupport = false;
-                sdlSupport = false;
-                jackSupport = false;
-                gtkSupport = false;
-                vncSupport = false;
-                smartcardSupport = false;
-                spiceSupport = false;
-                ncursesSupport = false;
-                libiscsiSupport = false;
-                tpmSupport = false;
-                numaSupport = false;
-                seccompSupport = false;
-                guestAgentSupport = false;
-              }).overrideAttrs
-                (super: rec {
-                  # Check https://github.com/proxmox/pve-qemu/tree/master for the version
-                  # of qemu and patch to use
-                  version = "9.0.0";
-                  src = pkgs.fetchurl {
-                    url = "https://download.qemu.org/qemu-${version}.tar.xz";
-                    hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
-                  };
-                  patches = [
-                    # Proxmox' VMA tool is published as a particular patch upon QEMU
-                    "${
-                      pkgs.fetchFromGitHub {
-                        owner = "proxmox";
-                        repo = "pve-qemu";
-                        rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
-                        hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
-                      }
-                    }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
-                  ];
-
-                  buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
-                  nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
-
-                });
-          in
-          ''
-            ${vma}/bin/vma create "${config.image.baseName}.vma" \
-              -c ${
-                cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
-              }/qemu-server.conf drive-virtio0=$diskImage
-            rm $diskImage
-            ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
-            mv "${config.image.fileName}" $out/
-
-            mkdir -p $out/nix-support
-            echo "file vma $out/${config.image.fileName}" > $out/nix-support/hydra-build-products
-          '';
-        inherit (cfg.qemuConf) additionalSpace bootSize;
-        inherit (config.virtualisation) diskSize;
-        format = "raw";
-        inherit config lib pkgs;
+      system.build = {
+        cloudImage = import ../../lib/make-disk-image.nix pveBaseConfigs;
+        VMA = import ../../lib/make-disk-image.nix (
+          pveBaseConfigs
+          // {
+            inherit postVM;
+          }
+        );
+        image = config.system.build.VMA;
       };
 
       boot = {
diff --git a/nixos/release.nix b/nixos/release.nix
index 3bcacf1e471c..ad5df8e41573 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -274,7 +274,7 @@ rec {
   );
 
   # KVM image for proxmox in VMA format
-  proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (
+  proxmoxVMA = forMatchingSystems [ "x86_64-linux" ] (
     system:
     with import ./.. { inherit system; };
 
@@ -288,6 +288,25 @@ rec {
     )
   );
 
+  # Keeping the old name for compatibility
+  proxmoxImage = proxmoxVMA;
+
+  # cloud-init image compatible with instructions given here:
+  # https://pve.proxmox.com/wiki/Cloud-Init_Support
+  proxmoxCloudImage = forMatchingSystems [ "x86_64-linux" ] (
+    system:
+    with import ./.. { inherit system; };
+
+    hydraJob (
+      (import lib/eval-config.nix {
+        inherit system;
+        modules = [
+          ./modules/virtualisation/proxmox-image.nix
+        ];
+      }).config.system.build.cloudImage
+    )
+  );
+
   # LXC tarball for proxmox
   proxmoxLXC = forMatchingSystems [ "x86_64-linux" ] (
     system:

From 4b4b4f9423fe09812513877661443ee6934adbac Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Sun, 3 Aug 2025 05:02:20 +0530
Subject: [PATCH 002/166] nixos/proxmox-image: make filename consistent with
 package name

---
 nixos/modules/virtualisation/proxmox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix
index 9f94738d32f6..a0aea2a321d1 100644
--- a/nixos/modules/virtualisation/proxmox-image.nix
+++ b/nixos/modules/virtualisation/proxmox-image.nix
@@ -289,7 +289,7 @@ with lib;
           echo "file vma $out/${config.image.fileName}" > $out/nix-support/hydra-build-products
         '';
       pveBaseConfigs = {
-        name = "proxmox-${cfg.filenameSuffix}";
+        name = config.image.baseName;
         baseName = config.image.baseName;
         inherit (cfg) partitionTableType;
         inherit (cfg.qemuConf) additionalSpace bootSize;

From 498d57b2155871dfb51e8c81bc5272607219a083 Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Mon, 11 Aug 2025 16:30:25 +0700
Subject: [PATCH 003/166] ddns-updater: Fix stuck-in-dns-resolver error

---
 pkgs/by-name/dd/ddns-updater/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix
index 1d3364428a5b..e86cf26291d2 100644
--- a/pkgs/by-name/dd/ddns-updater/package.nix
+++ b/pkgs/by-name/dd/ddns-updater/package.nix
@@ -2,6 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
+  makeWrapper,
   nixosTests,
   nix-update-script,
 }:
@@ -25,6 +26,13 @@ buildGoModule rec {
 
   subPackages = [ "cmd/ddns-updater" ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/ddns-updater \
+      --set GODEBUG "netdns=go"
+  '';
+
   passthru = {
     tests = {
       inherit (nixosTests) ddns-updater;

From 0095d2aa736b07cc6ba170ec387a5126688b5c76 Mon Sep 17 00:00:00 2001
From: DCsunset <DCsunset@protonmail.com>
Date: Mon, 30 Mar 2026 03:30:12 +0000
Subject: [PATCH 004/166] sydbox: 3.49.1 -> 3.51.2

Diff: https://gitlab.exherbo.org/Sydbox/sydbox/-/compare/v3.49.1...v3.51.2

Changelog: https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v3.51.2/ChangeLog.md
---
 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 9fd8a307bcac..fe2808eac32b 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.49.1";
+  version = "3.51.2";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TFPN0KvzO+tNlt9EWEx7MC3DNC3+CzHJn2MfMWpwOp4=";
+    hash = "sha256-tOHd+E68LXK5AZzcNcf2p/ONyO4EXjF+xYDWftLG/pU=";
   };
 
-  cargoHash = "sha256-yrsJrZ4rDBYlapz/O+1l4h6MIAgZ0PpYm68OFfeHb8A=";
+  cargoHash = "sha256-wkrbj553N5icVndoXwCvFGCWYnU+qg3gcADgoFHLeZc=";
 
   nativeBuildInputs = [
     mandoc

From 15a1c57994cb03e0068ecc0d88e32e227dbbbe50 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Mon, 13 Apr 2026 13:13:06 +0200
Subject: [PATCH 005/166] equibop: specify electron version

Ports #486865
---
 pkgs/by-name/eq/equibop/package.nix | 32 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index f04a380bce09..5750da37668e 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -6,16 +6,20 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  electron,
+  electron_40,
   python3Packages,
   pipewire,
   libpulseaudio,
+  jq,
   autoPatchelfHook,
   bun,
   nodejs,
   withTTS ? true,
   withMiddleClickScroll ? false,
 }:
+let
+  electron = electron_40;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
   version = "3.1.8";
@@ -40,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     bun
+    jq
     nodejs
     # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package
     # seems to build with or without this hook, but I (NotAShelf) don't have the
@@ -67,15 +72,22 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # electron builds must be writable to support electron fuses
-  preBuild =
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp -r ${electron.dist}/Electron.app .
-      chmod -R u+w Electron.app
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      cp -r ${electron.dist} electron-dist
-      chmod -R u+w electron-dist
-    '';
+  preBuild = ''
+    # Validate electron version matches upstream package.json
+    if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
+    then
+      echo "ERROR: electron version mismatch between package.json and nixpkgs"
+      exit 1
+    fi
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp -r ${electron.dist}/Electron.app .
+    chmod -R u+w Electron.app
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+  '';
 
   buildPhase = ''
     runHook preBuild

From a69628a2e2b9ca240754086c32ab92c45ca1f0a4 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Mon, 13 Apr 2026 13:14:12 +0200
Subject: [PATCH 006/166] equibop: Add `NIXOS_SPEECH` variable to allow turning
 off speech without rebuilding

Ports #398693
---
 pkgs/by-name/eq/equibop/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 5750da37668e..c4af7cd19250 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -131,10 +131,12 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     makeWrapper ${electron}/bin/electron $out/bin/equibop \
       --add-flags $out/opt/Equibop/resources/app.asar \
-      ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+      ${lib.optionalString withTTS ''
+        --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \
+        --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \
+      ''} \
       ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
   '';
 
   desktopItems = makeDesktopItem {

From eef498afbdc4e59247ae5978e67763d6ea2aae51 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 16 Apr 2026 10:54:44 +0200
Subject: [PATCH 007/166] plakar: fix build by using buildGo125Module

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 8d4cd13755aa..4019d180a71c 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -1,11 +1,11 @@
 {
   stdenv,
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   fuse,
 }:
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "plakar";
   version = "1.0.6";
 

From c9a8fd04308bd51034e15c5bc942bcfc5bb5e952 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 16 Apr 2026 10:54:58 +0200
Subject: [PATCH 008/166] plakar: install manpages

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 4019d180a71c..341a80de29a6 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -3,6 +3,7 @@
   lib,
   buildGo125Module,
   fetchFromGitHub,
+  installShellFiles,
   fuse,
 }:
 buildGo125Module (finalAttrs: {
@@ -22,6 +23,10 @@ buildGo125Module (finalAttrs: {
     fuse
   ];
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   checkFlags =
     let
       skippedTests = [
@@ -35,6 +40,10 @@ buildGo125Module (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
+  postInstall = ''
+    installManPage $(find $src -regex '.*\.[0-9]$')
+  '';
+
   meta = {
     mainProgram = "plakar";
     description = "Encrypted, queryable backups for engineers based on an immutable data store and portable archives";

From dd3b649313d4cd08ee683cc4713c0e89b36d0739 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 16 Apr 2026 12:40:38 +0200
Subject: [PATCH 009/166] plakar: disable failing test on darwin

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 341a80de29a6..d3a8c7e16d93 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -36,6 +36,7 @@ buildGo125Module (finalAttrs: {
       ++ lib.optionals stdenv.isDarwin [
         "TestBTreeScanMemory"
         "TestBTreeScanPebble"
+        "TestExecuteCmdServerDefault"
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

From 87acbb7a355b4f13402e6d01b0116b984d99df42 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 16 Apr 2026 22:55:59 -0400
Subject: [PATCH 010/166] unnix: init at 0.1.1

https://github.com/figsoda/unnix
---
 pkgs/by-name/un/unnix/package.nix | 70 +++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/un/unnix/package.nix

diff --git a/pkgs/by-name/un/unnix/package.nix b/pkgs/by-name/un/unnix/package.nix
new file mode 100644
index 000000000000..c088df964b67
--- /dev/null
+++ b/pkgs/by-name/un/unnix/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  pkg-config,
+  withBubblewrap ? stdenv.isLinux,
+  makeBinaryWrapper,
+  xz,
+  zstd,
+  writableTmpDirAsHomeHook,
+  bubblewrap,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "unnix";
+  version = "0.1.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "figsoda";
+    repo = "unnix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZmCagknLEJlAtoVfHrQZeb3CbxpT37J6Mvyxn/qQRmQ=";
+  };
+
+  cargoHash = "sha256-NXyB1Ic2EnLJPpFDn1idb5WYfS8gXzgvIRbQoJ3bsS8=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ]
+  ++ lib.optionals withBubblewrap [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    xz
+    zstd
+  ];
+
+  # tests try to access ~/.cache/unnix
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  env = {
+    GENERATE_ARTIFACTS = "artifacts";
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  postInstall = ''
+    installManPage artifacts/*.1
+    installShellCompletion artifacts/unnix.{bash,fish} --zsh artifacts/_unnix
+  ''
+  + lib.optionalString withBubblewrap ''
+    wrapProgram $out/bin/unnix \
+      --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
+  '';
+
+  meta = {
+    description = "Reproducible Nix environments without installing Nix";
+    homepage = "https://github.com/figsoda/unnix";
+    changelog = "https://github.com/figsoda/unnix/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "unnix";
+  };
+})

From d5150e6695c2646c87bc3c07ba1cc711a06e0ca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 00:49:48 +0000
Subject: [PATCH 011/166] attyx: 0.3.6 -> 0.3.15

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

diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix
index 1d286c3813d8..0b4d816f3c32 100644
--- a/pkgs/by-name/at/attyx/package.nix
+++ b/pkgs/by-name/at/attyx/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "attyx";
-  version = "0.3.6";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "semos-labs";
     repo = "attyx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FfHU+XZnMN3HqQFtNEZtYu3YMvBk32QcEP71plDtvjY=";
+    hash = "sha256-w71MyTlnuJBdC9HtXm9hdYNv+ONnh8Ii3i2BhmmcXz4=";
   };
 
   deps = callPackage ./build.zig.zon.nix { };

From bf416ab8945d3cfa7bf36d457741e5e4458dcfaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 23:06:37 +0000
Subject: [PATCH 012/166] protonmail-desktop: 1.12.1 -> 1.13.0

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

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 24624b16f18e..2fbefc55652a 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -10,9 +10,9 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.12.1";
-  linuxHash = "sha256-CNrL/O2PMXaUVgvXbmrLFZphz7yV4BlRlr388nbMsoE=";
-  darwinHash = "sha256-y8KgHm8pIbLQAb1/pIApNBbsaEi5ldInY4VXNBiTQlI=";
+  version = "1.13.0";
+  linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U=";
+  darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY=";
 in
 stdenv.mkDerivation {
   pname = "protonmail-desktop";

From 4d1406ada35ed8bd62c266488e9ab2a8f4c09bf8 Mon Sep 17 00:00:00 2001
From: David Wolff <nixpkgs@dav.dev>
Date: Mon, 20 Apr 2026 16:58:25 +0200
Subject: [PATCH 013/166] stylance-cli: 0.7.4 -> 0.8.0

Changing the source from crates.io to GitHub because
the crates.io source does not include some files necessary
for tests to pass.
---
 pkgs/by-name/st/stylance-cli/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index a4e932c99f06..36120c3a0a75 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -1,20 +1,22 @@
 {
   lib,
   rustPlatform,
-  fetchCrate,
+  fetchFromGitHub,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylance-cli";
-  version = "0.7.4";
+  version = "0.8.0";
 
-  src = fetchCrate {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-lGgKmNqZ0nflVAM3GMDwGgxnXyLCqVz1bTUsvabXmj8=";
+  src = fetchFromGitHub {
+    owner = "basro";
+    repo = "stylance-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YMC7pldkabU669CKeXX5QQOcN974/cZ42nTPphZPq5U=";
   };
 
-  cargoHash = "sha256-HWZQNEKTyNnmA1twN5cfo5RY2tOeCnL6zEp+M4F+Tqg=";
+  cargoHash = "sha256-hn1nEnihgWtj1JaRcUZTm6lrThnugUMs6mAs0lsWpbU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 46606217874c7b002ad23626efb4f62a61e4c8f5 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Mon, 20 Apr 2026 14:11:39 -0400
Subject: [PATCH 014/166] easyeffects: override speexdsp to disable fftw in
 build

---
 pkgs/by-name/ea/easyeffects/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index a76152aeaf29..f20dea5175c4 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -55,6 +55,7 @@ let
     kirigami-addons
     qqc2-desktop-style
     ;
+  speexdsp' = speexdsp.override { withFftw3 = false; };
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -109,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     rnnoise
     rubberband
     soundtouch
-    speexdsp
+    speexdsp'
     onetbb
     webrtc-audio-processing
     zita-convolver

From c48488e0d011fca8d8061199aae314d6dba94199 Mon Sep 17 00:00:00 2001
From: Andrew Fontaine <andrew@afontaine.ca>
Date: Mon, 20 Apr 2026 20:59:39 -0400
Subject: [PATCH 015/166] gitlab-duo: 8.67.0 -> 8.89.0

- Add ripgrep to the PATH for code search tool path
- Add SUPPORTED_TARGETS env to only build required package
- Add nodejs to upgrade script for npm
- Add --no-ext-diff to upgrade script to ensure well-formed patches
---
 .../gi/gitlab-duo/missing-hashes.patch        | 1566 +++++++----------
 pkgs/by-name/gi/gitlab-duo/package.nix        |   18 +-
 pkgs/by-name/gi/gitlab-duo/update.sh          |    4 +-
 3 files changed, 633 insertions(+), 955 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
index 91e8dfa0cf9a..b6718bdca087 100644
--- a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
+++ b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
@@ -1,16 +1,16 @@
 diff --git c/package-lock.json i/package-lock.json
-index 5607a09..44ec9a4 100644
+index 342d56e..b6d464b 100644
 --- c/package-lock.json
 +++ i/package-lock.json
-@@ -146,6 +146,7 @@
-         "eslint-formatter-gitlab": "^6.0.1",
+@@ -152,6 +152,7 @@
+         "eslint-import-resolver-typescript": "^4.4.4",
          "eslint-plugin-import": "^2.32.0",
          "execa": "^9.3.1",
 +        "extra-deps": "workspace:*",
          "fs-extra": "^11.3.2",
          "http-server": "^14.1.1",
          "ink": "^6.5.1",
-@@ -219,7 +220,9 @@
+@@ -225,7 +226,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -21,7 +21,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@adobe/css-tools": {
        "version": "4.4.4",
-@@ -524,18 +527,24 @@
+@@ -557,18 +560,24 @@
        "license": "ISC",
        "dependencies": {
          "yallist": "^3.0.2"
@@ -49,7 +49,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-create-class-features-plugin": {
        "version": "7.27.1",
-@@ -563,7 +572,9 @@
+@@ -596,7 +605,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -60,7 +60,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-create-regexp-features-plugin": {
        "version": "7.27.1",
-@@ -587,7 +598,9 @@
+@@ -620,7 +631,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -71,7 +71,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-define-polyfill-provider": {
        "version": "0.6.3",
-@@ -899,7 +912,9 @@
+@@ -932,7 +945,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -82,7 +82,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-async-generators": {
        "version": "7.8.4",
-@@ -910,7 +925,9 @@
+@@ -943,7 +958,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -93,7 +93,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-bigint": {
        "version": "7.8.3",
-@@ -921,7 +938,9 @@
+@@ -954,7 +971,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -104,7 +104,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-class-properties": {
        "version": "7.12.13",
-@@ -932,7 +951,9 @@
+@@ -965,7 +984,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -115,7 +115,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-decorators": {
        "version": "7.27.1",
-@@ -989,7 +1010,9 @@
+@@ -1022,7 +1043,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -126,7 +126,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-json-strings": {
        "version": "7.8.3",
-@@ -1000,7 +1023,9 @@
+@@ -1033,7 +1056,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -137,7 +137,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-jsx": {
        "version": "7.27.1",
-@@ -1027,7 +1052,9 @@
+@@ -1060,7 +1085,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -148,7 +148,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
        "version": "7.8.3",
-@@ -1038,7 +1065,9 @@
+@@ -1071,7 +1098,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -159,7 +159,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-numeric-separator": {
        "version": "7.10.4",
-@@ -1049,7 +1078,9 @@
+@@ -1082,7 +1111,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -170,7 +170,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-object-rest-spread": {
        "version": "7.8.3",
-@@ -1060,7 +1091,9 @@
+@@ -1093,7 +1124,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -181,7 +181,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-optional-catch-binding": {
        "version": "7.8.3",
-@@ -1071,7 +1104,9 @@
+@@ -1104,7 +1137,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -192,7 +192,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-optional-chaining": {
        "version": "7.8.3",
-@@ -1082,7 +1117,9 @@
+@@ -1115,7 +1150,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -203,7 +203,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-top-level-await": {
        "version": "7.14.5",
-@@ -1096,7 +1133,9 @@
+@@ -1129,7 +1166,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -214,7 +214,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-typescript": {
        "version": "7.27.1",
-@@ -1126,7 +1165,9 @@
+@@ -1159,7 +1198,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0"
@@ -225,7 +225,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-transform-arrow-functions": {
        "version": "7.27.1",
-@@ -1264,7 +1305,9 @@
+@@ -1297,7 +1338,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=4"
@@ -236,7 +236,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-transform-computed-properties": {
        "version": "7.27.1",
-@@ -4152,7 +4195,9 @@
+@@ -4269,7 +4312,9 @@
        "funding": {
          "type": "github",
          "url": "https://github.com/sponsors/nzakas"
@@ -247,7 +247,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@humanwhocodes/object-schema": {
        "version": "2.0.3",
-@@ -4443,7 +4488,9 @@
+@@ -4539,7 +4584,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -258,7 +258,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
        "version": "1.0.10",
-@@ -4451,7 +4498,9 @@
+@@ -4547,7 +4594,9 @@
        "license": "MIT",
        "dependencies": {
          "sprintf-js": "~1.0.2"
@@ -269,7 +269,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
        "version": "5.3.1",
-@@ -4459,7 +4508,9 @@
+@@ -4555,7 +4604,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -280,7 +280,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
        "version": "4.1.0",
-@@ -4471,7 +4522,9 @@
+@@ -4567,7 +4618,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -290,19 +290,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-       "version": "3.14.1",
-@@ -4483,7 +4536,9 @@
-       },
-       "bin": {
-         "js-yaml": "bin/js-yaml.js"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="
-     },
-     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-       "version": "5.0.0",
-@@ -4494,7 +4549,9 @@
+       "version": "3.14.2",
+@@ -4592,7 +4645,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -313,7 +302,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
        "version": "2.3.0",
-@@ -4508,7 +4565,9 @@
+@@ -4606,7 +4661,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -324,7 +313,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
        "version": "4.1.0",
-@@ -4519,7 +4578,9 @@
+@@ -4617,7 +4674,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -335,7 +324,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
        "version": "5.0.0",
-@@ -4527,7 +4588,9 @@
+@@ -4625,7 +4684,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -346,7 +335,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/schema": {
        "version": "0.1.3",
-@@ -4535,7 +4598,9 @@
+@@ -4633,7 +4694,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -357,7 +346,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@jest/console": {
        "version": "29.7.0",
-@@ -4942,7 +5007,9 @@
+@@ -5040,7 +5103,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6.0.0"
@@ -368,7 +357,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@jridgewell/sourcemap-codec": {
        "version": "1.5.5",
-@@ -5258,14 +5325,18 @@
+@@ -5323,14 +5388,18 @@
        },
        "engines": {
          "node": ">= 8"
@@ -389,7 +378,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@nodelib/fs.walk": {
        "version": "1.2.8",
-@@ -5276,7 +5347,9 @@
+@@ -5341,7 +5410,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -400,7 +389,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@octokit/auth-token": {
        "version": "5.1.1",
-@@ -8232,7 +8305,9 @@
+@@ -8561,7 +8632,9 @@
        "dependencies": {
          "@emnapi/wasi-threads": "1.1.0",
          "tslib": "^2.4.0"
@@ -411,7 +400,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
        "version": "1.7.1",
-@@ -8242,7 +8317,9 @@
+@@ -8571,7 +8644,9 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -422,7 +411,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
        "version": "1.1.0",
-@@ -8252,7 +8329,9 @@
+@@ -8581,7 +8656,9 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -433,7 +422,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
        "version": "1.1.0",
-@@ -8264,7 +8343,9 @@
+@@ -8593,7 +8670,9 @@
          "@emnapi/core": "^1.7.1",
          "@emnapi/runtime": "^1.7.1",
          "@tybys/wasm-util": "^0.10.1"
@@ -444,7 +433,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
        "version": "0.10.1",
-@@ -8274,14 +8355,18 @@
+@@ -8603,14 +8682,18 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -465,7 +454,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
        "version": "4.1.18",
-@@ -8455,7 +8540,9 @@
+@@ -9087,7 +9170,9 @@
      },
      "node_modules/@tootallnate/quickjs-emscripten": {
        "version": "0.23.0",
@@ -476,7 +465,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@ts-stack/markdown": {
        "version": "1.5.0",
-@@ -8674,7 +8761,9 @@
+@@ -9306,7 +9391,9 @@
      "node_modules/@types/istanbul-lib-coverage": {
        "version": "2.0.4",
        "dev": true,
@@ -487,7 +476,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/istanbul-lib-report": {
        "version": "3.0.0",
-@@ -8682,7 +8771,9 @@
+@@ -9314,7 +9401,9 @@
        "license": "MIT",
        "dependencies": {
          "@types/istanbul-lib-coverage": "*"
@@ -498,7 +487,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/istanbul-reports": {
        "version": "3.0.1",
-@@ -8690,7 +8781,9 @@
+@@ -9322,7 +9411,9 @@
        "license": "MIT",
        "dependencies": {
          "@types/istanbul-lib-report": "*"
@@ -509,7 +498,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/jest": {
        "version": "29.5.14",
-@@ -8893,7 +8986,9 @@
+@@ -9557,7 +9648,9 @@
      "node_modules/@types/stack-utils": {
        "version": "2.0.1",
        "dev": true,
@@ -520,7 +509,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/statuses": {
        "version": "2.0.6",
-@@ -8979,7 +9074,9 @@
+@@ -9642,7 +9735,9 @@
      "node_modules/@types/yargs-parser": {
        "version": "21.0.0",
        "dev": true,
@@ -531,7 +520,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/yauzl": {
        "version": "2.10.3",
-@@ -10071,7 +10168,9 @@
+@@ -11038,7 +11133,9 @@
      "node_modules/add-stream": {
        "version": "1.0.0",
        "dev": true,
@@ -542,7 +531,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/agent-base": {
        "version": "6.0.2",
-@@ -10081,7 +10180,9 @@
+@@ -11048,7 +11145,9 @@
        },
        "engines": {
          "node": ">= 6.0.0"
@@ -553,7 +542,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/aggregate-error": {
        "version": "3.1.0",
-@@ -10121,7 +10222,9 @@
+@@ -11089,7 +11188,9 @@
          "ajv": {
            "optional": true
          }
@@ -564,7 +553,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ajv-formats": {
        "version": "3.0.1",
-@@ -10216,7 +10319,9 @@
+@@ -11184,7 +11285,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -575,7 +564,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansi-escapes/node_modules/type-fest": {
        "version": "0.21.3",
-@@ -10227,14 +10332,18 @@
+@@ -11195,14 +11298,18 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -596,7 +585,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansi-styles": {
        "version": "4.3.0",
-@@ -10247,7 +10356,9 @@
+@@ -11215,7 +11322,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -607,7 +596,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansis": {
        "version": "4.1.0",
-@@ -10273,7 +10384,9 @@
+@@ -11241,7 +11350,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -617,8 +606,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="
      },
      "node_modules/anymatch/node_modules/picomatch": {
-       "version": "2.3.1",
-@@ -11040,7 +11153,9 @@
+       "version": "2.3.2",
+@@ -11864,7 +11975,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -629,7 +618,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/babel-plugin-jest-hoist": {
        "version": "29.6.3",
-@@ -11131,7 +11246,9 @@
+@@ -11955,7 +12068,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0"
@@ -640,7 +629,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/babel-preset-jest": {
        "version": "29.6.3",
-@@ -11324,7 +11441,9 @@
+@@ -12099,7 +12214,9 @@
      },
      "node_modules/balanced-match": {
        "version": "1.0.2",
@@ -651,18 +640,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/bare-events": {
        "version": "2.6.1",
-@@ -11470,7 +11589,9 @@
-       "license": "MIT",
-       "engines": {
-         "node": ">=10.0.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
-+      "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g=="
-     },
-     "node_modules/before-after-hook": {
-       "version": "3.0.2",
-@@ -12045,7 +12166,9 @@
+@@ -12845,7 +12962,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -673,7 +651,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/camelcase": {
        "version": "6.3.0",
-@@ -12275,7 +12398,9 @@
+@@ -13076,7 +13195,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -684,7 +662,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/cjs-module-lexer": {
        "version": "1.2.3",
-@@ -12537,7 +12662,9 @@
+@@ -13338,7 +13459,9 @@
        },
        "engines": {
          "node": ">=12"
@@ -695,7 +673,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/clone": {
        "version": "2.1.2",
-@@ -12626,7 +12753,9 @@
+@@ -13427,7 +13550,9 @@
        },
        "engines": {
          "node": ">=7.0.0"
@@ -706,7 +684,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/color-interpolate": {
        "version": "2.0.0",
-@@ -12640,7 +12769,9 @@
+@@ -13441,7 +13566,9 @@
      },
      "node_modules/color-name": {
        "version": "1.1.4",
@@ -717,7 +695,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/color-parse": {
        "version": "2.0.2",
-@@ -12681,13 +12812,13 @@
+@@ -13482,13 +13609,13 @@
      },
      "node_modules/commander": {
        "version": "14.0.2",
@@ -734,7 +712,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/compare-func": {
        "version": "2.0.0",
-@@ -12804,7 +12935,9 @@
+@@ -13605,7 +13732,9 @@
        "dependencies": {
          "ini": "^1.3.4",
          "proto-list": "~1.2.1"
@@ -745,7 +723,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/config-chain/node_modules/ini": {
        "version": "1.3.8",
-@@ -13168,7 +13301,9 @@
+@@ -13971,7 +14100,9 @@
      },
      "node_modules/convert-source-map": {
        "version": "2.0.0",
@@ -756,7 +734,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/convert-to-spaces": {
        "version": "2.0.1",
-@@ -13236,7 +13371,9 @@
+@@ -14039,7 +14170,9 @@
      "node_modules/core-util-is": {
        "version": "1.0.3",
        "dev": true,
@@ -767,7 +745,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/cors": {
        "version": "2.8.5",
-@@ -13616,7 +13753,9 @@
+@@ -14425,7 +14558,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 14"
@@ -778,7 +756,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/data-urls": {
        "version": "3.0.2",
-@@ -13828,7 +13967,9 @@
+@@ -14637,7 +14772,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -789,7 +767,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/dedent": {
        "version": "1.6.0",
-@@ -13861,12 +14002,16 @@
+@@ -14669,12 +14806,16 @@
        "license": "MIT",
        "engines": {
          "node": ">=4.0.0"
@@ -808,7 +786,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/deepmerge": {
        "version": "4.3.1",
-@@ -14191,7 +14336,9 @@
+@@ -14986,7 +15127,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -819,7 +797,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/dlv": {
        "version": "1.1.3",
-@@ -14537,7 +14684,9 @@
+@@ -15331,7 +15474,9 @@
      },
      "node_modules/emoji-regex": {
        "version": "8.0.0",
@@ -830,7 +808,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/emojilib": {
        "version": "2.4.0",
-@@ -14822,7 +14971,9 @@
+@@ -15611,7 +15756,9 @@
        "license": "MIT",
        "dependencies": {
          "is-arrayish": "^0.2.1"
@@ -841,167 +819,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/error-stack-parser-es": {
        "version": "1.0.5",
-@@ -15058,7 +15209,6 @@
-       "os": [
-         "android"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15075,7 +15225,6 @@
-       "os": [
-         "android"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15092,7 +15241,6 @@
-       "os": [
-         "darwin"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15109,7 +15257,6 @@
-       "os": [
-         "darwin"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15126,7 +15273,6 @@
-       "os": [
-         "freebsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15143,7 +15289,6 @@
-       "os": [
-         "freebsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15160,7 +15305,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15177,7 +15321,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15194,7 +15337,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15211,7 +15353,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15228,7 +15369,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15245,7 +15385,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15262,7 +15401,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15279,7 +15417,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15296,7 +15433,6 @@
-       "os": [
-         "netbsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15329,7 +15465,6 @@
-       "os": [
-         "openbsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15346,7 +15481,6 @@
-       "os": [
-         "sunos"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15363,7 +15497,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15380,7 +15513,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15397,7 +15529,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15867,7 +15998,9 @@
+@@ -16635,7 +16782,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1012,7 +830,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/escodegen": {
        "version": "2.1.0",
-@@ -15886,7 +16019,9 @@
+@@ -16654,7 +16803,9 @@
        },
        "optionalDependencies": {
          "source-map": "~0.6.1"
@@ -1023,7 +841,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/eslint": {
        "version": "9.32.0",
-@@ -16478,7 +16613,9 @@
+@@ -17333,7 +17484,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -1034,7 +852,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/esquery": {
        "version": "1.5.0",
-@@ -16489,7 +16626,9 @@
+@@ -17344,7 +17497,9 @@
        },
        "engines": {
          "node": ">=0.10"
@@ -1045,7 +863,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/esrecurse": {
        "version": "4.3.0",
-@@ -16522,7 +16661,9 @@
+@@ -17377,7 +17532,9 @@
        "license": "BSD-2-Clause",
        "engines": {
          "node": ">=0.10.0"
@@ -1056,7 +874,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/etag": {
        "version": "1.8.1",
-@@ -16543,7 +16684,9 @@
+@@ -17398,7 +17555,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.x"
@@ -1067,7 +885,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/eventsource": {
        "version": "3.0.7",
-@@ -16610,7 +16753,9 @@
+@@ -17465,7 +17624,9 @@
        "dev": true,
        "engines": {
          "node": ">= 0.8.0"
@@ -1078,7 +896,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/expect": {
        "version": "29.7.0",
-@@ -16793,6 +16938,10 @@
+@@ -17513,6 +17674,10 @@
          "node": ">=0.10.0"
        }
      },
@@ -1089,7 +907,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/extract-from-css": {
        "version": "0.4.4",
        "resolved": "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz",
-@@ -16851,7 +17000,9 @@
+@@ -17571,7 +17736,9 @@
      },
      "node_modules/fast-deep-equal": {
        "version": "3.1.3",
@@ -1100,7 +918,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-diff": {
        "version": "1.3.0",
-@@ -16890,11 +17041,15 @@
+@@ -17610,12 +17777,16 @@
        },
        "engines": {
          "node": ">= 6"
@@ -1111,6 +929,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-json-stable-stringify": {
        "version": "2.1.0",
+       "dev": true,
 -      "license": "MIT"
 +      "license": "MIT",
 +      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -1118,7 +937,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-json-stringify": {
        "version": "6.0.1",
-@@ -16923,7 +17078,9 @@
+@@ -17644,7 +17815,9 @@
      "node_modules/fast-levenshtein": {
        "version": "2.0.6",
        "dev": true,
@@ -1129,7 +948,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-querystring": {
        "version": "1.1.2",
-@@ -17242,7 +17399,9 @@
+@@ -18005,7 +18178,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1140,7 +959,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/find-up-simple": {
        "version": "1.0.0",
-@@ -17438,7 +17597,9 @@
+@@ -18202,7 +18377,9 @@
        "dependencies": {
          "inherits": "^2.0.1",
          "readable-stream": "^2.0.0"
@@ -1151,7 +970,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fs-extra": {
        "version": "11.3.2",
-@@ -17457,7 +17618,9 @@
+@@ -18221,7 +18398,9 @@
      },
      "node_modules/fs.realpath": {
        "version": "1.0.0",
@@ -1162,7 +981,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fsevents": {
        "version": "2.3.3",
-@@ -17468,7 +17631,9 @@
+@@ -18232,7 +18411,9 @@
        ],
        "engines": {
          "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
@@ -1173,7 +992,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/function-bind": {
        "version": "1.1.2",
-@@ -17531,14 +17696,18 @@
+@@ -18295,14 +18476,18 @@
        "license": "MIT",
        "engines": {
          "node": ">=6.9.0"
@@ -1194,7 +1013,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-east-asian-width": {
        "version": "1.3.1",
-@@ -17582,7 +17751,9 @@
+@@ -18346,7 +18531,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8.0.0"
@@ -1205,7 +1024,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-proto": {
        "version": "1.0.1",
-@@ -17602,7 +17773,9 @@
+@@ -18366,7 +18553,9 @@
        "license": "MIT",
        "dependencies": {
          "npm-conf": "~1.1.3"
@@ -1216,7 +1035,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-stream": {
        "version": "9.0.1",
-@@ -17661,7 +17834,9 @@
+@@ -18426,7 +18615,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -1227,7 +1046,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-uri/node_modules/fs-extra": {
        "version": "8.1.0",
-@@ -17673,21 +17848,27 @@
+@@ -18438,21 +18629,27 @@
        },
        "engines": {
          "node": ">=6 <7 || >=8"
@@ -1258,7 +1077,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/git-log-parser": {
        "version": "1.2.1",
-@@ -17761,7 +17942,9 @@
+@@ -18528,7 +18725,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -1269,7 +1088,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/glob-parent": {
        "version": "6.0.2",
-@@ -17771,7 +17954,9 @@
+@@ -18538,7 +18737,9 @@
        },
        "engines": {
          "node": ">=10.13.0"
@@ -1279,8 +1098,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="
      },
      "node_modules/glob/node_modules/brace-expansion": {
-       "version": "1.1.11",
-@@ -17990,12 +18175,16 @@
+       "version": "1.1.14",
+@@ -18759,12 +18960,16 @@
      },
      "node_modules/graceful-fs": {
        "version": "4.2.11",
@@ -1299,7 +1118,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/graphql": {
        "version": "16.11.0",
-@@ -18102,7 +18291,9 @@
+@@ -18872,7 +19077,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1310,7 +1129,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/has-property-descriptors": {
        "version": "1.0.2",
-@@ -18330,7 +18521,9 @@
+@@ -19099,7 +19306,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -1321,7 +1140,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/http-proxy/node_modules/eventemitter3": {
        "version": "4.0.7",
-@@ -18419,7 +18612,9 @@
+@@ -19188,7 +19397,9 @@
        },
        "engines": {
          "node": ">= 6"
@@ -1332,7 +1151,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/human-signals": {
        "version": "8.0.0",
-@@ -18557,7 +18752,9 @@
+@@ -19329,7 +19540,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1343,7 +1162,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/import-meta-resolve": {
        "version": "4.1.0",
-@@ -18575,7 +18772,9 @@
+@@ -19347,7 +19560,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.19"
@@ -1354,7 +1173,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/indent-string": {
        "version": "4.0.0",
-@@ -18605,11 +18804,15 @@
+@@ -19377,11 +19592,15 @@
        "dependencies": {
          "once": "^1.3.0",
          "wrappy": "1"
@@ -1372,7 +1191,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ini": {
        "version": "4.1.3",
-@@ -18874,7 +19077,9 @@
+@@ -19646,7 +19865,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1383,7 +1202,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ipaddr.js": {
        "version": "1.9.1",
-@@ -18931,7 +19136,9 @@
+@@ -19703,7 +19924,9 @@
      "node_modules/is-arrayish": {
        "version": "0.2.1",
        "dev": true,
@@ -1394,7 +1213,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-async-function": {
        "version": "2.1.1",
-@@ -19180,7 +19387,9 @@
+@@ -19961,7 +20184,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -1405,7 +1224,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-finalizationregistry": {
        "version": "1.1.1",
-@@ -19216,7 +19425,9 @@
+@@ -19984,7 +20209,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1416,7 +1235,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-generator-fn": {
        "version": "2.1.0",
-@@ -19254,7 +19465,9 @@
+@@ -20022,7 +20249,9 @@
        },
        "engines": {
          "node": ">=0.10.0"
@@ -1427,7 +1246,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-hexadecimal": {
        "version": "1.0.4",
-@@ -19600,7 +19813,9 @@
+@@ -20367,7 +20596,9 @@
      "node_modules/is-url": {
        "version": "1.2.4",
        "dev": true,
@@ -1438,7 +1257,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-weakmap": {
        "version": "2.0.2",
-@@ -19697,16 +19912,22 @@
+@@ -20464,16 +20695,22 @@
        },
        "engines": {
          "node": ">=v0.10.0"
@@ -1464,7 +1283,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/isomorphic-git": {
        "version": "1.32.3",
-@@ -19813,7 +20034,9 @@
+@@ -20580,7 +20817,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -1475,7 +1294,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/istanbul-lib-instrument/node_modules/semver": {
        "version": "6.3.1",
-@@ -19821,7 +20044,9 @@
+@@ -20588,7 +20827,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -1486,7 +1305,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/istanbul-lib-report": {
        "version": "3.0.1",
-@@ -20394,7 +20619,9 @@
+@@ -21163,7 +21404,9 @@
        },
        "engines": {
          "node": ">=10.12.0"
@@ -1497,7 +1316,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jest-junit/node_modules/uuid": {
        "version": "8.3.2",
-@@ -20402,7 +20629,9 @@
+@@ -21171,7 +21414,9 @@
        "license": "MIT",
        "bin": {
          "uuid": "dist/bin/uuid"
@@ -1508,7 +1327,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jest-leak-detector": {
        "version": "29.7.0",
-@@ -21163,7 +21392,9 @@
+@@ -21946,7 +22191,9 @@
      },
      "node_modules/json-schema-traverse": {
        "version": "1.0.0",
@@ -1517,9 +1336,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 +      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
      },
-     "node_modules/json-stable-stringify": {
-       "version": "1.3.0",
-@@ -21187,7 +21418,9 @@
+     "node_modules/json-schema-typed": {
+       "version": "8.0.2",
+@@ -21976,7 +22223,9 @@
      "node_modules/json-stable-stringify-without-jsonify": {
        "version": "1.0.1",
        "dev": true,
@@ -1530,7 +1349,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/json-stable-stringify/node_modules/isarray": {
        "version": "2.0.5",
-@@ -21210,7 +21443,9 @@
+@@ -21999,7 +22248,9 @@
        },
        "engines": {
          "node": ">=6"
@@ -1541,7 +1360,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jsonfile": {
        "version": "6.1.0",
-@@ -21220,7 +21455,9 @@
+@@ -22009,7 +22260,9 @@
        },
        "optionalDependencies": {
          "graceful-fs": "^4.1.6"
@@ -1552,7 +1371,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jsonify": {
        "version": "0.0.1",
-@@ -21491,7 +21728,9 @@
+@@ -22280,7 +22533,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -1563,7 +1382,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/light-my-request": {
        "version": "6.6.0",
-@@ -21872,7 +22111,9 @@
+@@ -22670,7 +22925,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1573,8 +1392,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="
      },
      "node_modules/lodash": {
-       "version": "4.17.23",
-@@ -21931,7 +22172,9 @@
+       "version": "4.18.1",
+@@ -22729,7 +22986,9 @@
      "node_modules/lodash.merge": {
        "version": "4.6.2",
        "dev": true,
@@ -1585,7 +1404,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/lodash.uniqby": {
        "version": "4.7.0",
-@@ -22408,14 +22651,18 @@
+@@ -23218,14 +23477,18 @@
      "node_modules/merge-stream": {
        "version": "2.0.0",
        "dev": true,
@@ -1606,7 +1425,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/micromark": {
        "version": "2.11.4",
-@@ -22595,7 +22842,9 @@
+@@ -23405,7 +23668,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1617,7 +1436,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/min-indent": {
        "version": "1.0.1",
-@@ -22626,7 +22875,9 @@
+@@ -23457,7 +23722,9 @@
        "license": "MIT",
        "funding": {
          "url": "https://github.com/sponsors/ljharb"
@@ -1628,7 +1447,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/minimisted": {
        "version": "2.0.1",
-@@ -22718,7 +22969,9 @@
+@@ -23502,7 +23769,9 @@
        },
        "engines": {
          "node": ">=10"
@@ -1638,8 +1457,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
      },
      "node_modules/mocha": {
-       "version": "11.7.2",
-@@ -22910,7 +23163,9 @@
+       "version": "11.7.5",
+@@ -23696,7 +23965,9 @@
      },
      "node_modules/ms": {
        "version": "2.1.2",
@@ -1650,7 +1469,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/msw": {
        "version": "2.11.2",
-@@ -23041,7 +23296,9 @@
+@@ -23843,7 +24114,9 @@
      "node_modules/natural-compare": {
        "version": "1.4.0",
        "dev": true,
@@ -1661,7 +1480,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/negotiator": {
        "version": "0.6.3",
-@@ -23159,7 +23416,9 @@
+@@ -23962,7 +24235,9 @@
          "encoding": {
            "optional": true
          }
@@ -1672,7 +1491,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/node-html-parser": {
        "version": "6.1.13",
-@@ -23217,7 +23476,9 @@
+@@ -24020,7 +24295,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -1683,7 +1502,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/normalize-url": {
        "version": "8.0.1",
-@@ -23401,7 +23662,9 @@
+@@ -24204,7 +24481,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -1694,7 +1513,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm-run-path": {
        "version": "5.3.0",
-@@ -23445,7 +23708,9 @@
+@@ -24248,7 +24527,9 @@
        },
        "engines": {
          "node": ">=12"
@@ -1704,15 +1523,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-       "version": "6.1.0",
-@@ -23457,13 +23722,17 @@
+       "version": "6.2.2",
+@@ -24260,13 +24541,17 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-regex?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
++      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": {
        "version": "9.2.2",
@@ -1725,7 +1544,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": {
        "version": "5.1.2",
-@@ -23480,7 +23749,9 @@
+@@ -24283,7 +24568,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1735,19 +1554,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-       "version": "7.1.0",
-@@ -23495,7 +23766,9 @@
+       "version": "7.2.0",
+@@ -24298,7 +24585,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/strip-ansi?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
++      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="
      },
      "node_modules/npm/node_modules/@isaacs/fs-minipass": {
        "version": "4.0.1",
-@@ -23507,13 +23780,17 @@
+@@ -24310,13 +24599,17 @@
        },
        "engines": {
          "node": ">=18.0.0"
@@ -1767,7 +1586,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/agent": {
        "version": "3.0.0",
-@@ -23529,7 +23806,9 @@
+@@ -24332,7 +24625,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1777,19 +1596,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q=="
      },
      "node_modules/npm/node_modules/@npmcli/arborist": {
-       "version": "8.0.1",
-@@ -23578,7 +23857,9 @@
+       "version": "8.0.5",
+@@ -24382,7 +24677,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.1.tgz",
-+      "integrity": "sha512-ZyJWuvP+SdT7JmHkmtGyElm/MkQZP/i4boJXut6HDgx1tmJc/JZ9OwahRuKD+IyowJcLyB/bbaXtYh+RoTCUuw=="
++      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.5.tgz",
++      "integrity": "sha512-dFby80JSC3e8825FRGRuhOMWFeKFHokz8j8osLOujmjOSKm6smGu/b1/gbgW0lP8d84iMZO+RxpqBbC5KgL6DQ=="
      },
      "node_modules/npm/node_modules/@npmcli/config": {
        "version": "9.0.0",
-@@ -23597,7 +23878,9 @@
+@@ -24401,7 +24698,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1800,7 +1619,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/fs": {
        "version": "4.0.0",
-@@ -23609,7 +23892,9 @@
+@@ -24413,7 +24712,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1811,7 +1630,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/git": {
        "version": "6.0.3",
-@@ -23628,7 +23913,9 @@
+@@ -24432,7 +24733,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1822,7 +1641,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/installed-package-contents": {
        "version": "3.0.0",
-@@ -23644,7 +23931,9 @@
+@@ -24448,7 +24751,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1833,7 +1652,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/map-workspaces": {
        "version": "4.0.2",
-@@ -23659,7 +23948,9 @@
+@@ -24463,7 +24768,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1844,7 +1663,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/metavuln-calculator": {
        "version": "8.0.1",
-@@ -23675,7 +23966,9 @@
+@@ -24479,7 +24786,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1854,19 +1673,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg=="
      },
      "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": {
-       "version": "20.0.0",
-@@ -23706,7 +23999,9 @@
+       "version": "20.0.1",
+@@ -24510,7 +24819,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz",
-+      "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A=="
++      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.1.tgz",
++      "integrity": "sha512-jTMLD/QK7JMUKg3g7K3M/DEqIbGm7sxclj12eQYIkL3viutSiefTs26IrqIqgGlFsviF/9dlDUZxnpGvkRXtjw=="
      },
      "node_modules/npm/node_modules/@npmcli/name-from-folder": {
        "version": "3.0.0",
-@@ -23715,7 +24010,9 @@
+@@ -24519,7 +24830,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1877,7 +1696,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/node-gyp": {
        "version": "4.0.0",
-@@ -23724,7 +24021,9 @@
+@@ -24528,7 +24841,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1888,7 +1707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/package-json": {
        "version": "6.2.0",
-@@ -23742,7 +24041,9 @@
+@@ -24546,7 +24861,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1898,19 +1717,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA=="
      },
      "node_modules/npm/node_modules/@npmcli/promise-spawn": {
-       "version": "8.0.2",
-@@ -23754,7 +24055,9 @@
+       "version": "8.0.3",
+@@ -24558,7 +24875,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz",
-+      "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ=="
++      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz",
++      "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg=="
      },
      "node_modules/npm/node_modules/@npmcli/query": {
        "version": "4.0.1",
-@@ -23766,7 +24069,9 @@
+@@ -24570,7 +24889,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1921,7 +1740,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/redact": {
        "version": "3.2.2",
-@@ -23775,7 +24080,9 @@
+@@ -24579,7 +24900,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1932,7 +1751,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/run-script": {
        "version": "9.1.0",
-@@ -23792,7 +24099,9 @@
+@@ -24596,7 +24919,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1943,7 +1762,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@pkgjs/parseargs": {
        "version": "0.11.0",
-@@ -23802,7 +24111,9 @@
+@@ -24606,7 +24931,9 @@
        "optional": true,
        "engines": {
          "node": ">=14"
@@ -1951,10 +1770,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
 +      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="
+     },
+     "node_modules/npm/node_modules/@sigstore/bundle": {
+       "version": "3.1.0",
+@@ -24618,7 +24945,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
++      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag=="
+     },
+     "node_modules/npm/node_modules/@sigstore/core": {
+       "version": "2.0.0",
+@@ -24627,7 +24956,9 @@
+       "license": "Apache-2.0",
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
++      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg=="
      },
      "node_modules/npm/node_modules/@sigstore/protobuf-specs": {
        "version": "0.4.3",
-@@ -23811,7 +24122,9 @@
+@@ -24636,7 +24967,9 @@
        "license": "Apache-2.0",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1962,10 +1803,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
 +      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA=="
+     },
+     "node_modules/npm/node_modules/@sigstore/sign": {
+       "version": "3.1.0",
+@@ -24653,7 +24986,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
++      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw=="
      },
      "node_modules/npm/node_modules/@sigstore/tuf": {
        "version": "3.1.1",
-@@ -23824,7 +24137,9 @@
+@@ -24666,7 +25001,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1973,10 +1825,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
 +      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg=="
+     },
+     "node_modules/npm/node_modules/@sigstore/verify": {
+       "version": "2.1.1",
+@@ -24680,7 +25017,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
++      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w=="
      },
      "node_modules/npm/node_modules/@tufjs/canonical-json": {
        "version": "2.0.0",
-@@ -23833,7 +24148,9 @@
+@@ -24689,7 +25028,9 @@
        "license": "MIT",
        "engines": {
          "node": "^16.14.0 || >=18.0.0"
@@ -1987,7 +1850,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/abbrev": {
        "version": "3.0.1",
-@@ -23842,7 +24159,9 @@
+@@ -24698,7 +25039,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1997,19 +1860,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg=="
      },
      "node_modules/npm/node_modules/agent-base": {
-       "version": "7.1.3",
-@@ -23851,7 +24170,9 @@
+       "version": "7.1.4",
+@@ -24707,7 +25050,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 14"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw=="
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
++      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="
      },
      "node_modules/npm/node_modules/ansi-regex": {
        "version": "5.0.1",
-@@ -23860,7 +24181,9 @@
+@@ -24716,7 +25061,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -2019,24 +1882,24 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
      },
      "node_modules/npm/node_modules/ansi-styles": {
-       "version": "6.2.1",
-@@ -23872,25 +24195,33 @@
+       "version": "6.2.3",
+@@ -24728,25 +25075,33 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
++      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="
      },
      "node_modules/npm/node_modules/aproba": {
-       "version": "2.0.0",
+       "version": "2.1.0",
        "dev": true,
        "inBundle": true,
 -      "license": "ISC"
 +      "license": "ISC",
-+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
++      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
++      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew=="
      },
      "node_modules/npm/node_modules/archy": {
        "version": "1.0.0",
@@ -2058,7 +1921,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/bin-links": {
        "version": "5.0.0",
-@@ -23906,7 +24237,9 @@
+@@ -24762,7 +25117,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2069,7 +1932,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/binary-extensions": {
        "version": "2.3.0",
-@@ -23918,7 +24251,9 @@
+@@ -24774,7 +25131,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -2080,7 +1943,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/brace-expansion": {
        "version": "2.0.2",
-@@ -23927,7 +24262,9 @@
+@@ -24783,7 +25142,9 @@
        "license": "MIT",
        "dependencies": {
          "balanced-match": "^1.0.0"
@@ -2091,7 +1954,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cacache": {
        "version": "19.0.1",
-@@ -23950,7 +24287,9 @@
+@@ -24806,7 +25167,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2100,9 +1963,20 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
 +      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ=="
      },
-     "node_modules/npm/node_modules/cacache/node_modules/chownr": {
+     "node_modules/npm/node_modules/chalk": {
+       "version": "5.6.2",
+@@ -24818,7 +25181,9 @@
+       },
+       "funding": {
+         "url": "https://github.com/chalk/chalk?sponsor=1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
++      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="
+     },
+     "node_modules/npm/node_modules/chownr": {
        "version": "3.0.0",
-@@ -23959,7 +24298,9 @@
+@@ -24827,7 +25192,9 @@
        "license": "BlueOak-1.0.0",
        "engines": {
          "node": ">=18"
@@ -2110,76 +1984,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
 +      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/mkdirp": {
-       "version": "3.0.1",
-@@ -23974,7 +24315,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/isaacs"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/tar": {
-       "version": "7.4.3",
-@@ -23991,7 +24334,9 @@
-       },
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/yallist": {
-       "version": "5.0.0",
-@@ -24000,7 +24345,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
-     },
-     "node_modules/npm/node_modules/chalk": {
-       "version": "5.4.1",
-@@ -24012,7 +24359,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/chalk/chalk?sponsor=1"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="
-     },
-     "node_modules/npm/node_modules/chownr": {
-       "version": "2.0.0",
-@@ -24021,7 +24370,9 @@
-       "license": "ISC",
-       "engines": {
-         "node": ">=10"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
      },
      "node_modules/npm/node_modules/ci-info": {
-       "version": "4.2.0",
-@@ -24036,7 +24387,9 @@
+       "version": "4.4.0",
+@@ -24842,7 +25209,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
-+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="
++      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
++      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg=="
      },
      "node_modules/npm/node_modules/cidr-regex": {
        "version": "4.1.3",
-@@ -24048,7 +24401,9 @@
+@@ -24854,7 +25223,9 @@
        },
        "engines": {
          "node": ">=14"
@@ -2190,7 +2009,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cli-columns": {
        "version": "4.0.0",
-@@ -24061,7 +24416,9 @@
+@@ -24867,7 +25238,9 @@
        },
        "engines": {
          "node": ">= 10"
@@ -2201,7 +2020,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cmd-shim": {
        "version": "7.0.0",
-@@ -24070,7 +24427,9 @@
+@@ -24876,7 +25249,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2212,7 +2031,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/color-convert": {
        "version": "2.0.1",
-@@ -24082,19 +24441,25 @@
+@@ -24888,19 +25263,25 @@
        },
        "engines": {
          "node": ">=7.0.0"
@@ -2241,7 +2060,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cross-spawn": {
        "version": "7.0.6",
-@@ -24108,7 +24473,9 @@
+@@ -24914,7 +25295,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2252,7 +2071,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
        "version": "2.0.2",
-@@ -24123,7 +24490,9 @@
+@@ -24929,7 +25312,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2263,7 +2082,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cssesc": {
        "version": "3.0.0",
-@@ -24135,7 +24504,9 @@
+@@ -24941,7 +25326,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -2273,26 +2092,26 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
      },
      "node_modules/npm/node_modules/debug": {
-       "version": "4.4.1",
-@@ -24152,7 +24523,9 @@
+       "version": "4.4.3",
+@@ -24958,7 +25345,9 @@
          "supports-color": {
            "optional": true
          }
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="
      },
      "node_modules/npm/node_modules/diff": {
-       "version": "5.2.0",
-@@ -24161,19 +24534,25 @@
+       "version": "5.2.2",
+@@ -24967,19 +25356,25 @@
        "license": "BSD-3-Clause",
        "engines": {
          "node": ">=0.3.1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="
++      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz",
++      "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A=="
      },
      "node_modules/npm/node_modules/eastasianwidth": {
        "version": "0.2.0",
@@ -2314,7 +2133,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/encoding": {
        "version": "0.1.13",
-@@ -24183,7 +24562,9 @@
+@@ -24989,7 +25384,9 @@
        "optional": true,
        "dependencies": {
          "iconv-lite": "^0.6.2"
@@ -2325,7 +2144,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/env-paths": {
        "version": "2.2.1",
-@@ -24192,19 +24573,25 @@
+@@ -24998,19 +25395,25 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -2344,17 +2163,17 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
      },
      "node_modules/npm/node_modules/exponential-backoff": {
-       "version": "3.1.2",
+       "version": "3.1.3",
        "dev": true,
        "inBundle": true,
 -      "license": "Apache-2.0"
 +      "license": "Apache-2.0",
-+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
++      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
++      "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="
      },
      "node_modules/npm/node_modules/fastest-levenshtein": {
        "version": "1.0.16",
-@@ -24213,7 +24600,9 @@
+@@ -25019,7 +25422,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 4.9.1"
@@ -2362,10 +2181,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
 +      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
+     },
+     "node_modules/npm/node_modules/fdir": {
+       "version": "6.5.0",
+@@ -25036,7 +25441,9 @@
+         "picomatch": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
++      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="
      },
      "node_modules/npm/node_modules/foreground-child": {
        "version": "3.3.1",
-@@ -24229,7 +24618,9 @@
+@@ -25052,7 +25459,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -2376,7 +2206,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/fs-minipass": {
        "version": "3.0.3",
-@@ -24241,7 +24632,9 @@
+@@ -25064,7 +25473,9 @@
        },
        "engines": {
          "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -2386,15 +2216,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="
      },
      "node_modules/npm/node_modules/glob": {
-       "version": "10.4.5",
-@@ -24261,13 +24654,17 @@
+       "version": "10.5.0",
+@@ -25084,13 +25495,17 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="
++      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
++      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="
      },
      "node_modules/npm/node_modules/graceful-fs": {
        "version": "4.2.11",
@@ -2407,7 +2237,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/hosted-git-info": {
        "version": "8.1.0",
-@@ -24279,13 +24676,17 @@
+@@ -25102,13 +25517,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2427,7 +2257,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/http-proxy-agent": {
        "version": "7.0.2",
-@@ -24298,7 +24699,9 @@
+@@ -25121,7 +25540,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -2438,7 +2268,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/https-proxy-agent": {
        "version": "7.0.6",
-@@ -24311,7 +24714,9 @@
+@@ -25134,7 +25555,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -2449,7 +2279,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/iconv-lite": {
        "version": "0.6.3",
-@@ -24324,7 +24729,9 @@
+@@ -25147,7 +25570,9 @@
        },
        "engines": {
          "node": ">=0.10.0"
@@ -2460,7 +2290,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/ignore-walk": {
        "version": "7.0.0",
-@@ -24336,7 +24743,9 @@
+@@ -25159,7 +25584,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2471,7 +2301,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/imurmurhash": {
        "version": "0.1.4",
-@@ -24345,7 +24754,9 @@
+@@ -25168,7 +25595,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.19"
@@ -2482,7 +2312,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/ini": {
        "version": "5.0.0",
-@@ -24354,7 +24765,9 @@
+@@ -25177,7 +25606,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2493,7 +2323,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/init-package-json": {
        "version": "7.0.2",
-@@ -24372,7 +24785,9 @@
+@@ -25195,7 +25626,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2503,19 +2333,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-Qg6nAQulaOQZjvaSzVLtYRqZmuqOi7gTknqqgdhZy7LV5oO+ppvHWq15tZYzGyxJLTH5BxRTqTa+cPDx2pSD9Q=="
      },
      "node_modules/npm/node_modules/ip-address": {
-       "version": "9.0.5",
-@@ -24385,7 +24800,9 @@
-       },
+       "version": "10.1.0",
+@@ -25204,7 +25637,9 @@
+       "license": "MIT",
        "engines": {
          "node": ">= 12"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="
++      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
++      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q=="
      },
      "node_modules/npm/node_modules/ip-regex": {
        "version": "5.0.0",
-@@ -24397,7 +24814,9 @@
+@@ -25216,7 +25651,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -2526,7 +2356,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/is-cidr": {
        "version": "5.1.1",
-@@ -24409,7 +24828,9 @@
+@@ -25228,7 +25665,9 @@
        },
        "engines": {
          "node": ">=14"
@@ -2537,7 +2367,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/is-fullwidth-code-point": {
        "version": "3.0.0",
-@@ -24418,13 +24839,17 @@
+@@ -25237,13 +25676,17 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -2557,7 +2387,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/jackspeak": {
        "version": "3.4.3",
-@@ -24439,13 +24864,17 @@
+@@ -25258,7 +25701,9 @@
        },
        "optionalDependencies": {
          "@pkgjs/parseargs": "^0.11.0"
@@ -2565,19 +2395,10 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
 +      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="
-     },
-     "node_modules/npm/node_modules/jsbn": {
-       "version": "1.1.0",
-       "dev": true,
-       "inBundle": true,
--      "license": "MIT"
-+      "license": "MIT",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
      },
      "node_modules/npm/node_modules/json-parse-even-better-errors": {
        "version": "4.0.0",
-@@ -24454,7 +24883,9 @@
+@@ -25267,7 +25712,9 @@
        "license": "MIT",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2588,7 +2409,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/json-stringify-nice": {
        "version": "1.1.4",
-@@ -24463,7 +24894,9 @@
+@@ -25276,7 +25723,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -2599,7 +2420,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/jsonparse": {
        "version": "1.3.1",
-@@ -24472,19 +24905,25 @@
+@@ -25285,19 +25734,25 @@
          "node >= 0.2.0"
        ],
        "inBundle": true,
@@ -2628,7 +2449,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmaccess": {
        "version": "9.0.0",
-@@ -24497,7 +24936,9 @@
+@@ -25310,7 +25765,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2638,41 +2459,41 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-mTCFoxyevNgXRrvgdOhghKJnCWByBc9yp7zX4u9RBsmZjwOYdUDEBfL5DdgD1/8gahsYnauqIWFbq0iK6tO6CQ=="
      },
      "node_modules/npm/node_modules/libnpmdiff": {
-       "version": "7.0.1",
-@@ -24516,7 +24957,9 @@
+       "version": "7.0.5",
+@@ -25329,7 +25786,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.1.tgz",
-+      "integrity": "sha512-CPcLUr23hLwiil/nAlnMQ/eWSTXPPaX+Qe31di8JvcV2ELbbBueucZHBaXlXruUch6zIlSY6c7JCGNAqKN7yaQ=="
++      "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.5.tgz",
++      "integrity": "sha512-pQ9Hg/j1DcHoY2tbkMKK8mIuEuDlwL9sYKmhY8foofBC8isgtjfrzXDjm4teoy91Pa2ukpnV8dXqKmFb04mc4A=="
      },
      "node_modules/npm/node_modules/libnpmexec": {
-       "version": "9.0.1",
-@@ -24537,7 +24980,9 @@
+       "version": "9.0.5",
+@@ -25350,7 +25809,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.1.tgz",
-+      "integrity": "sha512-+SI/x9p0KUkgJdW9L0nDNqtjsFRY3yA5kQKdtGYNMXX4iP/MXQjuXF8MaUAweuV6Awm8plxqn8xCPs2TelZEUg=="
++      "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.5.tgz",
++      "integrity": "sha512-XAuPuoQhSgv8FEI03zvnxgr7ueeClSLUfHRwG+xtE9Ue2gjny7CIgpJsjd2a6evS0yHu8CcqtEumq50WzQ/UtQ=="
      },
      "node_modules/npm/node_modules/libnpmfund": {
-       "version": "6.0.1",
-@@ -24549,7 +24994,9 @@
+       "version": "6.0.5",
+@@ -25362,7 +25823,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.1.tgz",
-+      "integrity": "sha512-UBbHY9yhhZVffbBpFJq+TsR2KhhEqpQ2mpsIJa6pt0PPQaZ2zgOjvGUYEjURYIGwg2wL1vfQFPeAtmN5w6i3Gg=="
++      "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.5.tgz",
++      "integrity": "sha512-8tGUrvobGjeAmbUxFI7ivjgWpeGsSz9CmI7FtrMdu7iGbtAcTESszl2J+R1+Pu0M+TO9fQIbyeovWGM6lI0akA=="
      },
      "node_modules/npm/node_modules/libnpmhook": {
        "version": "11.0.0",
-@@ -24562,7 +25009,9 @@
+@@ -25375,7 +25838,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2683,7 +2504,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmorg": {
        "version": "7.0.0",
-@@ -24575,7 +25024,9 @@
+@@ -25388,7 +25853,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2693,30 +2514,30 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-DcTodX31gDEiFrlIHurBQiBlBO6Var2KCqMVCk+HqZhfQXqUfhKGmFOp0UHr6HR1lkTVM0MzXOOYtUObk0r6Dg=="
      },
      "node_modules/npm/node_modules/libnpmpack": {
-       "version": "8.0.1",
-@@ -24590,7 +25041,9 @@
+       "version": "8.0.5",
+@@ -25403,7 +25870,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.1.tgz",
-+      "integrity": "sha512-E53w3QcldAXg5cG9NpXZcsgNiLw5AEtu7ufGJk6+dxudD0/U5Y6vHIws+CJiI76I9rAidXasKmmS2mwiYDncBw=="
++      "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.5.tgz",
++      "integrity": "sha512-j1Zyacp6VRe1HsmOH4MWpEOLMzPKwBkmSgMn5ep83wbALPIwD7LcAvhyjM9sEFjKyFuqmX56XUvNLcF8sUayOg=="
      },
      "node_modules/npm/node_modules/libnpmpublish": {
-       "version": "10.0.1",
-@@ -24609,7 +25062,9 @@
+       "version": "10.0.2",
+@@ -25422,7 +25891,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.1.tgz",
-+      "integrity": "sha512-xNa1DQs9a8dZetNRV0ky686MNzv1MTqB3szgOlRR3Fr24x1gWRu7aB9OpLZsml0YekmtppgHBkyZ+8QZlzmEyw=="
++      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.2.tgz",
++      "integrity": "sha512-Q+PlGO6vOZDlZ6jKPDqDLYbARfV5OBusmJZj9GPbNUiys8OK6/yrwJ8ty8ibbc4GkMspqgOMdJ/1dcJwhtpkDg=="
      },
      "node_modules/npm/node_modules/libnpmsearch": {
        "version": "8.0.0",
-@@ -24621,7 +25076,9 @@
+@@ -25434,7 +25905,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2727,7 +2548,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmteam": {
        "version": "7.0.0",
-@@ -24634,7 +25091,9 @@
+@@ -25447,7 +25920,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2738,7 +2559,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmversion": {
        "version": "7.0.0",
-@@ -24650,13 +25109,17 @@
+@@ -25463,13 +25938,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2758,7 +2579,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/make-fetch-happen": {
        "version": "14.0.3",
-@@ -24678,7 +25141,9 @@
+@@ -25491,7 +25970,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2766,43 +2587,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
 +      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ=="
-     },
-     "node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": {
-       "version": "1.0.0",
-@@ -24687,7 +25152,9 @@
-       "license": "MIT",
-       "engines": {
-         "node": ">= 0.6"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
      },
      "node_modules/npm/node_modules/minimatch": {
-       "version": "9.0.5",
-@@ -24702,7 +25169,9 @@
+       "version": "9.0.9",
+@@ -25506,7 +25987,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
++      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="
      },
      "node_modules/npm/node_modules/minipass": {
-       "version": "7.1.2",
-@@ -24711,7 +25180,9 @@
-       "license": "ISC",
+       "version": "7.1.3",
+@@ -25515,7 +25998,9 @@
+       "license": "BlueOak-1.0.0",
        "engines": {
          "node": ">=16 || 14 >=14.17"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
++      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="
      },
      "node_modules/npm/node_modules/minipass-collect": {
        "version": "2.0.1",
-@@ -24723,7 +25194,9 @@
+@@ -25527,7 +26012,9 @@
        },
        "engines": {
          "node": ">=16 || 14 >=14.17"
@@ -2813,7 +2623,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-fetch": {
        "version": "4.0.1",
-@@ -24740,7 +25213,9 @@
+@@ -25544,7 +26031,9 @@
        },
        "optionalDependencies": {
          "encoding": "^0.1.13"
@@ -2824,7 +2634,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-flush": {
        "version": "1.0.5",
-@@ -24752,7 +25227,9 @@
+@@ -25556,7 +26045,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2835,7 +2645,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24764,7 +25241,9 @@
+@@ -25568,13 +26059,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2843,10 +2653,19 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-flush/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minipass-pipeline": {
        "version": "1.2.4",
-@@ -24776,7 +25255,9 @@
+@@ -25586,7 +26081,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -2857,7 +2676,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24788,7 +25269,9 @@
+@@ -25598,13 +26095,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2865,10 +2684,19 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-pipeline/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minipass-sized": {
        "version": "1.0.3",
-@@ -24800,7 +25283,9 @@
+@@ -25616,7 +26117,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -2879,7 +2707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24812,7 +25297,9 @@
+@@ -25628,13 +26131,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2887,28 +2715,26 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-sized/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minizlib": {
-       "version": "3.0.2",
-@@ -24824,7 +25311,9 @@
+       "version": "3.1.0",
+@@ -25646,13 +26153,17 @@
        },
        "engines": {
          "node": ">= 18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA=="
-     },
-     "node_modules/npm/node_modules/mkdirp": {
-       "version": "1.0.4",
-@@ -24836,13 +25325,17 @@
-       },
-       "engines": {
-         "node": ">=10"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
++      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
++      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw=="
      },
      "node_modules/npm/node_modules/ms": {
        "version": "2.1.3",
@@ -2921,7 +2747,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/mute-stream": {
        "version": "2.0.0",
-@@ -24851,7 +25344,9 @@
+@@ -25661,7 +26172,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2929,65 +2755,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
 +      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA=="
+     },
+     "node_modules/npm/node_modules/negotiator": {
+       "version": "1.0.0",
+@@ -25670,7 +26183,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 0.6"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
++      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
      },
      "node_modules/npm/node_modules/node-gyp": {
-       "version": "11.2.0",
-@@ -24875,7 +25370,9 @@
+       "version": "11.5.0",
+@@ -25694,7 +26209,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz",
-+      "integrity": "sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/chownr": {
-       "version": "3.0.0",
-@@ -24884,7 +25381,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
-+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/mkdirp": {
-       "version": "3.0.1",
-@@ -24899,7 +25398,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/isaacs"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/tar": {
-       "version": "7.4.3",
-@@ -24916,7 +25417,9 @@
-       },
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/yallist": {
-       "version": "5.0.0",
-@@ -24925,7 +25428,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
++      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz",
++      "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ=="
      },
      "node_modules/npm/node_modules/nopt": {
        "version": "8.1.0",
-@@ -24940,7 +25445,9 @@
+@@ -25709,7 +26226,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2997,19 +2790,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A=="
      },
      "node_modules/npm/node_modules/normalize-package-data": {
-       "version": "7.0.0",
-@@ -24954,7 +25461,9 @@
+       "version": "7.0.1",
+@@ -25723,7 +26242,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.0.tgz",
-+      "integrity": "sha512-k6U0gKRIuNCTkwHGZqblCfLfBRh+w1vI6tBo+IeJwq2M8FUiOqhX7GH+GArQGScA7azd1WfyRCvxoXDO3hQDIA=="
++      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.1.tgz",
++      "integrity": "sha512-linxNAT6M0ebEYZOx2tO6vBEFsVgnPpv+AVjk0wJHfaUIbq31Jm3T6vvZaarnOeWDh8ShnwXuaAyM7WT3RzErA=="
      },
      "node_modules/npm/node_modules/npm-audit-report": {
        "version": "6.0.0",
-@@ -24963,7 +25472,9 @@
+@@ -25732,7 +26253,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3020,7 +2813,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-bundled": {
        "version": "4.0.0",
-@@ -24975,7 +25486,9 @@
+@@ -25744,7 +26267,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3030,19 +2823,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA=="
      },
      "node_modules/npm/node_modules/npm-install-checks": {
-       "version": "7.1.1",
-@@ -24987,7 +25500,9 @@
+       "version": "7.1.2",
+@@ -25756,7 +26281,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz",
-+      "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg=="
++      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz",
++      "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ=="
      },
      "node_modules/npm/node_modules/npm-normalize-package-bin": {
        "version": "4.0.0",
-@@ -24996,7 +25511,9 @@
+@@ -25765,7 +26292,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3053,7 +2846,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-package-arg": {
        "version": "12.0.2",
-@@ -25011,7 +25528,9 @@
+@@ -25780,7 +26309,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3064,7 +2857,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-packlist": {
        "version": "9.0.0",
-@@ -25023,7 +25542,9 @@
+@@ -25792,7 +26323,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3075,7 +2868,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-pick-manifest": {
        "version": "10.0.0",
-@@ -25038,7 +25559,9 @@
+@@ -25807,7 +26340,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3086,7 +2879,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-profile": {
        "version": "11.0.1",
-@@ -25051,7 +25574,9 @@
+@@ -25820,7 +26355,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3097,7 +2890,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-registry-fetch": {
        "version": "18.0.2",
-@@ -25070,7 +25595,9 @@
+@@ -25839,7 +26376,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3108,7 +2901,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-user-validate": {
        "version": "3.0.0",
-@@ -25079,7 +25606,9 @@
+@@ -25848,7 +26387,9 @@
        "license": "BSD-2-Clause",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3118,15 +2911,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-9xi0RdSmJ4mPYTC393VJPz1Sp8LyCx9cUnm/L9Qcb3cFO8gjT4mN20P9FAsea8qDHdQ7LtcN8VLh2UT47SdKCw=="
      },
      "node_modules/npm/node_modules/p-map": {
-       "version": "7.0.3",
-@@ -25091,13 +25620,17 @@
+       "version": "7.0.4",
+@@ -25860,13 +26401,17 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
-+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA=="
++      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
++      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ=="
      },
      "node_modules/npm/node_modules/package-json-from-dist": {
        "version": "1.0.1",
@@ -3138,19 +2931,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
      },
      "node_modules/npm/node_modules/pacote": {
-       "version": "19.0.1",
-@@ -25128,7 +25661,9 @@
+       "version": "19.0.2",
+@@ -25897,7 +26442,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.1.tgz",
-+      "integrity": "sha512-zIpxWAsr/BvhrkSruspG8aqCQUUrWtpwx0GjiRZQhEM/pZXrigA32ElN3vTcCPUDOFmHr6SFxwYrvVUs5NTEUg=="
++      "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.2.tgz",
++      "integrity": "sha512-iNInrWMS+PzYbaef5EW/mU8OiCPxGuTmYn6ht5ImeXd5TZIVY4+dDmIrbpB6v0MKG/KIMMvj2UD7eKU9GbTGHA=="
      },
      "node_modules/npm/node_modules/parse-conflict-json": {
        "version": "4.0.0",
-@@ -25142,7 +25677,9 @@
+@@ -25911,7 +26458,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3161,7 +2954,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/path-key": {
        "version": "3.1.1",
-@@ -25151,7 +25688,9 @@
+@@ -25920,7 +26469,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3172,7 +2965,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/path-scurry": {
        "version": "1.11.1",
-@@ -25167,7 +25706,9 @@
+@@ -25936,7 +26487,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3180,21 +2973,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
 +      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="
+     },
+     "node_modules/npm/node_modules/picomatch": {
+       "version": "4.0.3",
+@@ -25948,7 +26501,9 @@
+       },
+       "funding": {
+         "url": "https://github.com/sponsors/jonschlinkert"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
++      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
      },
      "node_modules/npm/node_modules/postcss-selector-parser": {
-       "version": "7.1.0",
-@@ -25180,7 +25721,9 @@
+       "version": "7.1.1",
+@@ -25961,7 +26516,9 @@
        },
        "engines": {
          "node": ">=4"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA=="
++      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
++      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg=="
      },
      "node_modules/npm/node_modules/proc-log": {
        "version": "5.0.0",
-@@ -25189,7 +25732,9 @@
+@@ -25970,7 +26527,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3205,7 +3009,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/proggy": {
        "version": "3.0.0",
-@@ -25198,7 +25743,9 @@
+@@ -25979,7 +26538,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3216,7 +3020,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-all-reject-late": {
        "version": "1.0.1",
-@@ -25207,7 +25754,9 @@
+@@ -25988,7 +26549,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3227,7 +3031,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-call-limit": {
        "version": "3.0.2",
-@@ -25216,7 +25765,9 @@
+@@ -25997,7 +26560,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3238,7 +3042,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-retry": {
        "version": "2.0.1",
-@@ -25229,7 +25780,9 @@
+@@ -26010,7 +26575,9 @@
        },
        "engines": {
          "node": ">=10"
@@ -3249,7 +3053,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promzard": {
        "version": "2.0.0",
-@@ -25241,7 +25794,9 @@
+@@ -26022,7 +26589,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3260,7 +3064,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/qrcode-terminal": {
        "version": "0.12.0",
-@@ -25249,7 +25804,9 @@
+@@ -26030,7 +26599,9 @@
        "inBundle": true,
        "bin": {
          "qrcode-terminal": "bin/qrcode-terminal.js"
@@ -3271,7 +3075,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read": {
        "version": "4.1.0",
-@@ -25261,7 +25818,9 @@
+@@ -26042,7 +26613,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3282,7 +3086,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read-cmd-shim": {
        "version": "5.0.0",
-@@ -25270,7 +25829,9 @@
+@@ -26051,7 +26624,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3293,7 +3097,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read-package-json-fast": {
        "version": "4.0.0",
-@@ -25283,7 +25844,9 @@
+@@ -26064,7 +26639,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3304,7 +3108,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/retry": {
        "version": "0.12.0",
-@@ -25292,14 +25855,18 @@
+@@ -26073,14 +26650,18 @@
        "license": "MIT",
        "engines": {
          "node": ">= 4"
@@ -3324,19 +3128,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
      },
      "node_modules/npm/node_modules/semver": {
-       "version": "7.7.2",
-@@ -25311,7 +25878,9 @@
+       "version": "7.7.4",
+@@ -26092,7 +26673,9 @@
        },
        "engines": {
          "node": ">=10"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="
      },
      "node_modules/npm/node_modules/shebang-command": {
        "version": "2.0.0",
-@@ -25323,7 +25892,9 @@
+@@ -26104,7 +26687,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3347,7 +3151,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/shebang-regex": {
        "version": "3.0.0",
-@@ -25332,7 +25903,9 @@
+@@ -26113,7 +26698,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3358,7 +3162,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/signal-exit": {
        "version": "4.1.0",
-@@ -25344,7 +25917,9 @@
+@@ -26125,7 +26712,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3369,7 +3173,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/sigstore": {
        "version": "3.1.0",
-@@ -25361,7 +25936,9 @@
+@@ -26142,7 +26731,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3377,54 +3181,10 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz",
 +      "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/bundle": {
-       "version": "3.1.0",
-@@ -25373,7 +25950,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
-+      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/core": {
-       "version": "2.0.0",
-@@ -25382,7 +25961,9 @@
-       "license": "Apache-2.0",
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
-+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/sign": {
-       "version": "3.1.0",
-@@ -25399,7 +25980,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
-+      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/verify": {
-       "version": "2.1.1",
-@@ -25413,7 +25996,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
-+      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w=="
      },
      "node_modules/npm/node_modules/smart-buffer": {
        "version": "4.2.0",
-@@ -25423,7 +26008,9 @@
+@@ -26152,7 +26743,9 @@
        "engines": {
          "node": ">= 6.0.0",
          "npm": ">= 3.0.0"
@@ -3434,19 +3194,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
      },
      "node_modules/npm/node_modules/socks": {
-       "version": "2.8.5",
-@@ -25437,7 +26024,9 @@
+       "version": "2.8.7",
+@@ -26166,7 +26759,9 @@
        "engines": {
          "node": ">= 10.0.0",
          "npm": ">= 3.0.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.5.tgz",
-+      "integrity": "sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww=="
++      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
++      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A=="
      },
      "node_modules/npm/node_modules/socks-proxy-agent": {
        "version": "8.0.5",
-@@ -25451,7 +26040,9 @@
+@@ -26180,7 +26775,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -3457,7 +3217,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-correct": {
        "version": "3.2.0",
-@@ -25461,7 +26052,9 @@
+@@ -26190,7 +26787,9 @@
        "dependencies": {
          "spdx-expression-parse": "^3.0.0",
          "spdx-license-ids": "^3.0.0"
@@ -3468,7 +3228,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": {
        "version": "3.0.1",
-@@ -25471,13 +26064,17 @@
+@@ -26200,13 +26799,17 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3488,7 +3248,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-expression-parse": {
        "version": "4.0.0",
-@@ -25487,19 +26084,25 @@
+@@ -26216,13 +26819,17 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3498,26 +3258,17 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ=="
      },
      "node_modules/npm/node_modules/spdx-license-ids": {
-       "version": "3.0.21",
+       "version": "3.0.23",
        "dev": true,
        "inBundle": true,
 -      "license": "CC0-1.0"
 +      "license": "CC0-1.0",
-+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg=="
-     },
-     "node_modules/npm/node_modules/sprintf-js": {
-       "version": "1.1.3",
-       "dev": true,
-       "inBundle": true,
--      "license": "BSD-3-Clause"
-+      "license": "BSD-3-Clause",
-+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
++      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
++      "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw=="
      },
      "node_modules/npm/node_modules/ssri": {
        "version": "12.0.0",
-@@ -25511,7 +26114,9 @@
+@@ -26234,7 +26841,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3528,7 +3279,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/string-width": {
        "version": "4.2.3",
-@@ -25525,7 +26130,9 @@
+@@ -26248,7 +26857,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3539,7 +3290,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/string-width-cjs": {
        "name": "string-width",
-@@ -25540,7 +26147,9 @@
+@@ -26263,7 +26874,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3550,7 +3301,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/strip-ansi": {
        "version": "6.0.1",
-@@ -25552,7 +26161,9 @@
+@@ -26275,7 +26888,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3561,7 +3312,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/strip-ansi-cjs": {
        "name": "strip-ansi",
-@@ -25565,7 +26176,9 @@
+@@ -26288,7 +26903,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3572,7 +3323,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/supports-color": {
        "version": "9.4.0",
-@@ -25577,7 +26190,9 @@
+@@ -26300,7 +26917,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/supports-color?sponsor=1"
@@ -3582,70 +3333,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw=="
      },
      "node_modules/npm/node_modules/tar": {
-       "version": "6.2.1",
-@@ -25594,7 +26209,9 @@
+       "version": "7.5.11",
+@@ -26316,19 +26935,25 @@
        },
        "engines": {
-         "node": ">=10"
+         "node": ">=18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/fs-minipass": {
-       "version": "2.1.0",
-@@ -25606,7 +26223,9 @@
-       },
-       "engines": {
-         "node": ">= 8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-       "version": "3.3.6",
-@@ -25618,7 +26237,9 @@
-       },
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minipass": {
-       "version": "5.0.0",
-@@ -25627,7 +26248,9 @@
-       "license": "ISC",
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minizlib": {
-       "version": "2.1.2",
-@@ -25640,7 +26263,9 @@
-       },
-       "engines": {
-         "node": ">= 8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minizlib/node_modules/minipass": {
-       "version": "3.3.6",
-@@ -25652,19 +26277,25 @@
-       },
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
++      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
++      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ=="
      },
      "node_modules/npm/node_modules/text-table": {
        "version": "0.2.0",
@@ -3666,41 +3362,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A=="
      },
      "node_modules/npm/node_modules/tinyglobby": {
-       "version": "0.2.14",
-@@ -25680,7 +26311,9 @@
+       "version": "0.2.15",
+@@ -26344,7 +26969,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/SuperchupuDev"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ=="
-     },
-     "node_modules/npm/node_modules/tinyglobby/node_modules/fdir": {
-       "version": "6.4.6",
-@@ -25694,7 +26327,9 @@
-         "picomatch": {
-           "optional": true
-         }
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w=="
-     },
-     "node_modules/npm/node_modules/tinyglobby/node_modules/picomatch": {
-       "version": "4.0.2",
-@@ -25706,7 +26341,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/jonschlinkert"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
++      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
++      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="
      },
      "node_modules/npm/node_modules/treeverse": {
        "version": "3.0.0",
-@@ -25715,7 +26352,9 @@
+@@ -26353,7 +26980,9 @@
        "license": "ISC",
        "engines": {
          "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -3710,19 +3384,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="
      },
      "node_modules/npm/node_modules/tuf-js": {
-       "version": "3.0.1",
-@@ -25729,7 +26368,9 @@
+       "version": "3.1.0",
+@@ -26367,7 +26996,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz",
-+      "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA=="
++      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.1.0.tgz",
++      "integrity": "sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg=="
      },
      "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": {
        "version": "3.0.1",
-@@ -25742,7 +26383,9 @@
+@@ -26380,7 +27011,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3733,7 +3407,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/unique-filename": {
        "version": "4.0.0",
-@@ -25754,7 +26397,9 @@
+@@ -26392,7 +27025,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3744,7 +3418,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/unique-slug": {
        "version": "5.0.0",
-@@ -25766,13 +26411,17 @@
+@@ -26404,13 +27039,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3764,7 +3438,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/validate-npm-package-license": {
        "version": "3.0.4",
-@@ -25782,7 +26431,9 @@
+@@ -26420,7 +27059,9 @@
        "dependencies": {
          "spdx-correct": "^3.0.0",
          "spdx-expression-parse": "^3.0.0"
@@ -3775,7 +3449,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
        "version": "3.0.1",
-@@ -25792,7 +26443,9 @@
+@@ -26430,7 +27071,9 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3785,15 +3459,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="
      },
      "node_modules/npm/node_modules/validate-npm-package-name": {
-       "version": "6.0.1",
-@@ -25801,13 +26454,17 @@
+       "version": "6.0.2",
+@@ -26439,13 +27082,17 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.1.tgz",
-+      "integrity": "sha512-OaI//3H0J7ZkR1OqlhGA8cA+Cbk/2xFOQpJOt5+s27/ta9eZwpeervh4Mxh4w0im/kdgktowaqVNR7QOrUd7Yg=="
++      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz",
++      "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ=="
      },
      "node_modules/npm/node_modules/walk-up-path": {
        "version": "3.0.1",
@@ -3806,7 +3480,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/which": {
        "version": "5.0.0",
-@@ -25822,7 +26479,9 @@
+@@ -26460,7 +27107,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3816,19 +3490,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ=="
      },
      "node_modules/npm/node_modules/which/node_modules/isexe": {
-       "version": "3.1.1",
-@@ -25831,7 +26490,9 @@
-       "license": "ISC",
+       "version": "3.1.5",
+@@ -26469,7 +27118,9 @@
+       "license": "BlueOak-1.0.0",
        "engines": {
-         "node": ">=16"
+         "node": ">=18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="
++      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
++      "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="
      },
      "node_modules/npm/node_modules/wrap-ansi": {
        "version": "8.1.0",
-@@ -25848,7 +26509,9 @@
+@@ -26486,7 +27137,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -3839,7 +3513,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi-cjs": {
        "name": "wrap-ansi",
-@@ -25866,7 +26529,9 @@
+@@ -26504,7 +27157,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -3850,7 +3524,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
        "version": "4.3.0",
-@@ -25881,7 +26546,9 @@
+@@ -26519,7 +27174,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -3860,15 +3534,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": {
-       "version": "6.1.0",
-@@ -25893,13 +26560,17 @@
+       "version": "6.2.2",
+@@ -26531,13 +27188,17 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-regex?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
++      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": {
        "version": "9.2.2",
@@ -3881,7 +3555,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": {
        "version": "5.1.2",
-@@ -25916,7 +26587,9 @@
+@@ -26554,7 +27215,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3891,19 +3565,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": {
-       "version": "7.1.0",
-@@ -25931,7 +26604,9 @@
+       "version": "7.2.0",
+@@ -26569,7 +27232,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/strip-ansi?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
++      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="
      },
      "node_modules/npm/node_modules/write-file-atomic": {
        "version": "6.0.0",
-@@ -25944,13 +26619,17 @@
+@@ -26582,7 +27247,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3913,17 +3587,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ=="
      },
      "node_modules/npm/node_modules/yallist": {
-       "version": "4.0.0",
-       "dev": true,
-       "inBundle": true,
--      "license": "ISC"
-+      "license": "ISC",
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+       "version": "5.0.0",
+@@ -26591,7 +27258,9 @@
+       "license": "BlueOak-1.0.0",
+       "engines": {
+         "node": ">=18"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
++      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
      },
      "node_modules/nth-check": {
        "version": "2.1.1",
-@@ -26122,7 +26801,9 @@
+@@ -26763,7 +27432,9 @@
        "license": "ISC",
        "dependencies": {
          "wrappy": "1"
@@ -3934,7 +3610,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/onetime": {
        "version": "5.1.2",
-@@ -26138,6 +26819,19 @@
+@@ -26779,6 +27450,19 @@
          "url": "https://github.com/sponsors/sindresorhus"
        }
      },
@@ -3954,7 +3630,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/open": {
        "version": "10.2.0",
        "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
-@@ -26194,7 +26888,9 @@
+@@ -26835,7 +27519,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -3963,9 +3639,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
 +      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg=="
      },
-     "node_modules/os-homedir": {
-       "version": "1.0.2",
-@@ -26322,7 +27018,9 @@
+     "node_modules/orderedmap": {
+       "version": "2.1.1",
+@@ -26949,7 +27635,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3976,7 +3652,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-limit": {
        "version": "3.1.0",
-@@ -26335,7 +27033,9 @@
+@@ -26962,7 +27650,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3987,7 +3663,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-locate": {
        "version": "5.0.0",
-@@ -26348,7 +27048,9 @@
+@@ -26975,7 +27665,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3998,7 +3674,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-map": {
        "version": "7.0.3",
-@@ -26404,7 +27106,9 @@
+@@ -27031,7 +27723,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -4009,7 +3685,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pac-proxy-agent": {
        "version": "7.1.0",
-@@ -26812,7 +27516,9 @@
+@@ -27439,7 +28133,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4020,7 +3696,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-is-absolute": {
        "version": "1.0.1",
-@@ -26820,7 +27526,9 @@
+@@ -27447,7 +28143,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4031,7 +3707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-is-inside": {
        "version": "1.0.2",
-@@ -26834,11 +27542,15 @@
+@@ -27461,11 +28159,15 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4049,7 +3725,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-scurry": {
        "version": "1.11.1",
-@@ -26870,7 +27582,9 @@
+@@ -27498,7 +28200,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4060,7 +3736,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pathe": {
        "version": "2.0.3",
-@@ -26955,7 +27669,9 @@
+@@ -27582,7 +28286,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=4"
@@ -4071,7 +3747,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pikaday": {
        "version": "1.8.2",
-@@ -27029,7 +27745,9 @@
+@@ -27656,7 +28362,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 6"
@@ -4082,7 +3758,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pixelmatch": {
        "version": "7.1.0",
-@@ -27142,7 +27860,9 @@
+@@ -27769,7 +28477,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4093,7 +3769,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/find-up": {
        "version": "4.1.0",
-@@ -27154,7 +27874,9 @@
+@@ -27781,7 +28491,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4104,7 +3780,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/locate-path": {
        "version": "5.0.0",
-@@ -27165,7 +27887,9 @@
+@@ -27792,7 +28504,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4115,7 +3791,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/p-limit": {
        "version": "2.3.0",
-@@ -27179,7 +27903,9 @@
+@@ -27806,7 +28520,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4126,7 +3802,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/p-locate": {
        "version": "4.1.0",
-@@ -27190,7 +27916,9 @@
+@@ -27817,7 +28533,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4137,7 +3813,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/playwright": {
        "version": "1.56.1",
-@@ -27489,7 +28217,9 @@
+@@ -28115,7 +28833,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 0.8.0"
@@ -4148,7 +3824,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/prepend-http": {
        "version": "1.0.4",
-@@ -27567,7 +28297,9 @@
+@@ -28193,7 +28913,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -4159,7 +3835,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pretty-ms": {
        "version": "9.0.0",
-@@ -27597,7 +28329,9 @@
+@@ -28213,7 +28935,9 @@
      "node_modules/process-nextick-args": {
        "version": "2.0.1",
        "dev": true,
@@ -4170,7 +3846,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/process-warning": {
        "version": "5.0.0",
-@@ -27670,7 +28404,9 @@
+@@ -28481,7 +29205,9 @@
      },
      "node_modules/proto-list": {
        "version": "1.2.4",
@@ -4181,7 +3857,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/protobufjs": {
        "version": "7.5.0",
-@@ -27770,7 +28506,9 @@
+@@ -28581,7 +29307,9 @@
      },
      "node_modules/proxy-from-env": {
        "version": "1.1.0",
@@ -4192,7 +3868,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pseudomap": {
        "version": "1.0.2",
-@@ -27938,7 +28676,9 @@
+@@ -28750,7 +29478,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -4201,9 +3877,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
 +      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
      },
-     "node_modules/puppeteer": {
-       "version": "24.20.0",
-@@ -28060,7 +28800,9 @@
+     "node_modules/punycode.js": {
+       "version": "2.3.1",
+@@ -28881,7 +29611,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4214,7 +3890,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/quick-format-unescaped": {
        "version": "4.0.4",
-@@ -28125,7 +28867,9 @@
+@@ -28962,7 +29694,9 @@
        },
        "bin": {
          "rc": "cli.js"
@@ -4225,7 +3901,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rc/node_modules/ini": {
        "version": "1.3.8",
-@@ -28139,7 +28883,9 @@
+@@ -28976,7 +29710,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4236,7 +3912,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/react": {
        "version": "19.2.0",
-@@ -28277,7 +29023,9 @@
+@@ -29100,7 +29836,9 @@
      "node_modules/react-is": {
        "version": "18.2.0",
        "dev": true,
@@ -4247,7 +3923,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/react-reconciler": {
        "version": "0.33.0",
-@@ -28504,12 +29252,16 @@
+@@ -29327,12 +30065,16 @@
          "safe-buffer": "~5.1.1",
          "string_decoder": "~1.1.1",
          "util-deprecate": "~1.0.1"
@@ -4266,7 +3942,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/readdirp": {
        "version": "3.6.0",
-@@ -28801,14 +29553,18 @@
+@@ -29606,14 +30348,18 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4287,7 +3963,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/require-in-the-middle": {
        "version": "7.5.1",
-@@ -28861,7 +29617,9 @@
+@@ -29666,7 +30412,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4298,7 +3974,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-cwd/node_modules/resolve-from": {
        "version": "5.0.0",
-@@ -28869,7 +29627,9 @@
+@@ -29674,7 +30422,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4309,7 +3985,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-from": {
        "version": "4.0.0",
-@@ -28886,7 +29646,9 @@
+@@ -29691,7 +30441,9 @@
        "license": "MIT",
        "funding": {
          "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
@@ -4320,7 +3996,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-url": {
        "version": "0.2.1",
-@@ -28966,7 +29728,9 @@
+@@ -29771,7 +30523,9 @@
        "engines": {
          "iojs": ">=1.0.0",
          "node": ">=0.10.0"
@@ -4331,7 +4007,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rfdc": {
        "version": "1.4.1",
-@@ -29260,7 +30024,9 @@
+@@ -30030,7 +30784,9 @@
        "license": "MIT",
        "dependencies": {
          "queue-microtask": "^1.2.2"
@@ -4342,7 +4018,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rxjs": {
        "version": "7.8.1",
-@@ -29314,7 +30080,9 @@
+@@ -30084,7 +30840,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4353,7 +4029,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/safe-push-apply": {
        "version": "1.0.0",
-@@ -29909,14 +30677,18 @@
+@@ -30687,14 +31445,18 @@
        },
        "engines": {
          "node": ">=8"
@@ -4373,8 +4049,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
      },
      "node_modules/shell-quote": {
-       "version": "1.8.1",
-@@ -30013,7 +30785,9 @@
+       "version": "1.8.3",
+@@ -30794,7 +31556,9 @@
      },
      "node_modules/signal-exit": {
        "version": "3.0.7",
@@ -4385,7 +4061,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/signale": {
        "version": "1.4.0",
-@@ -30128,7 +30902,9 @@
+@@ -30909,7 +31673,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4396,7 +4072,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/simple-get": {
        "version": "4.0.1",
-@@ -30151,7 +30927,9 @@
+@@ -30932,7 +31698,9 @@
          "decompress-response": "^6.0.0",
          "once": "^1.3.1",
          "simple-concat": "^1.0.0"
@@ -4406,8 +4082,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="
      },
      "node_modules/simple-git": {
-       "version": "3.28.0",
-@@ -30245,7 +31023,9 @@
+       "version": "3.36.0",
+@@ -31028,7 +31796,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4418,7 +4094,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/slice-ansi": {
        "version": "7.1.0",
-@@ -30426,7 +31206,9 @@
+@@ -31260,7 +32030,9 @@
        "license": "BSD-3-Clause",
        "engines": {
          "node": ">=0.10.0"
@@ -4429,7 +4105,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/source-map-js": {
        "version": "1.2.1",
-@@ -30525,12 +31307,16 @@
+@@ -31359,12 +32131,16 @@
        "license": "ISC",
        "engines": {
          "node": ">= 10.x"
@@ -4448,7 +4124,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ssh-config": {
        "version": "5.0.4",
-@@ -30546,14 +31332,18 @@
+@@ -31390,14 +32166,18 @@
        },
        "engines": {
          "node": ">=10"
@@ -4469,7 +4145,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/stackback": {
        "version": "0.0.2",
-@@ -30682,11 +31472,15 @@
+@@ -31604,11 +32384,15 @@
        "license": "MIT",
        "dependencies": {
          "safe-buffer": "~5.1.0"
@@ -4487,7 +4163,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/string-argv": {
        "version": "0.3.2",
-@@ -30720,7 +31514,9 @@
+@@ -31643,7 +32427,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4498,7 +4174,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/string-width-cjs": {
        "name": "string-width",
-@@ -30803,7 +31599,9 @@
+@@ -31726,7 +32512,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4509,7 +4185,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/strip-ansi-cjs": {
        "name": "strip-ansi",
-@@ -30869,7 +31667,9 @@
+@@ -31792,7 +32580,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4520,7 +4196,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/strip-literal": {
        "version": "3.1.0",
-@@ -31019,7 +31819,9 @@
+@@ -31944,7 +32734,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4531,7 +4207,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/supports-hyperlinks": {
        "version": "3.1.0",
-@@ -31044,7 +31846,9 @@
+@@ -31969,7 +32761,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/ljharb"
@@ -4542,7 +4218,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/symbol-tree": {
        "version": "3.2.4",
-@@ -31200,7 +32004,9 @@
+@@ -32111,7 +32905,9 @@
        "dependencies": {
          "debug": "4.3.1",
          "is2": "^2.0.6"
@@ -4553,7 +4229,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tcp-port-used/node_modules/debug": {
        "version": "4.3.1",
-@@ -31216,7 +32022,9 @@
+@@ -32127,7 +32923,9 @@
          "supports-color": {
            "optional": true
          }
@@ -4564,7 +4240,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/temp-dir": {
        "version": "3.0.0",
-@@ -31224,7 +32032,9 @@
+@@ -32135,7 +32933,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=14.16"
@@ -4575,7 +4251,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tempfile": {
        "version": "5.0.0",
-@@ -31238,7 +32048,9 @@
+@@ -32149,7 +32949,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4586,7 +4262,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tempy": {
        "version": "3.1.0",
-@@ -31427,7 +32239,9 @@
+@@ -32338,7 +33140,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4596,8 +4272,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="
      },
      "node_modules/test-exclude/node_modules/brace-expansion": {
-       "version": "1.1.11",
-@@ -31708,7 +32522,9 @@
+       "version": "1.1.14",
+@@ -32650,7 +33454,9 @@
      },
      "node_modules/tr46": {
        "version": "0.0.3",
@@ -4608,7 +4284,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/traverse": {
        "version": "0.6.8",
-@@ -32081,7 +32897,9 @@
+@@ -33016,7 +33822,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -4619,7 +4295,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/type-detect": {
        "version": "4.0.8",
-@@ -32534,7 +33352,9 @@
+@@ -33474,7 +34282,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 10.0.0"
@@ -4630,7 +4306,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/unpipe": {
        "version": "1.0.0",
-@@ -32752,7 +33572,9 @@
+@@ -33728,7 +34538,9 @@
        "license": "BSD-2-Clause",
        "dependencies": {
          "punycode": "^2.1.0"
@@ -4641,7 +4317,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/urix": {
        "version": "0.1.0",
-@@ -32803,7 +33625,9 @@
+@@ -33779,7 +34591,9 @@
      },
      "node_modules/util-deprecate": {
        "version": "1.0.2",
@@ -4652,7 +4328,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/uuid": {
        "version": "10.0.0",
-@@ -33515,7 +34339,9 @@
+@@ -34490,7 +35304,9 @@
        },
        "bin": {
          "installServerIntoExtension": "bin/installServerIntoExtension"
@@ -4663,7 +4339,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-languageserver-protocol": {
        "version": "3.17.5",
-@@ -33523,7 +34349,9 @@
+@@ -34498,7 +35314,9 @@
        "dependencies": {
          "vscode-jsonrpc": "8.2.0",
          "vscode-languageserver-types": "3.17.5"
@@ -4674,7 +4350,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": {
        "version": "8.2.0",
-@@ -33541,7 +34369,9 @@
+@@ -34516,7 +35334,9 @@
      },
      "node_modules/vscode-languageserver-types": {
        "version": "3.17.5",
@@ -4685,7 +4361,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-uri": {
        "version": "3.1.0",
-@@ -34054,7 +34884,9 @@
+@@ -35035,7 +35855,9 @@
      },
      "node_modules/webidl-conversions": {
        "version": "3.0.1",
@@ -4696,7 +4372,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/webpack-sources": {
        "version": "3.3.3",
-@@ -34100,7 +34932,9 @@
+@@ -35081,7 +35903,9 @@
        "dependencies": {
          "tr46": "~0.0.3",
          "webidl-conversions": "^3.0.0"
@@ -4707,7 +4383,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/which": {
        "version": "2.0.2",
-@@ -34113,7 +34947,9 @@
+@@ -35094,7 +35918,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -4718,7 +4394,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/which-boxed-primitive": {
        "version": "1.1.1",
-@@ -34189,6 +35025,16 @@
+@@ -35170,6 +35996,16 @@
          "url": "https://github.com/sponsors/ljharb"
        }
      },
@@ -4735,7 +4411,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/which-typed-array": {
        "version": "1.1.19",
        "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-@@ -34335,7 +35181,9 @@
+@@ -35315,7 +36151,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -4746,7 +4422,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/wrap-ansi-cjs": {
        "name": "wrap-ansi",
-@@ -34356,7 +35204,9 @@
+@@ -35336,7 +36174,9 @@
      },
      "node_modules/wrappy": {
        "version": "1.0.2",
@@ -4757,7 +4433,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/write-file-atomic": {
        "version": "4.0.2",
-@@ -34368,7 +35218,9 @@
+@@ -35348,7 +36188,9 @@
        },
        "engines": {
          "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
@@ -4768,7 +4444,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ws": {
        "version": "8.18.3",
-@@ -34420,7 +35272,9 @@
+@@ -35400,7 +36242,9 @@
      "node_modules/xml": {
        "version": "1.0.1",
        "dev": true,
@@ -4779,7 +4455,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/xml-name-validator": {
        "version": "4.0.0",
-@@ -34460,7 +35314,9 @@
+@@ -35440,7 +36284,9 @@
        "license": "ISC",
        "engines": {
          "node": ">=10"
@@ -4790,7 +4466,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yallist": {
        "version": "2.1.2",
-@@ -34494,14 +35350,18 @@
+@@ -35478,14 +36324,18 @@
        },
        "engines": {
          "node": ">=12"
@@ -4811,7 +4487,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yargs-unparser": {
        "version": "2.0.0",
-@@ -34534,7 +35394,9 @@
+@@ -35518,7 +36368,9 @@
        "license": "ISC",
        "engines": {
          "node": ">=12"
@@ -4822,7 +4498,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yauzl": {
        "version": "2.10.0",
-@@ -34564,7 +35426,9 @@
+@@ -35547,7 +36399,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4833,7 +4509,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yoctocolors": {
        "version": "2.0.0",
-@@ -34828,6 +35692,84 @@
+@@ -35809,6 +36663,84 @@
        "version": "0.0.0",
        "devDependencies": {}
      },
@@ -4918,7 +4594,7 @@ index 5607a09..44ec9a4 100644
      "packages/lib_ai_configuration": {
        "name": "@gitlab-org/ai-configuration",
        "version": "0.0.0",
-@@ -40060,4 +41002,4 @@
+@@ -41495,4 +42427,4 @@
        }
      }
    }
@@ -4926,10 +4602,10 @@ index 5607a09..44ec9a4 100644
 +}
 \ No newline at end of file
 diff --git c/package.json i/package.json
-index 97a2104..6002fb9 100644
+index a5f3bd6..0aa8b3e 100644
 --- c/package.json
 +++ i/package.json
-@@ -179,7 +179,8 @@
+@@ -184,7 +184,8 @@
      "ts-node": "^10.9.2",
      "tsx": "^4.20.4",
      "type-fest": "^4.41.0",
diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix
index e20b66d39fa9..c211fe1785db 100644
--- a/pkgs/by-name/gi/gitlab-duo/package.nix
+++ b/pkgs/by-name/gi/gitlab-duo/package.nix
@@ -8,10 +8,11 @@
   patch-package,
   stdenv,
   versionCheckHook,
+  ripgrep,
 }:
 buildNpmPackage (finalAttrs: {
   pname = "gitlab-duo";
-  version = "8.67.0";
+  version = "8.89.0";
 
   # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version
   nodejs = nodejs_22;
@@ -21,7 +22,7 @@ buildNpmPackage (finalAttrs: {
     owner = "editor-extensions";
     repo = "gitlab-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GnL3720MwiWtC7lHA4CrfiZUTeOV+ytWFii16OKGbAM=";
+    hash = "sha256-AiC0xxk8d/2rvRGm31vWqRuJ7nzMrITTGabv7v1LpOA=";
   };
 
   patches = [
@@ -30,13 +31,9 @@ buildNpmPackage (finalAttrs: {
     ./missing-hashes.patch
   ];
 
-  # PATCH: Only build for the current platform, not all targets
-  postPatch = ''
-    sed -i 's/SUPPORTED_TARGETS=".\+"/SUPPORTED_TARGETS="bun-$TARGET"/' packages/cli/scripts/compile_executables.sh
-  '';
-
   npmFlags = [ "--install-links" ];
-  npmDepsHash = "sha256-9b73NGu3GO5Sgus7BZ7WvOaXBvQ3UrW9BUTk6NwH+uY=";
+  npmDepsHash = "sha256-U/dwfYZqy/1CM+Emz1w44mAzY24Z8vKWBXSzSqeVmnY=";
+  npmRebuildFlags = [ "--ignore-scripts" ];
   npmBuildScript = "build:binary";
   npmWorkspace = "@gitlab/duo-cli";
   nativeBuildInputs = [
@@ -48,6 +45,8 @@ buildNpmPackage (finalAttrs: {
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true";
   env.PUPPETEER_SKIP_DOWNLOAD = "true";
   env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";
+  env.SUPPORTED_TARGETS = "bun-${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";
+  env.SKIP_RIPGREP_BUNDLE = 1;
 
   postConfigure = ''
     patchShebangs --build ./packages/cli/scripts
@@ -59,6 +58,9 @@ buildNpmPackage (finalAttrs: {
 
     install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo
 
+    wrapProgram $out/bin/duo \
+      --prefix PATH : ${lib.getExe ripgrep}
+
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/gi/gitlab-duo/update.sh b/pkgs/by-name/gi/gitlab-duo/update.sh
index 5d1148543a0e..784b159efc01 100755
--- a/pkgs/by-name/gi/gitlab-duo/update.sh
+++ b/pkgs/by-name/gi/gitlab-duo/update.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix
+#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix nodejs_22
 set -euo pipefail
 
 # Get new Gitlab Duo release
@@ -45,7 +45,7 @@ npm install --package-lock-only --ignore-scripts
 npm-lockfile-fix package-lock.json
 npmDepsHash="$(prefetch-npm-deps package-lock.json)"
 git add -A
-patch="$(git diff --cached)"
+patch="$(git diff --cached --no-ext-diff)"
 popd
 
 # Update nix expression with new hashes

From 374db7f82daa5b1cb15dbef83cfeda2e1582e9e0 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 20 Apr 2026 21:46:05 -0700
Subject: [PATCH 016/166] python3Packages.pyads: skip pre-release tags in
 update script

Co-authored-by: Copilot <copilot@github.com>
---
 pkgs/development/python-modules/pyads/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix
index 77b659a07b34..6b1e06cf6669 100644
--- a/pkgs/development/python-modules/pyads/default.nix
+++ b/pkgs/development/python-modules/pyads/default.nix
@@ -4,6 +4,7 @@
   adslib,
   buildPythonPackage,
   fetchFromGitHub,
+  nix-update-script,
   pytestCheckHook,
   setuptools,
 }:
@@ -45,6 +46,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyads" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^(\\d+\\.\\d+\\.\\d+)$"
+    ];
+  };
+
   meta = {
     description = "Python wrapper for TwinCAT ADS library";
     homepage = "https://github.com/MrLeeh/pyads";

From 5f81b6ee96ab1c8fb05d3ae2b2baa1db8c686405 Mon Sep 17 00:00:00 2001
From: Andrew Fontaine <andrew@afontaine.ca>
Date: Tue, 21 Apr 2026 08:58:09 -0400
Subject: [PATCH 017/166] gitlab-duo: no longer broken on darwin

Co-authored-by: Asherah Connor <ashe@kivikakk.ee>
---
 pkgs/by-name/gi/gitlab-duo/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix
index c211fe1785db..3aadd7bfbbc3 100644
--- a/pkgs/by-name/gi/gitlab-duo/package.nix
+++ b/pkgs/by-name/gi/gitlab-duo/package.nix
@@ -71,7 +71,6 @@ buildNpmPackage (finalAttrs: {
   passthru.updateScript = ./update.sh;
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md";
     description = "CLI for GitLab AI assistant";
     downloadPage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp";

From 22081ba452edabb7b604acc84bd402e6fb3232ec Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Tue, 21 Apr 2026 10:49:47 -0400
Subject: [PATCH 018/166] iterm2: 3.6.6 -> 3.6.10

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

diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index 033d30d73aa7..330cb67f2afb 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "iterm2";
-  version = "3.6.6";
+  version = "3.6.10";
 
   src = fetchzip {
     url = "https://iterm2.com/downloads/stable/iTerm2-${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-n3VoRxMOBQK/8mbVbORSBz73tsuKAUMG7dFZIbaqdHU=";
+    hash = "sha256-igdExoh3d8EZBuKkqyNqF087jUISax07rSWG3eenUbw=";
   };
 
   dontFixup = true;

From bb846a3692a886a7b236343fc8e6a39a33c09612 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 21 Apr 2026 22:29:41 +0200
Subject: [PATCH 019/166] maintainers: remove dritter

---
 maintainers/maintainer-list.nix                       | 6 ------
 pkgs/applications/editors/jetbrains/ides/phpstorm.nix | 5 +----
 pkgs/by-name/en/enpass/package.nix                    | 5 +----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cd8b9ec17930..71d7fd1ffdaf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7234,12 +7234,6 @@
     githubId = 187309685;
     name = "Drew Council";
   };
-  dritter = {
-    email = "dritter03@googlemail.com";
-    github = "dritter";
-    githubId = 1544760;
-    name = "Dominik Ritter";
-  };
   drperceptron = {
     github = "drperceptron";
     githubId = 92106371;
diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index 8fc96148791c..8351589dde10 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -54,10 +54,7 @@ mkJetBrainsProduct {
     homepage = "https://www.jetbrains.com/phpstorm/";
     description = "PHP IDE from JetBrains";
     longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code.";
-    maintainers = with lib.maintainers; [
-      dritter
-      tymscar
-    ];
+    maintainers = with lib.maintainers; [ tymscar ];
     license = lib.licenses.unfree;
     sourceProvenance =
       if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix
index 55b21ee2a309..4628e42d3d3f 100644
--- a/pkgs/by-name/en/enpass/package.nix
+++ b/pkgs/by-name/en/enpass/package.nix
@@ -100,10 +100,7 @@ let
         "x86_64-linux"
         "i686-linux"
       ];
-      maintainers = with lib.maintainers; [
-        ewok
-        dritter
-      ];
+      maintainers = with lib.maintainers; [ ewok ];
     };
 
     nativeBuildInputs = [ makeWrapper ];

From 0a140ed66bf4bbb0d1faa0e844b6660016673cf4 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 11 Mar 2026 02:37:58 -0400
Subject: [PATCH 020/166] linuxPackages.xpadneo: skip pre-releases in
 updateScript

---
 pkgs/os-specific/linux/xpadneo/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 713708d4a0ae..6a4ba6b51f56 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -36,12 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
   installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
   installTargets = [ "modules_install" ];
 
-  passthru.tests = {
-    xpadneo = nixosTests.xpadneo;
+  passthru = {
+    tests.xpadneo = nixosTests.xpadneo;
+    updateScript = nix-update-script {
+      extraArgs = [
+        # Skips pre-releases
+        "--version-regex"
+        "^v([\\d.]+)$"
+      ];
+    };
   };
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Advanced Linux driver for Xbox One wireless controllers";
     homepage = "https://atar-axis.github.io/xpadneo";

From 6851ced685f3b0b16b75fc91bd96c3869fddb0db Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 22 Apr 2026 19:17:50 -0400
Subject: [PATCH 021/166] linuxPackages.xpadneo: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 6a4ba6b51f56..fbe1aad2053a 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rMNgKhve76OXr2ha/Sqpw8sy/FWqxDm/bKF4YPlpVlc=";
+    hash = "sha256-GeQls+DeJrzduBRQw0rc9hf58Ncd5fRmn6Xwn0kMaXs=";
   };
 
   setSourceRoot = ''

From 9978830573bb4b5207ebea5af1ce278ffad5ecfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:18:39 -0300
Subject: [PATCH 022/166] lxqt.libdbusmenu-lxqt: 0.3.0 -> 0.4.0

Diff: https://github.com/lxqt/libdbusmenu-lxqt/compare/0.3.0...0.4.0
---
 pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index deb47bc956a8..8d016f8ba767 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-lxqt";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libdbusmenu-lxqt";
     rev = version;
-    hash = "sha256-PqX8ShSu3CYN9XIRp6IjVmr/eKH+oLNhXvwiudUH660=";
+    hash = "sha256-5X73kRUtOYeqBEIw2ctUnwXnWKPHDaoT489yT5nugZw=";
   };
 
   nativeBuildInputs = [

From 2736632a4c78ebd0de0ae1bbcc2559eedd799295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:18:44 -0300
Subject: [PATCH 023/166] lxqt.libfm-qt: 2.3.1 -> 2.4.0

Diff: https://github.com/lxqt/libfm-qt/compare/2.3.1...2.4.0
---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index f0c2c46d9c87..e1f25909741b 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -15,7 +15,7 @@
   qttools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.1",
+  version ? "2.4.0",
   qtx11extras ? null,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-        "2.3.1" = "sha256-2PDVNMBwzDpUOkZ7GnrWDMlXBeUgCyZ6vHXurW6fr4s=";
+        "2.4.0" = "sha256-gfyskv/TpAdBES0+O1MrrkQqTDqtAGtDMIwv3NF7pnE=";
       }
       ."${finalAttrs.version}";
   };

From 69f6ead9b5dd784443cfced5584c637de5ba3f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:02 -0300
Subject: [PATCH 024/166] lxqt.liblxqt: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/liblxqt/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 662769fc4801..5e08c5106e34 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "liblxqt";
     rev = version;
-    hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo=";
+    hash = "sha256-kGKgKpgiK40933O3T/astH0X1Y4oIH6kEKjjMBh43MA=";
   };
 
   nativeBuildInputs = [

From 6dc13bb6ddf124407f4fefdc999373fff7a964c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:07 -0300
Subject: [PATCH 025/166] lxqt.libqtxdg: 4.3.0 -> 4.4.0

Diff: https://github.com/lxqt/libqtxdg/compare/4.3.0...4.4.0
---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index ab9038c110fb..44d074a8e011 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "4.3.0",
+  version ? "4.4.0",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-        "4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
+        "4.4.0" = "sha256-9Hj5RnPWtqRkzhrAuXoHnMAQloFbnF/8koPT8ExfSAs=";
       }
       ."${finalAttrs.version}";
   };

From c88677a533beedd354ef0ee51c729e00cdaf95cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:14 -0300
Subject: [PATCH 026/166] lxqt.lximage-qt: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lximage-qt/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 72030d8d5df8..af0bc01e980f 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lximage-qt";
     rev = version;
-    hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU=";
+    hash = "sha256-ThP7MuAKysJ/Q/JSO12CuwCt6mCU5tZ2DiKEO0Nfg3U=";
   };
 
   nativeBuildInputs = [

From 21354872af9fb85772410a454d6026ad07f5550b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:21 -0300
Subject: [PATCH 027/166] lxqt.lxqt-about: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-about/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 3589471aeed3..dd66a85c1372 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-about";
     rev = version;
-    hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk=";
+    hash = "sha256-wJ4KJ+gSj0sdlO1l68RzAaOM8HxdPP6S1gWCoRfRZ3c=";
   };
 
   nativeBuildInputs = [

From ae64be62d98092a32184d8d2c6e99668a68b4a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:25 -0300
Subject: [PATCH 028/166] lxqt.lxqt-admin: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-admin/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 0e8850e862e9..277d0e1dc70a 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-admin";
     rev = version;
-    hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w=";
+    hash = "sha256-SNEOqyLIDlOio4LttsCUgC/EnGcCSDTwPxhJo1lEvJE=";
   };
 
   nativeBuildInputs = [

From 1f78b84c6d66a1505654a5b7c502bf9585328465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:29 -0300
Subject: [PATCH 029/166] lxqt.lxqt-archiver: 1.3.0 -> 1.4.0

Diff: https://github.com/lxqt/lxqt-archiver/compare/1.3.0...1.4.0
---
 pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index c5cddf8c8df9..5a2d9947fbf8 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA=";
+    hash = "sha256-f8s29INIJeqmPr6BWqQxYWWkjbG1wy+bUYZSy2OECKg=";
   };
 
   nativeBuildInputs = [

From b6fc9dd3b8f80494350d76d8838f386874047959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:33 -0300
Subject: [PATCH 030/166] lxqt.lxqt-build-tools: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-build-tools/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index eef1fcc73ed2..5b65c989bf02 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.0",
+  version ? "2.4.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo=";
+        "2.4.0" = "sha256-PvDXL4hHaHeHt7CXeNCj8L2bv3YYY78ZDTxsctc73fo=";
       }
       ."${version}";
   };
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
       --replace-fail AppleClang Clang
   ''
-  + lib.optionalString (lib.versionOlder version "2.3.0") ''
+  + lib.optionalString (lib.versionOlder version "2.4.0") ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';

From 1bf224a07edf0afcceb40d8fc331fc102240b84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:37 -0300
Subject: [PATCH 031/166] lxqt.lxqt-config: 2.3.1 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-config/compare/2.3.1...2.4.0
---
 pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 7ef745b30049..a0fe994122f4 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-config";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-config";
     tag = finalAttrs.version;
-    hash = "sha256-2fviPhSBwUU9jg3217PLbREh8MkArd2Uc4bhFXo2J7U=";
+    hash = "sha256-BG3+/QZkqCZp7kdaHgiruOMq506l8+9KKNq+IUgoTPw=";
   };
 
   nativeBuildInputs = [

From bc5e7edec8f367cf889eb75daa9f961619641049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:41 -0300
Subject: [PATCH 032/166] lxqt.lxqt-globalkeys: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-globalkeys/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 87dc4f06eadd..5ddfce6a6299 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-globalkeys";
     rev = version;
-    hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY=";
+    hash = "sha256-VhySpJYHdi17U4yJBWXEWE2KEyG7AVcWYLpYXr2iCyc=";
   };
 
   nativeBuildInputs = [

From bad95fc3324730e9fe3e70515f650978de148367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:45 -0300
Subject: [PATCH 033/166] lxqt.lxqt-menu-data: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-menu-data/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 335d257d4aae..844b11175baa 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-menu-data";
     rev = version;
-    hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg=";
+    hash = "sha256-Bu/M88VInCD6DzKFLjE3gZ5odJa0tvJ0EXHeLCBlgLw=";
   };
 
   nativeBuildInputs = [

From ff7ebd05045ed6e609bff3ee45772b498b39cd05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:49 -0300
Subject: [PATCH 034/166] lxqt.lxqt-notificationd: 2.3.1 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-notificationd/compare/2.3.1...2.4.0
---
 pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 79ec16557c71..869dc36db9aa 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-notificationd";
     rev = version;
-    hash = "sha256-TfTOuarMq2m5rAdcfiKqjyGeJzKyUSvhkJ2EoGUMTUQ=";
+    hash = "sha256-o+J7xg60T0WsznDOrfg7EjNlT9FQFbniNkvgkF12N0Q=";
   };
 
   nativeBuildInputs = [

From fad4bef5cdda0d39ede7a871e19d2b58048365d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:53 -0300
Subject: [PATCH 035/166] lxqt.lxqt-openssh-askpass: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-openssh-askpass/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 06bf0e17053c..cec884533e6c 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-openssh-askpass";
     rev = version;
-    hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU=";
+    hash = "sha256-87soVKVcC3B6Wm7iRy15k/rjLb9OX/2se0btIOyKA6Q=";
   };
 
   nativeBuildInputs = [

From 00d440312ee7f910a26b3e85ee538f15d638fce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:19:57 -0300
Subject: [PATCH 036/166] lxqt.lxqt-panel: 2.3.2 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-panel/compare/2.3.2...2.4.0
---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 04a62049fd8d..9cbfd76e52ae 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
     tag = finalAttrs.version;
-    hash = "sha256-n/U2EgEZfh8mJWtEX+HByqHqtm9NqIXnURqUzSOcvns=";
+    hash = "sha256-6A22/zBeR04KQXfEMOHefNABB//qWhFSZ8c+6CA3Ni4=";
   };
 
   nativeBuildInputs = [

From 4a608e875ec5e51c684ff9d923c06eaa3794f645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:01 -0300
Subject: [PATCH 037/166] lxqt.lxqt-policykit: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-policykit/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 7a2e29a5091b..533592b02ee7 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-policykit";
     rev = version;
-    hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q=";
+    hash = "sha256-cMYBR0Uwc6v+s+F+uYbClbGh8BgovtxShgB62LX/WgU=";
   };
 
   nativeBuildInputs = [

From 8d92b8f038e180c2eb92b0836a9a45e5ab22a91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:07 -0300
Subject: [PATCH 038/166] lxqt.lxqt-powermanagement: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-powermanagement/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 72cfd62dd538..242f55c4c51a 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-powermanagement";
     rev = version;
-    hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c=";
+    hash = "sha256-pHQp/bXeI+yGQJ2rgsP8H7ISpCqcGG+/F74Otz+vJpg=";
   };
 
   nativeBuildInputs = [

From fa107d39f5605b0d7f3491b1084997c5dc566cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:11 -0300
Subject: [PATCH 039/166] lxqt.lxqt-qtplugin: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-qtplugin/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 4765a792c437..f997136a5a74 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
     tag = finalAttrs.version;
-    hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o=";
+    hash = "sha256-Ax12jHeNTyEI+2dYj9aW8S6wzDVKN+I9U7ufhx6rycQ=";
   };
 
   nativeBuildInputs = [

From 175eb084e242ae017464a6f47bad7e127085f870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:16 -0300
Subject: [PATCH 040/166] lxqt.lxqt-runner: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-runner/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 413226587435..985d2929ed96 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-runner";
     rev = version;
-    hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ=";
+    hash = "sha256-L/9STKrYTZP/Ey1BCLaZFRdeipBAWdKkXIoiHvd3vq4=";
   };
 
   nativeBuildInputs = [

From 4c298cf17e0886a5f77e7dabb9fa05a6305405f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:21 -0300
Subject: [PATCH 041/166] lxqt.lxqt-session: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-session/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 1026c8fbdb98..7cb99f3a24e6 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-session";
     rev = version;
-    hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ=";
+    hash = "sha256-CV0g553V4qxq9Cj/RUbr5jxESrrzFjAwR80NKhwNgDU=";
   };
 
   nativeBuildInputs = [

From c15afa73df499c90176383a11dc958d0245e45f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:24 -0300
Subject: [PATCH 042/166] lxqt.lxqt-sudo: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-sudo/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 494b71ea57ca..ef5e31beccdc 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-sudo";
     rev = version;
-    hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E=";
+    hash = "sha256-wPkIvm6U/dZvf3sE/IsWfK1D647DmVZPV/JZbsRl/HI=";
   };
 
   nativeBuildInputs = [

From 2686162bad4d23e72ca0d02453d2b6afcc67968f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:29 -0300
Subject: [PATCH 043/166] lxqt.lxqt-themes: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/lxqt-themes/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 2b2c4e151d32..7d6466a0328b 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-themes";
     rev = version;
-    hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo=";
+    hash = "sha256-whMW4fMiIcL4Qb/VNynVGBTIyObTMlf6AaWCnBYikZI=";
   };
 
   nativeBuildInputs = [

From ad0446e4258388f7c91fc3b59e56b4d2684f013f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:34 -0300
Subject: [PATCH 044/166] lxqt.lxqt-wayland-session: 0.3.0 -> 0.4.0

Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.3.0...0.4.0
---
 pkgs/desktops/lxqt/lxqt-wayland-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 20ba7d6d4426..2f08d2cb4800 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI=";
+    hash = "sha256-QmknSFJLmAy3OxU9jv6xMAAxQXlWuUcuPNHDs8r2/ls=";
   };
 
   nativeBuildInputs = [

From 6b420ccda2af87c3142ac3506e4eb7fb6b94510a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:42 -0300
Subject: [PATCH 045/166] lxqt.pavucontrol-qt: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/pavucontrol-qt/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 35de208fb41c..58d438e4260a 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pavucontrol-qt";
     rev = version;
-    hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c=";
+    hash = "sha256-Ja+9Tb88SxdvsJPiQadeziCgFtOnInTBSHcisNjrSpA=";
   };
 
   nativeBuildInputs = [

From 10ef8a283fac8c8c57e01e4e77242ff1728885d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:46 -0300
Subject: [PATCH 046/166] lxqt.pcmanfm-qt: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/pcmanfm-qt/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 90845f83dead..c0497746aa3d 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pcmanfm-qt";
     rev = version;
-    hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U=";
+    hash = "sha256-KgYirooKoiUUkzEFsOScTZt/s1OTBLIjAYlW/Q0RQTk=";
   };
 
   nativeBuildInputs = [

From 93f8ddcc1583240ef1467cdd6d673bc62b6a598e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:50 -0300
Subject: [PATCH 047/166] lxqt.qlipper: 5.1.2-unstable-2025-10-29 -> 6.1.0

Diff: https://github.com/pvanek/qlipper/compare/4e9fcfe6684c465944baa153aeb7603ec27728b1...4e9fcfe6684c465944baa153aeb7603ec27728b1
---
 pkgs/desktops/lxqt/qlipper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 325864cd98df..7ea12bf86fd1 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation {
   pname = "qlipper";
-  version = "5.1.2-unstable-2025-10-29";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner = "pvanek";

From 21ff4864399f2cad9137e66bdcf0c30f873c99d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:53 -0300
Subject: [PATCH 048/166] lxqt.qps: 2.12.0 -> 2.13.0

Diff: https://github.com/lxqt/qps/compare/2.12.0...2.13.0
---
 pkgs/desktops/lxqt/qps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 6c31cff2d160..1631c62c9180 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qps";
     rev = version;
-    hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ=";
+    hash = "sha256-KH92JZkVLxz2iECF5z39yzAwt7TU2/WnJomPoAn8iDI=";
   };
 
   nativeBuildInputs = [

From 5a83ea6f52c25fb35f8232b7a74fa2da30feed39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:20:57 -0300
Subject: [PATCH 049/166] lxqt.qterminal: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/qterminal/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/qterminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index 87fd2479f5fc..b7b12e6fe7d3 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qterminal";
     rev = version;
-    hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc=";
+    hash = "sha256-8Bp4ZZ/oi4p6pAo/vRAmeSu0tfWZBvTBZTrm4ppJwFU=";
   };
 
   nativeBuildInputs = [

From a963cb7110237eefaa6e72c44f4d7900e3acefac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:21:01 -0300
Subject: [PATCH 050/166] lxqt.qtermwidget: 2.3.0 -> 2.4.0

Diff: https://github.com/lxqt/qtermwidget/compare/2.3.0...2.4.0
---
 pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 5616c94b6572..efad2ed3a5bf 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.0",
+  version ? "2.4.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-        "2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg=";
+        "2.4.0" = "sha256-fTE39goab0md0koS28gRiQgnEumtR5/vTKgpM/wuCrk=";
       }
       ."${version}";
   };

From ef383f3a5c3566aa28e07eb4e026c5d8551d2c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:21:06 -0300
Subject: [PATCH 051/166] lxqt.qtxdg-tools: 4.3.0 -> 4.4.0

Diff: https://github.com/lxqt/qtxdg-tools/compare/4.3.0...4.4.0
---
 pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index 6b8b39d65a32..c49f9b4899f5 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qtxdg-tools";
     rev = version;
-    hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y=";
+    hash = "sha256-pVFdodYoLQs8o8rF8etd7BKImgJRoDsckGg9DRrwVIY=";
   };
 
   nativeBuildInputs = [

From 5e6e2497a895031f4ce138c66b1a006817c73718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:21:10 -0300
Subject: [PATCH 052/166] lxqt.screengrab: 3.1.0 -> 3.2.0

Diff: https://github.com/lxqt/screengrab/compare/3.1.0...3.2.0
---
 pkgs/desktops/lxqt/screengrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index caa8717adc43..8fb25f3aa07b 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
     tag = finalAttrs.version;
-    hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ=";
+    hash = "sha256-WgQWFNAu+cws442o1HubuaANsg0Hxg0XLyZ/CeA3abM=";
   };
 
   nativeBuildInputs = [

From cbe86e38678410b5e17d81996f08de9aa08a3449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2026 22:21:14 -0300
Subject: [PATCH 053/166] lxqt.xdg-desktop-portal-lxqt: 1.3.0 -> 1.4.0

Diff: https://github.com/lxqt/xdg-desktop-portal-lxqt/compare/1.3.0...1.4.0
---
 pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 9a45f570dbf7..67000e583447 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
     tag = finalAttrs.version;
-    hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw=";
+    hash = "sha256-GtpOBnRa10xFpd0FHWJge9RtS58hdOawFQmDH6yD1yU=";
   };
 
   nativeBuildInputs = [

From ba988917f6bc4587217f1d6b8781847fb9b38815 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Apr 2026 03:04:42 +0000
Subject: [PATCH 054/166] curl-impersonate: 1.5.2 -> 1.5.5

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

diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix
index 68bd68586ff5..c8d7472578f2 100644
--- a/pkgs/by-name/cu/curl-impersonate/package.nix
+++ b/pkgs/by-name/cu/curl-impersonate/package.nix
@@ -27,7 +27,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "curl-impersonate";
-  version = "1.5.2";
+  version = "1.5.5";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "lexiforest";
     repo = "curl-impersonate";
     tag = "v${version}";
-    hash = "sha256-ca6YZBYN9WMaXL9nFC5TdX/rRTclu6i0ssQlSBMlteM=";
+    hash = "sha256-iKtNdBjAflg9evd/CmKJd8pXGPUM5sMBJEgJAbJ6vws=";
   };
 
   # Disable blanket -Werror to fix build on `gcc-13` related to minor

From bcf962d30af7df675731cf691f37df57dc7049d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 03:32:20 +0000
Subject: [PATCH 055/166] komga: 1.24.3 -> 1.24.4

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

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 16f4ea8afc28..fc7e34984b43 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.24.3";
+  version = "1.24.4";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-+MZ2Rr/QYJuKBZdQtuQaq1crRRqBPo3LGRHjkl1Gupo=";
+    sha256 = "sha256-O06bHt4MgGL4Ffz0llUyX0VM/6MmnjSNGFjy3R8/J1I=";
   };
 
   nativeBuildInputs = [

From 1a1c79f9de368a353995cc73de340ebffc9e3af5 Mon Sep 17 00:00:00 2001
From: "me@so.lar.is" <me@so.lar.is>
Date: Sun, 19 Apr 2026 13:24:22 +0200
Subject: [PATCH 056/166] ut1999: Add bonus content from second ISO

---
 pkgs/by-name/ut/ut1999/package.nix | 42 +++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix
index 5f15f39bac8d..299cb39c263e 100644
--- a/pkgs/by-name/ut/ut1999/package.nix
+++ b/pkgs/by-name/ut/ut1999/package.nix
@@ -43,11 +43,11 @@ let
     # fat binary
     aarch64-darwin = x86_64-darwin;
   };
-  unpackIso =
-    runCommand "ut1999-iso"
+  baseGame =
+    runCommand "ut1999-iso1"
       {
         # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community
-        # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99).
+        # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). The first ISO contains the base game.
         src = fetchurl {
           url = "https://archive.org/download/ut-goty/UT_GOTY_CD1.iso";
           hash = "sha256-4YSYTKiPABxd3VIDXXbNZOJm4mx0l1Fhte1yNmx0cE8=";
@@ -59,6 +59,21 @@ let
         mkdir $out
         cp -r Music Sounds Textures Maps $out
       '';
+  bonusPacks =
+    runCommand "ut1999-iso2"
+      {
+        # The second ISO contains bonus maps and game modes
+        src = fetchurl {
+          url = "https://archive.org/download/ut-goty/UT_GOTY_CD2.iso";
+          hash = "sha256-2V2O4c+VVi7gI/1UA17IgT1CdfY9GEdCMiCYbtyNANg=";
+        };
+        nativeBuildInputs = [ libarchive ];
+      }
+      ''
+        bsdtar -xvf "$src"
+        mkdir $out
+        cp -r System Sounds Textures maps $out
+      '';
   systemDir =
     rec {
       x86_64-linux = "System64";
@@ -137,26 +152,33 @@ stdenv.mkDerivation (finalAttrs: {
       # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future
       # on darwin it does, but they are empty
       rm -rf ./{Music,Sounds}
-      ln -s ${unpackIso}/{Music,Sounds} .
+      cp -r ${baseGame}/{Music,Sounds} .
+      chmod u+w ./Sounds
+      cp -n ${bonusPacks}/Sounds/* ./Sounds
+      cp -n ${bonusPacks}/System/*.{u,int} ./System
     ''
     + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      # maps need no post-processing on linux, therefore linking them is ok
+      # maps need no post-processing on linux
       rm -rf ./Maps
-      ln -s ${unpackIso}/Maps .
+      cp -r ${baseGame}/Maps .
+      chmod u+w ./Maps
+      cp -n ${bonusPacks}/maps/* ./Maps
     ''
     + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-      # Maps need post-processing on darwin, therefore need to be copied
-      cp -n ${unpackIso}/Maps/* ./Maps || true
+      # Maps need post-processing on darwin
+      cp -n ${baseGame}/Maps/* ./Maps || true
+      cp -n ${bonusPacks}/maps/* ./Maps || true
       # unpack compressed maps with ucc (needs absolute paths)
       for map in $PWD/Maps/*.uz; do ./UCC decompress $map; done
       mv ${systemDir}/*.unr ./Maps || true
       rm ./Maps/*.uz
     ''
     + ''
-      cp -n ${unpackIso}/Textures/* ./Textures || true
+      cp -n ${baseGame}/Textures/* ./Textures || true
+      cp -n ${bonusPacks}/Textures/* ./Textures || true
     ''
     + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      cp -n ${unpackIso}/System/*.{u,int} ./System || true
+      cp -n ${baseGame}/System/*.{u,int} ./System || true
       ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999"
       ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc"
 

From 0860b7c4793dd99ccac3477bbb5d0f78237c2b55 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <philipp.middendorf@desy.de>
Date: Fri, 24 Apr 2026 14:32:08 +0200
Subject: [PATCH 057/166] crystfel: fix mosflm download URL on OSX

---
 pkgs/applications/science/physics/crystfel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index 6dbfa8802315..1b5fdbd9d8b6 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -88,7 +88,7 @@ let
           fetchurl {
             url = "https://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver${
               builtins.replaceStrings [ "." ] [ "" ] version
-            }/downloads/mosflm-${version}-osx-64.zip";
+            }/downloads/imosflm-${version}-osx-64.zip";
             hash = "sha256-0sXgA3zSIjhy9+zTiv+K/51yZsIgGorMtKVjdRjW+AM=";
           }
         else

From 868aa81489b16bf98e5aa304b044809cfb3e5092 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 18:36:47 +0000
Subject: [PATCH 058/166] ceph-csi: 3.16.1 -> 3.16.2

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

diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index e8940b342260..41a1bf48b1f0 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ceph-csi";
-  version = "3.16.1";
+  version = "3.16.2";
 
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dp/dSZG+kaX2S78KxreSNERZJ2BmF0oSknA62U9UT78=";
+    hash = "sha256-jdBBRSkmNgwYzNUDY9Aarp0HNHsUcSNkZD+Fvv8drHQ=";
   };
 
   preConfigure = ''

From e082ede84422020d6464019b8726b1c17d10c655 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 23:35:50 +0000
Subject: [PATCH 059/166] quint: 0.31.0 -> 0.32.0

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

diff --git a/pkgs/by-name/qu/quint/package.nix b/pkgs/by-name/qu/quint/package.nix
index 6ecf1714b05d..d05bf63132ad 100644
--- a/pkgs/by-name/qu/quint/package.nix
+++ b/pkgs/by-name/qu/quint/package.nix
@@ -18,9 +18,9 @@
 }:
 
 let
-  version = "0.31.0";
-  apalacheVersion = "0.51.1";
-  evaluatorVersion = "0.5.0";
+  version = "0.32.0";
+  apalacheVersion = "0.56.1";
+  evaluatorVersion = "0.6.0";
 
   metaCommon = {
     description = "Formal specification language with TLA+ semantics";
@@ -34,7 +34,7 @@ let
     owner = "informalsystems";
     repo = "quint";
     tag = "v${version}";
-    hash = "sha256-d1iCkpUh5z+Gr2AbjpyfwiR4XZ6vYk96UHCeippC6iw=";
+    hash = "sha256-GTbphBmALx/gDc/iV/wtE1ovpK43VtCQoneN5AqUmvg=";
   };
 
   # Build the Quint CLI from source
@@ -44,7 +44,7 @@ let
 
     sourceRoot = "${src.name}/quint";
 
-    npmDepsHash = "sha256-UZbATCXqyAulEX+oxLEsT5VPm7y4NiCgnAwyugbzc9g=";
+    npmDepsHash = "sha256-6vKu9OTw68A92uhk1vHYDld5ixUln2tZav8pi55/l4c=";
 
     npmBuildScript = "compile";
 
@@ -90,7 +90,7 @@ let
   # Download Apalache. It runs on the JVM, so no need to build it from source.
   apalacheDist = fetchzip {
     url = "https://github.com/apalache-mc/apalache/releases/download/v${apalacheVersion}/apalache.tgz";
-    hash = "sha256-xYQQH9XxPwf3+YmjiRs7XlW49LdHrEnMeuvd16Ir0B4=";
+    hash = "sha256-2Gy+wQOUyuauiGedDNPPHatwcphll3BuL3SD4D12XMI=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {

From c0ef3dd78d91e9794d9571926ad73b83a2b69ee0 Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Sat, 25 Apr 2026 09:06:41 +0200
Subject: [PATCH 060/166] nextcloudPackages: update

---
 pkgs/servers/nextcloud/packages/32.json | 114 +++++++++++------------
 pkgs/servers/nextcloud/packages/33.json | 118 ++++++++++++------------
 2 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index 694020f7c6bf..3466d547d8c7 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -1,8 +1,8 @@
 {
   "bookmarks": {
-    "hash": "sha256-2v+lm1VBHcSdptKehpe8F+u9CiV3wC7zrx0UGdbKAek=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.3/bookmarks-16.1.3.tar.gz",
-    "version": "16.1.3",
+    "hash": "sha256-Q4NwDrCuex5e2sGEG4Gu00Ne3UeojrSRlGPKQ8R2+/0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.4/bookmarks-16.1.4.tar.gz",
+    "version": "16.1.4",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -21,7 +21,7 @@
   },
   "checksum": {
     "hash": "sha256-xA+BdtbAJVtM6YO5vdW7lfOGlyAkEhHlaCMvHmoHYX4=",
-    "url": "https://github.com/westberliner/checksum/releases/download/v2.0.3/checksum.tar.gz",
+    "url": "https://github.com/westberliner/checksum/releases/download/v2.1.0/checksum.tar.gz",
     "version": "2.0.3",
     "description": "Allows users to create a hash checksum of a file.\n        Possible algorithms are md5, sha1, sha256, sha384, sha512, sha3-256, sha3-512 and crc32.\n\n        Just open the details view of the file (Sidebar). There should be a new tab called \"Checksum\".\n        Select a algorithm and it will try to generate a hash.\n        If you want an other algorithm, just click on the reload button.",
     "homepage": "https://github.com/westberliner/checksum/",
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
-    "version": "4.2.0",
+    "hash": "sha256-hCH/P5at2pKCdBhCWoqaT0wrGkeRXcyNvno/b44+2DA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.3.0/collectives-4.3.0.tar.gz",
+    "version": "4.3.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-rEDSTyUAC+0cOh0MRAPwVrGMGhEflTznjl1+GJTuDpI=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.7/contacts-v8.3.7.tar.gz",
-    "version": "8.3.7",
+    "hash": "sha256-pjD/XPbqLAo+uM1lVVvIUZ96wcWV5sNTJ/dd8iqs5xU=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.8/contacts-v8.3.8.tar.gz",
+    "version": "8.3.8",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-RqY3onLYYw03MRWvZvwdO9QkleXB8Tz1q6OnkGqTsuY=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.3/deck-v1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-om9Ygy+UHl8DdHTr9TrmFhCNFi6WjIHoByYmTBostZQ=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.4/deck-v1.16.4.tar.gz",
+    "version": "1.16.4",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-hiDhtnWtscpI+ICOk1nulJoCLovnBv8YBtso/CtJjH4=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.5/forms-v5.2.5.tar.gz",
-    "version": "5.2.5",
+    "hash": "sha256-N5OoSJj69RFmAX2g59r4j5EOUKeXbqwtScYo5Iv3y20=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.7/forms-v5.2.7.tar.gz",
+    "version": "5.2.7",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,9 +150,9 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-+/16SkinCG7ATPc0JsAM13psfl914eSxAo3TU0l/+h8=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.12/groupfolders-v20.1.12.tar.gz",
-    "version": "20.1.12",
+    "hash": "sha256-7G/ExoNBXdNp3XwN+O9TE9Jj+EZ00XsNrc38xtZGALA=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.13/groupfolders-v20.1.13.tar.gz",
+    "version": "20.1.13",
     "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared folders that are accessible\n\t\t\tto selected teams within Nextcloud.\n\n\t\t\tAdmins can configure folders from the Team Folders section in the admin settings, where they can grant access to one\n\t\t\tor more teams, set custom permissions (such as read, write, and sharing rights), and assign storage quotas to each\n\t\t\tfolder.\n\n\t\t\tAs of Hub 10/Nextcloud 31, admins must be members of a team to assign it a Team Folder. The app supports advanced\n\t\t\tfeatures such as quota management, granular access control, and integration with Nextcloud’s trash and versioning\n\t\t\tsystems.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
@@ -180,9 +180,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-o50BZEMtN81UuemxP4+lJt1uI/40EwXiHfaf8FtvkbM=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.1.0/integration_deepl-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-aaGl57K99xzO53zUTZDWvIdoR0SwWnaqaljVeZQOgBU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.6/mail-v5.7.6.tar.gz",
-    "version": "5.7.6",
+    "hash": "sha256-IqsrI3Wt2eOMmb04VMFJytjwURu7otcIhcykdio+MHg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.12/mail-v5.7.12.tar.gz",
+    "version": "5.7.12",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
-    "version": "28.1.0",
+    "hash": "sha256-5KVKrtCQ3Nt7E8/vjYebAcpI0U6QzgvdqFqRk9MPEgo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.2.0/news.tar.gz",
+    "version": "28.2.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,9 +250,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
-    "version": "4.13.1",
+    "hash": "sha256-NCBDtNO6jsqws4BE8sGOnox2xUuODleYodQ5vv6jqEs=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v5.0.0/notes-v5.0.0.tar.gz",
+    "version": "5.0.0",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "oidc": {
-    "hash": "sha256-vWpugR+BoHUnAiAk8vEUzIm8UGgFTcNGAIGhyG4mTws=",
-    "url": "https://github.com/H2CK/oidc/releases/download/1.16.3/oidc-1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-81bCSHh3+kTFYIeOm8HdqnursJIheL1X2o5M4g8/Flw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.5/oidc-1.16.5.tar.gz",
+    "version": "1.16.5",
     "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
     "homepage": "https://github.com/H2CK/oidc",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "oidc_login": {
-    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "hash": "sha256-KBa8A7aC0uS6FQoOSa7nIkaaYe+A2KeAtzfqoKw0Gn4=",
     "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-u+/MGjmFX5xRCcECDlqkM2C0xPY4QiCVj7GXgD3iNXo=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.3/polls-v8.6.3.tar.gz",
-    "version": "8.6.3",
+    "hash": "sha256-ujl6c9teLVQQ7WWlN9Yw0+9bf04Y1UZ1zc9OdZZ9hTA=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v9.0.1/polls-v9.0.1.tar.gz",
+    "version": "9.0.1",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "repod": {
-    "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz",
-    "version": "4.0.0",
+    "hash": "sha256-Nvu90dlcLp4HpVwTcxGmVIIpdiV0G3ZUVj0eYYrFg4s=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.1.0/repod.tar.gz",
+    "version": "4.1.0",
     "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
     "homepage": "https://git.crystalyx.net/Xefir/repod",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
-    "version": "6.4.1",
+    "hash": "sha256-aWYPpqrrEj2SgJIGoyP7nL/HjM5yQItozmQ9b+Iu3NM=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.2/release.tar.gz",
+    "version": "6.4.2",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -390,9 +390,9 @@
     ]
   },
   "tables": {
-    "hash": "sha256-8TA8HIQjdYcIzRoEIBAAR6T83sylZ9ysRbwwsWHrLqA=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.5/tables-v1.0.5.tar.gz",
-    "version": "1.0.5",
+    "hash": "sha256-7D7xskgcu6XgeNh+JCccVMSpC4SSDGwWa0tLY5jf1AU=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.6/tables-v1.0.6.tar.gz",
+    "version": "1.0.6",
     "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
@@ -450,8 +450,8 @@
     ]
   },
   "uppush": {
-    "hash": "sha256-QMLrv44uCNPm+ko3u0XP6p5BZuJthtDFBsT07w0XW/c=",
-    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.0.tar.gz",
+    "hash": "sha256-MFOZqCQRyzICFPMyJGJIr366QpF47GZM/SpzqiY0HWQ=",
+    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.1.tar.gz",
     "version": "2.4.0",
     "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org",
     "homepage": "",
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-G8dxIpI4k3mlCtqYIwOUwHeJiMP08XOp9zM+BY/EWSo=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.8.0/user_oidc-v8.8.0.tar.gz",
-    "version": "8.8.0",
+    "hash": "sha256-Sc7R/hkjAvRUC4aUOLbMucoNabcXt27XB1pwqlz2Zv0=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.10.1/user_oidc-v8.10.1.tar.gz",
+    "version": "8.10.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,10 +470,10 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
-    "version": "7.1.4",
-    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
+    "hash": "sha256-5Unzid91ztnShRqblmQ/Prd/6jfAUU7hMwqKE6gkgKI=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.0.0/user_saml-v8.0.0.tar.gz",
+    "version": "8.0.0",
+    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
       "agpl"
diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json
index 68536082a8af..d42e5a57051e 100644
--- a/pkgs/servers/nextcloud/packages/33.json
+++ b/pkgs/servers/nextcloud/packages/33.json
@@ -1,8 +1,8 @@
 {
   "bookmarks": {
-    "hash": "sha256-2v+lm1VBHcSdptKehpe8F+u9CiV3wC7zrx0UGdbKAek=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.3/bookmarks-16.1.3.tar.gz",
-    "version": "16.1.3",
+    "hash": "sha256-Q4NwDrCuex5e2sGEG4Gu00Ne3UeojrSRlGPKQ8R2+/0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.4/bookmarks-16.1.4.tar.gz",
+    "version": "16.1.4",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "checksum": {
-    "hash": "sha256-xA+BdtbAJVtM6YO5vdW7lfOGlyAkEhHlaCMvHmoHYX4=",
-    "url": "https://github.com/westberliner/checksum/releases/download/v2.0.3/checksum.tar.gz",
-    "version": "2.0.3",
+    "hash": "sha256-hOxl6JySlNzBIbBItAoYsx2sGqF5nm1mryv/jZkrWzk=",
+    "url": "https://github.com/westberliner/checksum/releases/download/v2.1.1/checksum.tar.gz",
+    "version": "2.1.1",
     "description": "Allows users to create a hash checksum of a file.\n        Possible algorithms are md5, sha1, sha256, sha384, sha512, sha3-256, sha3-512 and crc32.\n\n        Just open the details view of the file (Sidebar). There should be a new tab called \"Checksum\".\n        Select a algorithm and it will try to generate a hash.\n        If you want an other algorithm, just click on the reload button.",
     "homepage": "https://github.com/westberliner/checksum/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
-    "version": "4.2.0",
+    "hash": "sha256-hCH/P5at2pKCdBhCWoqaT0wrGkeRXcyNvno/b44+2DA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.3.0/collectives-4.3.0.tar.gz",
+    "version": "4.3.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-2ptmc9Om0wELHVlqjqjZtY3dLCe5RbyxrylNeOa1CGA=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.3/contacts-v8.4.3.tar.gz",
-    "version": "8.4.3",
+    "hash": "sha256-ufDXVN3jKLb0FMVTS6CW3ZhShGPOOvJVGi356qtTfZE=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.4/contacts-v8.4.4.tar.gz",
+    "version": "8.4.4",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-AG4Ef7Jhl8OV7Ddd6heHeEzay62DXEd86lOk9co/tXc=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.17.0/deck-v1.17.0.tar.gz",
-    "version": "1.17.0",
+    "hash": "sha256-5ayXPoq2E8eIQqL74p/dytqmjAN3vkAZvrgQIqxf7Zo=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.17.1/deck-v1.17.1.tar.gz",
+    "version": "1.17.1",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -90,9 +90,9 @@
     ]
   },
   "end_to_end_encryption": {
-    "hash": "sha256-ZlvEXob0CaoCEsmSKBK1EEVUMIWdtkP/hSrCmzUhidA=",
-    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.0.2/end_to_end_encryption-v2.0.2.tar.gz",
-    "version": "2.0.2",
+    "hash": "sha256-OA0N0zvKRe/S1MuvmvoFG1UZZHfKiacQp0Alrlg6EFw=",
+    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.1.0/end_to_end_encryption-v2.1.0.tar.gz",
+    "version": "2.1.0",
     "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no one—not even the server administrator—can read them.\n\n**Benefits:**\n- 🔒 **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- 📱 **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- 🛡️ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- 🔐 **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- 🔒 **Secure FileDrop integration**: Enables secure file sharing with encryption\n- 🛡️ **Zero-knowledge architecture**: Server never has access to encryption keys\n- ⚙️ **Group restrictions**: Limit app usage to specific user groups if needed\n- 🔄 **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.",
     "homepage": "https://github.com/nextcloud/end_to_end_encryption",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-hiDhtnWtscpI+ICOk1nulJoCLovnBv8YBtso/CtJjH4=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.5/forms-v5.2.5.tar.gz",
-    "version": "5.2.5",
+    "hash": "sha256-N5OoSJj69RFmAX2g59r4j5EOUKeXbqwtScYo5Iv3y20=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.7/forms-v5.2.7.tar.gz",
+    "version": "5.2.7",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,9 +150,9 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-5V0gBRz6Q8HS3MxbsU+O7bRwv+765dS2SIbOnFVVERE=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.6/groupfolders-v21.0.6.tar.gz",
-    "version": "21.0.6",
+    "hash": "sha256-yLcyZCI3IHEiZJDAH/vb7uqi5UmNMHFsRedK2pN88mc=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.7/groupfolders-v21.0.7.tar.gz",
+    "version": "21.0.7",
     "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared folders that are accessible\n\t\t\tto selected teams within Nextcloud.\n\n\t\t\tAdmins can configure folders from the Team Folders section in the admin settings, where they can grant access to one\n\t\t\tor more teams, set custom permissions (such as read, write, and sharing rights), and assign storage quotas to each\n\t\t\tfolder.\n\n\t\t\tAs of Hub 10/Nextcloud 31, admins must be members of a team to assign it a Team Folder. The app supports advanced\n\t\t\tfeatures such as quota management, granular access control, and integration with Nextcloud’s trash and versioning\n\t\t\tsystems.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
@@ -180,9 +180,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-o50BZEMtN81UuemxP4+lJt1uI/40EwXiHfaf8FtvkbM=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.1.0/integration_deepl-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-aaGl57K99xzO53zUTZDWvIdoR0SwWnaqaljVeZQOgBU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.6/mail-v5.7.6.tar.gz",
-    "version": "5.7.6",
+    "hash": "sha256-IqsrI3Wt2eOMmb04VMFJytjwURu7otcIhcykdio+MHg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.12/mail-v5.7.12.tar.gz",
+    "version": "5.7.12",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
-    "version": "28.1.0",
+    "hash": "sha256-5KVKrtCQ3Nt7E8/vjYebAcpI0U6QzgvdqFqRk9MPEgo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.2.0/news.tar.gz",
+    "version": "28.2.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,9 +250,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
-    "version": "4.13.1",
+    "hash": "sha256-NCBDtNO6jsqws4BE8sGOnox2xUuODleYodQ5vv6jqEs=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v5.0.0/notes-v5.0.0.tar.gz",
+    "version": "5.0.0",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "oidc": {
-    "hash": "sha256-vWpugR+BoHUnAiAk8vEUzIm8UGgFTcNGAIGhyG4mTws=",
-    "url": "https://github.com/H2CK/oidc/releases/download/1.16.3/oidc-1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-81bCSHh3+kTFYIeOm8HdqnursJIheL1X2o5M4g8/Flw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.5/oidc-1.16.5.tar.gz",
+    "version": "1.16.5",
     "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
     "homepage": "https://github.com/H2CK/oidc",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "oidc_login": {
-    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "hash": "sha256-KBa8A7aC0uS6FQoOSa7nIkaaYe+A2KeAtzfqoKw0Gn4=",
     "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-u+/MGjmFX5xRCcECDlqkM2C0xPY4QiCVj7GXgD3iNXo=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.3/polls-v8.6.3.tar.gz",
-    "version": "8.6.3",
+    "hash": "sha256-ujl6c9teLVQQ7WWlN9Yw0+9bf04Y1UZ1zc9OdZZ9hTA=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v9.0.1/polls-v9.0.1.tar.gz",
+    "version": "9.0.1",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "repod": {
-    "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz",
-    "version": "4.0.0",
+    "hash": "sha256-Nvu90dlcLp4HpVwTcxGmVIIpdiV0G3ZUVj0eYYrFg4s=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.1.0/repod.tar.gz",
+    "version": "4.1.0",
     "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
     "homepage": "https://git.crystalyx.net/Xefir/repod",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
-    "version": "6.4.1",
+    "hash": "sha256-aWYPpqrrEj2SgJIGoyP7nL/HjM5yQItozmQ9b+Iu3NM=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.2/release.tar.gz",
+    "version": "6.4.2",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -450,8 +450,8 @@
     ]
   },
   "uppush": {
-    "hash": "sha256-QMLrv44uCNPm+ko3u0XP6p5BZuJthtDFBsT07w0XW/c=",
-    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.0.tar.gz",
+    "hash": "sha256-MFOZqCQRyzICFPMyJGJIr366QpF47GZM/SpzqiY0HWQ=",
+    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.1.tar.gz",
     "version": "2.4.0",
     "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org",
     "homepage": "",
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-G8dxIpI4k3mlCtqYIwOUwHeJiMP08XOp9zM+BY/EWSo=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.8.0/user_oidc-v8.8.0.tar.gz",
-    "version": "8.8.0",
+    "hash": "sha256-Sc7R/hkjAvRUC4aUOLbMucoNabcXt27XB1pwqlz2Zv0=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.10.1/user_oidc-v8.10.1.tar.gz",
+    "version": "8.10.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,10 +470,10 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
-    "version": "7.1.4",
-    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
+    "hash": "sha256-5Unzid91ztnShRqblmQ/Prd/6jfAUU7hMwqKE6gkgKI=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.0.0/user_saml-v8.0.0.tar.gz",
+    "version": "8.0.0",
+    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
       "agpl"

From bf2f15d2a517ddcdd46544a0d3a5e758da80303e Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Sun, 26 Apr 2026 09:54:00 -0300
Subject: [PATCH 061/166] polybarFull: fix gcc15 build by bumping i3ipcpp to
 C++17

The i3ipcpp submodule (used when i3Support=true) forces -std=c++11,
but the jsoncpp library is compiled with C++17 (JSONCPP_HAS_STRING_VIEW=1).
This causes an ABI mismatch: i3ipcpp resolves operator[](const char*) but
the jsoncpp library only exports operator[](std::string_view), resulting in
undefined references at link time.

Fix by changing i3ipcpp's compile standard from C++11 to C++17 to match
the jsoncpp ABI. Polybar itself already uses C++17.
---
 pkgs/by-name/po/polybar/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index d1375d9d8e20..1890481c389c 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -102,8 +102,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Replace hardcoded /etc when copying and reading the default config.
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace "/etc" $out
+    substituteInPlace CMakeLists.txt --replace-fail "/etc" $out
     substituteAllInPlace src/utils/file.cpp
+    # Fix gcc15 build: i3ipcpp forces -std=c++11 but the jsoncpp library was
+    # compiled with C++17 (JSONCPP_HAS_STRING_VIEW=1), causing ABI mismatch.
+    # The i3ipcpp code resolves operator[](const char*) but the library only
+    # exports operator[](std::string_view). Bump i3ipcpp to C++17 to match.
+    substituteInPlace lib/i3ipcpp/CMakeLists.txt --replace-fail \
+      "-std=c++11" \
+      "-std=c++17"
   '';
 
   postInstall = ''

From 779457023671db26cf383f674fa367d046938c6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 19:57:56 +0000
Subject: [PATCH 062/166] mediamtx: 1.17.1 -> 1.18.0

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

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 82fa79d82e87..13532b495f3f 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGo126Module (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KI6JSyhbraynwwuNp6rBH/VN9/oIJYGC8rTqyTvfDOU=";
+    hash = "sha256-DScZKan8PnEF0znAxJVx8fgbEskw73tv35v38d2jJtM=";
   };
 
-  vendorHash = "sha256-4UFSiPDslVHp6olB3c1AEm1ZxgCdeUKTp3KwqEo152I=";
+  vendorHash = "sha256-FJqERr/rC4y8nBFKh8luwm9pOeVEiKPHorZ5z57wD1E=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

From 054e2748f3c2aad00accaeba460afb3b29f9e19c Mon Sep 17 00:00:00 2001
From: Clara Engler <cve@cve.cx>
Date: Sun, 26 Apr 2026 14:58:43 +0200
Subject: [PATCH 063/166] openbgpd: 6.8p0 -> 9.0

This commit updates OpenBGPD to 9.0.

It also performs a few refactorings because a simple update was not
possible, as many changes happened throughout the past six years, making
a simple version not possible unfortunately.

* Fix wrong pname "opengpd" to "openbgpd"
* Use the version from the OpenBSD CDN
* Remove the autotools and openbgpd-openbsd stuff because it is broken
* Fix dependencies for 9.0
* Fix compiler workaround for 9.0
* Use clang instead of gcc
* Use finalAttrs instead of rec
---
 pkgs/by-name/op/openbgpd/package.nix | 66 +++++++---------------------
 1 file changed, 15 insertions(+), 51 deletions(-)

diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix
index 79d8f6b8b73c..97da596bd906 100644
--- a/pkgs/by-name/op/openbgpd/package.nix
+++ b/pkgs/by-name/op/openbgpd/package.nix
@@ -1,61 +1,25 @@
 {
   lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libtool,
-  m4,
-  bison,
+  clangStdenv,
+  fetchurl,
+  libevent,
 }:
+# Use clang instead of gcc because that issues way less warnings.
+# Besides, OpenBSD devs generally prefer clang over gcc, so it is more likely
+# that the entire compilation is more tested using clang from an upstream POV.
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "openbgpd";
+  version = "9.0";
 
-let
-  openbsd_version = "OPENBSD_6_8"; # This has to be equal to ${src}/OPENBSD_BRANCH
-  openbsd = fetchFromGitHub {
-    name = "portable";
-    owner = "openbgpd-portable";
-    repo = "openbgpd-openbsd";
-    rev = openbsd_version;
-    sha256 = "sha256-vCVK5k4g6aW2z2fg7Kv0uvkX7f34aRc8K2myb3jjl6w=";
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "opengpd";
-  version = "6.8p0";
-
-  src = fetchFromGitHub {
-    owner = "openbgpd-portable";
-    repo = "openbgpd-portable";
-    rev = version;
-    sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
+  src = fetchurl {
+    url = "https://cdn.openbsd.org/pub/OpenBSD/OpenBGPD/openbgpd-${finalAttrs.version}.tar.gz";
+    hash = "sha256-4JfE81Gibx3lM5IS2eENTPWrxLgQXk8cSI7wZakD9hU=";
   };
 
-  nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
-    m4
-    bison
+  buildInputs = [
+    libevent
   ];
 
-  preConfigure = ''
-    mkdir ./openbsd
-    cp -r ${openbsd}/* ./openbsd/
-    chmod -R +w ./openbsd
-    openbsd_version=$(cat ./OPENBSD_BRANCH)
-    if [ "$openbsd_version" != "${openbsd_version}" ]; then
-      echo "OPENBSD VERSION does not match"
-      exit 1
-    fi
-    ./autogen.sh
-  '';
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: bgpd-rde_peer.o:/build/source/src/bgpd/bgpd.h:133: multiple definition of `bgpd_process';
-  #     bgpd-bgpd.o:/build/source/src/bgpd/bgpd.h:133: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
   meta = {
     description = "Free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
     license = lib.licenses.isc;
@@ -63,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ cvengler ];
     platforms = lib.platforms.linux;
   };
-}
+})

From f8564c1945511f02a4119dbb794d7fecff6e7e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 27 Apr 2026 15:15:25 +0200
Subject: [PATCH 064/166] python314Packages.cli-helpers: convert to pyproject =
 true

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

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 923e7155452c..a346bc46f72c 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -6,13 +6,14 @@
   mock,
   pytestCheckHook,
   pygments,
+  setuptools,
   tabulate,
 }:
 
 buildPythonPackage rec {
   pname = "cli-helpers";
   version = "2.14.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "cli_helpers";
@@ -20,7 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-eY4HMfL01CV2fLEqOtlmvyi13nelZRZiBhu0pmvujzU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     configobj
     tabulate
   ]

From 0c28304e2685e4e2726d0e46b6c9258810e1c39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Apr 2026 07:26:42 -0700
Subject: [PATCH 065/166] python3Packages.rapidfuzz: 3.14.3 -> 3.14.5

Diff: https://github.com/maxbachmann/RapidFuzz/compare/v3.14.3...v3.14.5

Changelog: https://github.com/maxbachmann/RapidFuzz/blob/v3.14.5/CHANGELOG.rst
---
 .../python-modules/rapidfuzz/default.nix      | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index d7aa61ab488e..64d39f70ac98 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   clang-tools,
   cmake,
   cython,
@@ -19,34 +18,19 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "3.14.3";
+  version = "3.14.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     tag = "v${version}";
-    hash = "sha256-DOXeZaD21Qsum4brBlMSFcBAUbNEOgCXc6AqEboP1e4=";
+    hash = "sha256-wF7eeSD6GQfN0EOwDvrgjMqN5u2wxXFlktQS7nIKgkU=";
   };
 
-  patches = [
-    # https://github.com/rapidfuzz/RapidFuzz/pull/463
-    (fetchpatch {
-      name = "support-taskflow-3.11.0.patch";
-      url = "https://github.com/rapidfuzz/RapidFuzz/commit/0ef2a4980c41b852283e6db7a747a1632307c75e.patch";
-      hash = "sha256-xb+J3PXwD51lZqIJcTzPJWrT/oqrIXxh1cLp91DhIPg=";
-    })
-    # https://github.com/rapidfuzz/RapidFuzz/pull/470
-    (fetchpatch {
-      name = "support-taskflow-4.0.0.patch";
-      url = "https://github.com/rapidfuzz/RapidFuzz/commit/4b794e6168d98fff4c518a64c4d809238b17d8fe.patch";
-      hash = "sha256-F4gwV4ewcHfR7ptcEVAvbiNFIvXqFCIM/Qk8giv4jAc=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "Cython >=3.1.6, <3.2.0" "Cython >=3.1.6"
+      --replace-fail "Cython >=3.1.6, <3.3.0" "Cython >=3.1.6"
   '';
 
   build-system = [

From 77f04ba6d5038518ef1221a975215e29acc0bed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Sava=C3=ABte?= <laurent@where.tf>
Date: Mon, 27 Apr 2026 17:03:14 +0200
Subject: [PATCH 066/166] rbspy: 0.45.0 -> 0.46.0

Changelog: https://github.com/rbspy/rbspy/releases/tag/v0.46.0
This release actually makes rbspy usable with nix built ruby
---
 pkgs/by-name/rb/rbspy/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index ef79f2c60b6d..cc238e1e181b 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o4YSvPOVi+Q6Nf3PfT0ZqKnC+VQadiCkmVtb8q/os54=";
+    hash = "sha256-TC/0Y/+4rUO+cvZttgJCmDym47bRWW3TvZhJ6MFU+7U=";
   };
 
-  cargoHash = "sha256-s5MeEEGuz+kCJJ7XAKNbJHfJlqsh/oUCcXw1590CHrc=";
+  cargoHash = "sha256-dxloiguD1u/6khqeorBaozxdLnJiE7KL4/oU4uxJmIU=";
 
   doCheck = true;
 
@@ -34,14 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "/usr/bin/ruby" "${lib.getExe ruby}"
   '';
 
-  checkFlags = [
-    "--skip=test_get_trace"
-    "--skip=test_get_trace_when_process_has_exited"
-    "--skip=test_sample_single_process"
-    "--skip=test_sample_single_process_with_time_limit"
-    "--skip=test_sample_subprocesses"
-  ];
-
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook;
 
   nativeCheckInputs = [

From 9fdd0f0d65f4ebef8c6b53426cffac68a8ef66b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 15:05:03 +0000
Subject: [PATCH 067/166] ffizer: 2.13.9 -> 2.13.10

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

diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index fc4a1e38ebfa..b02f7ce3bd72 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ffizer";
-  version = "2.13.9";
+  version = "2.13.10";
 
   buildFeatures = [ "cli" ];
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ffizer";
     repo = "ffizer";
     rev = finalAttrs.version;
-    hash = "sha256-7nTtyCtppUZ3vEtiDfDMCvDztZRVDFH43bl5fgZtfFM=";
+    hash = "sha256-BaTqkfNiRLHgg3In/5zh4u5ThD+wfW7R3tjy/qsPVag=";
   };
 
-  cargoHash = "sha256-/BdODBhF+ikre/U1TzB+/DqSs7LYn7NhPKgMJT80TUM=";
+  cargoHash = "sha256-QbT6QxYP6ykDKtEWfFva16ms7b2wNOS+TrvPJV9ys2A=";
 
   nativeBuildInputs = [
     pkg-config

From 2e6136f3d3564608d3332d709ea996bc938b4ed4 Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Mon, 27 Apr 2026 16:13:53 +0100
Subject: [PATCH 068/166] harper: build harper-cli

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

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 61e1a5c3ca60..a29356e421e8 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -17,10 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-9AA2uln9cnMzFvPbxiD05sfdAZKO7xzoJSfQbeRNE9Y=";
   };
 
-  buildAndTestSubdir = "harper-ls";
-
   cargoHash = "sha256-P90qKrV4YK1ATwclbJ8wX+rcCdE1QetNNL96/IXeIMA=";
 
+  cargoBuildFlags = [
+    "--package=harper-cli"
+    "--package=harper-ls"
+  ];
+
+  cargoTestFlags = [
+    "--package=harper-cli"
+    "--package=harper-ls"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   nativeInstallCheckInputs = [

From 9bbd0926a68eea5da8d692b6b2cfc60acf3a39bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Apr 2026 19:12:18 +0200
Subject: [PATCH 069/166] cnspec: 13.5.0 -> 13.6.0

Diff: https://github.com/mondoohq/cnspec/compare/v13.5.0...v13.6.0

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v13.6.0
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index cdb3dbd82f05..eb320645acec 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "13.5.0";
+  version = "13.6.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B78wdVa3GrD7eXG0RKnO2/F/FXV3jwaul2Ag1P76s2g=";
+    hash = "sha256-edapPCYa1CtJS4p8+5Imi0G13qrs3S46QIZmnCNe+rQ=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-yb89NhE3d7Wx26ZzjadNTlOWauHVpT7Q4ScPauLcnlU=";
+  vendorHash = "sha256-eqdT/znugXvGuZeecwaVFXNSJspnVYo3nJPnf2HKkqY=";
 
   subPackages = [ "apps/cnspec" ];
 

From 0ea35e1cf967416b661991ed613bfef27a6d7236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 18:29:21 +0000
Subject: [PATCH 070/166] python3Packages.libtmux: 0.55.0 -> 0.55.1

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

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 36251d2b81f7..c6917416da86 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "libtmux";
-  version = "0.55.0";
+  version = "0.55.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-34YwI0QjewDeigHYLiTdEi8PgleW1VCiaQSQvrSpf/s=";
+    hash = "sha256-A8mi0Q9ScbHmFRSvcF+wbn+lAO8B3/rU/+HvTXvxWPE=";
   };
 
   postPatch = ''

From 67c4e17de3d2c3fc2c2d91ee0c3a52e8d42bb33b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 19:17:15 +0000
Subject: [PATCH 071/166] kazumi: 2.0.7 -> 2.0.8

---
 pkgs/by-name/ka/kazumi/git-hashes.json   |  4 ++--
 pkgs/by-name/ka/kazumi/package.nix       |  4 ++--
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json
index 60a9c9309799..cf2fa6745ad5 100644
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@@ -1,6 +1,6 @@
 {
   "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
-  "desktop_webview_window": "sha256-4nTulOxPTV7sePokTY7xJTwulyucvf4JZKw860P8pbA=",
+  "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
   "media_kit": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_android_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_ios_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
@@ -10,5 +10,5 @@
   "media_kit_libs_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_windows_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
-  "webview_windows": "sha256-YMOv3wRqsXqoccdDCv4dj10Pc1UkO9OuJWckNujMr5A="
+  "webview_windows": "sha256-5iNB/h6TzMOTxp98flg7jt2XZn0bFU6wSvYjjUXt3bk="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 2b726a92541b..6363529921f6 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-r3nV7XhwvPoNqobRz/1n6iGjcjGPvcFYch5DQCP6RLE=";
+    hash = "sha256-ph9VFRBGwkEjKJGjnPGldLDOwIdHpZtEWydW80hKOFg=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index b1f87ecf1e29..27af44111f65 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -445,8 +445,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "297b39532c426263d2fa9fde4d70d2b5bdfc8059",
-        "resolved-ref": "297b39532c426263d2fa9fde4d70d2b5bdfc8059",
+        "ref": "b429f8ba6b8a99cd0f7eb5fe8d1621f325635c3d",
+        "resolved-ref": "b429f8ba6b8a99cd0f7eb5fe8d1621f325635c3d",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
       "source": "git",
@@ -1365,6 +1365,16 @@
       "source": "hosted",
       "version": "7.0.2"
     },
+    "photo_view": {
+      "dependency": "direct main",
+      "description": {
+        "name": "photo_view",
+        "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.0"
+    },
     "platform": {
       "dependency": "transitive",
       "description": {
@@ -2145,8 +2155,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "1b9e83371356c04d8b0fb7ab1d20ebacf5cf9764",
-        "resolved-ref": "1b9e83371356c04d8b0fb7ab1d20ebacf5cf9764",
+        "ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
+        "resolved-ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2235,6 +2245,6 @@
   },
   "sdks": {
     "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.41.6"
+    "flutter": ">=3.41.7"
   }
 }

From c9961713bccd90ea753f404f9e9864d129dd696f Mon Sep 17 00:00:00 2001
From: Daste <stefankar1000@gmail.com>
Date: Mon, 27 Apr 2026 21:32:46 +0200
Subject: [PATCH 072/166] prisma_7, prisma-engines_7: 7.7.0 -> 7.8.0

---
 pkgs/by-name/pr/prisma-engines_7/package.nix | 4 ++--
 pkgs/by-name/pr/prisma_7/package.nix         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prisma-engines_7/package.nix b/pkgs/by-name/pr/prisma-engines_7/package.nix
index 38c8830aab52..080ac1480b77 100644
--- a/pkgs/by-name/pr/prisma-engines_7/package.nix
+++ b/pkgs/by-name/pr/prisma-engines_7/package.nix
@@ -11,13 +11,13 @@
 # function correctly.
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prisma-engines_7";
-  version = "7.7.0";
+  version = "7.8.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     tag = finalAttrs.version;
-    hash = "sha256-NMoAaiTa68i51lR6iMCyHyCAsFuuhPx2+tHFSSoqWqA=";
+    hash = "sha256-nquIcOmFz+ikD0x/YEPZ5NVKCFPCdR5MSCHldn+b9jI=";
   };
 
   cargoHash = "sha256-uiFvzxwVJXCW9LUDFRC6ZkzSa7LQk+9ZJcaJw8mrBX4=";
diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix
index 1b67704d8a0c..8f75e4535c17 100644
--- a/pkgs/by-name/pr/prisma_7/package.nix
+++ b/pkgs/by-name/pr/prisma_7/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma_7";
-  version = "7.7.0";
+  version = "7.8.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     tag = finalAttrs.version;
-    hash = "sha256-GdS70TdHOlI0OatLvu/laBJzBraS/KWuWwpwQGTIEEU=";
+    hash = "sha256-89q5433z54h3oGX+lEYDQykN2mNltGz4+LWlYSE75/E=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-lfvRw+F0X1BPw3Njiri602HCiyDJOpyXQ5Dgh9f1hfc=";
+    hash = "sha256-mrFU5SAF4QuTBJj5TP8tUkYDG4zchttjcQMLtx6OBnI=";
   };
 
   patchPhase = ''

From 7da13f8795c6cf3d219ebc9fb2fcd7887fb5408a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 20:09:26 +0000
Subject: [PATCH 073/166] bob-nvim: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/by-name/bo/bob-nvim/package.nix b/pkgs/by-name/bo/bob-nvim/package.nix
index 7550587e0e2c..837272a0813b 100644
--- a/pkgs/by-name/bo/bob-nvim/package.nix
+++ b/pkgs/by-name/bo/bob-nvim/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bob";
-  version = "4.1.6";
+  version = "4.1.7";
 
   src = fetchFromGitHub {
     owner = "MordechaiHadad";
     repo = "bob";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XI/oNGKLXQ/fpB6MojhTsEgmmPH1pHECD5oZgc1r4rQ=";
+    hash = "sha256-2TrmLN9VPjueRRL7kcnfH+eBpEdAOAKGP8N9KZE8bH0=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoHash = "sha256-YSZcYTGnMnN/srh8Z15toq+GIyRKfFd+pGkFQl5gCuo=";
+  cargoHash = "sha256-Akn0p8NBZV3M+pM91W01GIX9mF8nL7dt/kk0ufES8T0=";
 
   doCheck = false;
 

From b27818dd08887c8c19d5652c579f7e41799fa223 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 21:05:54 +0000
Subject: [PATCH 074/166] nb-cli: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 83c146cc12f8..557251ed3f30 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "nb-cli";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nonebot";
     repo = "nb-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/OZHDMfwaajePiQ7Nb6BsQcpUPybP5SDWHWG/tVUxCo=";
+    hash = "sha256-Vo+MmbaC+i/FZfrZywb2vgNQotafLyXpdBo6pDlZeaE=";
   };
 
   pythonRemoveDeps = [ "pip" ];

From a80b6a5dd1407cc7ff7e7b8fb1c554b8a7b785e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 21:54:54 +0000
Subject: [PATCH 075/166] libretro.beetle-lynx: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
index b76bb0deadbf..ba8b97d555d2 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-lynx";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-lynx-libretro";
-    rev = "40226b7b4fdd2604aa817fb7ded895b665282e25";
-    hash = "sha256-HjqNFfx4e1+DPq05Ii3scNocMn2FLA/LcI1vfT3TUes=";
+    rev = "fcdefcfb3c11d6d2e71be076a5d3df2e88ab73ed";
+    hash = "sha256-yucZWgJiqlfsgd/gQSPxSdZjt+9UfJe1Jq4vMLypDhg=";
   };
 
   makefile = "Makefile";

From 3a31921293e64084a3503f59e09ebd62dcb81646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Apr 2026 15:21:45 -0700
Subject: [PATCH 076/166] python3Packages.urllib3-future: 2.19.904 -> 2.19.913

Diff: https://github.com/jawah/urllib3.future/compare/2.19.904...2.19.913

Changelog: https://github.com/jawah/urllib3.future/blob/2.19.913/CHANGES.rst
---
 .../python-modules/urllib3-future/default.nix         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 32341aeaf819..ec46491b574f 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -10,6 +10,7 @@
   jh2,
   lib,
   pytest-asyncio,
+  pytest-rerunfailures,
   pytest-timeout,
   pytestCheckHook,
   python-socks,
@@ -24,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.19.904";
+  version = "2.19.913";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-bYkT78OT665Ea3k4boORlaFiORaryqRXSfxXt0yZLSM=";
+    hash = "sha256-ReoVZb31M1N1oxSFYGd1x1P5/qBx/oFEjaxJEiMwbvM=";
   };
 
   postPatch = ''
@@ -68,6 +69,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aiofile
     pytest-asyncio
+    pytest-rerunfailures
     pytest-timeout
     pytestCheckHook
     tornado
@@ -80,11 +82,6 @@ buildPythonPackage rec {
     "test/contrib/test_resolver.py::test_url_resolver"
   ];
 
-  disabledTests = [
-    # test hangs
-    "test_proxy_rejection"
-  ];
-
   meta = {
     changelog = "https://github.com/jawah/urllib3.future/blob/${src.tag}/CHANGES.rst";
     description = "Powerful HTTP 1.1, 2, and 3 client with both sync and async interfaces";

From bf844708c1062e6fcf4b9bd0dd257b6f1fa04351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Tue, 28 Apr 2026 00:41:30 +0200
Subject: [PATCH 077/166] auto-cpufreq: fix another path from /opt to /var/run

---
 pkgs/by-name/au/auto-cpufreq/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 7dd1eecaa8d9..d973a2995a45 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -38,6 +38,8 @@ python3Packages.buildPythonPackage rec {
   postPatch = ''
     substituteInPlace auto_cpufreq/core.py \
       --replace-fail "/opt/auto-cpufreq/override.pickle" "/var/run/override.pickle"
+    substituteInPlace auto_cpufreq/core.py \
+      --replace-fail "/opt/auto-cpufreq/turbo-override.pickle" "/var/run/turbo-override.pickle"
     substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \
       --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" "$out/bin/auto-cpufreq"
     substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \

From 9365d46a4e6c36399f55b59ef1d8a90848c12f29 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:53:50 +0200
Subject: [PATCH 078/166] tree-sitter-grammars.tree-sitter-blueprint:
 0-unstable-2025-06-17 -> 0-unstable-2026-04-18

diff: https://github.com/smrtrfszm/tree-sitter-blueprint/compare/de66f283c6c9b7c270d766c2e4cf95535650ec48...f2b043912ffbfcf4e9e8d09709b86ab39a4b78ea
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 82d5b2d51eec..d9c722b8a7bd 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -161,10 +161,10 @@
   };
 
   blueprint = {
-    version = "0-unstable-2025-06-17";
+    version = "0-unstable-2026-04-18";
     url = "github:smrtrfszm/tree-sitter-blueprint";
-    rev = "de66f283c6c9b7c270d766c2e4cf95535650ec48";
-    hash = "sha256-zmMJZAxyKO42gIK3cWP/LuoPIo2+xr6fEDeHXknqa7M=";
+    rev = "f2b043912ffbfcf4e9e8d09709b86ab39a4b78ea";
+    hash = "sha256-tcy4FIQ/59PeSHIXX8YmbBX5lK0acKahePT2/xKzYyM=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From f2a8226044c6baf1fd8ca8788b21b95661cadf60 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:53:51 +0200
Subject: [PATCH 079/166] tree-sitter-grammars.tree-sitter-caddyfile:
 0-unstable-2025-12-16 -> 0-unstable-2026-04-06

diff: https://github.com/caddyserver/tree-sitter-caddyfile/compare/2b816940b5bf4f86c650aded24500cb5b682f1a1...6e62b4e297c955f050a6542a8d24df2f223a90e8
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index d9c722b8a7bd..b20e0fce15d0 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -198,10 +198,10 @@
   };
 
   caddyfile = {
-    version = "0-unstable-2025-12-16";
+    version = "0-unstable-2026-04-06";
     url = "github:caddyserver/tree-sitter-caddyfile";
-    rev = "2b816940b5bf4f86c650aded24500cb5b682f1a1";
-    hash = "sha256-C/dTDm4X+VxtNZaqb2AHgcDZyGeBN9VMwZjSzJVEHGo=";
+    rev = "6e62b4e297c955f050a6542a8d24df2f223a90e8";
+    hash = "sha256-a/ioYTQBFueZTtzoDre7UD6h5NluZ8gQc+8yTrj2Goc=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From c6de381cd61117c51e7ffa53c15f98791d6948b1 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:53:52 +0200
Subject: [PATCH 080/166] tree-sitter-grammars.tree-sitter-cel:
 0-unstable-2024-02-13 -> 0-unstable-2026-03-04

diff: https://github.com/bufbuild/tree-sitter-cel/compare/df0585025e6f50cdb07347f5009ae3f47c652890...fd2e8efaa07e71e46dcc1d5c4c85556a742d8c36
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index b20e0fce15d0..e6086fcb3882 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -237,10 +237,10 @@
   };
 
   cel = {
-    version = "0-unstable-2024-02-13";
+    version = "0-unstable-2026-03-04";
     url = "github:bufbuild/tree-sitter-cel";
-    rev = "df0585025e6f50cdb07347f5009ae3f47c652890";
-    hash = "sha256-Fyq56kzu1bL44QhrF3ZnKWgsoPRh3tjTRi2CynNQGfw=";
+    rev = "fd2e8efaa07e71e46dcc1d5c4c85556a742d8c36";
+    hash = "sha256-f/Gpsp+Se3lSguz89vWDf3gGaefnwpHCp4Bzfz6y29I=";
     meta = {
       license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [

From de42789f484a83bfd16024cdd7d9938b4916a3cb Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:53:54 +0200
Subject: [PATCH 081/166] tree-sitter-grammars.tree-sitter-dart:
 0-unstable-2025-10-04 -> 0-unstable-2026-03-14

diff: https://github.com/usernobody14/tree-sitter-dart/compare/d4d8f3e337d8be23be27ffc35a0aef972343cd54...0fc19c3a57b1109802af41d2b8f60d8835c5da3a
---
 .../tr/tree-sitter/grammars/grammar-sources.nix     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index e6086fcb3882..4534646b6c49 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -410,20 +410,13 @@
   };
 
   dart = {
-    version = "0-unstable-2025-10-04";
+    version = "0-unstable-2026-03-14";
     url = "github:usernobody14/tree-sitter-dart";
-    rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
-    hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
+    rev = "0fc19c3a57b1109802af41d2b8f60d8835c5da3a";
+    hash = "sha256-yK4XfjVPABFHf8MjoDge6bmapcybhdIF+49rlXFP+pw=";
     meta = {
       license = lib.licenses.mit;
     };
-    patches = [
-      (fetchpatch {
-        name = "Fix invalid `tree-sitter.json`";
-        url = "https://github.com/UserNobody14/tree-sitter-dart/commit/81638dbbdb76a0e88ea8c31b95ec76b9625ddb84.diff";
-        hash = "sha256-oaxuKQPN/gprO4OFWYItkj5dqd2xlq3SV6qr4YkSFjM=";
-      })
-    ];
   };
 
   dbml = {

From f22cf887dce4cbd9cdc0a2667df5ee1757de67fc Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:57:27 +0200
Subject: [PATCH 082/166] tree-sitter-grammars.tree-sitter-djot: source moved

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 4534646b6c49..95747b1923e9 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -480,7 +480,7 @@
 
   djot = {
     version = "0-unstable-2025-09-15";
-    url = "github:treeman/tree-sitter-djot";
+    url = "codeberg:treeman/tree-sitter-djot";
     rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
     hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8=";
     meta = {

From 788c95d97a772e9aad7e4cee2cd9ff92a74a90a3 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:58:00 +0200
Subject: [PATCH 083/166] tree-sitter-grammars.tree-sitter-fga:
 0-unstable-2025-12-17 -> 0-unstable-2026-03-19

diff: https://github.com/matoous/tree-sitter-fga/compare/e763d12cfd8569494215f304bc2b0074c84709e9...ce72d1c484ba133a18e966d67be66bce85695451
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 95747b1923e9..4c2bc574d2f8 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -660,10 +660,10 @@
   };
 
   fga = {
-    version = "0-unstable-2025-12-17";
+    version = "0-unstable-2026-03-19";
     url = "github:matoous/tree-sitter-fga";
-    rev = "e763d12cfd8569494215f304bc2b0074c84709e9";
-    hash = "sha256-d1gvEoJosBcEiq4fxb+1LFcdSkuOWGXyG1cC44Lo19o=";
+    rev = "ce72d1c484ba133a18e966d67be66bce85695451";
+    hash = "sha256-8op8IFKh3dZY02Yiehvqz1XyeOw9qSoe0f31M4yzw1U=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 3a382bf52756f97aaf077254660f75a81ead9e74 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 27 Apr 2026 19:24:32 -0400
Subject: [PATCH 084/166] sioyek: fix changelog #514132

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

diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index 6975adb229ba..75cedc831e86 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -82,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sioyek.info/";
     description = "PDF viewer designed for research papers and technical books";
     mainProgram = "sioyek";
-    changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
+    # no changelog for unstable version, change back to
+    # https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}
+    # once stable again
+    changelog = "https://github.com/ahrm/sioyek/releases";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       podocarp

From c89e02c49da255f1e0f1499e177ec60f79747015 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 23:29:07 +0000
Subject: [PATCH 085/166] usque: 2.0.1 -> 3.0.0

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

diff --git a/pkgs/by-name/us/usque/package.nix b/pkgs/by-name/us/usque/package.nix
index ad80fab032f1..ec628309ca99 100644
--- a/pkgs/by-name/us/usque/package.nix
+++ b/pkgs/by-name/us/usque/package.nix
@@ -10,15 +10,15 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "usque";
-  version = "2.0.1";
+  version = "3.0.0";
   src = fetchFromGitHub {
     owner = "Diniboy1123";
     repo = "usque";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-veAUc2LeH2NoOs3AHj8GUr7zBPidHtr+JlUQjgo/WQQ=";
+    hash = "sha256-xgndE4kfR7LVLBvcxJ68Yq0NLN+8zyciMYaP9K+qS9M=";
   };
 
-  vendorHash = "sha256-pilBazQcrfCcgBCo9U9jGo/ZcuXLBR3kT8l+mad+umg=";
+  vendorHash = "sha256-29f/5PnmqaVS8PP1xVksgszFk3GyYZXXGDD1hjE/iSA=";
 
   ldflags = [
     "-s"

From 84ea23bff7cf035b97570e0c1e90eec2d704e1d9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 27 Apr 2026 20:26:10 -0400
Subject: [PATCH 086/166] walker: 2.16.0 -> 2.16.1

Changelog: https://github.com/abenz1267/walker/releases/tag/v2.16.1
---
 pkgs/by-name/wa/walker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix
index 17409408b212..d5caa33bc29b 100644
--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "walker";
-  version = "2.16.0";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "walker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ugacgbPxYM68pAcQRceuSlCWtUEuddltMUzAWrnWlHA=";
+    hash = "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=";
   };
 
-  cargoHash = "sha256-MPjMB5TsrJd28QuEoIDRJjM+SE0cTNCO5PRW+I+/CHE=";
+  cargoHash = "sha256-LoQiovL1DsM63VBFiIPoizaEbH3yFjN9DLUh4wXsRvQ=";
 
   nativeBuildInputs = [
     gobject-introspection

From 296837f060a592bdc91075a26c005349aebccc0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 00:31:00 +0000
Subject: [PATCH 087/166] thin-provisioning-tools: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 629bf3f4eeb9..101d7bbb6b86 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "thin-provisioning-tools";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hOwW2zda/KdA22A+94A5r2LIezQTZ71eewhkc72u5kI=";
+    hash = "sha256-hRGelBHFbyWHwV3fRecGXIEhoDzVQ+Rdj/VHGxcDH1k=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     udev
   ];
 
-  cargoHash = "sha256-f417GApMA1R7nX75Zkfv28aZskbpTkUHWePX30X22FU=";
+  cargoHash = "sha256-y3uvPwLps8edzO9GtJ1CpB55kieclk06PjOYsYs64go=";
 
   passthru.tests = {
     inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;

From 87ce361bec901608871176da5cbed452953a88fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 00:34:00 +0000
Subject: [PATCH 088/166] ipp-usb: 0.9.31 -> 0.9.32

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

diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix
index b9878ed61d63..107f0a680da2 100644
--- a/pkgs/by-name/ip/ipp-usb/package.nix
+++ b/pkgs/by-name/ip/ipp-usb/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "ipp-usb";
-  version = "0.9.31";
+  version = "0.9.32";
 
   src = fetchFromGitHub {
     owner = "openprinting";
     repo = "ipp-usb";
     rev = finalAttrs.version;
-    sha256 = "sha256-WoJa00dSTXknoEjRO/L1yZc6pA0SfAhKsG6QqS6aDSc=";
+    sha256 = "sha256-spXp9la5FV8J/cb/1IDQM29QqzFCDzgRKwPk1f3LgkM=";
   };
 
   postPatch = ''

From cf1181d436e1dac98f50154df8f082db738106ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 00:41:10 +0000
Subject: [PATCH 089/166] shpool: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index e3ac18cbba29..81ee1d8d4850 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shpool";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4+4R0RnynU8AF6FL+zmokRux7SzDANwLAhbg35okUBQ=";
+    hash = "sha256-Q2sIHOiFP/xj6wO3GNDc53eRwGygAz6nijsUqa3n9v0=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
   '';
 
-  cargoHash = "sha256-RHObvJs8hgM3jMLh7sG0EzQcWTRR2vy9e2rS5dUKEeg=";
+  cargoHash = "sha256-SkMPP3FwVMmHnsTIYqZjrjdliWk3YbPHsaRe1rx8sIg=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ];
 

From 6a963272afdca8e3c26c5ee0fe8505624afa8e26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Apr 2026 23:56:26 +0000
Subject: [PATCH 090/166] python3Packages.bravado-core: 6.6.1 -> 6.3.1

---
 .../python-modules/bravado-core/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index a402a1defbf6..1ba87cf8320f 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -21,19 +21,19 @@
 
 buildPythonPackage rec {
   pname = "bravado-core";
-  version = "6.6.1";
+  version = "6.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "bravado-core";
     rev = "v${version}";
-    hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
+    hash = "sha256-tMrGNezHtmSwuZOdTI+dMIFZ8SWi38LoOWevdwHcKr8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jsonref
     jsonschema # jsonschema[format-nongpl]
     python-dateutil
@@ -47,9 +47,10 @@ buildPythonPackage rec {
   ]
   ++ jsonschema.optional-dependencies.format-nongpl;
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  checkInputs = [ mock ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+  ];
 
   pythonImportsCheck = [ "bravado_core" ];
 

From 6eca6dc8261b1a8eb265a70b53f7c1d8909a0da3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 00:46:10 +0000
Subject: [PATCH 091/166] pluto: 5.23.6 -> 5.24.0

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

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 4e8bdcb1473d..bba13ebf3793 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pluto";
-  version = "5.23.6";
+  version = "5.24.0";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-P/N36LCoXLRDD4ASN4YQovgQFrW2WgS+tKRUlWTNZIs=";
+    hash = "sha256-s46O/lSrF7kNaUWOrWnxQpLxWh/jbvI9k+t2jZqOAjU=";
   };
 
-  vendorHash = "sha256-EAgfzwGt/kHMP5mJ9D+WW6KMV7P0r/gUf6EYTppLWIA=";
+  vendorHash = "sha256-mNY1BmugJ7OauR3nSoiD7EpJ8dlk5PKPL/4urvPtOIY=";
 
   ldflags = [
     "-w"

From 342dfd000026d7ba633b2b5662fb7ed3d1026958 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 01:16:45 +0000
Subject: [PATCH 092/166] gat: 0.27.0 -> 0.27.1

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

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 0d7dd048d2d7..8a5b783ecd8d 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gat";
-  version = "0.27.0";
+  version = "0.27.1";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xydy+iKBfO1np/jtzWHFNUmXqb545ldWtwqMymaah2c=";
+    hash = "sha256-8+IpVMbV+1aXNZoIWVZF/GDsLh2G1rHudkyifguGl0g=";
   };
 
-  vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8=";
+  vendorHash = "sha256-UUFfM51toafSxK+x7Q7c9wPDiO22f7YfLc05u3uWLAE=";
 
   env.CGO_ENABLED = 0;
 

From 131089ab182572addfec048d9b447dcbd6e3bb01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 01:28:40 +0000
Subject: [PATCH 093/166] ibus-engines.table: 1.17.17 -> 1.17.18

---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 40d3cb9d60d6..062232079e61 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.17.17";
+  version = "1.17.18";
 
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
     rev = version;
-    sha256 = "sha256-Y8tZBcRlND4DsBE0YQXrulgT0kn8WrGUAOEg0j1Nvc8=";
+    sha256 = "sha256-NU+lZcuCJs1k0BNnPyxR6aiFNc8mmcNxM9k9yrg0Q/M=";
   };
 
   postPatch = ''

From 50067b17143362fcc1f9b890dcf9b4f11c1f8b21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 01:30:13 +0000
Subject: [PATCH 094/166] gatekeeper: 3.22.1 -> 3.22.2

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

diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix
index 8dad97fc7d3d..9ec712993a9d 100644
--- a/pkgs/by-name/ga/gatekeeper/package.nix
+++ b/pkgs/by-name/ga/gatekeeper/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gatekeeper";
-  version = "3.22.1";
+  version = "3.22.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lYLII1aJwrYmoyVYf08KDyvIVuCJIya/97hLQyGKz44=";
+    hash = "sha256-fW5aSZ9/X/oQM8r1NWkNHlK+pd+ji7GTWPGx0NEW9gk=";
   };
 
   vendorHash = "sha256-PnBWUvpq7d3yQP50fgACWx/zcYobIGC+KiuzLqpKDcI=";

From 16826dbd939d52fa04d8464c646b627c20dea959 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 02:18:30 +0000
Subject: [PATCH 095/166] vega-lite: 6.4.2 -> 6.4.3

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

diff --git a/pkgs/by-name/ve/vega-lite/package.nix b/pkgs/by-name/ve/vega-lite/package.nix
index 12ec1f1b0e63..f507b1cec9e0 100644
--- a/pkgs/by-name/ve/vega-lite/package.nix
+++ b/pkgs/by-name/ve/vega-lite/package.nix
@@ -11,16 +11,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "vega-lite";
-  version = "6.4.2";
+  version = "6.4.3";
 
   src = fetchFromGitHub {
     owner = "vega";
     repo = "vega-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UQEgZk9SZTSKiAfOvBxnpkyiih9QcSv08O8vt4ooeYQ=";
+    hash = "sha256-bsPnvUleHrihsoOL98O8KTbiONx3FNuQjH9vrZ/bLTw=";
   };
 
-  npmDepsHash = "sha256-EOJGMmIObN4XCC4ZbZQQ89X12+STKejt6vugyIb7v0A=";
+  npmDepsHash = "sha256-dni2tEYzE/AzgGldCAtBpmQK24kIRck0KQXvD2e5xfw=";
 
   nativeBuildInputs = [
     pkg-config

From ded233de09bf24e68679cd95b10747663ae8c25d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 02:32:43 +0000
Subject: [PATCH 096/166] sem: 0.33.1 -> 0.34.0

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

diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index 313402ea4955..52039b84500a 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sem";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "semaphoreci";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+MNl+JOpC3FgzWBVybTDqV6VE4cdBafQ77IYcXO4j48=";
+    sha256 = "sha256-FJn1oTtECPZpBi2LsoAxA2kyS3RY1/5oJGOTZiwitsA=";
   };
 
   vendorHash = "sha256-XEr/vXamJ7GTRpXNdcVQ9PcUVvQ8EW3pmq/tEZMHSDo=";

From 9bc3bfeba79638b8166e677c2770f211efdf1aa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 02:34:52 +0000
Subject: [PATCH 097/166] vscode-extensions.vytautassurvila.csharp-ls: 0.0.31
 -> 0.0.32

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 472a4e8ee811..d4c5e0fc4dc0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5240,8 +5240,8 @@ let
         mktplcRef = {
           name = "csharp-ls";
           publisher = "vytautassurvila";
-          version = "0.0.31";
-          hash = "sha256-d2vHhM+/hzT/JdFzu2WtJiWY2BHGk8SicleHxwm8ciY=";
+          version = "0.0.32";
+          hash = "sha256-dc7aIUb+5fdmqVeHrysy8jjk0Sx6ThIsO9KagdQpx+M=";
         };
         meta = {
           changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";

From 9873cafacab5778d2c5fd407605ac9a3b164c388 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 02:40:25 +0000
Subject: [PATCH 098/166] spicedb-zed: 0.36.1 -> 1.0.0

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

diff --git a/pkgs/by-name/sp/spicedb-zed/package.nix b/pkgs/by-name/sp/spicedb-zed/package.nix
index 105954ba85aa..74541fb64c27 100644
--- a/pkgs/by-name/sp/spicedb-zed/package.nix
+++ b/pkgs/by-name/sp/spicedb-zed/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "zed";
-  version = "0.36.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-42c2utcrUOhLwFS7AdsR2/6vtBLo7Vitx3i9k7pFs7o=";
+    hash = "sha256-kF16ZmIOw80esknKJvHYFWrx4FG/kn+Il5xnC1JmAn4=";
   };
 
-  vendorHash = "sha256-WgTOwXdH1jgK7Un8UA/PX9iYt0VyAGMdpxYVXM6KyWE=";
+  vendorHash = "sha256-e/VrFEKVVAAtClAzFw2XV3cWVmto90qzMKVLpZjKZ8o=";
 
   ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
 

From 5ca00cd0c62c79134270119fcd76a8c8f6c0d0ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 04:14:23 +0000
Subject: [PATCH 099/166] python3Packages.stripe: 15.0.1 -> 15.1.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index f206d8c4de12..db7672f2658f 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "15.0.1";
+  version = "15.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PATozJ7I2VQvndmY4qQ2Hb49C2FQyhfT81JUbPIsVWU=";
+    hash = "sha256-JL07a9CWmkhBvU12gVVqnjXkbEFKB8hZCiJfvVqHhFA=";
   };
 
   build-system = [ flit-core ];

From afe2ce741beb6bf60d5738ab18ebe225866609ca Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:59:57 +0200
Subject: [PATCH 100/166] tree-sitter-grammars.tree-sitter-git-rebase:
 0-unstable-2024-07-22 -> 1.0.0

---
 .../tr/tree-sitter/grammars/grammar-sources.nix        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 4c2bc574d2f8..33c63b820a53 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -813,10 +813,14 @@
   };
 
   git-rebase = {
-    version = "0-unstable-2024-07-22";
+    version = "1.0.0";
     url = "github:the-mikedavis/tree-sitter-git-rebase";
-    rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
-    hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
+    hash = "sha256-EV/Ecfzu3jZ5BQynRxn8NJ+lfi9i5ixs+u1e72uZBJA=";
+    postPatch = ''
+      # The funding url is empty, which will result in failing tests for the python package
+      # tree-sitter-grammars.tree-sitter.git-rebase.
+      jq 'del(.metadata.links.funding)' tree-sitter.json > tree-sitter.json.tmp && mv tree-sitter.json.tmp tree-sitter.json
+    '';
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From db12a35d7d380bde156acaff971ebfd8ab3a9ba2 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:23 +0200
Subject: [PATCH 101/166] tree-sitter-grammars.tree-sitter-groovy:
 0-unstable-2025-01-22 -> 0-unstable-2026-04-11

diff: https://github.com/murtaza64/tree-sitter-groovy/compare/86911590a8e46d71301c66468e5620d9faa5b6af...deb0dcf8c4544f07564060f6e9b9f6e4b0bfc27d
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 33c63b820a53..2911fe9abf49 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1025,10 +1025,10 @@
   };
 
   groovy = {
-    version = "0-unstable-2025-01-22";
+    version = "0-unstable-2026-04-11";
     url = "github:murtaza64/tree-sitter-groovy";
-    rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
-    hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
+    rev = "deb0dcf8c4544f07564060f6e9b9f6e4b0bfc27d";
+    hash = "sha256-x7PawYYtgsduh60KNnS4LgB7SvoBV9aOJ9cHNsLBBhc=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 9b39660b4b697685b2ff22fba337db6b7b401a8c Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:24 +0200
Subject: [PATCH 102/166] tree-sitter-grammars.tree-sitter-ledger:
 0-unstable-2025-05-04 -> 0-unstable-2026-03-20

diff: https://github.com/cbarrete/tree-sitter-ledger/compare/96c92d4908a836bf8f661166721c98439f8afb80...22a1ab8195c1f6e808679f803007756fe7638c6f
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 2911fe9abf49..c6bb012adf0b 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1462,10 +1462,10 @@
   };
 
   ledger = {
-    version = "0-unstable-2025-05-04";
+    version = "0-unstable-2026-03-20";
     url = "github:cbarrete/tree-sitter-ledger";
-    rev = "96c92d4908a836bf8f661166721c98439f8afb80";
-    hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
+    rev = "22a1ab8195c1f6e808679f803007756fe7638c6f";
+    hash = "sha256-62xgcEavI5RKi77sbEnx9f3hA4faFeUCw0/uec8Nx3k=";
     meta = {
       license = lib.licenses.mit;
     };

From 672c1829144e1e29eea70e2bc722a299aa460eed Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:25 +0200
Subject: [PATCH 103/166] tree-sitter-grammars.tree-sitter-llvm:
 0-unstable-2024-10-07 -> 0-unstable-2025-08-22

diff: https://github.com/benwilliamgraham/tree-sitter-llvm/compare/c14cb839003348692158b845db9edda201374548...2914786ae6774d4c4e25a230f4afe16aa68fe1c1
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index c6bb012adf0b..db931398f60d 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1472,10 +1472,10 @@
   };
 
   llvm = {
-    version = "0-unstable-2024-10-07";
+    version = "0-unstable-2025-08-22";
     url = "github:benwilliamgraham/tree-sitter-llvm";
-    rev = "c14cb839003348692158b845db9edda201374548";
-    hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=";
+    rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
+    hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
     meta = {
       license = lib.licenses.mit;
     };

From 8b2ceb417596f35b057c4273493b2cad5c99b33c Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:26 +0200
Subject: [PATCH 104/166] tree-sitter-grammars.tree-sitter-mail:
 0-unstable-2025-04-09 -> 0-unstable-2026-03-08

diff: https://github.com/ficcdaf/tree-sitter-mail/compare/c84126474aee00ce67c32229710a4e1e09827a08...5eddbfdbec4c893182c79047499901c196332e78
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index db931398f60d..cce6d4a3c8a1 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1544,10 +1544,10 @@
   };
 
   mail = {
-    version = "0-unstable-2025-04-09";
+    version = "0-unstable-2026-03-08";
     url = "github:ficcdaf/tree-sitter-mail";
-    rev = "c84126474aee00ce67c32229710a4e1e09827a08";
-    hash = "sha256-qqy7jsqsWVUlRuk+Cv+n3sEiH/SlO5/4Q+mrcftFKP4=";
+    rev = "5eddbfdbec4c893182c79047499901c196332e78";
+    hash = "sha256-ax9MlBuat3SmYJE5lkuTSula0A/RKoHljSqi9UZ2wO8=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 8a53932d6b5f1da7633673a6bc2cc62c79afe239 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:27 +0200
Subject: [PATCH 105/166] tree-sitter-grammars.tree-sitter-mojo:
 0-unstable-2024-12-07 -> 0-unstable-2025-12-25

diff: https://github.com/lsh/tree-sitter-mojo/compare/564d5a8489e20e5f723020ae40308888699055c0...03966fb3f209bea86844aab3bd0f2158a5a8bb8d
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index cce6d4a3c8a1..683cd3041a87 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1640,10 +1640,10 @@
   };
 
   mojo = {
-    version = "0-unstable-2024-12-07";
+    version = "0-unstable-2025-12-25";
     url = "github:lsh/tree-sitter-mojo";
-    rev = "564d5a8489e20e5f723020ae40308888699055c0";
-    hash = "sha256-UY4gTG9HI/agpD+2syb7lUqfZpw6I6UnKzs9zE9JFwA=";
+    rev = "03966fb3f209bea86844aab3bd0f2158a5a8bb8d";
+    hash = "sha256-Ofc8Z1q0Rxb3q4iYMtnKanUdnpGetE8A8sl+Sr1t3PA=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From c89bb638fe7af70860008d9977992bbc9bfb2c23 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:28 +0200
Subject: [PATCH 106/166] tree-sitter-grammars.tree-sitter-nu:
 0-unstable-2025-12-13 -> 0-unstable-2026-04-22

diff: https://github.com/nushell/tree-sitter-nu/compare/4c149627cc592560f77ead1c384e27ec85926407...348b787d8b0409091d85fe9d4eb007fe9f3406bb
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 683cd3041a87..15619b27c394 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -1750,10 +1750,10 @@
   };
 
   nu = {
-    version = "0-unstable-2025-12-13";
+    version = "0-unstable-2026-04-22";
     url = "github:nushell/tree-sitter-nu";
-    rev = "4c149627cc592560f77ead1c384e27ec85926407";
-    hash = "sha256-h02kb3VxSK/fxQENtj2yaRmAQ5I8rt5s5R8VrWOQWeo=";
+    rev = "348b787d8b0409091d85fe9d4eb007fe9f3406bb";
+    hash = "sha256-OL3fqHjimJ9VrR2UoeIdLxKKcsA1J80A9T8GSBO9KwE=";
     meta = {
       license = lib.licenses.mit;
     };

From 1e3bfaf552704fae182709ef46570ee9c00d36db Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:31 +0200
Subject: [PATCH 107/166] tree-sitter-grammars.tree-sitter-razor:
 0-unstable-2025-02-17 -> 0-unstable-2026-04-20

diff: https://github.com/tris203/tree-sitter-razor/compare/fe46ce5ea7d844e53d59bc96f2175d33691c61c5...a3399c26610817c6d32c7643793caf3729cfb6d2
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 15619b27c394..d08f969000b7 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2199,10 +2199,10 @@
   };
 
   razor = {
-    version = "0-unstable-2025-02-17";
+    version = "0-unstable-2026-04-20";
     url = "github:tris203/tree-sitter-razor";
-    rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
-    hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
+    rev = "a3399c26610817c6d32c7643793caf3729cfb6d2";
+    hash = "sha256-hH3qIp5IKwOyxiQXlS2NnuTbt/ssNMEV8PaL1xDMi+g=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 86f9cbf707076ef161d94c6e4f88a89b0eab5787 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:32 +0200
Subject: [PATCH 108/166] tree-sitter-grammars.tree-sitter-rego:
 0-unstable-2024-06-12 -> 0-unstable-2026-01-14

diff: https://github.com/FallenAngel97/tree-sitter-rego/compare/20b5a5958c837bc9f74b231022a68a594a313f6d...ddd39af81fe8b0288102a7cb97959dfce723e0f3
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index d08f969000b7..1ea61e308be8 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2233,10 +2233,10 @@
   };
 
   rego = {
-    version = "0-unstable-2024-06-12";
+    version = "0-unstable-2026-01-14";
     url = "github:FallenAngel97/tree-sitter-rego";
-    rev = "20b5a5958c837bc9f74b231022a68a594a313f6d";
-    hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
+    rev = "ddd39af81fe8b0288102a7cb97959dfce723e0f3";
+    hash = "sha256-I6jZ5jsJUAdjQti/lj4d11+GRSHjbN/hoGYO7ezGKv8=";
     meta = {
       license = lib.licenses.mit;
     };

From 32af6eee4a8bb5a90274a70725d7394dd511c91b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:33 +0200
Subject: [PATCH 109/166] tree-sitter-grammars.tree-sitter-slint:
 0-unstable-2025-12-09 -> 0-unstable-2026-04-17

diff: https://github.com/slint-ui/tree-sitter-slint/compare/10fb0f188d7950400773c06ba6c31075866e14bf...68b25244cec6eb9d7f8f790ef781c29c822d8f84
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 1ea61e308be8..6e676d50a511 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2372,10 +2372,10 @@
   };
 
   slint = {
-    version = "0-unstable-2025-12-09";
+    version = "0-unstable-2026-04-17";
     url = "github:slint-ui/tree-sitter-slint";
-    rev = "10fb0f188d7950400773c06ba6c31075866e14bf";
-    hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
+    rev = "68b25244cec6eb9d7f8f790ef781c29c822d8f84";
+    hash = "sha256-ugdB7gN3zTAGLm9Jk2hjuuZWxIYxEWYXW72qLpXM+1Q=";
     meta = {
       license = lib.licenses.mit;
     };

From a7da61c451529e01feff25e68132ae201daca98e Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:34 +0200
Subject: [PATCH 110/166] tree-sitter-grammars.tree-sitter-typespec:
 0-unstable-2025-06-21 -> 0-unstable-2026-01-01

diff: https://github.com/happenslol/tree-sitter-typespec/compare/814c98283fd92a248ba9d49ebfe61bc672a35875...395bef1e1eb4dd18365401642beb534e8a244056
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 6e676d50a511..08a443d4e9de 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2793,10 +2793,10 @@
   };
 
   typespec = {
-    version = "0-unstable-2025-06-21";
+    version = "0-unstable-2026-01-01";
     url = "github:happenslol/tree-sitter-typespec";
-    rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
-    hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
+    rev = "395bef1e1eb4dd18365401642beb534e8a244056";
+    hash = "sha256-N+clb40CgGzjyvC9b/qMhbSUZ6VsLJzK7N1k5iq2seY=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 63048850716e071f2fd6ab4333772a355a7aaa37 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:00:35 +0200
Subject: [PATCH 111/166] tree-sitter-grammars.tree-sitter-vento:
 0-unstable-2024-12-30 -> 0-unstable-2026-02-23

diff: https://github.com/ventojs/tree-sitter-vento/compare/3b32474bc29584ea214e4e84b47102408263fe0e...4569bc1fb81f050ca4ef3ceefdd31cfeb35c4f0a
---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 08a443d4e9de..e58fe78ffd87 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2889,10 +2889,10 @@
   };
 
   vento = {
-    version = "0-unstable-2024-12-30";
+    version = "0-unstable-2026-02-23";
     url = "github:ventojs/tree-sitter-vento";
-    rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
-    hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
+    rev = "4569bc1fb81f050ca4ef3ceefdd31cfeb35c4f0a";
+    hash = "sha256-qD+O3gV/PGCdhv0nAlAi1ZeUmGSEfcKcbnipfZyex4g=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 813a1cfa672f95a29c39c24aee10b452ac9bd2d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 07:32:50 +0000
Subject: [PATCH 112/166] gosec: 2.25.0 -> 2.26.1

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

diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index 07d06f20a3ff..41e80d294946 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gosec";
-  version = "2.25.0";
+  version = "2.26.1";
 
   src = fetchFromGitHub {
     owner = "securego";
     repo = "gosec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ssRSI8RPwC+VSW6tPRLr4q5BE0hixWf4O92Fgu0P1aE=";
+    hash = "sha256-/iurQn0fNTonpSSFf1llmFA5+CYSb/vYFGE0JKbcL90=";
   };
 
-  vendorHash = "sha256-wXR5EMI7bvPFudAtw2/z4O//Zkbop71XAS3uyXx3iQs=";
+  vendorHash = "sha256-57fYXBbir4jPiYPtTH1iVNFPWZWfq/Sx21Z4jC3fEWs=";
 
   subPackages = [
     "cmd/gosec"

From 49b409e8ab9a0ddacfc0228c06e5cfa6afb7005a Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Tue, 28 Apr 2026 09:40:13 +0200
Subject: [PATCH 113/166] pythonPackages.googletrans: Remove changelog URL from
 googletrans metadata

Upstream does not provide a reliable changelog source for all versions.
It was exceptionally done for release 4.0.0 but no other since.
---
 pkgs/development/python-modules/googletrans/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix
index 596ae5dc7f60..1c372d054ef8 100644
--- a/pkgs/development/python-modules/googletrans/default.nix
+++ b/pkgs/development/python-modules/googletrans/default.nix
@@ -28,7 +28,6 @@ buildPythonPackage rec {
   meta = {
     description = "Library to interact with Google Translate API";
     homepage = "https://py-googletrans.readthedocs.io";
-    changelog = "https://github.com/ssut/py-googletrans/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ unode ];
     mainProgram = "translate";

From 5cdfe18fc3a6e96b1c9713fbcdfac28eef211156 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 28 Apr 2026 10:19:58 +0200
Subject: [PATCH 114/166] josh: fix changelog url

---
 pkgs/by-name/jo/josh/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index 0a47b643cb7f..ab3310bc96a5 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -48,6 +48,7 @@ rustPlatform.buildRustPackage {
   # used to teach josh itself about its version number
   env.JOSH_VERSION = "r${version}";
 
+  # josh and josh-filter are used interactively, so git is likely already in PATH
   postInstall = ''
     wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
   '';
@@ -56,7 +57,7 @@ rustPlatform.buildRustPackage {
     description = "Just One Single History";
     homepage = "https://josh-project.github.io/josh/";
     downloadPage = "https://github.com/josh-project/josh";
-    changelog = "https://github.com/josh-project/josh/releases/tag/${version}";
+    changelog = "https://github.com/josh-project/josh/releases/tag/r${version}";
     license = lib.licenses.mit;
     maintainers = [
       lib.maintainers.sternenseemann

From 50642cb01ef0a713f3d6530b5a1bc1e19cd7ba82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 08:26:33 +0000
Subject: [PATCH 115/166] cubeb: 0-unstable-2026-04-06 -> 0-unstable-2026-04-22

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

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index d23d91f68f0d..fab552cdcd88 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2026-04-06";
+  version = "0-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "626d7d9f906e9f3cfb70be9e58af0f5a5f399a74";
-    hash = "sha256-qo3gVlYGxKef7RVGngFDKuSODoVbSCaFZwoKY4RDaAk=";
+    rev = "a37dadd1ed5949ab0accd7087b7c5c57800eab43";
+    hash = "sha256-JUHuigIhXDF1pFGbkIp6ZKQhCpa/w2LL7HK4IpCYiek=";
   };
 
   outputs = [

From e5d6819bc33bfb2f3363d30179aa5cf294914cd5 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Tue, 28 Apr 2026 11:00:25 +0200
Subject: [PATCH 116/166] cartridges: fix changelog URL

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

diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix
index 225b92cb0df5..c0d5f073b634 100644
--- a/pkgs/by-name/ca/cartridges/package.nix
+++ b/pkgs/by-name/ca/cartridges/package.nix
@@ -83,7 +83,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       You can sort and hide games or download cover art from SteamGridDB.
     '';
     homepage = "https://apps.gnome.org/Cartridges/";
-    changelog = "https://github.com/kra-mo/cartridges/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/kra-mo/cartridges/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     teams = [ lib.teams.gnome-circle ];
     mainProgram = "cartridges";

From d2bdb7f9f3d70b8cc49b5afcdc75e82a42fea3d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 09:29:35 +0000
Subject: [PATCH 117/166] libretro.beetle-vb: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
index b87574122c24..619d07ba98b3 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-vb";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-vb-libretro";
-    rev = "734205c5ead87a89cd1d53fe086f8f8fe660cf1d";
-    hash = "sha256-32l0CZmP1n/HGuTheaBIWoNuMWw/wMdiN9z4F5fhawI=";
+    rev = "1275bd7bddf2166be5a10e45c26c5c2a61370658";
+    hash = "sha256-3JTcAITogWP9yQ4sLZl8YlUHzu9LvWor9liQRIwf2b8=";
   };
 
   makefile = "Makefile";

From ac1955983f59c29985909ba283add7205c254979 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 09:32:47 +0000
Subject: [PATCH 118/166] webdav: 5.11.6 -> 5.11.7

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

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index b8da03e924a4..aa5bbbc8fed7 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "webdav";
-  version = "5.11.6";
+  version = "5.11.7";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iTBh6cH7is7UnbbXhn+z/Tnvq5//Jdt1OlPHNfICVUw=";
+    hash = "sha256-xvkkOesOFcgT1OTm0X87eKFdKjEZpMu8Pw+YRTGjJlI=";
   };
 
-  vendorHash = "sha256-L98EShwiysMYXhI6aQut5bfMr76CwY1U06iOgG+jtCY=";
+  vendorHash = "sha256-fSFVqZZXkhFeJPompd6mg+zNV40k5C3pJSjrXiiaPJ8=";
 
   __darwinAllowLocalNetworking = true;
 

From 38e1a9de131bfef3b79ba325267011be1a2c5263 Mon Sep 17 00:00:00 2001
From: kurogeek <kurogeek@lmvhaus.com>
Date: Tue, 28 Apr 2026 17:33:01 +0700
Subject: [PATCH 119/166] python3Packages.django-ical: fix changelog URL

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

diff --git a/pkgs/development/python-modules/django-ical/default.nix b/pkgs/development/python-modules/django-ical/default.nix
index 09f8e8a6c271..13f3986e99e0 100644
--- a/pkgs/development/python-modules/django-ical/default.nix
+++ b/pkgs/development/python-modules/django-ical/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "iCal feeds for Django based on Django's syndication feed framework";
     homepage = "https://github.com/jazzband/django-ical";
-    changelog = "https://github.com/jazzband/django-ical/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/jazzband/django-ical/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kurogeek ];
   };

From ba9f68ebd2ad736af64ad05bb1143625b0cd3d3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 13:44:42 +0000
Subject: [PATCH 120/166] vscode-extensions.antfu.slidev: 52.14.2 -> 52.15.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 472a4e8ee811..78be30ecc9ed 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -291,8 +291,8 @@ let
         mktplcRef = {
           publisher = "antfu";
           name = "slidev";
-          version = "52.14.2";
-          hash = "sha256-Y9vAbdklsnWgLjEV6sLpWiJaKf8AOES0qgM/Hx+4UE4=";
+          version = "52.15.0";
+          hash = "sha256-iCOLP2ZOm/kwmNFrmc9NJi1nU+301y2Jgnj9FbUSbm0=";
         };
         meta = {
           license = lib.licenses.mit;

From a91a8737a79c8d80c0b3a25d9189e50b22122354 Mon Sep 17 00:00:00 2001
From: nicknb <nicknb@posteo.com>
Date: Tue, 28 Apr 2026 16:08:48 +0200
Subject: [PATCH 121/166] massren: 1.5.6 -> 1.5.7

Also remove patch, as support for Go Modules has been implemented
upstream:
https://github.com/laurent22/massren/commit/27e1c93c0563cb41e02e0026475e5ffc49a70b7e
---
 pkgs/by-name/ma/massren/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ma/massren/package.nix b/pkgs/by-name/ma/massren/package.nix
index a7085004b57f..d14b57039135 100644
--- a/pkgs/by-name/ma/massren/package.nix
+++ b/pkgs/by-name/ma/massren/package.nix
@@ -2,30 +2,21 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "massren";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "laurent22";
     repo = "massren";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
+    hash = "sha256-PjF7ani4NdM0Avz0/4D04CZLdvkQHg91E/eFoDXD6ks=";
   };
 
   vendorHash = null;
 
-  patches = [
-    # Add Go Modules support
-    (fetchpatch {
-      url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch";
-      hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs=";
-    })
-  ];
-
   ldflags = [
     "-s"
     "-w"

From b4d594ee098f21c5a2c89de2979b7c7f3c68adee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 28 Apr 2026 17:00:04 +0200
Subject: [PATCH 122/166] 
 home-assistant-custom-lovelace-modules.light-entity-card: fix meta.changelog

---
 .../custom-lovelace-modules/light-entity-card/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
index ce40d5c17553..95c7e3e0c721 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "light-entity-card";
   version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "ljmerza";
     repo = "light-entity-card";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y25jtbKJNTVi6XUHntm2AtIzuht96/o5l+uScwEE9So=";
   };
 
@@ -31,8 +31,8 @@ buildNpmPackage rec {
   meta = {
     description = "Control any light or switch entity";
     homepage = "https://github.com/ljmerza/light-entity-card";
-    changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${version}";
+    changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
     license = lib.licenses.mit;
   };
-}
+})

From 403ee8adf90981a23448d5a0b45bb77617ac1fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 28 Apr 2026 17:00:40 +0200
Subject: [PATCH 123/166] intel-graphics-compiler: fix meta.changelog

---
 pkgs/by-name/in/intel-graphics-compiler/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index 6f15f7d6be93..b1d16110f5e3 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
     homepage = "https://github.com/intel/intel-graphics-compiler";
-    changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${version}";
+    changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/v${version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];

From 9cdd8e86e687b18ebe3031bb52ba9870717f542f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 28 Apr 2026 17:03:07 +0200
Subject: [PATCH 124/166] python314Packages.protobuf: remove myself from
 maintainers

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

diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix
index 05f9ba66f81a..5e44c82d463f 100644
--- a/pkgs/development/python-modules/protobuf/5.nix
+++ b/pkgs/development/python-modules/protobuf/5.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://developers.google.com/protocol-buffers/";
     changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+    maintainers = [ ];
   };
 }

From 92c8ca73fa94df7d9c13d5cc8c136c35b7cc9387 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 14:45:06 +0000
Subject: [PATCH 125/166] python3Packages.pygame-ce: 2.5.6 -> 2.5.7

Diff: https://github.com/pygame-community/pygame-ce/compare/2.5.6...2.5.7

Changelog: https://github.com/pygame-community/pygame-ce/releases/tag/2.5.7
---
 .../python-modules/pygame-ce/default.nix      | 136 +++++++++++-------
 .../pygame-ce/fix-dependency-finding.patch    |  22 +--
 2 files changed, 95 insertions(+), 63 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 76810dad5f8c..fd6efdd93aee 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -1,18 +1,25 @@
 {
-  stdenv,
   lib,
-  replaceVars,
-  fetchFromGitHub,
+  stdenv,
   buildPythonPackage,
+  fetchFromGitHub,
+  replaceVars,
   python,
-  pkg-config,
-  setuptools,
-  cython,
-  ninja,
-  meson-python,
-  pyproject-metadata,
-  nix-update-script,
 
+  # build-system
+  cython,
+  meson-python,
+  ninja,
+  pyproject-metadata,
+  setuptools,
+  sphinx,
+  sphinx-autoapi,
+
+  # nativeBuildInputs
+  astroid,
+  pkg-config,
+
+  # buildInputs
   fontconfig,
   freetype,
   libjpeg,
@@ -23,22 +30,27 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
-  numpy,
-  astroid,
 
+  # tests
+  numpy,
+  writableTmpDirAsHomeHook,
+
+  # passthru
+  nix-update-script,
   pygame-gui,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygame-ce";
-  version = "2.5.6";
+  version = "2.5.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pygame-community";
     repo = "pygame-ce";
-    tag = version;
-    hash = "sha256-0DNvAs1E6OhN6wTvbMCDt9YAEFoBZp1r7hI4GSnJUl8=";
+    tag = finalAttrs.version;
+    hash = "sha256-Yjs2SLgPVMOy8DCS+Pfk0fs0G//sY20jfGQNJ5rN58Q=";
     # Unicode files cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
   };
@@ -50,52 +62,66 @@ buildPythonPackage rec {
           "${lib.getDev dep}/"
           "${lib.getDev dep}/include"
           "${lib.getDev dep}/include/SDL2"
-        ]) buildInputs
+        ]) finalAttrs.buildInputs
       );
       buildinputs_lib = builtins.toJSON (
         builtins.concatMap (dep: [
           "${lib.getLib dep}/"
           "${lib.getLib dep}/lib"
-        ]) buildInputs
+        ]) finalAttrs.buildInputs
       );
     })
-
-    # https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119
-    ./skip-failing-tests.patch
   ];
 
-  postPatch = ''
+  postPatch =
     # "pyproject-metadata!=0.9.1" was pinned due to https://github.com/pygame-community/pygame-ce/pull/3395
     # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
-    substituteInPlace pyproject.toml \
-      --replace-fail '"pyproject-metadata!=0.9.1",' '"pyproject-metadata",' \
-      --replace-fail '"meson<=1.9.1",' '"meson",' \
-      --replace-fail '"meson-python<=0.18.0",' '"meson-python",' \
-      --replace-fail '"ninja<=1.13.0",' "" \
-      --replace-fail '"astroid<4.0.0",' "" \
-      --replace-fail '"cython<=3.1.4",' '"cython",' \
-      --replace-fail '"sphinx<=8.2.3",' "" \
-      --replace-fail '"sphinx-autoapi<=3.6.0",' ""
-    substituteInPlace buildconfig/config_{unix,darwin}.py \
-      --replace-fail 'from distutils' 'from setuptools._distutils'
-    substituteInPlace src_py/sysfont.py \
-      --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \
-      --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail "meson-python<=0.18.0" "meson-python" \
+        --replace-fail "meson<=1.10.0" "meson" \
+        --replace-fail "ninja<=1.13.0" "ninja" \
+        --replace-fail "cython<=3.2.4" "cython" \
+        --replace-fail "sphinx<=8.2.3" "sphinx" \
+        --replace-fail "astroid<4.0.0" "astroid" \
+        --replace-fail "sphinx-autoapi<=3.6.0" "sphinx-autoapi" \
+        --replace-fail "pyproject-metadata!=0.9.1" "pyproject-metadata"
+    ''
+    # distutils now lives under setuptools._distutils
+    + ''
+      substituteInPlace buildconfig/config_{unix,darwin}.py \
+        --replace-fail 'from distutils' 'from setuptools._distutils'
+    ''
+    # Inject the path to fc-list
+    + ''
+      substituteInPlace src_py/sysfont.py \
+        --replace-fail \
+          'path="fc-list"' \
+          'path="${lib.getExe' fontconfig "fc-list"}"' \
+        --replace-fail \
+          '/usr/X11/bin/fc-list' \
+          '${lib.getExe' fontconfig "fc-list"}'
+    ''
     # flaky
-    rm test/system_test.py
-    substituteInPlace test/meson.build \
-      --replace-fail "'system_test.py'," ""
-  '';
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      rm test/system_test.py
+      substituteInPlace test/meson.build \
+        --replace-fail "'system_test.py'," ""
+    '';
+
+  build-system = [
+    astroid
+    cython
+    meson-python
+    ninja
+    pyproject-metadata
+    setuptools
+    sphinx
+    sphinx-autoapi
+  ];
 
   nativeBuildInputs = [
     pkg-config
-    cython
-    setuptools
-    ninja
-    meson-python
-    pyproject-metadata
   ];
 
   buildInputs = [
@@ -108,11 +134,11 @@ buildPythonPackage rec {
     (SDL2_image.override { enableSTB = false; })
     SDL2_mixer
     SDL2_ttf
-    astroid
   ];
 
   nativeCheckInputs = [
     numpy
+    writableTmpDirAsHomeHook
   ];
 
   preConfigure = ''
@@ -127,7 +153,6 @@ buildPythonPackage rec {
   };
 
   preCheck = ''
-    export HOME=$(mktemp -d)
     # No audio or video device in test environment
     export SDL_VIDEODRIVER=dummy
     export SDL_AUDIODRIVER=disk
@@ -158,18 +183,19 @@ buildPythonPackage rec {
     "pygame.version"
   ];
 
-  passthru.updateScript = nix-update-script { };
-
-  passthru.tests = {
-    inherit pygame-gui;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      inherit pygame-gui;
+    };
   };
 
   meta = {
     description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
     homepage = "https://pyga.me/";
-    changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${src.tag}";
+    changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ lib.maintainers.pbsds ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch b/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
index 5e39dff13575..43910758aa42 100644
--- a/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
+++ b/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
@@ -1,13 +1,19 @@
 diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
-index 9503ea70..d0d3ab6e 100644
+index fdc911318..9acce8e5f 100644
 --- a/buildconfig/config_darwin.py
 +++ b/buildconfig/config_darwin.py
-@@ -140,16 +140,8 @@ def main(auto_config=False):
-     ])
+@@ -138,22 +138,8 @@ def main(auto_config=False):
  
      print('Hunting dependencies...')
--    incdirs = ['/usr/local/include', '/opt/homebrew/include']
--    incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
+ 
+-    homebrew_prefix = '/opt/homebrew'
+-    try:
+-        homebrew_prefix = check_output(['brew', '--prefix'], text=True, stderr=DEVNULL).strip()
+-    except (FileNotFoundError, CalledProcessError):
+-        pass
+-
+-    incdirs = ['/usr/local/include', f'{homebrew_prefix}/include']
+-    incdirs.extend(['/usr/local/include/SDL2', f'{homebrew_prefix}/include/SDL2', '/opt/local/include/SDL2'])
 -
 -    incdirs.extend([
 -       #'/usr/X11/include',
@@ -15,17 +21,17 @@ index 9503ea70..d0d3ab6e 100644
 -       '/opt/local/include/freetype2/freetype']
 -    )
 -    #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
--    libdirs = ['/usr/local/lib', '/opt/local/lib', '/opt/homebrew/lib']
+-    libdirs = ['/usr/local/lib', '/opt/local/lib', f'{homebrew_prefix}/lib']
 +    incdirs = @buildinputs_include@
 +    libdirs = @buildinputs_lib@
  
      for d in DEPS:
          if isinstance(d, (list, tuple)):
 diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py
-index 3eba5b5c..53cc6233 100644
+index a9ebc8394..0875da6dd 100644
 --- a/buildconfig/config_unix.py
 +++ b/buildconfig/config_unix.py
-@@ -240,11 +240,8 @@ def main(auto_config=False):
+@@ -238,11 +238,8 @@ def main(auto_config=False):
      if not DEPS[0].found:
          raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.')
  

From 399d6c39013cdc7031e575b46ca08d748a022dc1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 14:41:27 +0000
Subject: [PATCH 126/166] python3Packages.pettingzoo: 1.25.0 -> 1.26.1

Diff: https://github.com/Farama-Foundation/PettingZoo/compare/1.25.0...1.26.1

Changelog: https://github.com/Farama-Foundation/PettingZoo/releases/tag/1.26.1
---
 .../python-modules/pettingzoo/default.nix     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index ad3ab0ca58e9..9ce13d12861b 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -12,7 +12,7 @@
   numpy,
 
   # optional-dependencies
-  pygame,
+  pygame-ce,
   pymunk,
   chess,
   rlcard,
@@ -31,16 +31,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pettingzoo";
-  version = "1.25.0";
+  version = "1.26.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "PettingZoo";
-    tag = version;
-    hash = "sha256-hQe/TMlLG//Bn8aaSo0/FPOUvOEyKfztuTIS7SMsUQ4=";
+    tag = finalAttrs.version;
+    hash = "sha256-WrfjkDnmir6bZvtMD7MVQKVoGvK+lutlOoNe9SNQ8jU=";
   };
 
   build-system = [
@@ -53,26 +54,25 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]);
     atari = [
       # multi-agent-ale-py
-      pygame
+      pygame-ce
     ];
     butterfly = [
-      pygame
+      pygame-ce
       pymunk
     ];
     classic = [
       chess
-      pygame
+      pygame-ce
       rlcard
       shimmy
     ];
-    mpe = [ pygame ];
+    mpe = [ pygame-ce ];
     other = [ pillow ];
     sisl = [
       pybox2d
-      pygame
+      pygame-ce
       pymunk
       scipy
     ];
@@ -91,7 +91,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     chess
-    pygame
+    pygame-ce
     pymunk
     pytest-markdown-docs
     pytest-xdist
@@ -118,8 +118,8 @@ buildPythonPackage rec {
   meta = {
     description = "API standard for multi-agent reinforcement learning environments, with popular reference environments and related utilities";
     homepage = "https://github.com/Farama-Foundation/PettingZoo";
-    changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${version}";
+    changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From 0700b4e89d7e044e135b666f4a1716ebf9e62a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Sat, 25 Apr 2026 15:57:58 +0200
Subject: [PATCH 127/166] anytype: Fix changelog URL

---
 pkgs/by-name/an/anytype/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 08f946bbeedd..140f6f504ae9 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -130,9 +130,7 @@ buildNpmPackage (finalAttrs: {
   meta = {
     description = "P2P note-taking tool";
     homepage = "https://anytype.io/";
-    changelog = "https://community.anytype.io/t/anytype-desktop-${
-      builtins.replaceStrings [ "." ] [ "-" ] (lib.versions.majorMinor finalAttrs.version)
-    }-0-released";
+    changelog = "https://github.com/anyproto/anytype-ts/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.unfreeRedistributable;
     mainProgram = "anytype";
     maintainers = with lib.maintainers; [

From b34e786eaa9366c2cb4a4c2c12335d8cdaf4a771 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 15:57:46 +0000
Subject: [PATCH 128/166] cargo-deb: 3.6.3 -> 3.6.4

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

diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 5b6598c3315a..a953746ad78d 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deb";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qYLJNhxBfSopfaNEh9FnKoKdq1Uu8nfWPOhpqzQH288=";
+    hash = "sha256-De4ouk+tub/sDSoIuEaoWYd9qjpLDA05xvuuQlaHF6M=";
   };
 
-  cargoHash = "sha256-VC116dm4XeR8ofvP3H0R5LiZOMqlUPpVGzZvTc9DhDk=";
+  cargoHash = "sha256-jac3VFOCeYKuedFHt4lEfBHlErHdfczRF6Mrs8Se88o=";
 
   nativeBuildInputs = [
     makeWrapper

From e6e2c380ab536cfd2729737b2128d1a24ecac5d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 16:03:01 +0000
Subject: [PATCH 129/166] jwx: 4.0.0 -> 4.0.1

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

diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index 749190209463..bb8f98f4b4ad 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b/Bc+pZeFbdqB/Sp0bGvDU/MHE0r1rPPcj96SHdfcAg=";
+    hash = "sha256-tVvesVrsbFONhmpFo59c/kC3vxAjWpQwnbaUmrx8O5E=";
   };
 
-  vendorHash = "sha256-RBv86IfoCQDeQQfTU74oLpMOwU0JRJc0dcr3VMKX8CA=";
+  vendorHash = "sha256-jCAHyCfTEcbtGEkxPLJvXJ90mVDyijWOoHJ5dbJouCs=";
 
   sourceRoot = "${finalAttrs.src.name}/cmd/jwx";
 

From 80bd21c54cd29c643ca840aae33d138c18cc648c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 15:51:59 +0000
Subject: [PATCH 130/166] python3Packages.pygame-gui: cleanup, fix

---
 .../python-modules/pygame-gui/default.nix     | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index ea2fd3040bfe..be21cc0d92af 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -3,43 +3,57 @@
   pkgs,
   stdenv,
   buildPythonPackage,
-  nix-update-script,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   pygame-ce,
   python-i18n,
+
+  # tests
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
+
+  # passthru
+  nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygame-gui";
   version = "0614";
   pyproject = true;
+  __structuredAttrs = true;
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "MyreMylar";
     repo = "pygame_gui";
-    tag = "v_${version}";
+    tag = "v_${finalAttrs.version}";
     hash = "sha256-wLvWaJuXMXk7zOaSZfIpsXhQt+eCjOtlh8IRuKbR75o=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    pygame-ce
-    python-i18n
-  ];
-
   postPatch = ''
     substituteInPlace pygame_gui/core/utility.py \
       --replace-fail "xsel" "${lib.getExe pkgs.xsel}"
   '';
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pygame-ce
+    python-i18n
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   preCheck = ''
-    export HOME=$TMPDIR
     export SDL_VIDEODRIVER=dummy
   '';
 
@@ -54,6 +68,22 @@ buildPythonPackage rec {
     "test_process_event_text_ctrl_v_select_range"
     "test_process_event_text_ctrl_a"
     "test_process_event_text_ctrl_x"
+
+    # Pixel-level rendering mismatches with pygame-ce 2.5.7
+    "test_clear"
+    "test_creation_grow_to_fit_width"
+    "test_draw_ui"
+    "test_on_hovered"
+    "test_on_unhovered"
+    "test_process_event_mouse_buttons"
+    "test_set_active"
+    "test_set_cursor_from_click_pos"
+    "test_set_cursor_position"
+    "test_set_default_text_colour"
+    "test_set_inactive"
+    "test_set_text"
+    "test_split"
+    "test_split_index"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fails to determine "/" as an existing path
@@ -79,4 +109,4 @@ buildPythonPackage rec {
       pbsds
     ];
   };
-}
+})

From c77ca12c56bdc08d32ae1d26eeed0d6fc8001fd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 16:05:01 +0000
Subject: [PATCH 131/166] cargo-codspeed: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index 8eed8a8dbdbb..4e60813d2ec8 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-codspeed";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "codspeed-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2xKTn+fiRyXyH6womZPJoSpBC7nMH9+rBuoZrWL2kQU=";
+    hash = "sha256-Hfqh9kKTiRTWhKbsdXAK/DqBeAKxXQaYdWoZN55lcLo=";
   };
 
-  cargoHash = "sha256-jN70cNOYLPtIPEji2JF8r/6zphvekRc9y0UNR3xNAUo=";
+  cargoHash = "sha256-ix8Q+GbazKC5HIIUUVYjLTlufOQLxppqmVGznbTAXEI=";
 
   nativeBuildInputs = [
     curl

From c3e0cf83e8c55749b5aaf967208eff5fb43e630a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 16:26:51 +0000
Subject: [PATCH 132/166] fabric-ai: 1.4.448 -> 1.4.451

---
 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 21804902d488..14c19781b51d 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fabric-ai";
-  version = "1.4.448";
+  version = "1.4.451";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4soF/1a5w9Wm8sGUZlDO4Y0JaKV9ro4F8mXxV8HtG3A=";
+    hash = "sha256-5eKARPLPD24MQLMlSIa76R7YoR1axCmn5vL9V7Zly5o=";
   };
 
-  vendorHash = "sha256-MxQfHrF9iwoQEa0p24FnmdfHyiCOYpMRv3EukV3Onzo=";
+  vendorHash = "sha256-oSHrn2Oad6XuIFjrqeC4NGC/rasCu+49xADY15YNSbc=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;

From a5607f5924cadc0646fa62720a0951113988a70f Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 28 Apr 2026 10:21:43 +0200
Subject: [PATCH 133/166] josh: 24.10.04 -> 26.04.19

https://github.com/josh-project/josh/releases/tag/r26.04.19
---
 pkgs/by-name/jo/josh/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index ab3310bc96a5..266ced05efa0 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -10,13 +10,7 @@
 }:
 
 let
-  # josh-ui requires javascript dependencies, haven't tried to figure it out yet
-  cargoFlags = [
-    "--workspace"
-    "--exclude"
-    "josh-ui"
-  ];
-  version = "24.10.04";
+  version = "26.04.19";
 in
 
 rustPlatform.buildRustPackage {
@@ -27,10 +21,10 @@ rustPlatform.buildRustPackage {
     owner = "josh-project";
     repo = "josh";
     rev = "r${version}";
-    hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo=";
+    hash = "sha256-tWU7ZGs148fmCXJxUM1RiDIgJONMZnFXO7ksaqqoT9I=";
   };
 
-  cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4=";
+  cargoHash = "sha256-Ksl3dFeEpwhpiotNuM9/vg7aD2TUuHKvqUaZkbceCdY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -42,8 +36,13 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoBuildFlags = cargoFlags;
-  cargoTestFlags = cargoFlags;
+  cargoBuildFlags = [ "--workspace" ];
+  # josh-proxy's inline tests need to interact with a specific test environment
+  cargoTestFlags = [
+    "--workspace"
+    "--exclude"
+    "josh-proxy"
+  ];
 
   # used to teach josh itself about its version number
   env.JOSH_VERSION = "r${version}";

From e7e5c0041f616e35235059314590eae3ccbcb961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Apr 2026 09:40:40 -0700
Subject: [PATCH 134/166] python3Packages.niquests: 3.18.6 -> 3.18.7

Diff: https://github.com/jawah/niquests/compare/v3.18.6...v3.18.7

Changelog: https://github.com/jawah/niquests/blob/v3.18.7/HISTORY.md
---
 pkgs/development/python-modules/niquests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index a8c3805f49ee..f66a0d57f092 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.18.6";
+  version = "3.18.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-hJD5hI/qvYo31eu05fhDZhgRNTbbGJnFE293HM+TuIA=";
+    hash = "sha256-ujqnb0B282MJi+2oy9AJfJY3KCE5JTjuJuyeeV0gZWA=";
   };
 
   build-system = [ hatchling ];

From 42c1c97f91062bc0d7e23144cff11c455d38c712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Apr 2026 09:40:42 -0700
Subject: [PATCH 135/166] python3Packages.qh3: 1.7.3 -> 1.7.4

Diff: https://github.com/jawah/qh3/compare/v1.7.3...v1.7.4

Changelog: https://github.com/jawah/qh3/blob/v1.7.4/CHANGELOG.rst
---
 pkgs/development/python-modules/qh3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 626b98609d8b..1f931f579ef6 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "qh3";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${version}";
-    hash = "sha256-wi2PYd74kOU2tol7pVgpMqbL3peGhXyKKEke6+CBIwU=";
+    hash = "sha256-zZQyKQK/zJ58XnCgxk/SvexBF1Z+GBtvulhuhUiIago=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-sv5DFeapeH00CBssQcRZ7SI3JlyUuKo7gIRVjN/kA+Q=";
+    hash = "sha256-2HwwyHex1SE34dUGtooOf5LCkhkVhLpsoEHBFvLUkLM=";
   };
 
   nativeBuildInputs = [

From 241834081945e522fdacf4f6662d17a7cd41c2c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 17:04:00 +0000
Subject: [PATCH 136/166] vscode-extensions.foam.foam-vscode: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 472a4e8ee811..ced8ab4a0970 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1760,8 +1760,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.38.0";
-          hash = "sha256-SJozi2AlV+wHD0wuhpgkG6Ve5AGIhsVDC37eE8/bnKM=";
+          version = "0.39.0";
+          hash = "sha256-kOzr8YjwHdA3Tgo4JeEAWda4tBrXjMQNBITNhmy9cP4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";

From adcac963227b8ffa7461b5283674ada509761ddb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 17:09:30 +0000
Subject: [PATCH 137/166] turso-cli: 1.0.20 -> 1.0.21

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index 016e5485a24d..475d7bb7906c 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "turso-cli";
-  version = "1.0.20";
+  version = "1.0.21";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vby81LYVEqysUmPU1P5d+VEME/SVYch14m1Mj7YvOXc=";
+    hash = "sha256-EO8j5XMwezSpTYVPpgoonTlNph7fCINXQoByUhlljDc=";
   };
 
   vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk=";

From 7be7c76604d4042daf5df9e2e4ef9888a2e8e33e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 17:35:52 +0000
Subject: [PATCH 138/166] python3Packages.iocx: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix
index 2f19b87cde71..28e35fe1c63b 100644
--- a/pkgs/development/python-modules/iocx/default.nix
+++ b/pkgs/development/python-modules/iocx/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iocx";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iocx-dev";
     repo = "iocx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WdUHqQXq/qJyqZ5O9+E777+fQaQowvftDtQ0mj67FHw=";
+    hash = "sha256-QLnlxCFVN2hxQtprNuete9iEAy3k4lxJUwbZcPhHMH0=";
   };
 
   build-system = [ setuptools ];

From bf29c9a4a0d4e374d57e45c64ed03c66fbdb3ce4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 17:55:45 +0000
Subject: [PATCH 139/166] troubadix: 26.4.4 -> 26.4.6

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 381c800c2b27..51d633c04f1b 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.4.4";
+  version = "26.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OByl6SYPgM6pFp2OQyHMZHGr3JJ4kTJTZByWjdEnF7c=";
+    hash = "sha256-wZpxwgIGvl4cVpPNrsYa5eGbAUgdf4lOxP2f537FYQI=";
   };
 
   pythonRelaxDeps = [

From 3f6cb63b0bf2a3194f06c7246575863d68e1faae Mon Sep 17 00:00:00 2001
From: Andreas Erdes <socialcoms@posteo.de>
Date: Tue, 28 Apr 2026 20:04:57 +0200
Subject: [PATCH 140/166] tuxbox: fix meta.changelog link

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

diff --git a/pkgs/by-name/tu/tuxbox/package.nix b/pkgs/by-name/tu/tuxbox/package.nix
index c889f6b2659c..c15d3c620fd4 100644
--- a/pkgs/by-name/tu/tuxbox/package.nix
+++ b/pkgs/by-name/tu/tuxbox/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/v${finalAttrs.version}";
     description = "Linux driver for all TourBox models - Native feel with USB, Bluetooth, haptics and graphical configuration GUI";
     homepage = "https://github.com/AndyCappDev/tuxbox";
     license = lib.licenses.mit;

From d00aa08278c37d9be9c289d5c07ef5f757748ffd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 18:11:44 +0000
Subject: [PATCH 141/166] vscode-extensions.prisma.prisma: 31.9.0 -> 31.10.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 472a4e8ee811..34068be87d6a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3799,8 +3799,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "31.9.0";
-          hash = "sha256-ubUVFFfjrtoz+hI8/epCcbrU4WfQdVYy4dPHighFpK0=";
+          version = "31.10.0";
+          hash = "sha256-2KJdvzIKrNcFwxvTmXKl3z7AkClfJhyl0ZUmdUcMnzg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

From cf7f19ad79238e9c3f4dfeb5fe28c8acd175e78d Mon Sep 17 00:00:00 2001
From: Vlad Petrov <ejiek@tpobeh.uk>
Date: Tue, 28 Apr 2026 21:41:44 +0300
Subject: [PATCH 142/166] pomerium: 0.32.4 -> 0.32.6

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

diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index b20af9ce8526..dc67aa519332 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -18,15 +18,15 @@ let
 in
 buildGoModule rec {
   pname = "pomerium";
-  version = "0.32.4";
+  version = "0.32.6";
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
     rev = "v${version}";
-    hash = "sha256-XTj0ZLPRe8I3a5be0oRTxRUuT2wHnbsms7wIvLUg9ms=";
+    hash = "sha256-VwmjuXlYsh2dGKf7ux8DyLZec7xMISuQ7SSb9+LwzfU=";
   };
 
-  vendorHash = "sha256-EYXmeS4jtueI9FwVQdMlsYX3CSRGH9Dft0Syf88nf7o=";
+  vendorHash = "sha256-b4H7gAMG7DXEbvkZFsoEZrKpuvPW0vkfv1qqBPBaGAM=";
 
   ui = buildNpmPackage {
     pname = "pomerium-ui";

From 376587ff2943ebc50cb9ca2a6688f3cf0cad2ad4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 18:48:04 +0000
Subject: [PATCH 143/166] python3Packages.mne: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index 103839e8b383..c1efad30c8fb 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "mne";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mne-tools";
     repo = "mne-python";
     tag = "v${version}";
-    hash = "sha256-j5PpUF7Yle8mFtIjawDaulq1s7zzVPpT3Y4+xNbQ+fk=";
+    hash = "sha256-8PzYTG8z35IG0nVegoPaJB/vpULujqHDd2VtLeXS0SQ=";
   };
 
   postPatch = ''

From f268e94d4ee088221418f93a46a0ed8b4e1dd373 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 18:56:55 +0000
Subject: [PATCH 144/166] bant: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index 9860fe294a7e..3a1f25d3a62e 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -20,13 +20,13 @@ let
 in
 buildBazelPackage rec {
   pname = "bant";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
     rev = "v${version}";
-    hash = "sha256-qS2oKQ9/vNX58PftEjHD+3ApXtWL90YVBHnifLtDTcU=";
+    hash = "sha256-aGm/SiHogz9LSK2LQkEOkeQWBVOHDRvUK0YEU9Tuznw=";
   };
 
   bazelFlags = [

From 45e86598778482376f35d5aa66d25bbcc17c508e Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 28 Apr 2026 20:57:12 +0200
Subject: [PATCH 145/166] helix: update tree-sitter-grammars overrides

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

diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index 31cdf7cb13ab..4325ce184118 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -13,8 +13,8 @@
       tree-sitter-beancount = prev.tree-sitter-beancount.override {
         excludeBrokenTreeSitterJson = false;
       };
-      tree-sitter-dart = prev.tree-sitter-dart.overrideAttrs {
-        patches = [ ];
+      tree-sitter-git-rebase = prev.tree-sitter-git-rebase.overrideAttrs {
+        dontPatch = true;
       };
       tree-sitter-glimmer = prev.tree-sitter-glimmer.override {
         excludeBrokenTreeSitterJson = false;
@@ -22,18 +22,12 @@
       tree-sitter-janet-simple = prev.tree-sitter-janet-simple.override {
         excludeBrokenTreeSitterJson = false;
       };
-      tree-sitter-latex = prev.tree-sitter-latex.override {
-        generate = false;
-      };
       tree-sitter-qmljs = prev.tree-sitter-qmljs.overrideAttrs {
         dontCheckForBrokenSymlinks = true;
       };
       tree-sitter-sql = prev.tree-sitter-sql.override {
         generate = false;
       };
-      tree-sitter-tlaplus = prev.tree-sitter-tlaplus.overrideAttrs {
-        patches = [ ];
-      };
     }
   ),
 }:

From 7758a732aeca9d4fd4c32deb36f29690833cb305 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 19:24:05 +0000
Subject: [PATCH 146/166] pop: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index f0445d40328c..d2c52670504d 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pop";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "pop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k=";
+    hash = "sha256-e1xkUXFC1C18nj/eTo2PmHGORKZ1cmz+s0I47SOcTiM=";
   };
 
-  vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8=";
+  vendorHash = "sha256-r2kKHwjUqls1nEOF0HwBMOZksSYp2UcjN+B0c1i8MmQ=";
 
   env.GOWORK = "off";
 

From 3ee93d8e55b1b9f56b3c86ce98a6780c0f4326f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 19:27:33 +0000
Subject: [PATCH 147/166] plow: 1.3.2 -> 1.4.0

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

diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix
index 58f21b72a80d..ad43fefcc63e 100644
--- a/pkgs/by-name/pl/plow/package.nix
+++ b/pkgs/by-name/pl/plow/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "plow";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "six-ddc";
     repo = "plow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q9k5GzhYPOP8p8VKrqpoHc3B9Qak+4DtZAZZuFlkED0=";
+    hash = "sha256-0/nMF9fqRMzN4bfK6EsTi5MW+OUG/dv4UKr5j/AhRoM=";
   };
 
-  vendorHash = "sha256-KfnDJI6M6tzfoI7krKId5FXUw27eV6cEoz3UaNrlXWk=";
+  vendorHash = "sha256-nGAPuyS95bHPkQMdHdtbdVWQ+MBOOHnHPh7bkSHji4E=";
 
   ldflags = [
     "-s"

From ce55261030ef7a35c4462d4e14849bb0ce2ed5f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 19:27:57 +0000
Subject: [PATCH 148/166] prometheus-unbound-exporter: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix b/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
index ac0a4e2e934c..34c88ffec3ad 100644
--- a/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.5.0";
+  version = "0.6.0";
 in
 buildGoModule {
   pname = "unbound_exporter";
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "letsencrypt";
     repo = "unbound_exporter";
     tag = "v${version}";
-    hash = "sha256-xVc6xES3YdKIaP6rwAzI0/RLoer7bcq7VAmfjYii8VI=";
+    hash = "sha256-XsiQGVYBEXM8DQtQWEA2wk/19TGGZaIBt7Vc4HHfIBY=";
   };
 
-  vendorHash = "sha256-6ZiBXQRsmlUU7h9Dvlb5WHnYAjrrhbw0rypP5ChoKPs=";
+  vendorHash = "sha256-2M7s9YPAFxCQcIgF+HDKu6kztHBvbl/S2BmaBngeBFI=";
 
   passthru.tests = {
     inherit (nixosTests.prometheus-exporters) unbound;

From bc0437743ea25c1a034c8cf4f132dfe82e656592 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 19:33:26 +0000
Subject: [PATCH 149/166] postfix-tlspol: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index a7add39ead54..1bebfcd69880 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "postfix-tlspol";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oS1U987pS365EQcf96w8RNGWGImFA/uRmv/Oh2HLyuo=";
+    hash = "sha256-JwggXJM8FDMG4oGRcVjVw1J/toTzc/kxrjdENFT9oGs=";
   };
 
   vendorHash = null;

From 2fca561ed380a2856993c903aee0eff4ab5c253a Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Tue, 28 Apr 2026 15:31:59 -0400
Subject: [PATCH 150/166] ocamlPackages.decoders: fix changelog urls

See #514132
---
 pkgs/development/ocaml-modules/decoders-bencode/default.nix | 2 +-
 pkgs/development/ocaml-modules/decoders-cbor/default.nix    | 2 +-
 pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix | 2 +-
 pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix  | 2 +-
 pkgs/development/ocaml-modules/decoders-jsonaf/default.nix  | 2 +-
 pkgs/development/ocaml-modules/decoders-jsonm/default.nix   | 2 +-
 pkgs/development/ocaml-modules/decoders-msgpck/default.nix  | 2 +-
 pkgs/development/ocaml-modules/decoders-sexplib/default.nix | 2 +-
 pkgs/development/ocaml-modules/decoders-yojson/default.nix  | 2 +-
 pkgs/development/ocaml-modules/decoders/default.nix         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/decoders-bencode/default.nix b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
index 6117dfab67d1..0ae7d2468755 100644
--- a/pkgs/development/ocaml-modules/decoders-bencode/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Bencode backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-cbor/default.nix b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
index c93b5cd38625..c14b5e2f93d9 100644
--- a/pkgs/development/ocaml-modules/decoders-cbor/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "CBOR backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
index 71ea3a104b73..59c288f859c7 100644
--- a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Ezjsonm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
index e6c4f567d0b3..b663c813499d 100644
--- a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
@@ -27,7 +27,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Ezxmlm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
index a7dacffc8464..742749cf1d76 100644
--- a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Jsonaf backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
index 031ff6796c45..c0445f732c8a 100644
--- a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Jsonm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
index 14e2fcf3d544..536dc7564603 100644
--- a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Msgpck backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
index d2ca0652cfb3..9a22691408ce 100644
--- a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
@@ -31,7 +31,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "sexplib backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-yojson/default.nix b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
index 0a6bd35ce951..78bcdeaade95 100644
--- a/pkgs/development/ocaml-modules/decoders-yojson/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Yojson backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders/default.nix b/pkgs/development/ocaml-modules/decoders/default.nix
index c7ec127e4e92..bbdbcfde4e7a 100644
--- a/pkgs/development/ocaml-modules/decoders/default.nix
+++ b/pkgs/development/ocaml-modules/decoders/default.nix
@@ -24,7 +24,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Elm-inspired decoders for Ocaml";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };

From d388234b82fd84a81565857d72d06939d4c0f581 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 25 Apr 2026 22:35:51 +0200
Subject: [PATCH 151/166] teapot: fix build

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

diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 31a2fefaec79..0df896b0e7b0 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env = {
     # By no known reason libtirpc is not detected
-    NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-    NIX_LDFLAGS = [ "-ltirpc" ];
+    NIX_CFLAGS_COMPILE = "-I${lib.getDev libtirpc}/include/tirpc";
+    NIX_LDFLAGS = "-ltirpc";
   };
 
   postPatch = ''

From 5beaff760d863b719128657212b3909dbdd3eed9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 20:27:53 +0000
Subject: [PATCH 152/166] terraform-providers.hashicorp_azurerm: 4.69.0 ->
 4.70.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 135639857579..ea981ef47328 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -526,11 +526,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-dLapX7pWRKR90D19e7DZZki+VTgKLP2n9ADww2CIQg8=",
+    "hash": "sha256-YQV1akoUREn2FHtX+L9DixHo4ghm4wLSrQsAUv1nqaQ=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.69.0",
+    "rev": "v4.70.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 25c0356d10c36d21390d7f5bac54472130545029 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Apr 2026 22:35:40 +0200
Subject: [PATCH 153/166] mqtt-randompub: fix changelog url

---
 pkgs/by-name/mq/mqtt-randompub/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mq/mqtt-randompub/package.nix b/pkgs/by-name/mq/mqtt-randompub/package.nix
index 1e97d6bda362..8fd8d9e47a3f 100644
--- a/pkgs/by-name/mq/mqtt-randompub/package.nix
+++ b/pkgs/by-name/mq/mqtt-randompub/package.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool that sends random MQTT messages to random topics";
     homepage = "https://github.com/fabaff/mqtt-randompub";
-    changelog = "https://github.com/fabaff/mqtt-randompub/blob/${finalAttrs.src.rev}/ChangeLog";
+    changelog = "https://github.com/fabaff/mqtt-randompub/blob/${finalAttrs.src.tag}/ChangeLog";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mqtt-randompub";

From 72c8faea659b3d92447584e18099bbf1325f4577 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Apr 2026 22:43:20 +0200
Subject: [PATCH 154/166] python3Packages.aiocoap: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index a3552ded199a..e97a1ac33322 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -15,7 +15,7 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aiocoap";
   version = "0.4.17";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrysn";
     repo = "aiocoap";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-l9MChfvBTJn/ABTqrw4i+YUNGJnDZmOJS/kumImaa/s=";
   };
 
@@ -70,8 +70,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python CoAP library";
     homepage = "https://aiocoap.readthedocs.io/";
-    changelog = "https://github.com/chrysn/aiocoap/blob/${src.tag}/NEWS";
+    changelog = "https://github.com/chrysn/aiocoap/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 7098f027512b2ef9168c507ee78fbf62ba0d9f6e Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Tue, 28 Apr 2026 17:12:09 -0400
Subject: [PATCH 155/166] vscode-extensions.gplane.wasm-language-tools: remove
 404 changelog link

---
 .../vscode/extensions/gplane.wasm-language-tools/default.nix     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
index 19546d9bd0ca..fe6f30fa0b53 100644
--- a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
@@ -25,7 +25,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
   '';
 
   meta = {
-    changelog = "https://marketplace.visualstudio.com/items/gplane.wasm-language-tools/changelog";
     description = "Language support of WebAssembly";
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=gplane.wasm-language-tools";
     homepage = "https://github.com/g-plane/vscode-wasm";

From d5b51ddd03c35fb7242b73a01e13b12cd764ecd0 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Tue, 21 Apr 2026 11:40:20 -0400
Subject: [PATCH 156/166] jai: 0.2.026 -> 0.2.029

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

diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index ce5dc1e234f9..2849b1e6c65d 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -9,7 +9,7 @@
 let
   pname = "jai";
   minor = "2";
-  patch = "026";
+  patch = "029";
   version = "0.${minor}.${patch}";
   zipName = "jai-beta-${minor}-${patch}.zip";
   jai = stdenv.mkDerivation {
@@ -20,7 +20,7 @@ let
           nix-store --add-fixed sha256 ${zipName}
       '';
       name = zipName;
-      sha256 = "sha256-iWPMVGzcDlR3cP4ruPZJBAAdvFLZeM8+pCxbsSk2ZLw=";
+      sha256 = "sha256-LH49sPgtn4TccDQa1080cnCnH/zlyZa1Jc4Y1DScJOc=";
     };
     nativeBuildInputs = [ unzip ];
     buildCommand = "unzip $src -d $out";

From 8f448975c14464e13187f8487c50d86fc6c235ac Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 22:27:06 +0000
Subject: [PATCH 157/166] python3Packages.pysdl2: 0.9.17-unstable-2025-04-03 ->
 0.9.17-unstable-2025-11-18

---
 .../python-modules/pysdl2/default.nix           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 66fb3a4664aa..d14b516513e2 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -19,18 +19,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pysdl2";
-  version = "0.9.17-unstable-2025-04-03";
+  version = "0.9.17-unstable-2025-11-18";
   pyproject = true;
-
-  pythonImportsCheck = [ "sdl2" ];
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "py-sdl";
     repo = "py-sdl2";
-    rev = "6414ee1c5f4a6eb91b71f5f9e35d469eee395b9f";
-    hash = "sha256-E6Jpuin4bqDkvFTaZTsTNkNQJd2e5fuTf2oLsQ71uQ0=";
+    rev = "3d0672135fab3ca58e2f00c0a76b7b25cb818784";
+    hash = "sha256-SgorCWZmJk13LNlTmh5Aomik14PTZdWliU3GWtkTASE=";
   };
 
   patches = [
@@ -72,6 +71,8 @@ buildPythonPackage rec {
     PYTHONFAULTHANDLER = "1";
   };
 
+  pythonImportsCheck = [ "sdl2" ];
+
   nativeCheckInputs = [
     numpy
     pillow
@@ -91,10 +92,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${src.rev}";
+    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${finalAttrs.src.rev}";
     description = "Wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
     homepage = "https://github.com/py-sdl/py-sdl2";
     license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ pmiddend ];
   };
-}
+})

From d2068665d012eb936cd6006065b219deabc131cc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 22:28:55 +0000
Subject: [PATCH 158/166] python3Packages.pytmx: cleanup

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

diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix
index 83cd7fd1b3c7..691a0f672db7 100644
--- a/pkgs/development/python-modules/pytmx/default.nix
+++ b/pkgs/development/python-modules/pytmx/default.nix
@@ -2,18 +2,24 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
   pygame,
   pyglet,
   pysdl2,
+
+  # tests
   pytestCheckHook,
-  setuptools-scm,
 }:
 
 buildPythonPackage {
   pname = "pytmx";
   version = "3.32";
-
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bitcraft";

From 3ac759f8b17576261e4a968f6d30223078df5474 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 22:42:31 +0000
Subject: [PATCH 159/166] terraform-providers.sysdiglabs_sysdig: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 135639857579..a759f5defc17 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1274,11 +1274,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-+rP7HnEF+J5NjwgnYEnFbSBdV/fyq7s2A0Xt4maLy7k=",
+    "hash": "sha256-g1al4OJTbnnOIT6ZsjMhEzB+dXvMrBUzctw+Jh2uFYI=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v3.7.1",
+    "rev": "v3.7.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
   },

From 0e6724e0535d2330c3a30261c7076bf6eabd0d54 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Apr 2026 13:07:49 +0000
Subject: [PATCH 160/166] python3Packages.executorch: fix cuda build

---
 .../python-modules/executorch/default.nix     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index c8e393dc4166..02604cfe8f10 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -7,6 +7,8 @@
 
   # nativeBuildInputs
   gitMinimal,
+  # cuda-only:
+  autoPatchelfHook,
 
   # build-system
   certifi,
@@ -46,8 +48,11 @@
   transformers,
   writableTmpDirAsHomeHook,
   yaspin,
+
+  cudaSupport ? torch.cudaSupport,
+  cudaPackages,
 }:
-buildPythonPackage (finalAttrs: {
+buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "executorch";
   version = "1.2.0";
   pyproject = true;
@@ -107,6 +112,9 @@ buildPythonPackage (finalAttrs: {
     #  Some binaries contain forbidden references to /build/. Check the error above!
     CMAKE_ARGS = lib.concatStringsSep " " [
       (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
+
+      # For some cmake-tier reason, cmakeBool does not work here
+      (lib.cmakeFeature "EXECUTORCH_BUILD_CUDA" (if cudaSupport then "ON" else "OFF"))
     ];
   };
 
@@ -122,6 +130,15 @@ buildPythonPackage (finalAttrs: {
 
   nativeBuildInputs = [
     gitMinimal
+  ]
+  ++ lib.optionals cudaSupport [
+    autoPatchelfHook
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvrtc
   ];
 
   pythonRemoveDeps = [

From 4bb116f2dc0fb2e1d42adcebb6fa66b8a0dfbfac Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 28 Apr 2026 23:23:44 +0200
Subject: [PATCH 161/166] chromium,chromedriver: 147.0.7727.116 ->
 147.0.7727.137

https://chromereleases.googleblog.com/2026/04/stable-channel-update-for-desktop_28.html

This update includes 30 security fixes.

CVEs:
CVE-2026-7363 CVE-2026-7361 CVE-2026-7344 CVE-2026-7343 CVE-2026-7333
CVE-2026-7360 CVE-2026-7359 CVE-2026-7358 CVE-2026-7334 CVE-2026-7357
CVE-2026-7356 CVE-2026-7354 CVE-2026-7353 CVE-2026-7352 CVE-2026-7351
CVE-2026-7350 CVE-2026-7349 CVE-2026-7348 CVE-2026-7335 CVE-2026-7336
CVE-2026-7337 CVE-2026-7347 CVE-2026-7346 CVE-2026-7345 CVE-2026-7338
CVE-2026-7342 CVE-2026-7341 CVE-2026-7339 CVE-2026-7340 CVE-2026-7355
---
 .../networking/browsers/chromium/info.json    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index aecc44b24b0e..6a2a1cd9fb60 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,15 +1,15 @@
 {
   "chromium": {
-    "version": "147.0.7727.116",
+    "version": "147.0.7727.137",
     "chromedriver": {
-      "version": "147.0.7727.117",
-      "hash_darwin": "sha256-FiP2cEz2DVnpZpqC4mrIPKeyP45nEvGhwuokfz/KUCQ=",
-      "hash_darwin_aarch64": "sha256-RckHAtsSLwh2IfT4Re/3pkUxvL8PwzfG8OtUHF1G0lU="
+      "version": "147.0.7727.138",
+      "hash_darwin": "sha256-d2dEPcR2mlfkL6XGhzMsgH/OwAI+yLXdS0dF4luPRfM=",
+      "hash_darwin_aarch64": "sha256-6rguKqpJJd058DQbiLVKVd/t+E7yYe1FHHB6zlwD6bU="
     },
     "deps": {
       "depot_tools": {
-        "rev": "f16c2eb7bfe77c7354a75ac2460bdd18ac2f59d2",
-        "hash": "sha256-VnmcmfAZq2sIFvPXaV3BtAjzDDPB6/h5Jz68qB124bE="
+        "rev": "d0e1a84d5b0c3c556b0fbdbeb77908d9817e6bbb",
+        "hash": "sha256-mc/W0D9MEtNQPeJ66X9T28IB+pvYqDRXj9UYb9hLlvA="
       },
       "gn": {
         "version": "0-unstable-2026-03-05",
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "dbcf1b1bfb506cc580859bcb5ff9460a8443af90",
-        "hash": "sha256-pcrElIGFOcPQjJUF1ceHMRjS3YLjbTa9cM3Qg/G3u6I=",
+        "rev": "68ba233a543d25e75c30f1228dd3bafa2da96937",
+        "hash": "sha256-ktIkQRYWcyKnZKEhvxFGssMZ///ctd/Ue3VIYPvQzuM=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "82ab43bfda5a3f59e1876fd3c828f047c689bc12",
-        "hash": "sha256-6WjecQRoyCLUoSbqDMpmsJ5tZazPF171KWnjxxK8hd4="
+        "rev": "534e0d1c1d0fcb4b57fd6a3fb9284cd14eaa28cd",
+        "hash": "sha256-o3UV8X27G7wpaDiKDzgMZN64+d9JQrvcQXpSybxi/h4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "ff7b4f6c5d964879b5f4356ef6e732adeed2f627",
-        "hash": "sha256-pURclm6gi0am32tohZTB4iT2BWa55uRBJNRVW0gjDcY="
+        "rev": "049880d58d6636a819168c00f44f8a4ed1e33e51",
+        "hash": "sha256-AHUos4ejvcsHTDdretkDHAeyLugtI6Jg14Hb9MbbPPs="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -657,8 +657,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "f8cd2da0256752afb0059bf17e4bf2bec422967e",
-        "hash": "sha256-dtSWBpCaewkKMW3Jc1PNDQh0jSQHIPduaXsIU9rcTa0="
+        "rev": "6e0fbe154ccaf018b2dd1f0e42eec285e7d79d00",
+        "hash": "sha256-oqfNOSQB+5sbAnw4tPBXn22rk6Ai5b2aZNLJUyM181k="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -792,8 +792,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "997079137283f693a0fac6a5350ae7f6f2cf3b59",
-        "hash": "sha256-SOV9YS8Dk1HFCo00Qe6zttJOP0PEBS4B6Ah79OXmTew="
+        "rev": "28452dff1bf86fec881a47949d4dedd4a2fe1f09",
+        "hash": "sha256-KBz94jvdVgxWuTuSoeHKNdY7wEJDGqG3xVsSVB3ubRQ="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -822,8 +822,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "9b21082faf16a5f029a4316272c9a627d8b33eb4",
-        "hash": "sha256-dT1f9Df1K1ZLp346Tpqn6Lkq2HDYWWQIAuhqXMIIydk="
+        "rev": "c152c31c55cd54fd239772532a86c802d95b4617",
+        "hash": "sha256-7qEPh9l94LqyaA9qW0ZfFmmFyMNTjTJaeunLgDhtFuM="
       }
     }
   },

From 92e5873e3075d375e9af8d41cfe2af25b24edfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Apr 2026 16:19:30 -0700
Subject: [PATCH 162/166] python3Packages.aioxmpp: fix meta.changelog

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

diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix
index 1e0184d6a365..e0285de62caa 100644
--- a/pkgs/development/python-modules/aioxmpp/default.nix
+++ b/pkgs/development/python-modules/aioxmpp/default.nix
@@ -91,7 +91,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pure-python XMPP library for asyncio";
     homepage = "https://codeberg.org/jssfr/aioxmpp";
-    changelog = "https://codeberg.org/jssfr/aioxmpp/blob/${src.rev}/docs/api/changelog.rst";
+    changelog = "https://codeberg.org/jssfr/aioxmpp/src/tag/${src.tag}/docs/api/changelog.rst";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
   };

From d989cb45fc4042648471807ec2a8c318532d93c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Apr 2026 16:29:23 -0700
Subject: [PATCH 163/166] python3Packages.epicstore-api: fix meta.changelog

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

diff --git a/pkgs/development/python-modules/epicstore-api/default.nix b/pkgs/development/python-modules/epicstore-api/default.nix
index 4bc4e125c364..32d596b4bd69 100644
--- a/pkgs/development/python-modules/epicstore-api/default.nix
+++ b/pkgs/development/python-modules/epicstore-api/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/v_${src.tag}";
+    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/${src.tag}";
     description = "Epic Games Store Web API Wrapper written in Python";
     homepage = "https://github.com/SD4RK/epicstore_api";
     license = lib.licenses.mit;

From 6265a15c61ae5e8eb4605f58724b7b7d81a3b474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Apr 2026 16:32:26 -0700
Subject: [PATCH 164/166] python3Packages.jaraco-email: fix meta.changelog

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

diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix
index b5835a6b2360..ab8bebde6350 100644
--- a/pkgs/development/python-modules/jaraco-email/default.nix
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.tag}/NEWS.rst";
     description = "E-mail facilities by jaraco";
     homepage = "https://github.com/jaraco/jaraco.email";
     license = lib.licenses.mit;

From d46e3b17151721cee8f037bb282201515298fe0a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 29 Apr 2026 02:02:18 +0200
Subject: [PATCH 165/166] pretix: 2026.3.1 -> 2026.4.0

https://pretix.eu/about/en/blog/20260428-release-2026-4/
---
 pkgs/by-name/pr/pretix/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index b0f6df0356e4..b15cd1805a86 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -51,13 +51,13 @@ let
   };
 
   pname = "pretix";
-  version = "2026.3.1";
+  version = "2026.4.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     tag = "v${version}";
-    hash = "sha256-E/WJRuugcfy/r6USS37G73PiHg8DuYRFSq0e19XIRJg=";
+    hash = "sha256-M5ty2kcIyVAFzGiieLx1FHIRXnl4jCR/O2IU7kztV3U=";
   };
 
   npmDeps = buildNpmPackage {
@@ -65,7 +65,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-+84WFNs0iPhMb4YIKfHYByYeFQHITyWeF5yIM8pvQSs=";
+    npmDepsHash = "sha256-U4oXGir53h7R3z4p371PJGm2EU+arsqe/abn6GvSGXs=";
 
     dontBuild = true;
 
@@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication rec {
     "bleach"
     "celery"
     "css-inline"
+    "cryptography"
     "django-bootstrap3"
     "django-compressor"
     "django-filter"

From 6fe7ab48baca0b96713f3817530a78155f68180d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 29 Apr 2026 02:06:25 +0200
Subject: [PATCH 166/166] pretix.plugins.mollie: 2.5.3 -> 2.5.4

https://github.com/pretix/pretix-mollie/compare/v2.5.3...v2.5.4
---
 pkgs/by-name/pr/pretix/plugins/mollie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index e48900a713c8..df4813bbde40 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.5.3";
+  version = "2.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-fWfevPhwpdHkpvuedf16b/f2QfHLy1/FAS3nVV4utwM=";
+    hash = "sha256-lDICcpO8Qod++eM2okq4CJirIBM18zYnbM6Bbwb9e34=";
   };
 
   build-system = [