From 20396156cb81c5aa4b409286b3da1055a2b1c6ea Mon Sep 17 00:00:00 2001
From: Sokhibjon Orzikulov <sakhib@orzklv.uz>
Date: Fri, 28 Mar 2025 02:44:28 +0500
Subject: [PATCH 01/87] e-imzo: initialize module

e-imzo: (fix, to be squashed) formatted accordingly using `nixfmt`
e-imzo: (fix, to be squashed) removed lib from options by @ FliegendeWurst
e-imzo: (fix, to be squashed) use lib.getExe as mainProgram is defined by @FliegendeWurst
e-imzo: (fix, to be squashed) formatted with `nixfmt-rfc-style` suggestion by @FliegendeWurst
Co-Authored-By: Arne Keller <arne.keller@posteo.de>
---
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/services/security/e-imzo.nix | 50 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 nixos/modules/services/security/e-imzo.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 902503335169..a030a68e1e50 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1394,6 +1394,7 @@
   ./services/security/certmgr.nix
   ./services/security/cfssl.nix
   ./services/security/clamav.nix
+  ./services/security/e-imzo.nix
   ./services/security/endlessh-go.nix
   ./services/security/endlessh.nix
   ./services/security/esdm.nix
diff --git a/nixos/modules/services/security/e-imzo.nix b/nixos/modules/services/security/e-imzo.nix
new file mode 100644
index 000000000000..1423f3ec9596
--- /dev/null
+++ b/nixos/modules/services/security/e-imzo.nix
@@ -0,0 +1,50 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.e-imzo;
+in
+{
+  options = {
+    services.e-imzo = {
+      enable = lib.mkEnableOption "E-IMZO";
+
+      package = lib.mkPackageOption pkgs "e-imzo" {
+        extraDescription = "Official mirror deletes old versions as soon as they release new one. Feel free to use either unstable or your own custom e-imzo package and ping maintainer.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.user.services.e-imzo = {
+      enable = true;
+      description = "E-IMZO, uzbek state web signing service";
+      documentation = [ "https://github.com/xinux-org/e-imzo" ];
+
+      after = [
+        "network-online.target"
+        "graphical.target"
+      ];
+      wants = [
+        "network-online.target"
+        "graphical.target"
+      ];
+      wantedBy = [ "default.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+        RestartSec = 1;
+        ExecStart = lib.getExe cfg.package;
+
+        NoNewPrivileges = true;
+        SystemCallArchitectures = "native";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ orzklv ];
+}

From e2b65c023983cd579e1f9eb050504fd5959ecb41 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Tue, 3 Dec 2024 09:30:45 +0100
Subject: [PATCH 02/87] nixos/tzupdate: make enabled module actually be enabled

Without this fix, when setting `services.tzupdate.enable = true`, the service would never run automatically.

Now, it's actually enabled in systemd and it actually gets executed.

Still, it could be improved with a timer as explained in https://github.com/NixOS/nixpkgs/issues/127984#issuecomment-2512059143, but this makes it at least work out of the box when rebooting the system.
---
 nixos/modules/services/misc/tzupdate.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix
index 18fee37ddd1b..65a6f7d72098 100644
--- a/nixos/modules/services/misc/tzupdate.nix
+++ b/nixos/modules/services/misc/tzupdate.nix
@@ -26,11 +26,12 @@ in
     # zone, which is better than silently overriding it.
     time.timeZone = null;
 
-    # We provide a one-shot service which can be manually run. We could
-    # provide a service that runs on startup, but it's tricky to get
-    # a service to run after you have *internet* access.
+    # We provide a one-shot service that runs at startup once network
+    # interfaces are up, but we can’t ensure we actually have Internet access
+    # at that point. It can also be run manually with `systemctl start tzupdate`.
     systemd.services.tzupdate = {
       description = "tzupdate timezone update service";
+      wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       script = ''

From fb77311164cdba8642f31d02e6292ff0d31fb43f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Apr 2025 14:33:32 +0000
Subject: [PATCH 03/87] aliae: 0.26.4 -> 0.26.5

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

diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index 5de675497c7f..342cb01d9e0e 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "aliae";
-  version = "0.26.4";
+  version = "0.26.5";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     tag = "v${version}";
-    hash = "sha256-Xyj/CEvYnVz8bX0vMsFAyRY7Hp6heHFjvq+VeCYWXow=";
+    hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw=";
   };
 
-  vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM=";
+  vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM=";
 
   sourceRoot = "${src.name}/src";
 

From 813e6c9c826508e4734dbc83112e04dc1fbe90f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 07:13:15 +0000
Subject: [PATCH 04/87] go-ethereum: 1.15.6 -> 1.15.8

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

diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index 5c6035799e8d..c65b636eb1a3 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -18,13 +18,13 @@ let
 in
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.15.6";
+  version = "1.15.8";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo=";
+    hash = "sha256-dEGPObm3Hy2MHOYrk+lga0PAeHrdSt0jfsTrk74wCUA=";
   };
 
   proxyVendor = true;

From ec6b34809cd7a990d438b9fb1ac6dfe82ac87430 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <me@netali.de>
Date: Wed, 16 Apr 2025 19:08:49 +0200
Subject: [PATCH 05/87] zammad: 6.4.1 -> 6.5.0

---
 .../za/zammad/fix-sendmail-location.diff      |  15 +-
 pkgs/by-name/za/zammad/gemset.nix             | 963 ++++++++++++------
 pkgs/by-name/za/zammad/package.nix            |   4 +-
 pkgs/by-name/za/zammad/source.json            |   4 +-
 4 files changed, 651 insertions(+), 335 deletions(-)

diff --git a/pkgs/by-name/za/zammad/fix-sendmail-location.diff b/pkgs/by-name/za/zammad/fix-sendmail-location.diff
index c8f948284e73..b9a76053be97 100644
--- a/pkgs/by-name/za/zammad/fix-sendmail-location.diff
+++ b/pkgs/by-name/za/zammad/fix-sendmail-location.diff
@@ -1,12 +1,13 @@
 diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
-index b15ef48a6..64c120a87 100644
+index 475636c013..7f3149c331 100644
 --- a/app/models/channel/driver/sendmail.rb
 +++ b/app/models/channel/driver/sendmail.rb
-@@ -32,6 +32,6 @@ def delivery_method(mail)
- 
-     return mail.delivery_method :test if Rails.env.test?
- 
--    mail.delivery_method :sendmail
-+    mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
+@@ -30,7 +30,7 @@ class Channel::Driver::Sendmail < Channel::Driver::BaseEmailOutbound
+       # test
+       super(attr, notification, :test)
+     else
+-      super(attr, notification, :sendmail)
++      super(attr, notification, :sendmail, { location: '/run/wrappers/bin/sendmail' })
+     end
    end
  end
diff --git a/pkgs/by-name/za/zammad/gemset.nix b/pkgs/by-name/za/zammad/gemset.nix
index 2ccee6292b3a..f18606851e2b 100644
--- a/pkgs/by-name/za/zammad/gemset.nix
+++ b/pkgs/by-name/za/zammad/gemset.nix
@@ -22,10 +22,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx";
+      sha256 = "1d7z3fqanmzr6d99idvm2qj6lil2pxn5haxz7kb6f1x8fm88hfsv";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   actionmailbox = {
     dependencies = [
@@ -35,18 +35,15 @@
       "activestorage"
       "activesupport"
       "mail"
-      "net-imap"
-      "net-pop"
-      "net-smtp"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk";
+      sha256 = "098f12d19q64d0svzgz73w23mv2y3zmccryybp3hfi8gab14fsl9";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   actionmailer = {
     dependencies = [
@@ -55,19 +52,16 @@
       "activejob"
       "activesupport"
       "mail"
-      "net-imap"
-      "net-pop"
-      "net-smtp"
       "rails-dom-testing"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr";
+      sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   actionpack = {
     dependencies = [
@@ -80,6 +74,7 @@
       "rack-test"
       "rails-dom-testing"
       "rails-html-sanitizer"
+      "useragent"
     ];
     groups = [
       "assets"
@@ -90,10 +85,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx";
+      sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   actiontext = {
     dependencies = [
@@ -108,10 +103,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d";
+      sha256 = "1mphlcvnfba3gd1sydcrr2i7brfwlcbxjmwjpybvcx363bjcwsgk";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   actionview = {
     dependencies = [
@@ -130,10 +125,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j";
+      sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   activejob = {
     dependencies = [
@@ -144,10 +139,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl";
+      sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -155,10 +150,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl";
+      sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   activerecord = {
     dependencies = [
@@ -170,10 +165,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1";
+      sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   activerecord-import = {
     dependencies = [ "activerecord" ];
@@ -181,10 +176,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g16yn1ixfixd979yfqbxp9y71ryr4a6wakbr6dmpq4s7glm6366";
+      sha256 = "151cihrjlf3nypdnaj4gmkdx47a2qjd3qlwgq4jy2dmnqj3ca6vv";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "2.1.0";
   };
   activerecord-session_store = {
     dependencies = [
@@ -216,21 +211,23 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8";
+      sha256 = "0psjqn03irbfk79x57ylaaaj83pqqcwy8b4mwrp6bmnljkzkbv5l";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   activesupport = {
     dependencies = [
       "base64"
+      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
       "drb"
       "i18n"
+      "logger"
       "minitest"
-      "mutex_m"
+      "securerandom"
       "tzinfo"
     ];
     groups = [
@@ -242,10 +239,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0";
+      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   acts_as_list = {
     dependencies = [
@@ -256,10 +253,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jbzjf6344a0m083d69qgx55xqqsxxrli8g1ark9d16fbcayi0j6";
+      sha256 = "0lanxa1hia36p13h1v68m4k5l8fvf9d65ccfgnp6d7c7y6axcvjy";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.4";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -276,6 +273,16 @@
     };
     version = "2.8.7";
   };
+  aes_key_wrap = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
   android_key_attestation = {
     groups = [ "default" ];
     platforms = [ ];
@@ -295,10 +302,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mwmrqfpwljp0pkv8zbamg66s2zlxrhhvfvcgg9jlldzf98zc3lq";
+      sha256 = "12bg9a07cnp9kbx8qvcfm614wybl7gfj8vmwfncqvjipmxq43c32";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.3.2";
   };
   ast = {
     groups = [
@@ -314,6 +321,16 @@
     };
     version = "2.4.2";
   };
+  attr_required = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
   autodiscover = {
     dependencies = [
       "httpclient"
@@ -343,51 +360,42 @@
     };
     version = "10.4.19.0";
   };
-  awrence = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
   aws-eventstream = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
+      sha256 = "0fs0shrf2f5dizr8c0lyg0y5j6ixkf6p72i6n5ps6s8xsynv4ra4";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.3.1";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1l3rkiqvlmh3bgq6447s2d398z43slk3swz0cvgjprvm6182ici4";
+      sha256 = "0af8syr32m1dz1w4cqxgkalghdqq7ilkxfvzmcy4648w45v9izjd";
       type = "gem";
     };
-    version = "1.984.0";
+    version = "1.1052.0";
   };
   aws-sdk-core = {
     dependencies = [
       "aws-eventstream"
       "aws-partitions"
       "aws-sigv4"
+      "base64"
       "jmespath"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq";
+      sha256 = "0jf64bcgv1iyjhvlax78za4jg6ylgmrwvfvwvf7dxwg1xhr3h36i";
       type = "gem";
     };
-    version = "3.209.1";
+    version = "3.219.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -398,10 +406,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh";
+      sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
       type = "gem";
     };
-    version = "1.94.0";
+    version = "1.99.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -413,10 +421,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kln41q23a6rxj1r9wj972z4jaxiqn7fm64y9ry6qkbzn1ibgam6";
+      sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
       type = "gem";
     };
-    version = "1.167.0";
+    version = "1.182.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -424,10 +432,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm";
+      sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
   base64 = {
     groups = [
@@ -444,6 +452,21 @@
     };
     version = "0.2.0";
   };
+  benchmark = {
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   bigdecimal = {
     groups = [
       "assets"
@@ -454,10 +477,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
+      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
       type = "gem";
     };
-    version = "3.1.8";
+    version = "3.1.9";
   };
   bindata = {
     groups = [ "default" ];
@@ -514,20 +537,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "078syvjnnkbair5ffyvchxj9yd2c8215c1271kfh1gqsmaf70bl6";
+      sha256 = "0xw57fqs89g02mg482x17agc3b606aim72jlc6d525qgqyq2408s";
       type = "gem";
     };
-    version = "6.2.1";
+    version = "7.0.0";
   };
   browser = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "083rx0jjlzbh9fxiy967l87f1123hairdc4mm6d54plj5kqz1683";
+      sha256 = "0bffb8dddrg6zn8c74swhy8mq2mysb195hi7chwwj9c8g2am4798";
       type = "gem";
     };
-    version = "6.0.0";
+    version = "6.2.0";
   };
   buftok = {
     groups = [ "default" ];
@@ -574,6 +597,16 @@
     };
     version = "1.1.0";
   };
+  camertron-eprun = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jyfz769dqpipy0wi72la16c8brh5793akvaixj64pj42rwk73ls";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
   capybara = {
     dependencies = [
       "addressable"
@@ -612,10 +645,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3";
+      sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.4.2";
   };
   childprocess = {
     dependencies = [ "logger" ];
@@ -655,6 +688,27 @@
     };
     version = "1.0.4";
   };
+  cld = {
+    dependencies = [ "ffi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "03297qpxh4q1c4fhksq8wkgwwlqdqg47izy5piz9x62n2xsbasa2";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  cldr-plurals-runtime-rb = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1afzavyzb7rw15s75vzfg6lj8nw2fglr2266970gmscvz1d8flr3";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
   clearbit = {
     dependencies = [ "nestful" ];
     groups = [ "default" ];
@@ -734,10 +788,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "1.3.5";
   };
   connection_pool = {
     groups = [
@@ -749,10 +803,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
+      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "2.5.0";
   };
   cose = {
     dependencies = [
@@ -806,10 +860,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
+      sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.2";
   };
   daemons = {
     groups = [ "default" ];
@@ -832,14 +886,19 @@
     version = "3.2.8";
   };
   date = {
-    groups = [ "default" ];
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
+      sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
       type = "gem";
     };
-    version = "3.3.4";
+    version = "3.4.1";
   };
   debug_inspector = {
     groups = [ "default" ];
@@ -857,10 +916,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zyjp3yfchfw1jynvxk3147hzmchwq8cnqh16gjii557nd0z0mhx";
+      sha256 = "1frvhp463nmng3gqxawdziwmqwnkkxlqzafnkwklk0vbci6fcha9";
       type = "gem";
     };
-    version = "4.1.12";
+    version = "4.1.13";
   };
   delayed_job_active_record = {
     dependencies = [
@@ -871,10 +930,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08dl21wbrhb5ynk23dqv71wmm3s0zcz1xa0hmmmwk3yh48irza6j";
+      sha256 = "1a0vghmm4lkgiwqn51wkhq78r25d0ip7rbqxvykxfv9ia1nlmwv4";
       type = "gem";
     };
-    version = "4.1.10";
+    version = "4.1.11";
   };
   deprecation_toolkit = {
     dependencies = [ "activesupport" ];
@@ -885,10 +944,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0f37k15bsq6aq8bikkvlg5bi96ic8z7hwyxxcz8mx3xgkgfdhzx0";
+      sha256 = "1zfvkd5sm5wi5zdxh6lk6nwxz652wywx3nb7s393lmw3plqw33x5";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   diff-lcs = {
     groups = [
@@ -909,10 +968,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n";
+      sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.4.3";
   };
   domain_name = {
     groups = [ "default" ];
@@ -930,10 +989,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b";
+      sha256 = "0v6jjb1259y8dq97ibchc20jqjgk3z7zn12ggv5wzn2mcz1z6m3d";
       type = "gem";
     };
-    version = "5.7.1";
+    version = "5.8.1";
   };
   drb = {
     groups = [
@@ -955,37 +1014,39 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18cxi596f5x1vglnma4hhm6z15m7yma6yparsybyfz3a2z0iqc08";
+      sha256 = "0nyrgj4a0ppk0qfp8cny4wb3hsr2cw55ynh2w973brhf54xxz5wc";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.0";
   };
   dry-core = {
     dependencies = [
       "concurrent-ruby"
+      "logger"
       "zeitwerk"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk";
+      sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   dry-inflector = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14k7q3jvzphkbkd4i1s3ika6kz4p9pcqy78z0yimahwvnsqvj3rl";
+      sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.0";
   };
   dry-logic = {
     dependencies = [
+      "bigdecimal"
       "concurrent-ruby"
       "dry-core"
       "zeitwerk"
@@ -994,10 +1055,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr";
+      sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.0";
   };
   dry-struct = {
     dependencies = [
@@ -1010,10 +1071,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rnlgn4wif0dvkvi10xwh1vd1q6mp35q6a7lwva0zmbc79dh4drp";
+      sha256 = "1bjkxrmsi8wbymkx44fm0fyv89zpcw0a09np67ak4sd34hx92022";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.1";
   };
   dry-types = {
     dependencies = [
@@ -1028,10 +1089,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sn4n13jj8x27n07yv2s7zp0c5cdlwsbh21laqm5f7ikhp10y67z";
+      sha256 = "03zcngwfpq0nx9wmxma0s1c6sb3xxph93q8j7dy75721d7d9lkn8";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.8.2";
   };
   eco = {
     dependencies = [
@@ -1076,15 +1137,29 @@
     version = "0.5.3";
   };
   email_address = {
-    dependencies = [ "simpleidn" ];
+    dependencies = [
+      "base64"
+      "simpleidn"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09clyyp65ry2dqg4kwr4lbyi40c9nci282qxpfgmvq75z8clia8y";
+      sha256 = "171840113n47lmrm4ll7x8jhadq75d2kfpd081x81m86b0bv0fl7";
       type = "gem";
     };
-    version = "0.2.4";
+    version = "0.2.5";
+  };
+  email_validator = {
+    dependencies = [ "activemodel" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs";
+      type = "gem";
+    };
+    version = "2.2.4";
   };
   equalizer = {
     groups = [ "default" ];
@@ -1106,10 +1181,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw";
+      sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0";
       type = "gem";
     };
-    version = "1.13.0";
+    version = "1.13.1";
   };
   eventmachine = {
     groups = [ "default" ];
@@ -1126,10 +1201,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8";
+      sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb";
       type = "gem";
     };
-    version = "2.9.1";
+    version = "2.10.0";
   };
   factory_bot = {
     dependencies = [ "activesupport" ];
@@ -1141,10 +1216,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q927lvgjqj0xaplxhicj5xv8xadx3957mank3p7g01vb6iv6x33";
+      sha256 = "1abc5lr617i0wlnkghc433gln9vpsjggkx5q2iay1bn0pskiwn20";
       type = "gem";
     };
-    version = "6.5.0";
+    version = "6.5.1";
   };
   factory_bot_rails = {
     dependencies = [
@@ -1158,10 +1233,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1j6w4rr2cb5wng9yrn2ya9k40q52m0pbz47kzw8xrwqg3jncwwza";
+      sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk";
       type = "gem";
     };
-    version = "6.4.3";
+    version = "6.4.4";
   };
   faker = {
     dependencies = [ "i18n" ];
@@ -1172,10 +1247,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xj0xx2snnxzjipxpxwiki7053441jkdg10h0rmjiri040s5lssi";
+      sha256 = "1z4vhl6lbd0la2j0ab05sz8wq5mqvpikzhjrc142z24x4zmgpl8s";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.5.1";
   };
   faraday = {
     dependencies = [
@@ -1191,10 +1266,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni";
+      sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
       type = "gem";
     };
-    version = "2.12.0";
+    version = "2.12.2";
+  };
+  faraday-follow_redirects = {
+    dependencies = [ "faraday" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+      type = "gem";
+    };
+    version = "0.3.0";
   };
   faraday-mashify = {
     dependencies = [
@@ -1224,10 +1310,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
+      sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.1.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -1239,10 +1325,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk";
+      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.4.0";
   };
   ffi = {
     groups = [
@@ -1252,10 +1338,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.17.1";
   };
   ffi-compiler = {
     dependencies = [
@@ -1282,6 +1368,7 @@
     version = "1.0.0";
   };
   gli = {
+    dependencies = [ "ostruct" ];
     groups = [
       "default"
       "development"
@@ -1290,10 +1377,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fd4blr0pa0b4dd9pzqqpzh49m3p1ff4aa0bys4wpk1jniisl7vy";
+      sha256 = "1c2x5wh3d3mz8vg5bs7c5is0zvc56j6a2b4biv5z1w5hi1n8s3jq";
       type = "gem";
     };
-    version = "2.21.5";
+    version = "2.22.2";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -1310,15 +1397,16 @@
     dependencies = [
       "base64"
       "fiber-storage"
+      "logger"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1is9rr5l0lw9z12h9v064fpp1nrnv42p2z2j1r3mnk4ik1lrdjba";
+      sha256 = "17dayn5422rnbaqs33dnl8d9jw7acpn6cg88z2awk4scwblvc7gv";
       type = "gem";
     };
-    version = "2.3.16";
+    version = "2.4.13";
   };
   graphql-batch = {
     dependencies = [
@@ -1334,6 +1422,17 @@
     };
     version = "0.6.0";
   };
+  graphql-fragment_cache = {
+    dependencies = [ "graphql" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11kpjw5gx2j8ip89ipwmpwhn4zdx4wvvrsgzszsva7cr82wdnkvi";
+      type = "gem";
+    };
+    version = "1.22.0";
+  };
   hashdiff = {
     groups = [
       "default"
@@ -1343,10 +1442,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0slky0n6n12gjgimzdbdigpwyg5wgq8fysjwkzzfw33ff8b675n7";
+      sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.2";
   };
   hashie = {
     groups = [
@@ -1404,10 +1503,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb";
+      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
       type = "gem";
     };
-    version = "1.0.7";
+    version = "1.0.8";
   };
   http-form_data = {
     groups = [ "default" ];
@@ -1479,10 +1578,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.14.6";
+    version = "1.14.7";
   };
   icalendar = {
     dependencies = [
@@ -1577,13 +1676,14 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h";
+      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
       type = "gem";
     };
-    version = "0.7.2";
+    version = "0.8.0";
   };
   irb = {
     dependencies = [
+      "pp"
       "rdoc"
       "reline"
     ];
@@ -1596,10 +1696,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y40dv3caswr81dlsyln6vnmmpzf5jcal2rqjbsglvnkb0xh0xar";
+      sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
       type = "gem";
     };
-    version = "1.14.1";
+    version = "1.15.1";
   };
   jmespath = {
     groups = [ "default" ];
@@ -1620,10 +1720,28 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.10.2";
+  };
+  json-jwt = {
+    dependencies = [
+      "activesupport"
+      "aes_key_wrap"
+      "base64"
+      "bindata"
+      "faraday"
+      "faraday-follow_redirects"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "19bjs404inbydn40nampk5ij7vqkwpmqp3hp4dmjf50sdm6gzayc";
+      type = "gem";
+    };
+    version = "1.16.7";
   };
   jwt = {
     groups = [ "default" ];
@@ -1635,25 +1753,6 @@
     };
     version = "2.3.0";
   };
-  keycloak-admin = {
-    dependencies = [
-      "hashie"
-      "httparty"
-    ];
-    groups = [
-      "development"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      fetchSubmodules = false;
-      rev = "7ea4e62d77fad93fc2da840c3f8bd5c45588d131";
-      sha256 = "022883w42a9dg0q97xxl58mrzhkba9jf3kij0zc2fq1zsl37rq1n";
-      type = "git";
-      url = "https://github.com/tschaefer/ruby-keycloak-admin/";
-    };
-    version = "23.0.7";
-  };
   koala = {
     dependencies = [
       "addressable"
@@ -1681,10 +1780,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
       type = "gem";
     };
-    version = "3.17.0.3";
+    version = "3.17.0.4";
+  };
+  lint_roller = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   listen = {
     dependencies = [
@@ -1725,6 +1838,7 @@
   };
   logger = {
     groups = [
+      "assets"
       "default"
       "development"
       "test"
@@ -1732,10 +1846,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.6.6";
   };
   logging = {
     dependencies = [
@@ -1765,10 +1879,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
+      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
       type = "gem";
     };
-    version = "2.23.1";
+    version = "2.24.0";
   };
   macaddr = {
     dependencies = [ "systemu" ];
@@ -1876,10 +1990,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
+      sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3";
       type = "gem";
     };
-    version = "3.2024.1001";
+    version = "3.2025.0107";
   };
   mini_mime = {
     groups = [
@@ -1920,20 +2034,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
+      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
       type = "gem";
     };
-    version = "5.25.1";
+    version = "5.25.4";
   };
   msgpack = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr";
+      sha256 = "1a5fsgchkpcca4wf3pipbb2jbj523l7fbaq37j10cr0yymwlkc7z";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.7.5";
   };
   multi_json = {
     groups = [ "default" ];
@@ -1975,19 +2089,14 @@
     version = "2.4.1";
   };
   mutex_m = {
-    groups = [
-      "assets"
-      "default"
-      "development"
-      "test"
-    ];
+    groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
+      sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.3.0";
   };
   mysql2 = {
     groups = [ "mysql" ];
@@ -2019,20 +2128,6 @@
     };
     version = "1.1.4";
   };
-  net-ftp = {
-    dependencies = [
-      "net-protocol"
-      "time"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8";
-      type = "gem";
-    };
-    version = "0.3.8";
-  };
   net-http = {
     dependencies = [ "uri" ];
     groups = [
@@ -2043,10 +2138,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";
+      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.6.0";
   };
   net-imap = {
     dependencies = [
@@ -2057,10 +2152,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "160mfk4gnpwfc7j4kpchxgzfkml54h94q7vfzjw061flrkrclyqj";
+      sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy";
       type = "gem";
     };
-    version = "0.4.17";
+    version = "0.5.6";
   };
   net-ldap = {
     groups = [ "default" ];
@@ -2100,10 +2195,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z";
+      sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.5.1";
   };
   nio4r = {
     groups = [
@@ -2113,10 +2208,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
+      sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr";
       type = "gem";
     };
-    version = "2.7.3";
+    version = "2.7.4";
   };
   nkf = {
     groups = [ "default" ];
@@ -2142,10 +2237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny";
+      sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
       type = "gem";
     };
-    version = "1.16.8";
+    version = "1.18.5";
   };
   nori = {
     dependencies = [ "bigdecimal" ];
@@ -2387,15 +2482,53 @@
     };
     version = "0.5.2";
   };
+  omniauth_openid_connect = {
+    dependencies = [
+      "omniauth"
+      "openid_connect"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "099xg7s6450wlfzs77mbdx78g3dp0glx5q6f44i78akf7283hbqz";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  openid_connect = {
+    dependencies = [
+      "activemodel"
+      "attr_required"
+      "email_validator"
+      "faraday"
+      "faraday-follow_redirects"
+      "json-jwt"
+      "mail"
+      "rack-oauth2"
+      "swd"
+      "tzinfo"
+      "validate_url"
+      "webfinger"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "10i13cn40jiiw8lslkv7bj1isinnwbmzlk6msgiph3gqry08702x";
+      type = "gem";
+    };
+    version = "2.3.1";
+  };
   openssl = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw";
+      sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.3.0";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -2409,14 +2542,18 @@
     version = "1.3.0";
   };
   ostruct = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv";
+      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.1";
   };
   overcommit = {
     dependencies = [
@@ -2431,10 +2568,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lpl1ppjrqwsmywsb4srfjfm31dna30jrjyx2lkmws7s2jchy94v";
+      sha256 = "1g21qql4im223bq1x6r3n2g7s6hgnpsik2v9wmjd7hcsg5nbv5wg";
       type = "gem";
     };
-    version = "0.64.0";
+    version = "0.67.0";
   };
   parallel = {
     groups = [
@@ -2463,20 +2600,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk";
+      sha256 = "18dcwrcnddvi8gl3hmbsb2cj1l7afxk2lh3jmhj90l95h1hn3gkx";
       type = "gem";
     };
-    version = "3.3.5.0";
+    version = "3.3.7.1";
   };
   pg = {
     groups = [ "postgres" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dsgcmzc55w7i9cpghfkzhmiskzndvp1vijd8c5ryv8xvlwikmzg";
+      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
       type = "gem";
     };
-    version = "1.5.8";
+    version = "1.5.9";
   };
   PoParser = {
     dependencies = [ "simple_po_parser" ];
@@ -2498,10 +2635,41 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y2c5mvkq7zc5vh4ijs1wc9hc0yn4mwsbrjch34jf11pcz116pnd";
+      sha256 = "08y3bc9f0jbrlbnrqs98y2xzai4695j6h595dlrmgsmqbfw13db3";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "2.0.5";
+  };
+  pp = {
+    dependencies = [ "prettyprint" ];
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  prettyprint = {
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
   "promise.rb" = {
     groups = [ "default" ];
@@ -2627,7 +2795,10 @@
     version = "1.3.1";
   };
   psych = {
-    dependencies = [ "stringio" ];
+    dependencies = [
+      "date"
+      "stringio"
+    ];
     groups = [
       "assets"
       "default"
@@ -2637,10 +2808,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
+      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
       type = "gem";
     };
-    version = "5.1.2";
+    version = "5.2.3";
   };
   public_suffix = {
     groups = [
@@ -2662,10 +2833,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
+      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
       type = "gem";
     };
-    version = "6.4.3";
+    version = "6.6.0";
   };
   pundit = {
     dependencies = [ "activesupport" ];
@@ -2692,10 +2863,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gmvppwknijhy013azyws85bkyck8x9ly7yh2162kxa59z1kbsgq";
+      sha256 = "1mgzij87czkr59xp1v0il7hqwj2pabgp7vd3xk6afpjp3mx0gmjr";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "4.0.0";
   };
   racc = {
     groups = [
@@ -2722,10 +2893,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
+      sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
       type = "gem";
     };
-    version = "2.2.10";
+    version = "2.2.13";
   };
   rack-attack = {
     dependencies = [ "rack" ];
@@ -2738,6 +2909,24 @@
     };
     version = "6.7.0";
   };
+  rack-oauth2 = {
+    dependencies = [
+      "activesupport"
+      "attr_required"
+      "faraday"
+      "faraday-follow_redirects"
+      "json-jwt"
+      "rack"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
   rack-protection = {
     dependencies = [
       "base64"
@@ -2790,10 +2979,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c";
+      sha256 = "0qy4ylhcfdn65a5mz2hly7g9vl0g13p5a0rmm6sc0sih5ilkcnh0";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   rackup = {
     dependencies = [
@@ -2809,10 +2998,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wbr03334ba9ilcq25wh9913xciwj0j117zs60vsqm0zgwdkwpp9";
+      sha256 = "0jf2ncj2nx56vh96hh2nh6h4r530nccxh87z7c2f37wq515611ms";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   rails = {
     dependencies = [
@@ -2833,10 +3022,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja";
+      sha256 = "0h5vr7wd15s4zlhrnrm97b1h5bjdlcd5lvh6x2sl6khgnh21dnxf";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   rails-controller-testing = {
     dependencies = [
@@ -2890,10 +3079,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3";
+      sha256 = "0q55i6mpad20m2x1lg5pkqfpbmmapk0sjsrvr1sqgnj2hb5f5z1m";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.6.2";
   };
   railties = {
     dependencies = [
@@ -2914,10 +3103,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x";
+      sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3";
       type = "gem";
     };
-    version = "7.1.4.1";
+    version = "7.2.2.1";
   };
   rainbow = {
     groups = [
@@ -2980,10 +3169,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
+      sha256 = "1455yhd1arccrns3ghhvn4dl6gnrf4zn1xxsaa33ffyqrn399216";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.9.0";
   };
   rdoc = {
     dependencies = [ "psych" ];
@@ -2996,10 +3185,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
+      sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy";
       type = "gem";
     };
-    version = "6.7.0";
+    version = "6.11.0";
   };
   redis = {
     groups = [ "default" ];
@@ -3020,10 +3209,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss";
+      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
       type = "gem";
     };
-    version = "2.9.2";
+    version = "2.10.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -3036,10 +3225,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n";
+      sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
       type = "gem";
     };
-    version = "0.5.10";
+    version = "0.6.0";
   };
   rexml = {
     groups = [
@@ -3050,10 +3239,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
+      sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
       type = "gem";
     };
-    version = "3.3.9";
+    version = "3.4.1";
   };
   rotp = {
     groups = [ "default" ];
@@ -3075,10 +3264,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx";
+      sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5";
       type = "gem";
     };
-    version = "3.13.1";
+    version = "3.13.3";
   };
   rspec-expectations = {
     dependencies = [
@@ -3111,10 +3300,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
+      sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
       type = "gem";
     };
-    version = "3.13.1";
+    version = "3.13.2";
   };
   rspec-rails = {
     dependencies = [
@@ -3133,10 +3322,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd";
+      sha256 = "0cg3ay2jin7jv20carhx3icv3gnwka0hqcr15zcjy7i1xnmwqpg1";
       type = "gem";
     };
-    version = "7.0.1";
+    version = "7.1.1";
   };
   rspec-retry = {
     dependencies = [ "rspec-core" ];
@@ -3161,10 +3350,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
+      sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
       type = "gem";
     };
-    version = "3.13.1";
+    version = "3.13.2";
   };
   rszr = {
     groups = [ "default" ];
@@ -3180,6 +3369,7 @@
     dependencies = [
       "json"
       "language_server-protocol"
+      "lint_roller"
       "parallel"
       "parser"
       "rainbow"
@@ -3195,10 +3385,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86";
+      sha256 = "0sz9782vyhm7kn1p2jfvr4cpfdcnwr3qhkacpy10irpyi4ns6n82";
       type = "gem";
     };
-    version = "1.66.1";
+    version = "1.72.2";
   };
   rubocop-ast = {
     dependencies = [ "parser" ];
@@ -3210,10 +3400,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820";
+      sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg";
       type = "gem";
     };
-    version = "1.32.3";
+    version = "1.38.0";
   };
   rubocop-capybara = {
     dependencies = [ "rubocop" ];
@@ -3246,6 +3436,7 @@
   rubocop-faker = {
     dependencies = [
       "faker"
+      "lint_roller"
       "rubocop"
     ];
     groups = [
@@ -3255,10 +3446,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05d2mpi8xq50xh1s53h75hgvdhcz76lv9cnfn4jg35nbg67j1pdz";
+      sha256 = "16swvh7jgx2j8375pvxs5hklvgq08xqzby7rsnv2v7agshrc36nb";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.3.0";
   };
   rubocop-graphql = {
     dependencies = [ "rubocop" ];
@@ -3287,13 +3478,14 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1qdhwixqiix90a4n52g2b26mi66mrkx8b91pf7yda60m331jfbfr";
+      sha256 = "0sxmmsl0vghkgd4xp5qr56c06kmps6vilxsin0l57iysl61whj3k";
       type = "gem";
     };
-    version = "0.2.1";
+    version = "1.0.0";
   };
   rubocop-performance = {
     dependencies = [
+      "lint_roller"
       "rubocop"
       "rubocop-ast"
     ];
@@ -3304,14 +3496,15 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yd616imfjvlpwsk7lw5kq9h4iz6qkmf10xlaib6b47fy5x77ncy";
+      sha256 = "1da08idjsdclcm9cimjbvd1jz2gm6z62fsc8mywrb0rn7vzkkgg5";
       type = "gem";
     };
-    version = "1.22.1";
+    version = "1.24.0";
   };
   rubocop-rails = {
     dependencies = [
       "activesupport"
+      "lint_roller"
       "rack"
       "rubocop"
       "rubocop-ast"
@@ -3323,13 +3516,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm";
+      sha256 = "0yh2f7h11cscmyxqx2mgkdh6lf7502w53i0cz60mjghy01f46j0r";
       type = "gem";
     };
-    version = "2.26.2";
+    version = "2.30.2";
   };
   rubocop-rspec = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "development"
       "test"
@@ -3337,10 +3533,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nwbi4j22gs1x559dyhpsdllz3vy2i1pw3cb9mpbpszynkdx9p0y";
+      sha256 = "0k1hsppf3p72q9phm2084ad94ldhvf5vnp57xsl4p25gw4pr833i";
       type = "gem";
     };
-    version = "3.1.0";
+    version = "3.5.0";
   };
   rubocop-rspec_rails = {
     dependencies = [
@@ -3359,6 +3555,23 @@
     };
     version = "2.30.0";
   };
+  ruby-keycloak-admin = {
+    dependencies = [
+      "hashie"
+      "httparty"
+    ];
+    groups = [
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qvfhz2wmv3ql3dsb74dnxf444clxiswsqpn38yi4widnqbj041q";
+      type = "gem";
+    };
+    version = "26.0.8";
+  };
   ruby-progressbar = {
     groups = [
       "default"
@@ -3382,10 +3595,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684";
+      sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.18.0";
   };
   rubyntlm = {
     dependencies = [ "base64" ];
@@ -3407,10 +3620,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.4.1";
   };
   safety_net_attestation = {
     dependencies = [ "jwt" ];
@@ -3471,6 +3684,21 @@
     };
     version = "5.1.0";
   };
+  securerandom = {
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
+      type = "gem";
+    };
+    version = "0.4.1";
+  };
   selenium-webdriver = {
     dependencies = [
       "base64"
@@ -3486,10 +3714,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by";
+      sha256 = "0im1hclf7iki2393jngqk2dlxil6wz31bqc9pfnibifjqhyfazqa";
       type = "gem";
     };
-    version = "4.25.0";
+    version = "4.29.1";
   };
   shoulda-matchers = {
     dependencies = [ "activesupport" ];
@@ -3552,6 +3780,7 @@
       "faraday-multipart"
       "gli"
       "hashie"
+      "logger"
     ];
     groups = [
       "development"
@@ -3560,10 +3789,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03nq74m0d31wic05ldrdvn5n9inn60p9n78b9x8yh4dx32caj3ic";
+      sha256 = "14rwj2is80q355z0zxsirip79pglzz79dzkii3gnpjh0xvfwkqxg";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.2";
   };
   slop = {
     groups = [ "default" ];
@@ -3632,10 +3861,26 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
+      sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.2";
+  };
+  swd = {
+    dependencies = [
+      "activesupport"
+      "attr_required"
+      "faraday"
+      "faraday-follow_redirects"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc";
+      type = "gem";
+    };
+    version = "2.0.3";
   };
   systemu = {
     groups = [ "default" ];
@@ -3655,10 +3900,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fq1dxyc34fzyi9ivjb4wb3b4cs5pjh1cl44jn7rbzb8qdg6hp3p";
+      sha256 = "1m7dzia4wwllin385vwhrhyy05gpvklzd9haymd16k87hjyi7d3y";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   telegram-bot-ruby = {
     dependencies = [
@@ -3671,20 +3916,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1flwm4206d2x56gmhqyvrvy4q4y57xnilj5j9f7hgp30b1h8p019";
+      sha256 = "02drr6qsfl4q2xxkji8a01i98vwsxj99gag4i7d4iv2i5pfdpr24";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.4.0";
   };
   telephone_number = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zaqvxl4a4184pyjadayski818p4s5n4sh65yiy8w4n0liqxl3zm";
+      sha256 = "007a6kd7gn4rlng1rgl4lvljiks80axclc29snwh9axn2g2wg4qh";
       type = "gem";
     };
-    version = "1.4.21";
+    version = "1.4.22";
   };
   terser = {
     dependencies = [ "execjs" ];
@@ -3692,10 +3937,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "176swgmwq0cc4z2134x12j9vjvx5y3nrlpbb8p6p0zhsn2wi2cf0";
+      sha256 = "19xzrjqbl2d6qq7zn4hpi20nypjdaz38fzr1f1vqkxhsnrq9gr7i";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.2.5";
   };
   test-unit = {
     dependencies = [ "power_assert" ];
@@ -3706,10 +3951,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fb0ya3w6cwl1xnvilggdhr223jn5az1jrhd7x551jlh77181r1w";
+      sha256 = "08cjs9hidab1izrkzgkx7jzw01glcfq20g5lc6iq9silffgvnhn3";
       type = "gem";
     };
-    version = "3.6.2";
+    version = "3.6.7";
   };
   thor = {
     groups = [
@@ -3744,31 +3989,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
+      sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
       type = "gem";
     };
-    version = "2.4.0";
-  };
-  time = {
-    dependencies = [ "date" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1pk1dwyvx3qvl9zqch4zcfm0h21ny4r0w67mh3wv5hgma173fj8r";
-      type = "gem";
-    };
-    version = "0.4.0";
+    version = "2.6.0";
   };
   timeout = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
+      sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.4.3";
   };
   tpm-key_attestation = {
     dependencies = [
@@ -3780,25 +4014,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18xc7hyasg5ja2i2vb23d9c5pd6rf316kzwqxqx5d8vbs2z1a4rw";
+      sha256 = "0jxzs8bspy26n5q0l3p5zix1rsnkhh77wh07fdmc72bz74mwap6h";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.14.0";
   };
   twilio-ruby = {
     dependencies = [
+      "benchmark"
       "faraday"
       "jwt"
       "nokogiri"
+      "ostruct"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kc065bbl85nz0ana0b9c92w88b3wch2kz81pn96sgrba2p442q2";
+      sha256 = "1qaypfc8yjy5qkbjwdznnk0l7qz04l2lkdxxiqk9mk4wsnx4xbfi";
       type = "gem";
     };
-    version = "7.3.3";
+    version = "7.4.5";
   };
   twitter = {
     dependencies = [
@@ -3822,6 +4058,22 @@
     };
     version = "7.0.0";
   };
+  twitter_cldr = {
+    dependencies = [
+      "base64"
+      "camertron-eprun"
+      "cldr-plurals-runtime-rb"
+      "tzinfo"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1967m253d7yihqjdzvnmhbclkz7xcrbm6q528ajwv2q0jwqc462x";
+      type = "gem";
+    };
+    version = "6.14.0";
+  };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
     groups = [
@@ -3844,12 +4096,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cw6xv9a525mcs7202bq9768aic1dwx353prm1bss4fp2nq24a3j";
+      sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d";
       type = "gem";
     };
-    version = "1.2024.2";
+    version = "1.2025.1";
   };
   unicode-display_width = {
+    dependencies = [ "unicode-emoji" ];
     groups = [
       "default"
       "development"
@@ -3858,10 +4111,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
+      sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "3.1.4";
+  };
+  unicode-emoji = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
+      type = "gem";
+    };
+    version = "4.0.4";
   };
   uri = {
     groups = [
@@ -3872,10 +4139,39 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz";
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "1.0.3";
+  };
+  useragent = {
+    groups = [
+      "assets"
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0i1q2xdjam4d7gwwc35lfnz0wyyzvnca0zslcfxm9fabml9n83kh";
+      type = "gem";
+    };
+    version = "0.16.11";
+  };
+  validate_url = {
+    dependencies = [
+      "activemodel"
+      "public_suffix"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj";
+      type = "gem";
+    };
+    version = "1.0.15";
   };
   vcr = {
     dependencies = [ "base64" ];
@@ -3926,14 +4222,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k4bllg0zpmpkjfmk1gybc2ygca4v40l2fmlplf9h0jqwniqa3mr";
+      sha256 = "005mbcprdhjqx27561mb54kssjwxwij157x6wya1yp60gdkl8p0r";
       type = "gem";
     };
-    version = "3.0.17";
+    version = "3.0.19";
   };
   vite_ruby = {
     dependencies = [
       "dry-cli"
+      "logger"
+      "mutex_m"
       "rack-proxy"
       "zeitwerk"
     ];
@@ -3941,15 +4239,14 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fcharh45xwi2cx96m695v9gccny3hgvdkkhcbkhplk1bc6ldwgk";
+      sha256 = "1i2ckb29ffjj431amnk0sr5h9vbs00139irs7bqh51jpl55lln74";
       type = "gem";
     };
-    version = "3.8.2";
+    version = "3.9.1";
   };
   webauthn = {
     dependencies = [
       "android_key_attestation"
-      "awrence"
       "bindata"
       "cbor"
       "cose"
@@ -3961,10 +4258,25 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dwh2xrpwhbzyncb1wvgzz8fmln3r15iqz53c48q4swagpqzqig5";
+      sha256 = "1igl18smiycv8crkwgpqm96szq2p1i41gz8r0ax5dcayw3sna1m1";
       type = "gem";
     };
-    version = "3.1.0";
+    version = "3.4.0";
+  };
+  webfinger = {
+    dependencies = [
+      "activesupport"
+      "faraday"
+      "faraday-follow_redirects"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn";
+      type = "gem";
+    };
+    version = "2.1.3";
   };
   webmock = {
     dependencies = [
@@ -3979,10 +4291,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy";
+      sha256 = "13hrfja9as50ymbzsmlqsnv3ijirnf6mini21y1qq04793y26g2p";
       type = "gem";
     };
-    version = "3.24.0";
+    version = "3.25.0";
   };
   webrick = {
     groups = [
@@ -3994,10 +4306,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
+      sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.9.1";
   };
   websocket = {
     groups = [
@@ -4014,15 +4326,18 @@
     version = "1.2.11";
   };
   websocket-driver = {
-    dependencies = [ "websocket-extensions" ];
+    dependencies = [
+      "base64"
+      "websocket-extensions"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n";
+      sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85";
       type = "gem";
     };
-    version = "0.7.6";
+    version = "0.7.7";
   };
   websocket-extensions = {
     groups = [ "default" ];
@@ -4102,10 +4417,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx";
+      sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89";
       type = "gem";
     };
-    version = "2.6.18";
+    version = "2.7.1";
   };
   zendesk_api = {
     dependencies = [
@@ -4120,9 +4435,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cjiqm50zc4gpsn456235k8x0prafbmz921yqjgava4rp706467d";
+      sha256 = "05kjdvi67h26xsfjk550a0b6zwma7jxh4zy4qf6yx7vjcdi68nzq";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "3.1.1";
   };
 }
diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index ccbb8aa3788f..5e994ac4b21a 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -20,7 +20,7 @@
 
 let
   pname = "zammad";
-  version = "6.4.1";
+  version = "6.5.0";
 
   src = applyPatches {
     src = fetchFromGitHub (lib.importJSON ./source.json);
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname src;
 
-    hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs=";
+    hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/za/zammad/source.json b/pkgs/by-name/za/zammad/source.json
index 114d21e6af47..81ff39ada53a 100644
--- a/pkgs/by-name/za/zammad/source.json
+++ b/pkgs/by-name/za/zammad/source.json
@@ -1,8 +1,8 @@
 {
   "owner": "zammad",
   "repo": "zammad",
-  "rev": "453aeb09c1ad4584fae68b3a1c7d54b555d4384a",
-  "hash": "sha256-KlS9S6r787YJArhiWP0r4YsZQYEFet89MdwXGyrbe3g=",
+  "rev": "568ebbedd173a449eea2bd8c6f456b30ce106242",
+  "hash": "sha256-3EoKcAKIktdgzi2KO73YgFM1yCDhy2BYDMCS9xY6OSU=",
   "fetchSubmodules": true
 }
 

From bf35e5f293729f17298d213f6b1bbf3d2307422f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 00:46:00 +0200
Subject: [PATCH 06/87] nixos/nix-ld: update source repository

This project was transferred from @Mic92 to @nix-community.
---
 nixos/modules/programs/nix-ld.nix  | 2 +-
 pkgs/by-name/ni/nix-ld/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix
index 84e17c65db82..e41742ac7e0d 100644
--- a/nixos/modules/programs/nix-ld.nix
+++ b/nixos/modules/programs/nix-ld.nix
@@ -22,7 +22,7 @@ in
 {
   meta.maintainers = [ lib.maintainers.mic92 ];
   options.programs.nix-ld = {
-    enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'';
+    enable = lib.mkEnableOption ''nix-ld, Documentation: <https://github.com/nix-community/nix-ld>'';
     package = lib.mkPackageOption pkgs "nix-ld" { };
     libraries = lib.mkOption {
       type = lib.types.listOf lib.types.package;
diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index b7b517f1976b..8e5463525dc8 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   version = "2.0.3";
 
   src = fetchFromGitHub {
-    owner = "mic92";
+    owner = "nix-community";
     repo = "nix-ld";
     rev = version;
     hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Run unpatched dynamic binaries on NixOS";
-    homepage = "https://github.com/Mic92/nix-ld";
+    homepage = "https://github.com/nix-community/nix-ld";
     license = licenses.mit;
     maintainers = with maintainers; [ mic92 ];
     platforms = platforms.linux;

From 1c8f173ccd6d67a4d773436b1f164b47762e47b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:14:55 +0200
Subject: [PATCH 07/87] nix-ld: 2.0.3 -> 2.0.4

https://github.com/nix-community/nix-ld/releases/tag/2.0.4
---
 pkgs/by-name/ni/nix-ld/package.nix     |  8 +++---
 pkgs/by-name/ni/nix-ld/rust-1.83.patch | 36 --------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/ni/nix-ld/rust-1.83.patch

diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index 8e5463525dc8..c4619b89f1a7 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -8,19 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-ld";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-ld";
     rev = version;
-    hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
+    hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
   };
 
-  patches = [ ./rust-1.83.patch ];
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4=";
+  cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/by-name/ni/nix-ld/rust-1.83.patch b/pkgs/by-name/ni/nix-ld/rust-1.83.patch
deleted file mode 100644
index 8ff1fb7d9ce7..000000000000
--- a/pkgs/by-name/ni/nix-ld/rust-1.83.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/arch.rs
-+++ b/src/arch.rs
-@@ -142,7 +142,7 @@ cfg_match! {
- 
-         #[naked]
-         unsafe extern "C" fn entry_trampoline() -> ! {
--            core::arch::asm!(
-+            core::arch::naked_asm!(
-                 "lea r10, [rip + {context}]",
-                 "mov r11, [r10 + {size} * 1]", // .env_entry
-                 "test r11, r11",
-@@ -153,7 +153,6 @@ cfg_match! {
-                 "jmp [rip + {context}]",
-                 context = sym TRAMPOLINE_CONTEXT,
-                 size = const core::mem::size_of::<*const u8>(),
--                options(noreturn),
-             )
-         }
-     }
-@@ -162,7 +161,7 @@ cfg_match! {
- 
-         #[naked]
-         unsafe extern "C" fn entry_trampoline() -> ! {
--            core::arch::asm!(
-+            core::arch::naked_asm!(
-                 "adrp x8, {context}",
-                 "ldr x9, [x8, {env_entry_off}]", // .env_entry
-                 "cbz x9, 2f",
-@@ -174,7 +173,6 @@ cfg_match! {
-                 context = sym TRAMPOLINE_CONTEXT,
-                 env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,
-                 env_string_off = const TrampolineContext::ENV_STRING_OFFSET,
--                options(noreturn),
-             )
-         }
-     }

From 5bd2fcc4c7b649db983a8e8a1788830b280eb997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:18:29 +0200
Subject: [PATCH 08/87] nix-ld: remove `meta = with lib; ...`

https://github.com/NixOS/nixpkgs/issues/371862
---
 pkgs/by-name/ni/nix-ld/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index c4619b89f1a7..c53db6681ff0 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -45,11 +45,11 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests = nixosTests.nix-ld;
 
-  meta = with lib; {
+  meta = {
     description = "Run unpatched dynamic binaries on NixOS";
     homepage = "https://github.com/nix-community/nix-ld";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mic92 ];
+    platforms = lib.platforms.linux;
   };
 }

From bdc70ea03cd10981e3cc8c47949c81d705fb90ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:50:27 +0200
Subject: [PATCH 09/87] nixosTests.nix-ld: remove redundant test with alias

https://github.com/NixOS/nixpkgs/pull/335290
---
 nixos/tests/nix-ld.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix
index 03f5c5e89fbf..9a1f7110eeea 100644
--- a/nixos/tests/nix-ld.nix
+++ b/nixos/tests/nix-ld.nix
@@ -26,15 +26,4 @@ in
       machine.succeed("hello")
     '';
   };
-  nix-ld-rs = makeTest {
-    name = "nix-ld-rs";
-    nodes.machine = {
-      imports = [ shared ];
-      programs.nix-ld.package = pkgs.nix-ld-rs;
-    };
-    testScript = ''
-      start_all()
-      machine.succeed("hello")
-    '';
-  };
 }

From 84137f5adbdab2f44869e95910fd05f36da6d16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 02:02:34 +0200
Subject: [PATCH 10/87] nixosTests.nix-ld: migrate to `runTest`

https://github.com/NixOS/nixpkgs/issues/386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/nix-ld.nix    | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 78bc07a59a37..cd61eae0c862 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -914,7 +914,7 @@ in
   nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;
   nitter = handleTest ./nitter.nix { };
   nix-config = handleTest ./nix-config.nix { };
-  nix-ld = handleTest ./nix-ld.nix { };
+  nix-ld = runTest ./nix-ld.nix;
   nix-misc = handleTest ./nix/misc.nix { };
   nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
   nix-required-mounts = runTest ./nix-required-mounts;
diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix
index 9a1f7110eeea..0b89b99a33b5 100644
--- a/nixos/tests/nix-ld.nix
+++ b/nixos/tests/nix-ld.nix
@@ -1,14 +1,12 @@
+{ ... }:
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
-  shared =
+  name = "nix-ld";
+
+  nodes.machine =
     { config, pkgs, ... }:
     {
       programs.nix-ld.enable = true;
+
       environment.systemPackages = [
         (pkgs.runCommand "patched-hello" { } ''
           install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello
@@ -16,14 +14,9 @@ let
         '')
       ];
     };
-in
-{
-  nix-ld = makeTest {
-    name = "nix-ld";
-    nodes.machine = shared;
-    testScript = ''
-      start_all()
-      machine.succeed("hello")
-    '';
-  };
+
+  testScript = ''
+    start_all()
+    machine.succeed("hello")
+  '';
 }

From 98d6f4dc0afc6b2e9e50b28337125cf7ffe55dfb Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 29 Mar 2025 15:57:47 +0100
Subject: [PATCH 11/87] varnish77: init at 7.7.0

---
 nixos/tests/all-tests.nix         | 15 +++++++++++++++
 pkgs/servers/varnish/default.nix  |  5 +++++
 pkgs/servers/varnish/modules.nix  |  4 ++++
 pkgs/servers/varnish/packages.nix |  5 +++++
 pkgs/top-level/all-packages.nix   |  3 ++-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9fc6594182b0..77c179920439 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1410,6 +1410,7 @@ in
   user-activation-scripts = handleTest ./user-activation-scripts.nix { };
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
+<<<<<<< HEAD
   user-home-mode = handleTest ./user-home-mode.nix { };
   ustreamer = handleTest ./ustreamer.nix { };
   uwsgi = handleTest ./uwsgi.nix { };
@@ -1430,6 +1431,20 @@ in
   vault-agent = handleTest ./vault-agent.nix { };
   vault-dev = handleTest ./vault-dev.nix { };
   vault-postgresql = handleTest ./vault-postgresql.nix { };
+=======
+  user-home-mode = handleTest ./user-home-mode.nix {};
+  ustreamer = handleTest ./ustreamer.nix {};
+  uwsgi = handleTest ./uwsgi.nix {};
+  v2ray = handleTest ./v2ray.nix {};
+  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
+  varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
+  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
+  varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; };
+  vault = handleTest ./vault.nix {};
+  vault-agent = handleTest ./vault-agent.nix {};
+  vault-dev = handleTest ./vault-dev.nix {};
+  vault-postgresql = handleTest ./vault-postgresql.nix {};
+>>>>>>> 0a00164b4295 (varnish77: init at 7.7.0)
   vaultwarden = discoverTests (import ./vaultwarden.nix);
   vdirsyncer = handleTest ./vdirsyncer.nix { };
   vector = handleTest ./vector { };
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 976147d8ab33..3f020a0163ba 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -104,4 +104,9 @@ in
     version = "7.6.2";
     hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
   };
+  # EOL 2026-03-15
+  varnish77 = common {
+    version = "7.7.0";
+    hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index d51a2dae3f7c..46223e939f40 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -63,4 +63,8 @@ in
     version = "0.25.0";
     hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
   };
+  modules26 = common {
+    version = "0.26.0";
+    hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
+  };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 114e3db4b131..85d9fb6bd3a3 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -4,6 +4,7 @@
   varnish60,
   varnish75,
   varnish76,
+  varnish77,
 }:
 {
   varnish60Packages = rec {
@@ -28,4 +29,8 @@
     varnish = varnish76;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
   };
+  varnish77Packages = rec {
+    varnish = varnish77;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9041c61f98..2c52cf6f9efd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,13 +5607,14 @@ with pkgs;
     varnish60
     varnish75
     varnish76
+    varnish77
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
     varnish75Packages
     varnish76Packages
+    varnish77Packages
     ;
-
   varnishPackages = varnish75Packages;
   varnish = varnishPackages.varnish;
 

From 26fa0a55366a907571ad97a3bf862d2d6d37407d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 29 Mar 2025 16:06:51 +0100
Subject: [PATCH 12/87] varnish: move to varnish77

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index da6b49ab689a..0786fbbdb1e2 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -259,6 +259,9 @@
 - The `gotenberg` package has been updated to 8.16.0, which brings breaking changes to the configuration from version 8.13.0. See the [upstream release notes](https://github.com/gotenberg/gotenberg/releases/tag/v8.13.0)
   for that release to get all the details. The `services.gotenberg` module has been updated appropriately to ensure your configuration is valid with this new release.
 
+- `varnish` was updated from 7.5.0 to 7.7.0, see [Varnish 7.6.0 upgrade guide](https://varnish-cache.org/docs/7.6/whats-new/upgrading-7.6.html) and
+[Varnish 7.7.0 upgrade guide](https://varnish-cache.org/docs/7.7/whats-new/upgrading-7.7.html#whatsnew-upgrading-7-7).
+
 - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
   ```diff
   -services.asusd.asusdConfig = '''file contents'''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c52cf6f9efd..b47b29a30402 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5615,7 +5615,7 @@ with pkgs;
     varnish76Packages
     varnish77Packages
     ;
-  varnishPackages = varnish75Packages;
+  varnishPackages = varnish77Packages;
   varnish = varnishPackages.varnish;
 
   viceroy = callPackage ../development/tools/viceroy {

From a09af24025d02d4ef5aafcc89ea17b96e0ad9034 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 29 Mar 2025 16:10:15 +0100
Subject: [PATCH 13/87] varnish75: drop

varnish75 is EOL and vulnerable to CVE-2025-30346
---
 nixos/tests/all-tests.nix         | 23 ++++-------------------
 pkgs/servers/varnish/default.nix  |  5 -----
 pkgs/servers/varnish/modules.nix  |  4 ----
 pkgs/servers/varnish/packages.nix |  5 -----
 pkgs/top-level/aliases.nix        |  2 ++
 pkgs/top-level/all-packages.nix   |  2 --
 6 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 77c179920439..bf9061230834 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1410,7 +1410,6 @@ in
   user-activation-scripts = handleTest ./user-activation-scripts.nix { };
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
-<<<<<<< HEAD
   user-home-mode = handleTest ./user-home-mode.nix { };
   ustreamer = handleTest ./ustreamer.nix { };
   uwsgi = handleTest ./uwsgi.nix { };
@@ -1419,32 +1418,18 @@ in
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish60;
   };
-  varnish75 = runTest {
-    imports = [ ./varnish.nix ];
-    _module.args.package = pkgs.varnish75;
-  };
   varnish76 = runTest {
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish76;
   };
+  varnish77 = runTest {
+    imports = [ ./varnish.nix ];
+    _module.args.package = pkgs.varnish77;
+  };
   vault = handleTest ./vault.nix { };
   vault-agent = handleTest ./vault-agent.nix { };
   vault-dev = handleTest ./vault-dev.nix { };
   vault-postgresql = handleTest ./vault-postgresql.nix { };
-=======
-  user-home-mode = handleTest ./user-home-mode.nix {};
-  ustreamer = handleTest ./ustreamer.nix {};
-  uwsgi = handleTest ./uwsgi.nix {};
-  v2ray = handleTest ./v2ray.nix {};
-  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
-  varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
-  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
-  varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; };
-  vault = handleTest ./vault.nix {};
-  vault-agent = handleTest ./vault-agent.nix {};
-  vault-dev = handleTest ./vault-dev.nix {};
-  vault-postgresql = handleTest ./vault-postgresql.nix {};
->>>>>>> 0a00164b4295 (varnish77: init at 7.7.0)
   vaultwarden = discoverTests (import ./vaultwarden.nix);
   vdirsyncer = handleTest ./vdirsyncer.nix { };
   vector = handleTest ./vector { };
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 3f020a0163ba..a60ef4d0fc4b 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -94,11 +94,6 @@ in
     version = "6.0.13";
     hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
   };
-  # EOL 2025-03-15
-  varnish75 = common {
-    version = "7.5.0";
-    hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";
-  };
   # EOL 2025-09-15
   varnish76 = common {
     version = "7.6.2";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 46223e939f40..c1cdb0277016 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -55,10 +55,6 @@ in
     version = "0.15.1";
     hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
   };
-  modules24 = common {
-    version = "0.24.0";
-    hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";
-  };
   modules25 = common {
     version = "0.25.0";
     hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 85d9fb6bd3a3..1596a1f67717 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -2,7 +2,6 @@
   callPackages,
   callPackage,
   varnish60,
-  varnish75,
   varnish76,
   varnish77,
 }:
@@ -21,10 +20,6 @@
       sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
     };
   };
-  varnish75Packages = rec {
-    varnish = varnish75;
-    modules = (callPackages ./modules.nix { inherit varnish; }).modules24;
-  };
   varnish76Packages = rec {
     varnish = varnish76;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a9a43e5d8bb9..dfb552ab07bd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1809,6 +1809,8 @@ mapAliases {
   vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
+  varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29
+  varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b47b29a30402..fd3a182fbd8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5605,13 +5605,11 @@ with pkgs;
 
   inherit (callPackages ../servers/varnish { })
     varnish60
-    varnish75
     varnish76
     varnish77
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
-    varnish75Packages
     varnish76Packages
     varnish77Packages
     ;

From a6c31c856b44058079de808793f762aca38dadca Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Mon, 16 Dec 2024 11:22:00 +0000
Subject: [PATCH 14/87] nixos/tzupdate: add timer and package options

---
 nixos/modules/services/misc/tzupdate.nix | 32 +++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix
index 65a6f7d72098..454b47620e11 100644
--- a/nixos/modules/services/misc/tzupdate.nix
+++ b/nixos/modules/services/misc/tzupdate.nix
@@ -18,6 +18,25 @@ in
         update the timezone.
       '';
     };
+
+    package = lib.mkPackageOption pkgs "tzupdate" { };
+
+    timer.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Enable the tzupdate timer to update the timezone automatically.
+      '';
+    };
+
+    timer.interval = lib.mkOption {
+      type = lib.types.str;
+      default = "hourly";
+      description = ''
+        The interval at which the tzupdate timer should run. See
+        {manpage}`systemd.time(7)` to understand the format.
+      '';
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -35,7 +54,7 @@ in
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       script = ''
-        timezone="$(${lib.getExe pkgs.tzupdate} --print-only)"
+        timezone="$(${lib.getExe cfg.package} --print-only)"
         if [[ -n "$timezone" ]]; then
           echo "Setting timezone to '$timezone'"
           timedatectl set-timezone "$timezone"
@@ -46,6 +65,17 @@ in
         Type = "oneshot";
       };
     };
+
+    systemd.timers.tzupdate = {
+      enable = cfg.timer.enable;
+      interval = cfg.timer.interval;
+      timerConfig = {
+        OnStartupSec = "30s";
+        OnCalendar = cfg.timer.interval;
+        Persistent = true;
+      };
+      wantedBy = [ "timers.target" ];
+    };
   };
 
   meta.maintainers = with lib.maintainers; [ doronbehar ];

From cd31b2ac991c2df9028140076634d4ff8f1f22bd Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 18 Apr 2025 23:52:31 +0900
Subject: [PATCH 15/87] docker: 28.0.4 -> 28.1.1

https://github.com/docker/cli/compare/v28.0.4...v28.1.1
https://github.com/moby/moby/compare/v28.0.4...v28.1.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c4fbc8b1c4a0..c622bf18d993 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -404,11 +404,11 @@ rec {
   };
 
   docker_28 = callPackage dockerGen rec {
-    version = "28.0.4";
+    version = "28.1.1";
     cliRev = "v${version}";
-    cliHash = "sha256-DLUcmxbCxJs3EA96SGaesA+GzvHq6DC2vrGe5PvA0dE=";
+    cliHash = "sha256-bRnJ+c2C4t+94NL82L0S3r84uoJaTDq16YQGvEmo7Sw=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-yvz8MUOU61OuphPaIDu6+1wsbCXkIxJYQKK0fhcVwp0=";
+    mobyHash = "sha256-FB9btun41PAqqBjb9Ebn7SyjrIg/ILe3xJ+mqu2lqrs=";
     runcRev = "v1.2.6";
     runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
     containerdRev = "v1.7.27";

From d3ac34722160d09d22a1d8c97b94b5da8de5eee0 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Fri, 18 Apr 2025 21:22:49 +0000
Subject: [PATCH 16/87] otf2: enableParallelBuilding and enableParallelChecking

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

diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index 385501c529f5..7477a1c5f49d 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -18,9 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-backend-test-runs"
   ];
 
+  enableParallelBuilding = true;
+
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doCheck = true;
+  enableParallelChecking = true;
   doInstallCheck = true;
 
   versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ];

From 995e33e89330bf3c5081e32ad9190a6dd35dcffd Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Fri, 18 Apr 2025 21:22:50 +0000
Subject: [PATCH 17/87] otf2: fix cross

---
 pkgs/by-name/ot/otf2/package.nix | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index 7477a1c5f49d..63da6998cb16 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  buildPackages,
+  which,
   versionCheckHook,
 }:
 
@@ -14,8 +16,29 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4=";
   };
 
-  configureFlags = [
-    "--enable-backend-test-runs"
+  postPatch = ''
+    substituteInPlace build-config/common/platforms/platform-backend-user-provided \
+      --replace-fail 'CC=' 'CC=${stdenv.cc.targetPrefix}cc' \
+      --replace-fail 'CXX=' 'CXX=${stdenv.cc.targetPrefix}c++'
+    substituteInPlace build-config/common/platforms/platform-frontend-user-provided \
+      --replace-fail 'CC_FOR_BUILD=' 'CC_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}cc' \
+      --replace-fail 'CXX_FOR_BUILD=' 'CXX_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}c++'
+  '';
+
+  strictDeps = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  configureFlags =
+    [
+      (lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs")
+      (lib.withFeature true "custom-compilers")
+    ]
+    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+      "ac_scorep_cross_compiling=yes"
+    ];
+
+  nativeBuildInputs = [
+    which # used in configure script
   ];
 
   enableParallelBuilding = true;

From 1e4c23f581d3fcbfcd4afae996caa4a49912e9a3 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Fri, 18 Apr 2025 21:22:52 +0000
Subject: [PATCH 18/87] otf2: split out and lib

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

diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index 63da6998cb16..ce73099f4015 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "otf2";
   version = "3.1.1";
 
+  outputs = [
+    "out"
+    "lib"
+  ];
+
   src = fetchurl {
     url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz";
     hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4=";

From c43e9c4a5c1198ef745e5e66ab9035dedc682f7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 00:25:04 +0000
Subject: [PATCH 19/87] tigerbeetle: 0.16.35 -> 0.16.36

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

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 1ef79e5d1a51..7e8dad29ce55 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-ryYQyt+qjNKiT3XQuAwaG65I8KIMrkM2QeL9WvFkyik=";
-    "x86_64-linux" = "sha256-VgV+K6DDtoX5CjqGUlSAZYVakAs4GWX6+8Fi9v29HjY=";
-    "aarch64-linux" = "sha256-euyfFe9iXnAnePYd1u4ymtWqKGrf7vNuOeS0jFtChCA=";
+    "universal-macos" = "sha256-6GDD3lS8g2F7cOBoqi32tKO2klY7JHtqJq8NIjTiH04=";
+    "x86_64-linux" = "sha256-BiRIScj309vOU5TvA19RdhUeVaGd+ke6GhTlVocbMRE=";
+    "aarch64-linux" = "sha256-4MlbXJ8dIHDtoXsUsJD76/YlgKt8faKhQVEeEyFi/T0=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.35";
+  version = "0.16.36";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From e0d0d4bc5c340c243c79832034b46122764617f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 18 Apr 2025 22:00:24 -0700
Subject: [PATCH 20/87] python313Packages.pytradfri: 13.0.0 -> 14.0.0

Diff: https://github.com/home-assistant-libs/pytradfri/compare/refs/tags/13.0.0...14.0.0

Changelog: https://github.com/home-assistant-libs/pytradfri/releases/tag/14.0.0
---
 .../python-modules/pytradfri/default.nix      | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix
index ab7772360d65..b979daab4d2f 100644
--- a/pkgs/development/python-modules/pytradfri/default.nix
+++ b/pkgs/development/python-modules/pytradfri/default.nix
@@ -1,9 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   setuptools,
   aiocoap,
   dtlssocket,
@@ -13,27 +11,16 @@
 
 buildPythonPackage rec {
   pname = "pytradfri";
-  version = "13.0.0";
+  version = "14.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pytradfri";
     tag = version;
-    hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0=";
+    hash = "sha256-oYYi1P0Zu9PLsacUW//BlJlLmeOVvHgb/lR52KwZ7N8=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "pydantic2-compat.patch";
-      url = "https://github.com/home-assistant-libs/pytradfri/commit/ecd099837a0b4538a56301af6260fddde77fbbb1.patch";
-      excludes = [ "requirements.txt" ];
-      hash = "sha256-QsvBTB9evKyE1fcfDaB0SN21kHmNmLgGPs3GJHHsMJc=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [ pydantic ];
@@ -52,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway";
     homepage = "https://github.com/home-assistant-libs/pytradfri";
-    changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}";
+    changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 21fcca99aa45775d927b579aedb8a50ac8370c2d Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sat, 19 Apr 2025 11:19:36 +0000
Subject: [PATCH 21/87] eztrace: 1.1-11 -> 2.1.1, fix build, adopt

---
 .../ez/eztrace/0001-otf2-backend-cross.patch  | 27 +++++++
 pkgs/by-name/ez/eztrace/package.nix           | 81 ++++++++++++++-----
 2 files changed, 87 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch

diff --git a/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch
new file mode 100644
index 000000000000..4b4dfc058204
--- /dev/null
+++ b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake_modules/FindOTF2.cmake b/cmake_modules/FindOTF2.cmake
+index 2853f92a..af1f3225 100644
+--- a/cmake_modules/FindOTF2.cmake
++++ b/cmake_modules/FindOTF2.cmake
+@@ -15,11 +15,11 @@ IF(NOT OTF2_CONFIG OR NOT EXISTS ${OTF2_CONFIG})
+ ELSE()
+   message(STATUS "OTF2 installation found. (using ${OTF2_CONFIG})")
+ 
+-  execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
++  execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" "--target" "backend" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
+   STRING(REPLACE "\n" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
+   STRING(REPLACE "-I" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
+   
+-  execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS)
++  execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
+   STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
+   FOREACH( _ARG ${_LINK_LD_ARGS} )
+     IF(${_ARG} MATCHES "^-L")
+@@ -29,7 +29,7 @@ ELSE()
+     ENDIF(${_ARG} MATCHES "^-L")
+   ENDFOREACH(_ARG)
+ 
+-  execute_process(COMMAND ${OTF2_CONFIG} "--libs" OUTPUT_VARIABLE _LINK_LD_ARGS)
++  execute_process(COMMAND ${OTF2_CONFIG} "--libs" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
+   STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
+   FOREACH( _ARG ${_LINK_LD_ARGS} )
+     IF(${_ARG} MATCHES "^-l")
diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix
index 8a5b3dbeb91c..a541c3b85792 100644
--- a/pkgs/by-name/ez/eztrace/package.nix
+++ b/pkgs/by-name/ez/eztrace/package.nix
@@ -2,43 +2,82 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  cmake,
   gfortran,
   libelf,
   libiberty,
-  zlib,
-  # Once https://gitlab.com/eztrace/eztrace/-/issues/41
-  # is released we can switch to latest binutils.
-  libbfd_2_38,
-  libopcodes_2_38,
-  autoreconfHook,
+  libbfd,
+  libopcodes,
+  otf2,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "EZTrace";
-  version = "1.1-11";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eztrace";
+  version = "2.1.1";
+
+  outputs = [
+    "out"
+    "lib"
+    "man"
+  ];
 
   src = fetchFromGitLab {
     owner = "eztrace";
     repo = "eztrace";
-    rev = "eztrace-${version}";
-    hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU=";
   };
 
-  nativeBuildInputs = [
-    gfortran
-    autoreconfHook
+  patches = [
+    ./0001-otf2-backend-cross.patch # To fix cross.
   ];
+
+  postPatch = ''
+    substituteInPlace src/eztrace-lib/eztrace_otf2.c \
+      --replace-fail "/bin/rm" "rm"
+    substituteInPlace cmake_modules/FindOTF2.cmake \
+      --replace-fail "find_program(OTF2_CONFIG otf2-config REQUIRED)" \
+                     "find_program(OTF2_CONFIG "${lib.getExe' otf2 "otf2-config"}" REQUIRED)" \
+      --replace-fail "find_program(OTF2_PRINT otf2-print REQUIRED)" \
+                     "find_program(OTF2_PRINT "${lib.getExe' otf2 "otf2-print"}" REQUIRED)"
+    patchShebangs test
+  '';
+
+  strictDeps = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "EZTRACE_ENABLE_MEMORY" true)
+    # This test is somewhat flaky and fails once per several rebuilds.
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;memory_tests")
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gfortran
+  ];
+
   buildInputs = [
     libelf
     libiberty
-    zlib
-    libbfd_2_38
-    libopcodes_2_38
+    libbfd
+    libopcodes
+    otf2
   ];
 
-  meta = with lib; {
+  doCheck = true;
+  nativeCheckInputs = [
+    otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests
+  ];
+
+  meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
-    license = licenses.cecill-b;
-    maintainers = [ ];
+    license = lib.licenses.cecill-b;
+    maintainers = [ lib.maintainers.xokdvium ];
+    mainProgram = "eztrace";
+    badPlatforms = [
+      # Undefined symbols for architecture x86_64:
+      #        >   "___cyg_profile_func_enter", referenced from:
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
-}
+})

From 66a1d99b3faa64459a9de4461ebd539ac6a6965e Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sat, 19 Apr 2025 11:19:37 +0000
Subject: [PATCH 22/87] eztrace: add meta.homepage

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

diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix
index a541c3b85792..8ccebfc8396c 100644
--- a/pkgs/by-name/ez/eztrace/package.nix
+++ b/pkgs/by-name/ez/eztrace/package.nix
@@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
+    homepage = "https://eztrace.gitlab.io/eztrace/index.html";
     license = lib.licenses.cecill-b;
     maintainers = [ lib.maintainers.xokdvium ];
     mainProgram = "eztrace";

From 0d3583dbf0f6129d2f39524d3587c877ee5790ae Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sat, 19 Apr 2025 11:22:36 +0000
Subject: [PATCH 23/87] eztrace: split dev output and fix .pc files

---
 .../0002-absolute-cmake-install-paths.patch   | 23 +++++++++++++++++++
 pkgs/by-name/ez/eztrace/package.nix           |  7 ++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch

diff --git a/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch
new file mode 100644
index 000000000000..67e3ec25b71b
--- /dev/null
+++ b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b36a8a94..74c6de2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,8 +195,16 @@ set(EZTRACE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
+ #set(__PPTRACE_BINARY_TYPE "PPTRACE_BINARY_TYPE_BFD")
+ #set(abs_top_builddir ${CMAKE_BINARY_DIR})
+ 
+-set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
++if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
++  set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
++else()
++  set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
++endif()
++if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
++  set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
++else()
++  set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
++endif()
+ set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 
+ # Subdirectory
diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix
index 8ccebfc8396c..3f5ddb0a8125 100644
--- a/pkgs/by-name/ez/eztrace/package.nix
+++ b/pkgs/by-name/ez/eztrace/package.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+    "dev"
     "lib"
     "man"
   ];
@@ -28,8 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU=";
   };
 
+  # Possibly upstream these patches.
   patches = [
     ./0001-otf2-backend-cross.patch # To fix cross.
+    ./0002-absolute-cmake-install-paths.patch # To fix generated .pc file
   ];
 
   postPatch = ''
@@ -69,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
     otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests
   ];
 
+  postInstall = ''
+    moveToOutput bin/eztrace_create_plugin "$dev"
+  '';
+
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
     homepage = "https://eztrace.gitlab.io/eztrace/index.html";

From a7230f64b370d91fa972e9c8c41a5acca37c9167 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sat, 19 Apr 2025 11:48:37 +0000
Subject: [PATCH 24/87] otf2: split doc output

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

diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix
index ce73099f4015..12593de5b110 100644
--- a/pkgs/by-name/ot/otf2/package.nix
+++ b/pkgs/by-name/ot/otf2/package.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "lib"
+    "doc"
   ];
 
   src = fetchurl {

From 7970846801d30e5760545154762d868ba21a9557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 16:35:55 +0000
Subject: [PATCH 25/87] rattler-build: 0.39.0 -> 0.40.0

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

diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index 7b9771af8229..53cf99ccb4cd 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.39.0";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM=";
+    hash = "sha256-NwsNCd6ueCtvJp04fJTsfoXtfUlgZou+zwDHrXeUlhk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4=";
+  cargoHash = "sha256-O0nTxgftGv70c8yv4qEG+fEZEXZ+H6fhUzd/p8CQMQ4=";
 
   doCheck = false; # test requires network access
 

From 869327a7fe6bb69f235b9c5a72d9cfb466d55dd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Apr 2025 01:10:39 +0000
Subject: [PATCH 26/87] dalfox: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix
index ee4b66bc9474..924a520e9acd 100644
--- a/pkgs/by-name/da/dalfox/package.nix
+++ b/pkgs/by-name/da/dalfox/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "dalfox";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = "dalfox";
     tag = "v${version}";
-    hash = "sha256-F4CXVgHdEjSMK3YIF5X6zCVVI17GkIE3KGAE1OxfhyY=";
+    hash = "sha256-EM5T8uBMSkjxd7wTaMFPpbErAhcN2oLaV2g8MAxb0lQ=";
   };
 
-  vendorHash = "sha256-Nt0Rgwrjs2irKPnt5G/32VH3Wj19+xnh+gLspWDnKCY=";
+  vendorHash = "sha256-EgNE3Z/NZ1lV0BPVe4MhB9bIYSMLftzYfmw65ktSo7A=";
 
   ldflags = [
     "-w"

From 3e5b16c2cf3d2d105f28f7efe143445808053d3d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 20 Apr 2025 09:46:11 +0100
Subject: [PATCH 27/87] SDL2_gfx: fix underlinking against `-lm`

Without the change `freeciv_sdl2` fails to detec `-lSDL2_gfx` as
https://hydra.nixos.org/build/294735307:

    checking for rotozoomSurface in -lSDL2_gfx... no
    configure: error: specified client 'sdl2' not configurable (SDL2_gfx is needed (www.libsdl.org))
---
 pkgs/by-name/sd/SDL2_gfx/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix
index 4d6f6d77bbd7..5ae903baf1c2 100644
--- a/pkgs/by-name/sd/SDL2_gfx/package.nix
+++ b/pkgs/by-name/sd/SDL2_gfx/package.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  # Missing 'sincos()' implementation fails linking projects
+  # like 'freeciv_sdl2'.
+  env.NIX_LDFLAGS = "-lm";
+
   configureFlags = [
     (lib.enableFeature enableMmx "mmx")
     (lib.enableFeature enableSdltest "sdltest")

From 136eb348f88aeacc2e47fd3bcfdebd36a6c76609 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 20 Apr 2025 09:50:45 +0100
Subject: [PATCH 28/87] SDL2_gfx: enable parallel building

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

diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix
index 5ae903baf1c2..2e88d0f17ed0 100644
--- a/pkgs/by-name/sd/SDL2_gfx/package.nix
+++ b/pkgs/by-name/sd/SDL2_gfx/package.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  enableParallelBuilding = true;
+
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;

From 1a45115282d81cb40d0be03e9124dac8965fb183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 20 Apr 2025 07:37:05 -0700
Subject: [PATCH 29/87] textlsp: unpin tree-sitter

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

diff --git a/pkgs/by-name/te/textlsp/package.nix b/pkgs/by-name/te/textlsp/package.nix
index 24abaca86ef8..2b6ad6f59bf8 100644
--- a/pkgs/by-name/te/textlsp/package.nix
+++ b/pkgs/by-name/te/textlsp/package.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
     pygls
     lsprotocol
     language-tool-python
-    tree-sitter_0_21
+    tree-sitter
     gitpython
     appdirs
     openai

From b371008f1fa42b635145984c4a79c096794a895a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 20 Apr 2025 07:38:11 -0700
Subject: [PATCH 30/87] python313Packages.tree-sitter_0_21: drop

---
 .../python-modules/tree-sitter/0_21.nix       | 48 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tree-sitter/0_21.nix

diff --git a/pkgs/development/python-modules/tree-sitter/0_21.nix b/pkgs/development/python-modules/tree-sitter/0_21.nix
deleted file mode 100644
index 1d3326ea967a..000000000000
--- a/pkgs/development/python-modules/tree-sitter/0_21.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  pythonAtLeast,
-  setuptools,
-  distutils,
-}:
-
-buildPythonPackage rec {
-  pname = "tree-sitter";
-  version = "0.21.3";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "tree-sitter";
-    repo = "py-tree-sitter";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-HT1sRzDFpeelWCq1ZMeRmoUg0a3SBR7bZKxBqn4fb2g=";
-    fetchSubmodules = true;
-  };
-
-  build-system = [ setuptools ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "tree_sitter" ];
-
-  # Needed explicitly for Python >= 3.12 as tree-sitter provides
-  # calls to distutils functions to compile language files
-  dependencies = lib.optionals (pythonAtLeast "3.12") [ distutils ];
-
-  preCheck = ''
-    rm -r tree_sitter
-  '';
-
-  meta = with lib; {
-    description = "Python bindings to the Tree-sitter parsing library";
-    homepage = "https://github.com/tree-sitter/py-tree-sitter";
-    changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a6a77d1ea23..828c3e433a85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17538,8 +17538,6 @@ self: super: with self; {
 
   tree-sitter-yaml = callPackage ../development/python-modules/tree-sitter-yaml { };
 
-  tree-sitter_0_21 = callPackage ../development/python-modules/tree-sitter/0_21.nix { };
-
   treelib = callPackage ../development/python-modules/treelib { };
 
   treelog = callPackage ../development/python-modules/treelog { };

From 4d5df5427fff883e915713263624aadaf5c50796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 20 Apr 2025 16:57:46 -0700
Subject: [PATCH 31/87] python313Packages.mlxtend: drop unused argument

---
 pkgs/development/python-modules/mlxtend/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
index 1ee22516471f..87f82295d1e8 100644
--- a/pkgs/development/python-modules/mlxtend/default.nix
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -7,7 +7,6 @@
   pytestCheckHook,
   scipy,
   numpy,
-  numpy_1,
   scikit-learn,
   pandas,
   matplotlib,

From 8f976b9917b89fe353700eab9a7676a8811cb3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 20 Apr 2025 18:39:38 -0700
Subject: [PATCH 32/87] python313Packages.stringzilla: 3.12.4 -> 3.12.5

Diff: https://github.com/ashvardanian/stringzilla/compare/refs/tags/v3.12.4...refs/tags/v3.12.5

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

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 48cf73bc5fff..32170ae34794 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "3.12.4";
+  version = "3.12.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     tag = "v${version}";
-    hash = "sha256-U745bA3GTPyNPpiB7NESsUJYKmUCY8qK4aqbHECQqnE=";
+    hash = "sha256-Hp66R4+gic0WstRVnutMBx8g+DMzLEnxPzt3sgvWGG4=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From d79cfc4e6685f8d501ef306526f47ea00bf345ae Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Wed, 9 Apr 2025 08:21:29 -0400
Subject: [PATCH 33/87] duckdb: 1.2.1 -> 1.2.2

1.2.1 -> 1.2.2 changelog: https://github.com/duckdb/duckdb/releases/tag/v1.2.2
1.2.1 -> 1.2.2 diff: https://github.com/duckdb/duckdb/compare/v1.2.1...v1.2.2
---
 pkgs/by-name/du/duckdb/versions.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json
index 071631c3216b..e86a40a50599 100644
--- a/pkgs/by-name/du/duckdb/versions.json
+++ b/pkgs/by-name/du/duckdb/versions.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.1",
-  "rev": "8e52ec43959ab363643d63cb78ee214577111da4",
-  "hash": "sha256-ez5BBZ+Yw+UkdpI3VvRZrYZPfk3Nkk3JmrJBdg8N+e0="
+  "version": "1.2.2",
+  "rev": "7c039464e452ddc3330e2691d3fa6d305521d09b",
+  "hash": "sha256-cHQcEA9Gpza/edEVyXUYiINC/Q2b3bf+zEQbl/Otfr4="
 }

From 654bdbffb39aac48985e5ec75326a1e4d59154f3 Mon Sep 17 00:00:00 2001
From: 3pleX-dev <afuadajoe@gmail.com>
Date: Wed, 9 Apr 2025 11:07:15 +0000
Subject: [PATCH 34/87] sip: Fixed non-deterministic timestamps in wheel files

---
 .../python-modules/sip/default.nix            |  5 ++++
 .../python-modules/sip/sip-builder.patch      | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/sip/sip-builder.patch

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 7f544f6c1531..58c80823fac7 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -24,6 +24,11 @@ buildPythonPackage rec {
     hash = "sha256-eQS+UZDXh5lSVjt4o68OWPon2VJa9/U/k+rHqDtDPns=";
   };
 
+  patches = [
+    # Make wheel file generation deterministic https://github.com/NixOS/nixpkgs/issues/383885
+    ./sip-builder.patch
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/sip/sip-builder.patch b/pkgs/development/python-modules/sip/sip-builder.patch
new file mode 100644
index 000000000000..2a7e1a5753d7
--- /dev/null
+++ b/pkgs/development/python-modules/sip/sip-builder.patch
@@ -0,0 +1,28 @@
+--- a/sipbuild/builder.py	2025-04-21 12:19:34
++++ b/sipbuild/builder.py	2025-04-21 12:27:09
+@@ -177,16 +177,23 @@
+         saved_cwd = os.getcwd()
+         os.chdir(wheel_build_dir)
+ 
+-        from zipfile import ZipFile, ZIP_DEFLATED
++        from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
++        import time
+ 
++        epoch = int(os.environ.get('SOURCE_DATE_EPOCH', '946684800'))
++        zip_timestamp = time.gmtime(epoch)[:6]
++
+         with ZipFile(wheel_path, 'w', compression=ZIP_DEFLATED) as zf:
+             for dirpath, _, filenames in os.walk('.'):
+                 for filename in filenames:
+                     # This will result in a name with no leading '.'.
+                     name = os.path.relpath(os.path.join(dirpath, filename))
+ 
+-                    zf.write(name)
++                    zi = ZipInfo(name, zip_timestamp)
+ 
++                    with open(name, 'rb') as f:
++                        zf.writestr(zi, f.read())
++
+         os.chdir(saved_cwd)
+ 
+         return wheel_file

From af25c4a278c0db3f3018f715d2b59f47a2a7317d Mon Sep 17 00:00:00 2001
From: Joshua Hunt <joshua.edward.hunt@gmail.com>
Date: Mon, 21 Apr 2025 20:06:56 +0200
Subject: [PATCH 35/87] xmage: 1.4.51-dev_2024-01-30_19-35 ->
 1.4.57-dev_2025-04-19_14-28

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

diff --git a/pkgs/by-name/xm/xmage/package.nix b/pkgs/by-name/xm/xmage/package.nix
index 31b4b0aa883c..2fb74e7215a9 100644
--- a/pkgs/by-name/xm/xmage/package.nix
+++ b/pkgs/by-name/xm/xmage/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmage";
-  version = "1.4.51-dev_2024-01-30_19-35";
+  version = "1.4.57-dev_2025-04-19_14-28";
 
   src = fetchurl {
     url = "http://xmage.today/files/mage-full_${finalAttrs.version}.zip";
-    sha256 = "sha256-ogi0hd2FoulTnc3gg5cpLwr4Jln71YA0WBBZFOT6apg=";
+    sha256 = "sha256-EeaUd81fqiPDqHiMP86E9gtdFi545PIBfCgb1i5Z5i0=";
   };
 
   preferLocalBuild = true;
@@ -23,10 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase =
     let
-      # upstream maintainers forgot to update version, so manual override for now
-      # strVersion = lib.substring 0 6 finalAttrs.version;
-      strVersion = "1.4.50";
-
+      strVersion = lib.substring 0 6 finalAttrs.version;
     in
     ''
       mkdir -p $out/bin

From 22ac5cedcb5827b67ca3ddfe2bfe76c755c76760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 11:40:46 -0700
Subject: [PATCH 36/87] ooniprobe-cli: 3.24.0 -> 3.25.0

Diff: https://github.com/ooni/probe-cli/compare/v3.24.0...v3.25.0

Changelog: https://github.com/ooni/probe-cli/releases/tag/v3.25.0
---
 pkgs/by-name/oo/ooniprobe-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix
index 9c14e54425d8..9cb0b79de641 100644
--- a/pkgs/by-name/oo/ooniprobe-cli/package.nix
+++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ooniprobe-cli";
-  version = "3.24.0";
+  version = "3.25.0";
 
   src = fetchFromGitHub {
     owner = "ooni";
     repo = "probe-cli";
-    rev = "v${version}";
-    hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A=";
+    tag = "v${version}";
+    hash = "sha256-6BZ1ZhlskvP1eYS/yMaPgR0gbAUDJS0rS3KId+Lq450=";
   };
 
-  vendorHash = "sha256-QH5PyCvfJWWDhjH6Jo8O3wBq3MwfpHWKSuYMmpaqjWk=";
+  vendorHash = "sha256-WPfeelgKGY0zTfP19+x8PLBrCFpla2uJFstXxJM966o=";
 
   subPackages = [ "cmd/ooniprobe" ];
 
@@ -25,7 +25,7 @@ buildGoModule rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}";
+    changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.tag}";
     description = "Open Observatory of Network Interference command line network probe";
     homepage = "https://ooni.org/install/cli";
     license = licenses.gpl3Plus;

From 065caae2754ade54d6a6ea0e495b4e23fb4577a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Apr 2025 19:53:05 +0000
Subject: [PATCH 37/87] meli: 0.8.10 -> 0.8.11

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

diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix
index 321fa21b8b04..224cea987cb9 100644
--- a/pkgs/by-name/me/meli/package.nix
+++ b/pkgs/by-name/me/meli/package.nix
@@ -25,7 +25,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "meli";
-  version = "0.8.10";
+  version = "0.8.11";
 
   src = fetchzip {
     urls = [
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
       "https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
       "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
     ];
-    hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0=";
+    hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg=";
+  cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ=";
 
   # Needed to get openssl-sys to use pkg-config
   OPENSSL_NO_VENDOR = 1;

From bf1a4caeccacb744f49508119b63db5b255a2f59 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Mon, 21 Apr 2025 20:34:52 +0000
Subject: [PATCH 38/87] eztrace: add meta.downloadPage

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

diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix
index 3f5ddb0a8125..9b95c11d6737 100644
--- a/pkgs/by-name/ez/eztrace/package.nix
+++ b/pkgs/by-name/ez/eztrace/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
     homepage = "https://eztrace.gitlab.io/eztrace/index.html";
+    downloadPage = "https://gitlab.com/eztrace/eztrace/";
     license = lib.licenses.cecill-b;
     maintainers = [ lib.maintainers.xokdvium ];
     mainProgram = "eztrace";

From aff74c72281afce48854dad77907d3ceaff7b8b3 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 21 Apr 2025 08:39:06 -0700
Subject: [PATCH 39/87] treefmt: add passthru runtimeInputs

---
 pkgs/by-name/tr/treefmt/with-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/tr/treefmt/with-config.nix b/pkgs/by-name/tr/treefmt/with-config.nix
index 9d3f73c1e6b2..bf139f07d9dd 100644
--- a/pkgs/by-name/tr/treefmt/with-config.nix
+++ b/pkgs/by-name/tr/treefmt/with-config.nix
@@ -14,6 +14,7 @@ runCommand name
     nativeBuildInputs = [ makeBinaryWrapper ];
     treefmtExe = lib.getExe treefmt;
     binPath = lib.makeBinPath runtimeInputs;
+    passthru = { inherit runtimeInputs; };
     configFile = treefmt.buildConfig {
       # Wrap user's modules with a default file location
       _file = "<treefmt.withConfig settings arg>";

From 6a640f04c995c31ab2425700516a1731357a83f5 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Mon, 21 Apr 2025 20:57:53 +0000
Subject: [PATCH 40/87] eztrace: fix reported version and use versionCheckHook

Upstream seemingly forgot to bump their patch version
for 2.1.1 and do a gitlab release as well.

Use `versionCheckHook` as a smoke test for
installation completeness.
---
 pkgs/by-name/ez/eztrace/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix
index 9b95c11d6737..a55d917bfde2 100644
--- a/pkgs/by-name/ez/eztrace/package.nix
+++ b/pkgs/by-name/ez/eztrace/package.nix
@@ -9,6 +9,7 @@
   libbfd,
   libopcodes,
   otf2,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
                      "find_program(OTF2_CONFIG "${lib.getExe' otf2 "otf2-config"}" REQUIRED)" \
       --replace-fail "find_program(OTF2_PRINT otf2-print REQUIRED)" \
                      "find_program(OTF2_PRINT "${lib.getExe' otf2 "otf2-print"}" REQUIRED)"
+    # 2.1.1 incorrectly reports 2.1.0. TODO: Remove after next release
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "2.1.0" "${finalAttrs.version}"
     patchShebangs test
   '';
 
@@ -76,6 +80,9 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput bin/eztrace_create_plugin "$dev"
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
     homepage = "https://eztrace.gitlab.io/eztrace/index.html";

From 03c098bd5365506c327180eb024907c65b530bdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Apr 2025 21:17:30 +0000
Subject: [PATCH 41/87] python312Packages.banks: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix
index b42d754e912f..5f05da988c23 100644
--- a/pkgs/development/python-modules/banks/default.nix
+++ b/pkgs/development/python-modules/banks/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "banks";
-  version = "2.1.1";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "masci";
     repo = "banks";
     tag = "v${version}";
-    hash = "sha256-bDOPWq941UGcRXlUO8CVewjmEDFHJH7OZaRTo1Iqbjw=";
+    hash = "sha256-lOlNYIBMa3G06t5KfRWNd/d8aXjxnWp11n8Kw7Ydy+Y=";
   };
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 0a2345a9a5469331f8c3e061a2c336e4c8c8a2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:27:07 -0700
Subject: [PATCH 42/87] python313Packages.python-linkplay: 0.2.3 -> 0.2.4

Diff: https://github.com/Velleman/python-linkplay/compare/refs/tags/v0.2.3...refs/tags/v0.2.4

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

diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index e72cd3c76b6a..a2f7b0ce22d2 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-linkplay";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Velleman";
     repo = "python-linkplay";
     tag = "v${version}";
-    hash = "sha256-xs91de8ELDbBU7deDiOXgnyGMqmYcQY38HkltvPpScU=";
+    hash = "sha256-J0DwSUl1m0Yek1oPvMVLGEx9V3CCwo2OQyiI41Qs0x0=";
   };
 
   build-system = [ setuptools ];

From a5a92ad67a7075ac4d8e77beca6b6476546e9076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:30:11 -0700
Subject: [PATCH 43/87] python313Packages.fuzzyfinder: 2.2.0 -> 2.3.0

Diff: https://github.com/amjith/fuzzyfinder/compare/refs/tags/v2.2.0...refs/tags/v2.3.0

Changelog: https://github.com/amjith/fuzzyfinder/blob/v2.3.0/CHANGELOG.rst
---
 .../development/python-modules/fuzzyfinder/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix
index 99ee29d91688..20a922509bc6 100644
--- a/pkgs/development/python-modules/fuzzyfinder/default.nix
+++ b/pkgs/development/python-modules/fuzzyfinder/default.nix
@@ -3,29 +3,29 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "fuzzyfinder";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "amjith";
     repo = "fuzzyfinder";
     tag = "v${version}";
-    hash = "sha256-QWUABljgtzsZONl1klCrxEh0tPYodMOXokEb3YvWsyg=";
+    hash = "sha256-Zqh2H2d2TCxErmEE9gQwdpzZBGsjeQIo3AxBsc+C5u0=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "fuzzyfinder" ];
 
   meta = with lib; {
-    changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.tag}/CHANGELOG.rst";
     description = "Fuzzy Finder implemented in Python";
     homepage = "https://github.com/amjith/fuzzyfinder";
     license = licenses.bsd3;

From bffca04150dbd94fe666905b625d4f933ee77904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:34:22 -0700
Subject: [PATCH 44/87] python313Packages.recurring-ical-events: 3.6.1 -> 3.7.0

Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/refs/tags/v3.6.1...refs/tags/v3.7.0

Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v3.7.0/README.rst#changelog
---
 .../python-modules/recurring-ical-events/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix
index 526af7e59c07..bf220ef7b20c 100644
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "recurring-ical-events";
-  version = "3.6.1";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "niccokunzmann";
     repo = "python-recurring-ical-events";
     tag = "v${version}";
-    hash = "sha256-DrrWRzMauKDnX7iyD/Q6BnLSLawekxc1f5HxjQH/Lds=";
+    hash = "sha256-N/Y3K/QyJ6Djy9h08wgNdDm1gdy19f+6tkcV6mLaSag=";
   };
 
   postPatch = ''

From 1bd44fd6bdbb993c6ca61ba893b433fcd5eafb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:43:14 -0700
Subject: [PATCH 45/87] python313Packages.eheimdigital: 1.0.6 -> 1.1.0

Diff: https://github.com/autinerd/eheimdigital/compare/refs/tags/1.0.6...refs/tags/1.1.0

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

diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix
index 35497ca9a13f..438cbd43fa69 100644
--- a/pkgs/development/python-modules/eheimdigital/default.nix
+++ b/pkgs/development/python-modules/eheimdigital/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "eheimdigital";
-  version = "1.0.6";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "autinerd";
     repo = "eheimdigital";
     tag = version;
-    hash = "sha256-ocDw7ZwuKSGQT8fPcZEbkKyRH0sCOJusopV0kM11rCw=";
+    hash = "sha256-dqQeRaPy9NtvRhmGUVBVzmORJNYxzM2X/ricJUBlCK0=";
   };
 
   build-system = [ hatchling ];

From 26875a64956bba63e1cc5bcd84875ba7448ca8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:45:11 -0700
Subject: [PATCH 46/87] python313Packages.bosch-alarm-mode2: 0.4.3 -> 0.4.6

Diff: https://github.com/mag1024/bosch-alarm-mode2/compare/refs/tags/v0.4.3...refs/tags/v0.4.6
---
 .../python-modules/bosch-alarm-mode2/default.nix           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
index b9b3e6501c57..bbbf81d71d18 100644
--- a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
+++ b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "bosch-alarm-mode2";
-  version = "0.4.3";
+  version = "0.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mag1024";
     repo = "bosch-alarm-mode2";
     tag = "v${version}";
-    hash = "sha256-bVLwEPWpdCuLanEOAykvvVnL8C8JvOrbcVic/kV15BE=";
+    hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk=";
   };
 
   build-system = [
@@ -25,6 +25,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "bosch_alarm_mode2" ];
 
+  # upstream has no tests
+  doCheck = false;
+
   meta = {
     description = "Async Python library for interacting with Bosch Alarm Panels supporting the 'Mode 2' API";
     homepage = "https://github.com/mag1024/bosch-alarm-mode2";

From d1c905254d3cc963e0f88593df98f6d1b3d6dc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Apr 2025 14:47:29 -0700
Subject: [PATCH 47/87] python313Packages.ayla-iot-unofficial: 1.4.8 -> 1.5.0

Diff: https://github.com/rewardone/ayla-iot-unofficial/compare/refs/tags/v1.4.8...refs/tags/v1.5.0

Changelog: https://github.com/rewardone/ayla-iot-unofficial/releases/tag/v1.5.0
---
 .../python-modules/ayla-iot-unofficial/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
index 0c248c7e76d0..817a17a89da9 100644
--- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
+++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ayla-iot-unofficial";
-  version = "1.4.8";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rewardone";
     repo = "ayla-iot-unofficial";
     tag = "v${version}";
-    hash = "sha256-XFLNt+TwkowNoDcJJpaX9kKi+Gcx4JnzEU1JikpbzZ0=";
+    hash = "sha256-/Js2XMhGe4zPAjpeH2ON4377TAPaWPvA8+HEliYKxlw=";
   };
 
   build-system = [ setuptools ];

From 938e5dc44ef48edd0b82139a120b9df3be8bd9c3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 07:11:40 +0800
Subject: [PATCH 48/87] fcast-receiver: 1.0.14 -> 2.0.0

Diff: https://gitlab.futo.org/videostreaming/fcast/-/compare/c7a1cb27c470870df50dbf0de00a133061298d46...3
---
 pkgs/by-name/fc/fcast-receiver/package.nix | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fc/fcast-receiver/package.nix b/pkgs/by-name/fc/fcast-receiver/package.nix
index ae1a093fe214..8225fc2cfce4 100644
--- a/pkgs/by-name/fc/fcast-receiver/package.nix
+++ b/pkgs/by-name/fc/fcast-receiver/package.nix
@@ -6,31 +6,32 @@
   copyDesktopItems,
   makeWrapper,
   electron,
+  rsync,
 }:
 
 buildNpmPackage rec {
   pname = "fcast-receiver";
-  version = "1.0.14";
+  version = "2.0.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.futo.org";
     owner = "videostreaming";
     repo = "fcast";
-    rev = "c7a1cb27c470870df50dbf0de00a133061298d46";
-    hash = "sha256-9xF1DZ2wt6zMoUQywmvnNN3Z8m4GhOFJElENhozF9c8=";
+    rev = "4af2a537ef431918a5cf53b3ba18abe6b2d18c1e";
+    hash = "sha256-Y3IyxYLGRi/fLh5A3ap+5x3Wny9WRplaYtBM3R3I8+U=";
   };
 
   sourceRoot = "${src.name}/receivers/electron";
 
   makeCacheWritable = true;
 
-  npmDepsHash = "sha256-gpbFZ8rKYR/GUY1l4eH5io/lz6FpJLUTl5h8q3haxvw=";
+  npmDepsHash = "sha256-GXlqOukGWtt3KP+xsAiDsUG2Naej0v2RL7Vq3hqcavE=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
+      name = "fcast-receiver";
       desktopName = "FCast Receiver";
       genericName = "Media Streaming Receiver";
       exec = "fcast-receiver";
@@ -42,24 +43,26 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    rsync
   ];
 
   postInstall = ''
-    install -Dm644 $out/lib/node_modules/fcast-receiver/app.png $out/share/pixmaps/fcast-receiver.png
+    install -Dm644 assets/icons/app/icon.png $out/share/pixmaps/fcast-receiver.png
+    ln -s $out/lib/node_modules/fcast-receiver/package.json $out/lib/node_modules/fcast-receiver/dist/package.json
 
     makeWrapper ${electron}/bin/electron $out/bin/fcast-receiver \
       --add-flags $out/lib/node_modules/fcast-receiver/dist/bundle.js
   '';
 
-  meta = with lib; {
+  meta = {
     description = "FCast Receiver, an open-source media streaming receiver";
     longDescription = ''
       FCast Receiver is a receiver for an open-source media streaming protocol, FCast, an alternative to Chromecast and AirPlay.
     '';
     homepage = "https://fcast.org/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ymstnt ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ymstnt ];
     mainProgram = "fcast-receiver";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From 12a4a8943386874b7de20363340d442119993fb2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 07:32:50 +0800
Subject: [PATCH 49/87] ffmpeg-normalize: 1.28.3 -> 1.31.3

---
 pkgs/by-name/ff/ffmpeg-normalize/package.nix | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
index bcfc78b66e9c..4ffaeca2b432 100644
--- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix
+++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
@@ -4,23 +4,31 @@
   fetchPypi,
   ffmpeg,
 }:
+
 python3Packages.buildPythonApplication rec {
   pname = "ffmpeg-normalize";
-  version = "1.28.3";
+  version = "1.31.3";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-8wNPuVRQRQpFK6opgwqdKYMYmAFRqq8p/T5V9kC8QaY=";
+    inherit version;
+    pname = "ffmpeg_normalize";
+    hash = "sha256-sewDSBUX6gCZSIHeRtpx5fQGtOKN8OWZKrtCF2bgI9Y=";
   };
 
-  propagatedBuildInputs = [
-    ffmpeg
-    python3Packages.ffmpeg-progress-yield
-  ];
-  dependencies = with python3Packages; [ colorlog ];
+  dependencies =
+    with python3Packages;
+    [
+      colorlog
+      ffmpeg-progress-yield
+    ]
+    ++ [ ffmpeg ];
 
   checkPhase = ''
+    runHook preCheck
+
     $out/bin/ffmpeg-normalize --help > /dev/null
+
+    runHook postCheck
   '';
 
   meta = {

From 0b36722ae125f234f63295a6e55afa7521c2feb0 Mon Sep 17 00:00:00 2001
From: Eric Roberts <eric@ericroberts.dev>
Date: Tue, 15 Apr 2025 17:54:29 -0400
Subject: [PATCH 50/87] hoarder: 0.23.0 -> 0.23.2, rename to karakeep

---
 pkgs/by-name/ho/hoarder/helpers/hoarder-cli   |  5 --
 pkgs/by-name/ka/karakeep/helpers/karakeep     |  5 ++
 .../hoarder => ka/karakeep}/helpers/migrate   |  4 +-
 .../hoarder => ka/karakeep}/helpers/start-web |  4 +-
 .../karakeep}/helpers/start-workers           |  6 +--
 .../{ho/hoarder => ka/karakeep}/package.nix   | 50 +++++++++----------
 .../patches/dont-lock-pnpm-version.patch      |  0
 .../patches/fix-migrations-path.patch         |  0
 .../karakeep}/patches/use-local-font.patch    |  0
 pkgs/top-level/aliases.nix                    |  1 +
 10 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100755 pkgs/by-name/ho/hoarder/helpers/hoarder-cli
 create mode 100755 pkgs/by-name/ka/karakeep/helpers/karakeep
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/helpers/migrate (57%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/helpers/start-web (60%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/helpers/start-workers (51%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/package.nix (63%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/patches/dont-lock-pnpm-version.patch (100%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/patches/fix-migrations-path.patch (100%)
 rename pkgs/by-name/{ho/hoarder => ka/karakeep}/patches/use-local-font.patch (100%)

diff --git a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli b/pkgs/by-name/ho/hoarder/helpers/hoarder-cli
deleted file mode 100755
index 0a957eacaad9..000000000000
--- a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-HOARDER_LIB_PATH=
-NODEJS=
-exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/cli/dist/index.mjs" "$@"
diff --git a/pkgs/by-name/ka/karakeep/helpers/karakeep b/pkgs/by-name/ka/karakeep/helpers/karakeep
new file mode 100755
index 000000000000..a749bbdd0b1f
--- /dev/null
+++ b/pkgs/by-name/ka/karakeep/helpers/karakeep
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+KARAKEEP_LIB_PATH=
+NODEJS=
+exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/cli/dist/index.mjs" "$@"
diff --git a/pkgs/by-name/ho/hoarder/helpers/migrate b/pkgs/by-name/ka/karakeep/helpers/migrate
similarity index 57%
rename from pkgs/by-name/ho/hoarder/helpers/migrate
rename to pkgs/by-name/ka/karakeep/helpers/migrate
index e11a50542340..92f4705e5cd7 100755
--- a/pkgs/by-name/ho/hoarder/helpers/migrate
+++ b/pkgs/by-name/ka/karakeep/helpers/migrate
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
-HOARDER_LIB_PATH=
+KARAKEEP_LIB_PATH=
 RELEASE=
 NODE_ENV=production
 
 [[ -d "$DATA_DIR" ]]	# Ensure DATA_DIR is defined and exists
 
 export RELEASE NODE_ENV
-exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/packages/db/migrate.ts" "$@"
+exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/packages/db/migrate.ts" "$@"
diff --git a/pkgs/by-name/ho/hoarder/helpers/start-web b/pkgs/by-name/ka/karakeep/helpers/start-web
similarity index 60%
rename from pkgs/by-name/ho/hoarder/helpers/start-web
rename to pkgs/by-name/ka/karakeep/helpers/start-web
index 93c920f07a55..daa6a93167b3 100755
--- a/pkgs/by-name/ho/hoarder/helpers/start-web
+++ b/pkgs/by-name/ka/karakeep/helpers/start-web
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
-HOARDER_LIB_PATH=
+KARAKEEP_LIB_PATH=
 RELEASE=
 NODEJS=
 NODE_ENV=production
@@ -8,4 +8,4 @@ NODE_ENV=production
 [[ -d "$DATA_DIR" ]]	# Ensure DATA_DIR is defined and exists
 
 export RELEASE NODE_ENV
-exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/server.js"
+exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/server.js"
diff --git a/pkgs/by-name/ho/hoarder/helpers/start-workers b/pkgs/by-name/ka/karakeep/helpers/start-workers
similarity index 51%
rename from pkgs/by-name/ho/hoarder/helpers/start-workers
rename to pkgs/by-name/ka/karakeep/helpers/start-workers
index 5af794341bb5..9bb764f6ed3c 100755
--- a/pkgs/by-name/ho/hoarder/helpers/start-workers
+++ b/pkgs/by-name/ka/karakeep/helpers/start-workers
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
-HOARDER_LIB_PATH=
+KARAKEEP_LIB_PATH=
 RELEASE=
 NODE_ENV=production
-NODE_PATH="$HOARDER_LIB_PATH/apps/workers"
+NODE_PATH="$KARAKEEP_LIB_PATH/apps/workers"
 
 [[ -d "$DATA_DIR" ]]	# Ensure DATA_DIR is defined and exists
 
 export RELEASE NODE_ENV NODE_PATH
-exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/apps/workers/index.ts"
+exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/apps/workers/index.ts"
diff --git a/pkgs/by-name/ho/hoarder/package.nix b/pkgs/by-name/ka/karakeep/package.nix
similarity index 63%
rename from pkgs/by-name/ho/hoarder/package.nix
rename to pkgs/by-name/ka/karakeep/package.nix
index bd8dd0a2862d..bb9df1978dbd 100644
--- a/pkgs/by-name/ho/hoarder/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -14,14 +14,14 @@ let
   pnpm = pnpm_9;
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "hoarder";
-  version = "0.23.0";
+  pname = "karakeep";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
-    owner = "hoarder-app";
-    repo = "hoarder";
+    owner = "karakeep-app";
+    repo = "karakeep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ro2+jXfp83JfQ9HQr0imy7aohSFbH5J6Wx5bxhMT5TM=";
+    hash = "sha256-Cm6e1XEmMHzQ3vODxa9+Yuwt+9zLvQ9S7jmwAozjA/k=";
   };
 
   patches = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     };
 
-    hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA=";
+    hash = "sha256-HZb11CAbnlGSmP/Gxyjncd/RuIWkPv3GvwYs9QZ12Ss=";
   };
   buildPhase = ''
     runHook preBuild
@@ -81,56 +81,56 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/doc/hoarder
-    cp README.md LICENSE $out/share/doc/hoarder
+    mkdir -p $out/share/doc/karakeep
+    cp README.md LICENSE $out/share/doc/karakeep
 
-    # Copy necessary files into lib/hoarder while keeping the directory structure
+    # Copy necessary files into lib/karakeep while keeping the directory structure
     LIB_TO_COPY="node_modules apps/web/.next/standalone apps/cli/dist apps/workers packages/db packages/shared packages/trpc"
-    HOARDER_LIB_PATH="$out/lib/hoarder"
+    KARAKEEP_LIB_PATH="$out/lib/karakeep"
     for DIR in $LIB_TO_COPY; do
-      mkdir -p "$HOARDER_LIB_PATH/$DIR"
-      cp -a $DIR/{.,}* "$HOARDER_LIB_PATH/$DIR"
-      chmod -R u+w "$HOARDER_LIB_PATH/$DIR"
+      mkdir -p "$KARAKEEP_LIB_PATH/$DIR"
+      cp -a $DIR/{.,}* "$KARAKEEP_LIB_PATH/$DIR"
+      chmod -R u+w "$KARAKEEP_LIB_PATH/$DIR"
     done
 
     # NextJS requires static files are copied in a specific way
     # https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files
-    cp -r ./apps/web/public "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/"
-    cp -r ./apps/web/.next/static "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/.next/"
+    cp -r ./apps/web/public "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/"
+    cp -r ./apps/web/.next/static "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/.next/"
 
     # Copy and patch helper scripts
     for HELPER_SCRIPT in ${./helpers}/*; do
       HELPER_SCRIPT_NAME="$(basename "$HELPER_SCRIPT")"
-      cp "$HELPER_SCRIPT" "$HOARDER_LIB_PATH/"
-      substituteInPlace "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" \
-        --replace-warn "HOARDER_LIB_PATH=" "HOARDER_LIB_PATH=$HOARDER_LIB_PATH" \
+      cp "$HELPER_SCRIPT" "$KARAKEEP_LIB_PATH/"
+      substituteInPlace "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" \
+        --replace-warn "KARAKEEP_LIB_PATH=" "KARAKEEP_LIB_PATH=$KARAKEEP_LIB_PATH" \
         --replace-warn "RELEASE=" "RELEASE=${finalAttrs.version}" \
         --replace-warn "NODEJS=" "NODEJS=${nodejs}"
-      chmod +x "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME"
-      patchShebangs "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME"
+      chmod +x "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME"
+      patchShebangs "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME"
     done
 
     # The cli should be in bin/
     mkdir -p $out/bin
-    mv "$HOARDER_LIB_PATH/hoarder-cli" $out/bin/
+    mv "$KARAKEEP_LIB_PATH/karakeep" $out/bin/
 
     runHook postInstall
   '';
 
   postFixup = ''
     # Remove large dependencies that are not necessary during runtime
-    rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist}
+    rm -rf $out/lib/karakeep/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist}
 
     # Remove broken symlinks
     find $out -type l ! -exec test -e {} \; -delete
   '';
 
   meta = {
-    homepage = "https://github.com/hoarder-app/hoarder";
-    description = "Self-hostable bookmark-everything app with a touch of AI for the data hoarders out there";
+    homepage = "https://karakeep.app/";
+    description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search";
     license = lib.licenses.agpl3Only;
     maintainers = [ lib.maintainers.three ];
-    mainProgram = "hoarder-cli";
+    mainProgram = "karakeep";
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
similarity index 100%
rename from pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch
rename to pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
diff --git a/pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch b/pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch
similarity index 100%
rename from pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch
rename to pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch
diff --git a/pkgs/by-name/ho/hoarder/patches/use-local-font.patch b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch
similarity index 100%
rename from pkgs/by-name/ho/hoarder/patches/use-local-font.patch
rename to pkgs/by-name/ka/karakeep/patches/use-local-font.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a9a43e5d8bb9..9d430d8994c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -812,6 +812,7 @@ mapAliases {
   haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
   HentaiAtHome = hentai-at-home; # Added 2024-06-12
   hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
+  hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
   hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13
   hpp-fcl = coal; # Added 2024-11-15
   ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17

From 9790df5968405b884dc45cb41889d510e7d1a980 Mon Sep 17 00:00:00 2001
From: Eric Roberts <eric@ericroberts.dev>
Date: Tue, 15 Apr 2025 21:23:54 -0400
Subject: [PATCH 51/87] nixos/karakeep: init module

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/web-apps/karakeep.nix | 225 +++++++++++++++++++
 2 files changed, 226 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/karakeep.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ecdc692ef5d..7dcf787b65fb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1560,6 +1560,7 @@
   ./services/web-apps/isso.nix
   ./services/web-apps/jirafeau.nix
   ./services/web-apps/jitsi-meet.nix
+  ./services/web-apps/karakeep.nix
   ./services/web-apps/kasmweb/default.nix
   ./services/web-apps/kanboard.nix
   ./services/web-apps/kavita.nix
diff --git a/nixos/modules/services/web-apps/karakeep.nix b/nixos/modules/services/web-apps/karakeep.nix
new file mode 100644
index 000000000000..14ec552a41d6
--- /dev/null
+++ b/nixos/modules/services/web-apps/karakeep.nix
@@ -0,0 +1,225 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.karakeep;
+
+  karakeepEnv = lib.mkMerge [
+    { DATA_DIR = "/var/lib/karakeep"; }
+    (lib.mkIf cfg.meilisearch.enable {
+      MEILI_ADDR = "http://127.0.0.1:${toString config.services.meilisearch.listenPort}";
+    })
+    (lib.mkIf cfg.browser.enable {
+      BROWSER_WEB_URL = "http://127.0.0.1:${toString cfg.browser.port}";
+    })
+    cfg.extraEnvironment
+  ];
+
+  environmentFiles = [
+    "/var/lib/karakeep/settings.env"
+  ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);
+in
+{
+  options = {
+    services.karakeep = {
+      enable = lib.mkEnableOption "Enable the Karakeep service";
+      package = lib.mkPackageOption pkgs "karakeep" { };
+
+      extraEnvironment = lib.mkOption {
+        description = ''
+          Environment variables to pass to Karakaeep. This is how most settings
+          can be configured. Changing DATA_DIR is possible but not supported.
+
+          See https://docs.karakeep.app/configuration/
+        '';
+        type = lib.types.attrsOf lib.types.str;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            PORT = "1234";
+            DISABLE_SIGNUPS = "true";
+            DISABLE_NEW_RELEASE_CHECK = "true";
+          }
+        '';
+      };
+
+      environmentFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        description = ''
+          An optional path to an environment file that will be used in the web and workers
+          services. This is useful for loading private keys.
+        '';
+        example = "/var/lib/karakeep/secrets.env";
+      };
+
+      browser = {
+        enable = lib.mkOption {
+          description = ''
+            Enable the karakeep-browser service that runs a chromium instance in
+            the background with debugging ports exposed. This is necessary for
+            certain features like screenshots.
+          '';
+          type = lib.types.bool;
+          default = true;
+        };
+        port = lib.mkOption {
+          description = "The port the browser should run on.";
+          type = lib.types.port;
+          default = 9222;
+        };
+        exe = lib.mkOption {
+          description = "The browser executable (must be Chrome-like).";
+          type = lib.types.str;
+          default = "${pkgs.chromium}/bin/chromium";
+          defaultText = lib.literalExpression "\${pkgs.chromium}/bin/chromium";
+          example = lib.literalExpression "\${pkgs.google-chrome}/bin/google-chrome-stable";
+        };
+      };
+
+      meilisearch = {
+        enable = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+          description = ''
+            Enable Meilisearch and configure Karakeep to use it. Meilisearch is
+            required for text search.
+          '';
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    users.groups.karakeep = { };
+    users.users.karakeep = {
+      isSystemUser = true;
+      group = "karakeep";
+    };
+
+    services.meilisearch = lib.mkIf cfg.meilisearch.enable {
+      enable = true;
+    };
+
+    systemd.services.karakeep-init = {
+      description = "Initialize Karakeep Data";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      partOf = [ "karakeep.service" ];
+      path = [ pkgs.openssl ];
+      script = ''
+        umask 0077
+
+        if [ ! -f "$STATE_DIRECTORY/settings.env" ]; then
+          cat <<EOF >"$STATE_DIRECTORY/settings.env"
+        # Generated by NixOS Karakeep module
+        MEILI_MASTER_KEY=$(openssl rand -base64 36)
+        NEXTAUTH_SECRET=$(openssl rand -base64 36)
+        EOF
+        fi
+
+        export DATA_DIR="$STATE_DIRECTORY"
+        exec "${cfg.package}/lib/karakeep/migrate"
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        User = "karakeep";
+        Group = "karakeep";
+        StateDirectory = "karakeep";
+        PrivateTmp = "yes";
+      };
+    };
+
+    systemd.services.karakeep-workers = {
+      description = "Karakeep Workers";
+      wantedBy = [ "multi-user.target" ];
+      after = [
+        "network.target"
+        "karakeep-init.service"
+      ];
+      partOf = [ "karakeep.service" ];
+      path = [
+        pkgs.monolith
+        pkgs.yt-dlp
+      ];
+      environment = karakeepEnv;
+      serviceConfig = {
+        User = "karakeep";
+        Group = "karakeep";
+        ExecStart = "${cfg.package}/lib/karakeep/start-workers";
+        StateDirectory = "karakeep";
+        EnvironmentFile = environmentFiles;
+        PrivateTmp = "yes";
+      };
+    };
+
+    systemd.services.karakeep-web = {
+      description = "Karakeep Web";
+      wantedBy = [ "multi-user.target" ];
+      after = [
+        "network.target"
+        "karakeep-init.service"
+        "karakeep-workers.service"
+      ];
+      partOf = [ "karakeep.service" ];
+      environment = karakeepEnv;
+      serviceConfig = {
+        ExecStart = "${cfg.package}/lib/karakeep/start-web";
+        User = "karakeep";
+        Group = "karakeep";
+        StateDirectory = "karakeep";
+        EnvironmentFile = environmentFiles;
+        PrivateTmp = "yes";
+      };
+    };
+
+    systemd.services.karakeep-browser = lib.mkIf cfg.browser.enable {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      partOf = [ "karakeep.service" ];
+      script = ''
+        export HOME="$CACHE_DIRECTORY"
+        exec ${cfg.browser.exe} \
+          --headless --no-sandbox --disable-gpu --disable-dev-shm-usage \
+          --remote-debugging-address=127.0.0.1 \
+          --remote-debugging-port=${toString cfg.browser.port} \
+          --hide-scrollbars \
+          --user-data-dir="$STATE_DIRECTORY"
+      '';
+      serviceConfig = {
+        Type = "simple";
+        Restart = "on-failure";
+
+        CacheDirectory = "karakeep-browser";
+        StateDirectory = "karakeep-browser";
+
+        DevicePolicy = "closed";
+        DynamicUser = true;
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+      };
+    };
+  };
+
+  meta = {
+    maintainers = [ lib.maintainers.three ];
+  };
+}

From 12c14cc53ff89b41018e0ffc1a00b2ce3381215c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 02:57:37 +0000
Subject: [PATCH 52/87] nezha-theme-admin: 1.10.4 -> 1.12.0

---
 .../ne/nezha-theme-admin/package-lock.json    | 1514 ++++++++++-------
 pkgs/by-name/ne/nezha-theme-admin/package.nix |    6 +-
 2 files changed, 886 insertions(+), 634 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
index 31048724c393..1fe63e47f65c 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -384,6 +384,36 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@biomejs/js-api": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.7.1.tgz",
+            "integrity": "sha512-VFdgFFZWcyCQxZcAasyv8Enpexn4CblMdWmr6izLYHTLcbd+z9x/LuKU71qnmClABfnYqZjiY7c8DKTVri3Ajw==",
+            "dev": true,
+            "license": "MIT OR Apache-2.0",
+            "peerDependencies": {
+                "@biomejs/wasm-bundler": "^1.9.2",
+                "@biomejs/wasm-nodejs": "^1.9.2",
+                "@biomejs/wasm-web": "^1.9.2"
+            },
+            "peerDependenciesMeta": {
+                "@biomejs/wasm-bundler": {
+                    "optional": true
+                },
+                "@biomejs/wasm-nodejs": {
+                    "optional": true
+                },
+                "@biomejs/wasm-web": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@biomejs/wasm-nodejs": {
+            "version": "1.9.4",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-1.9.4.tgz",
+            "integrity": "sha512-ZqNlhKcZW6MW1LxWIOfh9YVrBykvzyFad3bOh6JJFraDnNa3NXboRDiaI8dmrbb0ZHXCU1Tsq6WQsKV2Vpp5dw==",
+            "dev": true,
+            "license": "MIT OR Apache-2.0"
+        },
         "node_modules/@esbuild/aix-ppc64": {
             "version": "0.25.2",
             "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
@@ -810,9 +840,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.5.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
-            "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+            "version": "4.6.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz",
+            "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -852,9 +882,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.19.2",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
-            "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+            "version": "0.20.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -877,9 +907,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-            "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+            "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -927,9 +957,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.23.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
-            "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
+            "version": "9.25.1",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.25.1.tgz",
+            "integrity": "sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -960,19 +990,6 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
-            "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/@exodus/schemasafe": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
@@ -1204,29 +1221,29 @@
             }
         },
         "node_modules/@radix-ui/number": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz",
-            "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
+            "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==",
             "license": "MIT"
         },
         "node_modules/@radix-ui/primitive": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
-            "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz",
+            "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==",
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-alert-dialog": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.6.tgz",
-            "integrity": "sha512-p4XnPqgej8sZAAReCAKgz1REYZEBLR8hU9Pg27wFnCWIMc8g1ccCs0FjBcy05V15VTu8pAePw/VDYeOm/uZ6yQ==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.10.tgz",
+            "integrity": "sha512-EJ+FGNgLiOw33YOipPZ4/fZC2x1zKELDBjdJJleYsM6kJCBp3lvAPuXeUoYEHXNvv9iWl5VRU3IT7d/f4A5C7g==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-dialog": "1.1.6",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-slot": "1.1.2"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-dialog": "1.1.10",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-slot": "1.2.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1244,12 +1261,12 @@
             }
         },
         "node_modules/@radix-ui/react-arrow": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz",
-            "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.4.tgz",
+            "integrity": "sha512-qz+fxrqgNxG0dYew5l7qR3c7wdgRu1XVUHGnGYX7rg5HM4p9SWaRmJwfgR3J0SgyUKayLmzQIun+N6rWRgiRKw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.0.2"
+                "@radix-ui/react-primitive": "2.1.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1267,15 +1284,16 @@
             }
         },
         "node_modules/@radix-ui/react-avatar": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.3.tgz",
-            "integrity": "sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==",
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.6.tgz",
+            "integrity": "sha512-YDduxvqNMHzTQWNqja7Z/XTyFc8UOP98/ePjJTFa1vqILPlTPcQaVa1YyQMiQl4SFQPA9Y/zj1dHBgMlE5G/ow==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-is-hydrated": "0.0.0",
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1293,19 +1311,19 @@
             }
         },
         "node_modules/@radix-ui/react-checkbox": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz",
-            "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.2.2.tgz",
+            "integrity": "sha512-pMxzQLK+m/tkDRXJg7VUjRx6ozsBdzNLOV4vexfVBU57qT2Gvf4cw2gKKhOohJxjadQ+WcUXCKosTIxcZzi03A==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-controllable-state": "1.1.0",
-                "@radix-ui/react-use-previous": "1.1.0",
-                "@radix-ui/react-use-size": "1.1.0"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
+                "@radix-ui/react-use-previous": "1.1.1",
+                "@radix-ui/react-use-size": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1323,15 +1341,15 @@
             }
         },
         "node_modules/@radix-ui/react-collection": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz",
-            "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.4.tgz",
+            "integrity": "sha512-cv4vSf7HttqXilDnAnvINd53OTl1/bjUYVZrkFnA7nwmY9Ob2POUy0WY0sfqBAe1s5FyKsyceQlqiEGPYNTadg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-slot": "1.1.2"
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-slot": "1.2.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1349,9 +1367,9 @@
             }
         },
         "node_modules/@radix-ui/react-compose-refs": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
-            "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+            "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1364,9 +1382,9 @@
             }
         },
         "node_modules/@radix-ui/react-context": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
-            "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+            "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1379,23 +1397,23 @@
             }
         },
         "node_modules/@radix-ui/react-dialog": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
-            "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.10.tgz",
+            "integrity": "sha512-m6pZb0gEM5uHPSb+i2nKKGQi/HMSVjARMsLMWQfKDP+eJ6B+uqryHnXhpnohTWElw+vEcMk/o4wJODtdRKHwqg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.5",
-                "@radix-ui/react-focus-guards": "1.1.1",
-                "@radix-ui/react-focus-scope": "1.1.2",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-portal": "1.1.4",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-slot": "1.1.2",
-                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-portal": "1.1.6",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
             },
@@ -1415,9 +1433,9 @@
             }
         },
         "node_modules/@radix-ui/react-direction": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
-            "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz",
+            "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1430,16 +1448,16 @@
             }
         },
         "node_modules/@radix-ui/react-dismissable-layer": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
-            "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.7.tgz",
+            "integrity": "sha512-j5+WBUdhccJsmH5/H0K6RncjDtoALSEr6jbkaZu+bjw6hOPOhHycr6vEUujl+HBK8kjUfWcoCJXxP6e4lUlMZw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-escape-keydown": "1.1.0"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-escape-keydown": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1457,18 +1475,18 @@
             }
         },
         "node_modules/@radix-ui/react-dropdown-menu": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz",
-            "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==",
+            "version": "2.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.11.tgz",
+            "integrity": "sha512-wbPE3cFBfLl+S+LCxChWQGX0k14zUxgvep1HEnLhJ9mNhjyO3ETzRviAeKZ3XomT/iVRRZAWFsnFZ3N0wI8OmA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-menu": "2.1.6",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-controllable-state": "1.1.0"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-menu": "2.1.11",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1486,9 +1504,9 @@
             }
         },
         "node_modules/@radix-ui/react-focus-guards": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz",
-            "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz",
+            "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1501,14 +1519,14 @@
             }
         },
         "node_modules/@radix-ui/react-focus-scope": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
-            "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.4.tgz",
+            "integrity": "sha512-r2annK27lIW5w9Ho5NyQgqs0MmgZSTIKXWpVCJaLC1q2kZrZkcqnmHkCHMEmv8XLvsLlurKMPT+kbKkRkm/xVA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0"
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1526,12 +1544,12 @@
             }
         },
         "node_modules/@radix-ui/react-id": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
-            "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
+            "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1544,12 +1562,12 @@
             }
         },
         "node_modules/@radix-ui/react-label": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz",
-            "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==",
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.4.tgz",
+            "integrity": "sha512-wy3dqizZnZVV4ja0FNnUhIWNwWdoldXrneEyUcVtLYDAt8ovGS4ridtMAOGgXBBIfggL4BOveVWsjXDORdGEQg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.0.2"
+                "@radix-ui/react-primitive": "2.1.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1567,27 +1585,27 @@
             }
         },
         "node_modules/@radix-ui/react-menu": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz",
-            "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==",
+            "version": "2.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.11.tgz",
+            "integrity": "sha512-sbFI4Qaw02J0ogmR9tOMsSqsdrGNpUanlPYAqTE2JJafow8ecHtykg4fSTjNHBdDl4deiKMK+RhTEwyVhP7UDA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-collection": "1.1.2",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-dismissable-layer": "1.1.5",
-                "@radix-ui/react-focus-guards": "1.1.1",
-                "@radix-ui/react-focus-scope": "1.1.2",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-popper": "1.2.2",
-                "@radix-ui/react-portal": "1.1.4",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-roving-focus": "1.1.2",
-                "@radix-ui/react-slot": "1.1.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-popper": "1.2.4",
+                "@radix-ui/react-portal": "1.1.6",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-roving-focus": "1.1.7",
+                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
             },
@@ -1607,25 +1625,25 @@
             }
         },
         "node_modules/@radix-ui/react-navigation-menu": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.5.tgz",
-            "integrity": "sha512-myMHHQUZ3ZLTi8W381/Vu43Ia0NqakkQZ2vzynMmTUtQQ9kNkjzhOwkZC9TAM5R07OZUVIQyHC06f/9JZJpvvA==",
+            "version": "1.2.9",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.9.tgz",
+            "integrity": "sha512-Z7lefjA5VAmEB5ZClxeHGWGQAqhGWgEc6u0MYviUmIVrgGCVLv5mv/jsfUY3tJWI71cVhpQ7dnf/Q6RtM3ylVA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-collection": "1.1.2",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-dismissable-layer": "1.1.5",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-controllable-state": "1.1.0",
-                "@radix-ui/react-use-layout-effect": "1.1.0",
-                "@radix-ui/react-use-previous": "1.1.0",
-                "@radix-ui/react-visually-hidden": "1.1.2"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
+                "@radix-ui/react-use-layout-effect": "1.1.1",
+                "@radix-ui/react-use-previous": "1.1.1",
+                "@radix-ui/react-visually-hidden": "1.2.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1643,24 +1661,24 @@
             }
         },
         "node_modules/@radix-ui/react-popover": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz",
-            "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.10.tgz",
+            "integrity": "sha512-IZN7b3sXqajiPsOzKuNJBSP9obF4MX5/5UhTgWNofw4r1H+eATWb0SyMlaxPD/kzA4vadFgy1s7Z1AEJ6WMyHQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.5",
-                "@radix-ui/react-focus-guards": "1.1.1",
-                "@radix-ui/react-focus-scope": "1.1.2",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-popper": "1.2.2",
-                "@radix-ui/react-portal": "1.1.4",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-slot": "1.1.2",
-                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-popper": "1.2.4",
+                "@radix-ui/react-portal": "1.1.6",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
             },
@@ -1680,21 +1698,21 @@
             }
         },
         "node_modules/@radix-ui/react-popper": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz",
-            "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.4.tgz",
+            "integrity": "sha512-3p2Rgm/a1cK0r/UVkx5F/K9v/EplfjAeIFCGOPYPO4lZ0jtg4iSQXt/YGTSLWaf4x7NG6Z4+uKFcylcTZjeqDA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/react-dom": "^2.0.0",
-                "@radix-ui/react-arrow": "1.1.2",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-layout-effect": "1.1.0",
-                "@radix-ui/react-use-rect": "1.1.0",
-                "@radix-ui/react-use-size": "1.1.0",
-                "@radix-ui/rect": "1.1.0"
+                "@radix-ui/react-arrow": "1.1.4",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-layout-effect": "1.1.1",
+                "@radix-ui/react-use-rect": "1.1.1",
+                "@radix-ui/react-use-size": "1.1.1",
+                "@radix-ui/rect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1712,13 +1730,13 @@
             }
         },
         "node_modules/@radix-ui/react-portal": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
-            "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.6.tgz",
+            "integrity": "sha512-XmsIl2z1n/TsYFLIdYam2rmFwf9OC/Sh2avkbmVMDuBZIe7hSpM0cYnWPAo7nHOVx8zTuwDZGByfcqLdnzp3Vw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1736,13 +1754,13 @@
             }
         },
         "node_modules/@radix-ui/react-presence": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz",
-            "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.3.tgz",
+            "integrity": "sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1760,12 +1778,12 @@
             }
         },
         "node_modules/@radix-ui/react-primitive": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
-            "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.0.tgz",
+            "integrity": "sha512-/J/FhLdK0zVcILOwt5g+dH4KnkonCtkVJsa2G6JmvbbtZfBEI1gMsO3QMjseL4F/SwfAMt1Vc/0XKYKq+xJ1sw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-slot": "1.1.2"
+                "@radix-ui/react-slot": "1.2.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1783,20 +1801,20 @@
             }
         },
         "node_modules/@radix-ui/react-roving-focus": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz",
-            "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.7.tgz",
+            "integrity": "sha512-C6oAg451/fQT3EGbWHbCQjYTtbyjNO1uzQgMzwyivcHT3GKNEmu1q3UuREhN+HzHAVtv3ivMVK08QlC+PkYw9Q==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-collection": "1.1.2",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-controllable-state": "1.1.0"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1814,20 +1832,20 @@
             }
         },
         "node_modules/@radix-ui/react-scroll-area": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.3.tgz",
-            "integrity": "sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ==",
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.5.tgz",
+            "integrity": "sha512-VyLjxI8/gXYn+Wij1FLpXjZp6Z/uNklUFQQ75tOpJNESeNaZ2kCRfjiEDmHgWmLeUPeJGwrqbgRmcdFjtYEkMA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/number": "1.1.0",
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/number": "1.1.1",
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1845,30 +1863,30 @@
             }
         },
         "node_modules/@radix-ui/react-select": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz",
-            "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==",
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.2.tgz",
+            "integrity": "sha512-HjkVHtBkuq+r3zUAZ/CvNWUGKPfuicGDbgtZgiQuFmNcV5F+Tgy24ep2nsAW2nFgvhGPJVqeBZa6KyVN0EyrBA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/number": "1.1.0",
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-collection": "1.1.2",
-                "@radix-ui/react-compose-refs": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-dismissable-layer": "1.1.5",
-                "@radix-ui/react-focus-guards": "1.1.1",
-                "@radix-ui/react-focus-scope": "1.1.2",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-popper": "1.2.2",
-                "@radix-ui/react-portal": "1.1.4",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-slot": "1.1.2",
-                "@radix-ui/react-use-callback-ref": "1.1.0",
-                "@radix-ui/react-use-controllable-state": "1.1.0",
-                "@radix-ui/react-use-layout-effect": "1.1.0",
-                "@radix-ui/react-use-previous": "1.1.0",
-                "@radix-ui/react-visually-hidden": "1.1.2",
+                "@radix-ui/number": "1.1.1",
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-popper": "1.2.4",
+                "@radix-ui/react-portal": "1.1.6",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-use-callback-ref": "1.1.1",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
+                "@radix-ui/react-use-layout-effect": "1.1.1",
+                "@radix-ui/react-use-previous": "1.1.1",
+                "@radix-ui/react-visually-hidden": "1.2.0",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
             },
@@ -1888,12 +1906,12 @@
             }
         },
         "node_modules/@radix-ui/react-separator": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz",
-            "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.4.tgz",
+            "integrity": "sha512-2fTm6PSiUm8YPq9W0E4reYuv01EE3aFSzt8edBiXqPHshF8N9+Kymt/k0/R+F3dkY5lQyB/zPtrP82phskLi7w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.0.2"
+                "@radix-ui/react-primitive": "2.1.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1911,12 +1929,12 @@
             }
         },
         "node_modules/@radix-ui/react-slot": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
-            "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.0.tgz",
+            "integrity": "sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.1"
+                "@radix-ui/react-compose-refs": "1.1.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1929,19 +1947,19 @@
             }
         },
         "node_modules/@radix-ui/react-tabs": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.3.tgz",
-            "integrity": "sha512-9mFyI30cuRDImbmFF6O2KUJdgEOsGh9Vmx9x/Dh9tOhL7BngmQPQfwW4aejKm5OHpfWIdmeV6ySyuxoOGjtNng==",
+            "version": "1.1.8",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.8.tgz",
+            "integrity": "sha512-4iUaN9SYtG+/E+hJ7jRks/Nv90f+uAsRHbLYA6BcA9EsR6GNWgsvtS4iwU2SP0tOZfDGAyqIT0yz7ckgohEIFA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.1",
-                "@radix-ui/react-context": "1.1.1",
-                "@radix-ui/react-direction": "1.1.0",
-                "@radix-ui/react-id": "1.1.0",
-                "@radix-ui/react-presence": "1.1.2",
-                "@radix-ui/react-primitive": "2.0.2",
-                "@radix-ui/react-roving-focus": "1.1.2",
-                "@radix-ui/react-use-controllable-state": "1.1.0"
+                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-direction": "1.1.1",
+                "@radix-ui/react-id": "1.1.1",
+                "@radix-ui/react-presence": "1.1.3",
+                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-roving-focus": "1.1.7",
+                "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1959,9 +1977,9 @@
             }
         },
         "node_modules/@radix-ui/react-use-callback-ref": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
-            "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
+            "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1974,12 +1992,31 @@
             }
         },
         "node_modules/@radix-ui/react-use-controllable-state": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
-            "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
+            "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-callback-ref": "1.1.0"
+                "@radix-ui/react-use-effect-event": "0.0.2",
+                "@radix-ui/react-use-layout-effect": "1.1.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-effect-event": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
+            "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1992,12 +2029,30 @@
             }
         },
         "node_modules/@radix-ui/react-use-escape-keydown": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
-            "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
+            "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-callback-ref": "1.1.0"
+                "@radix-ui/react-use-callback-ref": "1.1.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-is-hydrated": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.0.0.tgz",
+            "integrity": "sha512-23RkSm7jSZ8+rtfdSJTi/2D+p9soPbtnoG/tPf08egYCDr6p8X83hrcmW77p7MJ8kJYWNXwruuPTPp1TwIIH4g==",
+            "license": "MIT",
+            "dependencies": {
+                "use-sync-external-store": "^1.4.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2010,9 +2065,9 @@
             }
         },
         "node_modules/@radix-ui/react-use-layout-effect": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
-            "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+            "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -2025,9 +2080,9 @@
             }
         },
         "node_modules/@radix-ui/react-use-previous": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz",
-            "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz",
+            "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -2040,12 +2095,12 @@
             }
         },
         "node_modules/@radix-ui/react-use-rect": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz",
-            "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz",
+            "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/rect": "1.1.0"
+                "@radix-ui/rect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2058,12 +2113,12 @@
             }
         },
         "node_modules/@radix-ui/react-use-size": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz",
-            "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz",
+            "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-layout-effect": "1.1.0"
+                "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2076,12 +2131,12 @@
             }
         },
         "node_modules/@radix-ui/react-visually-hidden": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
-            "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.0.tgz",
+            "integrity": "sha512-rQj0aAWOpCdCMRbI6pLQm8r7S2BM3YhTa0SzOYD55k+hJA8oo9J+H+9wLM9oMlZWOX/wJWPTzfDfmZkf7LvCfg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.0.2"
+                "@radix-ui/react-primitive": "2.1.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2099,15 +2154,15 @@
             }
         },
         "node_modules/@radix-ui/rect": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
-            "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",
+            "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
             "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz",
-            "integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
+            "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
             "cpu": [
                 "arm"
             ],
@@ -2119,9 +2174,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz",
-            "integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
+            "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
             "cpu": [
                 "arm64"
             ],
@@ -2133,9 +2188,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz",
-            "integrity": "sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
+            "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2147,9 +2202,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz",
-            "integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
+            "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
             "cpu": [
                 "x64"
             ],
@@ -2161,9 +2216,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz",
-            "integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
+            "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
             "cpu": [
                 "arm64"
             ],
@@ -2175,9 +2230,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz",
-            "integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
+            "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
             "cpu": [
                 "x64"
             ],
@@ -2189,9 +2244,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz",
-            "integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
+            "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
             "cpu": [
                 "arm"
             ],
@@ -2203,9 +2258,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz",
-            "integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
+            "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
             "cpu": [
                 "arm"
             ],
@@ -2217,9 +2272,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
-            "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
+            "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
             "cpu": [
                 "arm64"
             ],
@@ -2231,9 +2286,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz",
-            "integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
+            "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2245,9 +2300,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz",
-            "integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
+            "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
             "cpu": [
                 "loong64"
             ],
@@ -2259,9 +2314,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz",
-            "integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
+            "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2273,9 +2328,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz",
-            "integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
+            "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
             "cpu": [
                 "riscv64"
             ],
@@ -2287,9 +2342,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz",
-            "integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
+            "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -2301,9 +2356,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz",
-            "integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
+            "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
             "cpu": [
                 "s390x"
             ],
@@ -2315,9 +2370,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
-            "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
+            "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
             "cpu": [
                 "x64"
             ],
@@ -2329,9 +2384,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz",
-            "integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
+            "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
             "cpu": [
                 "x64"
             ],
@@ -2343,9 +2398,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz",
-            "integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
+            "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2357,9 +2412,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz",
-            "integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
+            "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
             "cpu": [
                 "ia32"
             ],
@@ -2371,9 +2426,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz",
-            "integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
+            "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
             "cpu": [
                 "x64"
             ],
@@ -2385,12 +2440,12 @@
             ]
         },
         "node_modules/@tanstack/react-table": {
-            "version": "8.21.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz",
-            "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==",
+            "version": "8.21.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
+            "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==",
             "license": "MIT",
             "dependencies": {
-                "@tanstack/table-core": "8.21.2"
+                "@tanstack/table-core": "8.21.3"
             },
             "engines": {
                 "node": ">=12"
@@ -2405,9 +2460,9 @@
             }
         },
         "node_modules/@tanstack/table-core": {
-            "version": "8.21.2",
-            "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz",
-            "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==",
+            "version": "8.21.3",
+            "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+            "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==",
             "license": "MIT",
             "engines": {
                 "node": ">=12"
@@ -2466,9 +2521,9 @@
             }
         },
         "node_modules/@types/babel__generator": {
-            "version": "7.6.8",
-            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+            "version": "7.27.0",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+            "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2496,12 +2551,6 @@
                 "@babel/types": "^7.20.7"
             }
         },
-        "node_modules/@types/cookie": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-            "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-            "license": "MIT"
-        },
         "node_modules/@types/estree": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -2517,15 +2566,15 @@
             "license": "MIT"
         },
         "node_modules/@types/luxon": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.0.tgz",
-            "integrity": "sha512-RtEj20xRyG7cRp142MkQpV3GRF8Wo2MtDkKLz65MQs7rM1Lh8bz+HtfPXCCJEYpnDFu6VwAq/Iv2Ikyp9Jw/hw==",
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
+            "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.14.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
-            "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
+            "version": "22.14.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
+            "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2568,17 +2617,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz",
-            "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.0.tgz",
+            "integrity": "sha512-evaQJZ/J/S4wisevDvC1KFZkPzRetH8kYZbkgcTRyql3mcKsf+ZFDV1BVWUGTCAW5pQHoqn5gK5b8kn7ou9aFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.29.0",
-                "@typescript-eslint/type-utils": "8.29.0",
-                "@typescript-eslint/utils": "8.29.0",
-                "@typescript-eslint/visitor-keys": "8.29.0",
+                "@typescript-eslint/scope-manager": "8.31.0",
+                "@typescript-eslint/type-utils": "8.31.0",
+                "@typescript-eslint/utils": "8.31.0",
+                "@typescript-eslint/visitor-keys": "8.31.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -2598,16 +2647,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
-            "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",
+            "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.29.0",
-                "@typescript-eslint/types": "8.29.0",
-                "@typescript-eslint/typescript-estree": "8.29.0",
-                "@typescript-eslint/visitor-keys": "8.29.0",
+                "@typescript-eslint/scope-manager": "8.31.0",
+                "@typescript-eslint/types": "8.31.0",
+                "@typescript-eslint/typescript-estree": "8.31.0",
+                "@typescript-eslint/visitor-keys": "8.31.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2623,14 +2672,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
-            "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",
+            "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.0",
-                "@typescript-eslint/visitor-keys": "8.29.0"
+                "@typescript-eslint/types": "8.31.0",
+                "@typescript-eslint/visitor-keys": "8.31.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2641,14 +2690,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz",
-            "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.0.tgz",
+            "integrity": "sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.29.0",
-                "@typescript-eslint/utils": "8.29.0",
+                "@typescript-eslint/typescript-estree": "8.31.0",
+                "@typescript-eslint/utils": "8.31.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.0.1"
             },
@@ -2665,9 +2714,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
-            "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",
+            "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2679,14 +2728,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
-            "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",
+            "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.0",
-                "@typescript-eslint/visitor-keys": "8.29.0",
+                "@typescript-eslint/types": "8.31.0",
+                "@typescript-eslint/visitor-keys": "8.31.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2745,16 +2794,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz",
-            "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz",
+            "integrity": "sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.29.0",
-                "@typescript-eslint/types": "8.29.0",
-                "@typescript-eslint/typescript-estree": "8.29.0"
+                "@typescript-eslint/scope-manager": "8.31.0",
+                "@typescript-eslint/types": "8.31.0",
+                "@typescript-eslint/typescript-estree": "8.31.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2769,13 +2818,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
-            "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",
+            "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.29.0",
+                "@typescript-eslint/types": "8.31.0",
                 "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
@@ -2787,17 +2836,17 @@
             }
         },
         "node_modules/@vitejs/plugin-react": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
-            "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz",
+            "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.26.0",
+                "@babel/core": "^7.26.10",
                 "@babel/plugin-transform-react-jsx-self": "^7.25.9",
                 "@babel/plugin-transform-react-jsx-source": "^7.25.9",
                 "@types/babel__core": "^7.20.5",
-                "react-refresh": "^0.14.2"
+                "react-refresh": "^0.17.0"
             },
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
@@ -3053,6 +3102,35 @@
                 "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
             }
         },
+        "node_modules/c12": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.3.tgz",
+            "integrity": "sha512-uC3MacKBb0Z15o5QWCHvHWj5Zv34pGQj9P+iXKSpTuSGFS0KKhUWf4t9AJ+gWjYOdmWCPEGpEzm8sS0iqbpo1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chokidar": "^4.0.3",
+                "confbox": "^0.2.2",
+                "defu": "^6.1.4",
+                "dotenv": "^16.4.7",
+                "exsolve": "^1.0.4",
+                "giget": "^2.0.0",
+                "jiti": "^2.4.2",
+                "ohash": "^2.0.11",
+                "pathe": "^2.0.3",
+                "perfect-debounce": "^1.0.0",
+                "pkg-types": "^2.1.0",
+                "rc9": "^2.1.2"
+            },
+            "peerDependencies": {
+                "magicast": "^0.3.5"
+            },
+            "peerDependenciesMeta": {
+                "magicast": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/call-me-maybe": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
@@ -3080,9 +3158,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001707",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
-            "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
+            "version": "1.0.30001715",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
+            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
             "dev": true,
             "funding": [
                 {
@@ -3118,39 +3196,19 @@
             }
         },
         "node_modules/chokidar": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+            "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
+                "readdirp": "^4.0.1"
             },
             "engines": {
-                "node": ">= 8.10.0"
+                "node": ">= 14.16.0"
             },
             "funding": {
                 "url": "https://paulmillr.com/funding/"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/chokidar/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "license": "ISC",
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
             }
         },
         "node_modules/citty": {
@@ -3312,6 +3370,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/confbox": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
+            "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/consola": {
             "version": "3.4.2",
             "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
@@ -3347,33 +3412,6 @@
                 "toggle-selection": "^1.0.6"
             }
         },
-        "node_modules/cosmiconfig": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-            "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "env-paths": "^2.2.1",
-                "import-fresh": "^3.3.0",
-                "js-yaml": "^4.1.0",
-                "parse-json": "^5.2.0"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/d-fischer"
-            },
-            "peerDependencies": {
-                "typescript": ">=4.9.5"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -3431,6 +3469,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/defu": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
+            "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/dequal": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -3440,6 +3485,13 @@
                 "node": ">=6"
             }
         },
+        "node_modules/destr": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz",
+            "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/detect-node-es": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
@@ -3458,6 +3510,19 @@
             "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
             "license": "MIT"
         },
+        "node_modules/dotenv": {
+            "version": "16.5.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
+            "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
+        },
         "node_modules/eastasianwidth": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -3465,9 +3530,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.129",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz",
-            "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==",
+            "version": "1.5.140",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz",
+            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
             "dev": true,
             "license": "ISC"
         },
@@ -3477,26 +3542,6 @@
             "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
             "license": "MIT"
         },
-        "node_modules/env-paths": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-arrayish": "^0.2.1"
-            }
-        },
         "node_modules/es6-promise": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
@@ -3569,20 +3614,20 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.23.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
-            "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
+            "version": "9.25.1",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.25.1.tgz",
+            "integrity": "sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.19.2",
-                "@eslint/config-helpers": "^0.2.0",
-                "@eslint/core": "^0.12.0",
+                "@eslint/config-array": "^0.20.0",
+                "@eslint/config-helpers": "^0.2.1",
+                "@eslint/core": "^0.13.0",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.23.0",
-                "@eslint/plugin-kit": "^0.2.7",
+                "@eslint/js": "9.25.1",
+                "@eslint/plugin-kit": "^0.2.8",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
@@ -3643,9 +3688,9 @@
             }
         },
         "node_modules/eslint-plugin-react-refresh": {
-            "version": "0.4.19",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz",
-            "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==",
+            "version": "0.4.20",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz",
+            "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -3759,6 +3804,13 @@
                 "url": "https://github.com/eta-dev/eta?sponsor=1"
             }
         },
+        "node_modules/exsolve": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz",
+            "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -3996,6 +4048,24 @@
                 "node": ">=6"
             }
         },
+        "node_modules/giget": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
+            "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "citty": "^0.1.6",
+                "consola": "^3.4.0",
+                "defu": "^6.1.4",
+                "node-fetch-native": "^1.6.6",
+                "nypm": "^0.6.0",
+                "pathe": "^2.0.3"
+            },
+            "bin": {
+                "giget": "dist/cli.mjs"
+            }
+        },
         "node_modules/glob": {
             "version": "10.4.5",
             "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -4142,9 +4212,9 @@
             }
         },
         "node_modules/i18next-browser-languagedetector": {
-            "version": "8.0.4",
-            "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz",
-            "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==",
+            "version": "8.0.5",
+            "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.5.tgz",
+            "integrity": "sha512-OstebRKqKiQw8xEvQF5aRyUujsCatanj7Q9eo5iiH2gJpoXGZ7483ol3sVBwfqbobTQPNH1J+NAyJ1aCQoEC+w==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.23.2"
@@ -4187,13 +4257,6 @@
                 "node": ">=0.8.19"
             }
         },
-        "node_modules/is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/is-binary-path": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -4288,18 +4351,19 @@
             "license": "MIT"
         },
         "node_modules/jiti": {
-            "version": "1.21.7",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+            "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+            "dev": true,
             "license": "MIT",
             "bin": {
-                "jiti": "bin/jiti.js"
+                "jiti": "lib/jiti-cli.mjs"
             }
         },
         "node_modules/jotai": {
-            "version": "2.12.2",
-            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.2.tgz",
-            "integrity": "sha512-oN8715y7MkjXlSrpyjlR887TOuc/NLZMs9gvgtfWH/JP47ChwO0lR2ijSwBvPMYyXRAPT+liIAhuBavluKGgtA==",
+            "version": "2.12.3",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.3.tgz",
+            "integrity": "sha512-DpoddSkmPGXMFtdfnoIHfueFeGP643nqYUWC6REjUcME+PG2UkAtYnLbffRDw3OURI9ZUTcRWkRGLsOvxuWMCg==",
             "license": "MIT",
             "peer": true,
             "engines": {
@@ -4365,13 +4429,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/json-parse-even-better-errors": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -4643,6 +4700,13 @@
                 "node": "4.x || >=6.0.0"
             }
         },
+        "node_modules/node-fetch-native": {
+            "version": "1.6.6",
+            "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz",
+            "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/node-readfiles": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz",
@@ -4679,6 +4743,26 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/nypm": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.0.tgz",
+            "integrity": "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "citty": "^0.1.6",
+                "consola": "^3.4.0",
+                "pathe": "^2.0.3",
+                "pkg-types": "^2.0.0",
+                "tinyexec": "^0.3.2"
+            },
+            "bin": {
+                "nypm": "dist/cli.mjs"
+            },
+            "engines": {
+                "node": "^14.16.0 || >=16.10.0"
+            }
+        },
         "node_modules/oas-kit-common": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
@@ -4802,6 +4886,13 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/ohash": {
+            "version": "2.0.11",
+            "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
+            "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/optionator": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -4871,25 +4962,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/parse-json": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.0.0",
-                "error-ex": "^1.3.1",
-                "json-parse-even-better-errors": "^2.3.0",
-                "lines-and-columns": "^1.1.6"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/path-exists": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -4937,6 +5009,20 @@
             "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
             "license": "ISC"
         },
+        "node_modules/pathe": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+            "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/perfect-debounce": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/picocolors": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -4973,6 +5059,18 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/pkg-types": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz",
+            "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "confbox": "^0.2.1",
+                "exsolve": "^1.0.1",
+                "pathe": "^2.0.3"
+            }
+        },
         "node_modules/postcss": {
             "version": "8.5.3",
             "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
@@ -5131,6 +5229,7 @@
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
             "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
             },
@@ -5249,6 +5348,17 @@
             ],
             "license": "MIT"
         },
+        "node_modules/rc9": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz",
+            "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "defu": "^6.1.4",
+                "destr": "^2.0.3"
+            }
+        },
         "node_modules/react": {
             "version": "19.1.0",
             "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
@@ -5271,9 +5381,9 @@
             }
         },
         "node_modules/react-hook-form": {
-            "version": "7.55.0",
-            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.55.0.tgz",
-            "integrity": "sha512-XRnjsH3GVMQz1moZTW53MxfoWN7aDpUg/GpVNc4A3eXRVNdGXfbzJ4vM4aLQ8g6XCUh1nIbx70aaNCl7kxnjog==",
+            "version": "7.56.0",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.0.tgz",
+            "integrity": "sha512-U2QQgx5z2Y8Z0qlXv3W19hWHJgfKdWMz0O/osuY+o+CYq568V2R/JhzC6OAXfR8k24rIN0Muan2Qliaq9eKs/g==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.0.0"
@@ -5309,9 +5419,9 @@
             }
         },
         "node_modules/react-refresh": {
-            "version": "0.14.2",
-            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
-            "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
+            "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5366,12 +5476,11 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.1.tgz",
-            "integrity": "sha512-Vmizn9ZNzxfh3cumddqv3kLOKvc7AskUT0dC1prTabhiEi0U4A33LmkDOJ79tXaeSqCqMBXBU/ySX88W85+EUg==",
+            "version": "7.5.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.1.tgz",
+            "integrity": "sha512-/jjU3fcYNd2bwz9Q0xt5TwyiyoO8XjSEFXJY4O/lMAlkGTHWuHRAbR9Etik+lSDqMC7A7mz3UlXzgYT6Vl58sA==",
             "license": "MIT",
             "dependencies": {
-                "@types/cookie": "^0.6.0",
                 "cookie": "^1.0.1",
                 "set-cookie-parser": "^2.6.0",
                 "turbo-stream": "2.4.0"
@@ -5390,12 +5499,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.4.1.tgz",
-            "integrity": "sha512-L3/4tig0Lvs6m6THK0HRV4eHUdpx0dlJasgCxXKnavwhh4tKYgpuZk75HRYNoRKDyDWi9QgzGXsQ1oQSBlWpAA==",
+            "version": "7.5.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.1.tgz",
+            "integrity": "sha512-5DPSPc7ENrt2tlKPq0FtpG80ZbqA9aIKEyqX6hSNJDlol/tr6iqCK4crqdsusmOSSotq6zDsn0y3urX9TuTNmA==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.4.1"
+                "react-router": "7.5.1"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5447,15 +5556,17 @@
             }
         },
         "node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+            "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+            "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "picomatch": "^2.2.1"
-            },
             "engines": {
-                "node": ">=8.10.0"
+                "node": ">= 14.18.0"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://paulmillr.com/funding/"
             }
         },
         "node_modules/reftools": {
@@ -5525,9 +5636,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.39.0.tgz",
-            "integrity": "sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
+            "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5541,26 +5652,26 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.39.0",
-                "@rollup/rollup-android-arm64": "4.39.0",
-                "@rollup/rollup-darwin-arm64": "4.39.0",
-                "@rollup/rollup-darwin-x64": "4.39.0",
-                "@rollup/rollup-freebsd-arm64": "4.39.0",
-                "@rollup/rollup-freebsd-x64": "4.39.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.39.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.39.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.39.0",
-                "@rollup/rollup-linux-arm64-musl": "4.39.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.39.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.39.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.39.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.39.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.39.0",
-                "@rollup/rollup-linux-x64-gnu": "4.39.0",
-                "@rollup/rollup-linux-x64-musl": "4.39.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.39.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.39.0",
-                "@rollup/rollup-win32-x64-msvc": "4.39.0",
+                "@rollup/rollup-android-arm-eabi": "4.40.0",
+                "@rollup/rollup-android-arm64": "4.40.0",
+                "@rollup/rollup-darwin-arm64": "4.40.0",
+                "@rollup/rollup-darwin-x64": "4.40.0",
+                "@rollup/rollup-freebsd-arm64": "4.40.0",
+                "@rollup/rollup-freebsd-x64": "4.40.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.40.0",
+                "@rollup/rollup-linux-arm64-musl": "4.40.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.40.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.40.0",
+                "@rollup/rollup-linux-x64-gnu": "4.40.0",
+                "@rollup/rollup-linux-x64-musl": "4.40.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.40.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.40.0",
+                "@rollup/rollup-win32-x64-msvc": "4.40.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -5885,24 +5996,25 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.0.28",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.28.tgz",
-            "integrity": "sha512-8IwPD6nCFDTtzSl8rS7xlAx0NGMpBUlFfccJwgMV7t8d/nKw1yQWPVdC7h94XDsDPrLFvICd5xAJJm2TK2Pcpw==",
+            "version": "13.1.1",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.1.1.tgz",
+            "integrity": "sha512-Slwbvz1cAno7TjujKfKIvGK5R72BlpQhnVUUtK/TcQjx/pMIiGVCaLaJWOux0mye7LEABABAhUwArFEAusuAcQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
+                "@biomejs/js-api": "^0.7.1",
+                "@biomejs/wasm-nodejs": "^1.9.4",
                 "@types/swagger-schema-official": "^2.0.25",
+                "c12": "^3.0.3",
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
-                "cosmiconfig": "^9.0.0",
                 "eta": "^2.2.0",
                 "js-yaml": "^4.1.0",
                 "lodash": "^4.17.21",
                 "nanoid": "^5.1.5",
-                "prettier": "~3.5.3",
                 "swagger-schema-official": "2.0.0-bab6bed",
                 "swagger2openapi": "^7.0.8",
-                "typescript": "~5.8.2"
+                "typescript": "~5.8.3"
             },
             "bin": {
                 "sta": "dist/cli.js",
@@ -5932,9 +6044,9 @@
             }
         },
         "node_modules/swagger-typescript-api/node_modules/typescript": {
-            "version": "5.8.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
-            "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
+            "version": "5.8.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -6052,6 +6164,63 @@
                 "tailwindcss": ">=3.0.0 || insiders"
             }
         },
+        "node_modules/tailwindcss/node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/tailwindcss/node_modules/jiti": {
+            "version": "1.21.7",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+            "license": "MIT",
+            "bin": {
+                "jiti": "bin/jiti.js"
+            }
+        },
+        "node_modules/tailwindcss/node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
         "node_modules/thenify": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
@@ -6073,6 +6242,58 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/tinyexec": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+            "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/tinyglobby": {
+            "version": "0.2.13",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
+            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fdir": "^6.4.4",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/tinyglobby/node_modules/fdir": {
+            "version": "6.4.4",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/tinyglobby/node_modules/picomatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -6157,15 +6378,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz",
-            "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==",
+            "version": "8.31.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.0.tgz",
+            "integrity": "sha512-u+93F0sB0An8WEAPtwxVhFby573E8ckdjwUUQUj9QA4v8JAvgtoDdIyYR3XFwFHq2W1KJ1AurwJCO+w+Y1ixyQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.29.0",
-                "@typescript-eslint/parser": "8.29.0",
-                "@typescript-eslint/utils": "8.29.0"
+                "@typescript-eslint/eslint-plugin": "8.31.0",
+                "@typescript-eslint/parser": "8.31.0",
+                "@typescript-eslint/utils": "8.31.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6299,15 +6520,18 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.2.4",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz",
-            "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==",
+            "version": "6.3.2",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz",
+            "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.25.0",
+                "fdir": "^6.4.3",
+                "picomatch": "^4.0.2",
                 "postcss": "^8.5.3",
-                "rollup": "^4.30.1"
+                "rollup": "^4.34.9",
+                "tinyglobby": "^0.2.12"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -6370,6 +6594,34 @@
                 }
             }
         },
+        "node_modules/vite/node_modules/fdir": {
+            "version": "6.4.4",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite/node_modules/picomatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/void-elements": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
@@ -6627,9 +6879,9 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.24.2",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
-            "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+            "version": "3.24.3",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz",
+            "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index 759235b00d46..c2abd6506922 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.10.4";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-TT/WCeHYi/Q5zpB8DCdJdAv8sJsm4J7q596qOqbCH4E=";
+    hash = "sha256-M1iJmSskXk0Qhr+p9yradZE4Xnf88F28NBUfJw4Wr34=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-vkToSpCqsXrbjMxmnlyBGeiWTQaQC04XBnCRtn9lEQU=";
+  npmDepsHash = "sha256-y0MnD6ymU4YDpNkTrEKMROHwllSVRm1LQeG0v3IPa0Y=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From 0ea868a5fd94b2f2df17bc563986f7b993f42afc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 03:23:35 +0000
Subject: [PATCH 53/87] python312Packages.django-crispy-forms: 2.3 -> 2.4

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

diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix
index 68513dd4beec..6a353b2776dc 100644
--- a/pkgs/development/python-modules/django-crispy-forms/default.nix
+++ b/pkgs/development/python-modules/django-crispy-forms/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-crispy-forms";
-  version = "2.3";
+  version = "2.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "django-crispy-forms";
     tag = version;
-    hash = "sha256-R2s2dUsVw5p7xn4yWeFcE7au8yHWXjFgS5jjCBveg04=";
+    hash = "sha256-YV7XUv5N2Xcf79/8EdI7XnVtpiX+yQBhQumSUbZmOfc=";
   };
 
   propagatedBuildInputs = [

From 3a1b0a167512cdc4fcd54c00c7685bdc217a1db4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 04:56:13 +0000
Subject: [PATCH 54/87] python312Packages.google-cloud-webrisk: 1.17.1 ->
 1.18.0

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

diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index d20b53813f14..ae4d79f1fcf1 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-webrisk";
-  version = "1.17.1";
+  version = "1.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_webrisk";
     inherit version;
-    hash = "sha256-apCNF81eeLIP4nNdzm9KeUlUO7pjN6quKTrl1xsUn0Q=";
+    hash = "sha256-a+hb4chZzPaPduJihVmQHBd8arZ6MEKYBDFkNOvsprI=";
   };
 
   build-system = [ setuptools ];

From 9d598f396aef616de4db92043474a0006a183f6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 06:38:08 +0000
Subject: [PATCH 55/87] codebook: 0.2.9 -> 0.2.10

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 7b97353d1d18..cb03a2915dc3 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.2.9";
+  version = "0.2.10";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iJ9S9DDoZVZxZ1o9dkor8PGM6Z+FljWZfetWFFMOIIo=";
+    hash = "sha256-LH5/xMbmHo0vBlPnNTsj3iX6gvBp9PFGZcAy999402E=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-PmhfEftgto0FHOIfryN9JME9S+/CarAEZ6hV/vj37Eg=";
+  cargoHash = "sha256-EbcG99T0T5Hh7bRI5I3gf9qBiOcnl0EoCtVIfcJHeJg=";
 
   nativeBuildInputs = [
     pkg-config

From 8fac07fbe54f60ea1735fd3f15b8eaeb8970b137 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 23 Mar 2025 18:58:25 +0100
Subject: [PATCH 56/87] zabbix50: remove due to EOL

The EOL will be reached at the end of the current release cycle.

https://www.zabbix.com/life_cycle_and_release_policy
---
 pkgs/servers/monitoring/zabbix/server.nix   | 4 ----
 pkgs/servers/monitoring/zabbix/versions.nix | 6 ------
 pkgs/servers/monitoring/zabbix/web.nix      | 2 +-
 pkgs/top-level/aliases.nix                  | 1 +
 pkgs/top-level/all-packages.nix             | 1 -
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 03cfae182aa4..54968b0bd4ff 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -91,10 +91,6 @@ import ./versions.nix (
       ++ optional postgresqlSupport "--with-postgresql"
       ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";
 
-    env.NIX_CFLAGS_COMPILE = lib.optionalString (
-      lib.versions.major version <= "5"
-    ) "-Wno-error=incompatible-pointer-types";
-
     prePatch = ''
       find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
     '';
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 64359e034b37..8b6a6bdc7c03 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -19,10 +19,4 @@ generic: {
     hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
     vendorHash = null;
   };
-
-  v50 = generic {
-    version = "5.0.46";
-    hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4=";
-    vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0=";
-  };
 }
diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix
index 7cbefe782637..a447c6e6b74f 100644
--- a/pkgs/servers/monitoring/zabbix/web.nix
+++ b/pkgs/servers/monitoring/zabbix/web.nix
@@ -24,7 +24,7 @@ import ./versions.nix (
 
     installPhase = ''
       mkdir -p $out/share/zabbix/
-      cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/
+      cp -a ui/. $out/share/zabbix/
       cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php
     '';
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4e22c6ac92e1..8fbe6fcfda83 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1928,6 +1928,7 @@ mapAliases {
 
   ### Z ###
 
+  zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";
   zeroadPackages = recurseIntoAttrs {
     zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
     zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15866dc68366..516952a47bb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12578,7 +12578,6 @@ with pkgs;
   zabbix70 = recurseIntoAttrs (zabbixFor "v70");
   zabbix60 = recurseIntoAttrs (zabbixFor "v60");
   zabbix64 = recurseIntoAttrs (zabbixFor "v64");
-  zabbix50 = recurseIntoAttrs (zabbixFor "v50");
 
   zabbix = zabbix60;
 

From e67f7f1d003bed53a365060fa3328fd3c1b0f071 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 23 Mar 2025 19:01:59 +0100
Subject: [PATCH 57/87] zabbix64: remove due to EOL

zabbix64 is EOL.

https://www.zabbix.com/life_cycle_and_release_policy
---
 pkgs/servers/monitoring/zabbix/versions.nix | 5 -----
 pkgs/top-level/aliases.nix                  | 1 +
 pkgs/top-level/all-packages.nix             | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 8b6a6bdc7c03..2b00d8939412 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -9,11 +9,6 @@ generic: {
     hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";
     vendorHash = null;
   };
-  v64 = generic {
-    version = "6.4.20";
-    hash = "sha256-tFsg2Jq8Uaa5YULGUu1kXLkxyJuA3YGeSfJ4DPfOHkk=";
-    vendorHash = null;
-  };
   v60 = generic {
     version = "6.0.36";
     hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8fbe6fcfda83..57291469d208 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1929,6 +1929,7 @@ mapAliases {
   ### Z ###
 
   zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";
+  zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'.";
   zeroadPackages = recurseIntoAttrs {
     zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
     zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 516952a47bb4..df0d13442b07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12577,7 +12577,6 @@ with pkgs;
   zabbix72 = recurseIntoAttrs (zabbixFor "v72");
   zabbix70 = recurseIntoAttrs (zabbixFor "v70");
   zabbix60 = recurseIntoAttrs (zabbixFor "v60");
-  zabbix64 = recurseIntoAttrs (zabbixFor "v64");
 
   zabbix = zabbix60;
 

From 14e8d4c920e8d2635c2660bdf155ae42e5261a29 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 23 Mar 2025 19:08:51 +0100
Subject: [PATCH 58/87] zabbix: remove not needed vendorHash in versions file

---
 pkgs/servers/monitoring/zabbix/agent2.nix   | 3 +--
 pkgs/servers/monitoring/zabbix/versions.nix | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix
index b1bf7cd6f22f..e4e009cc64a7 100644
--- a/pkgs/servers/monitoring/zabbix/agent2.nix
+++ b/pkgs/servers/monitoring/zabbix/agent2.nix
@@ -14,7 +14,6 @@ import ./versions.nix (
   {
     version,
     hash,
-    vendorHash ? throw "unsupported version ${version} for zabbix-agent2",
     ...
   }:
   buildGoModule {
@@ -28,7 +27,7 @@ import ./versions.nix (
 
     modRoot = "src/go";
 
-    inherit vendorHash;
+    vendorHash = null;
 
     nativeBuildInputs = [
       autoreconfHook
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 2b00d8939412..c477c85ec87f 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -2,16 +2,13 @@ generic: {
   v72 = generic {
     version = "7.2.5";
     hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
-    vendorHash = null;
   };
   v70 = generic {
     version = "7.0.11";
     hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";
-    vendorHash = null;
   };
   v60 = generic {
     version = "6.0.36";
     hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
-    vendorHash = null;
   };
 }

From 54bd55332be44abfe5f4e8049b06f533c8395886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Mon, 21 Apr 2025 13:44:32 +0700
Subject: [PATCH 59/87] =?UTF-8?q?h2o:=202.3.0.20250417=20=E2=86=92=202.3.0?=
 =?UTF-8?q?.20250421?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 87b557b1dd4f..c7f280a5b3a5 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0.20250417";
+  version = "2.3.0.20250421";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "a5f5c212bfbec54a6c098a21cf5f9c0b0b5d5895";
-    sha256 = "sha256-+naLQWYx/nGOT24UbxzVl2UFW1sx9HksZkXahIm9byQ=";
+    rev = "be7c58007376d5a01f20400ca54bb8db01528ccd";
+    sha256 = "sha256-ewuTRdDtAQF1z/r0ukkaCaNS5gOFgykGvuqUmocEsBg=";
   };
 
   outputs = [

From 083538e5d229dfa175fb7f92fa91101b1d866024 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Apr 2025 09:52:59 +0200
Subject: [PATCH 60/87] python3Packages.jsonschema-rs: add update script

To allow using the local update script for maintainers.
---
 pkgs/development/python-modules/jsonschema-rs/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index b11211ff687d..b0b091ee83f5 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -3,6 +3,7 @@
   fetchPypi,
   hypothesis,
   lib,
+  nix-update-script,
   pytestCheckHook,
   pythonOlder,
   rustPlatform,
@@ -41,6 +42,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "jsonschema_rs" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "High-performance JSON Schema validator for Python";
     homepage = "https://github.com/Stranger6667/jsonschema/tree/master/crates/jsonschema-py";

From 6df39e2817699e6e6e5efb4afce6c8815927b5c4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Apr 2025 09:54:14 +0200
Subject: [PATCH 61/87] python3Packages.jsonschema-rs: 0.29.1 -> 0.30.0

Changelog:
https://github.com/Stranger6667/jsonschema/blob/python-v0.30.0/crates/jsonschema-py/CHANGELOG.md
---
 pkgs/development/python-modules/jsonschema-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index b0b091ee83f5..f81f0d004d90 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-rs";
-  version = "0.29.1";
+  version = "0.30.0";
 
   pyproject = true;
 
@@ -21,13 +21,13 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "jsonschema_rs";
-    hash = "sha256-qfiWqeRRdjA3TxdTZHBYNsIvCdW9W7sG7AYRMytnAv0=";
+    hash = "sha256-KfmI0ik3HWrv1WDFsT5xvxyRyXKg2DpmxeuUHOR9MZM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-kVi4EFig0ZGnOSVjzfJuGeR7BiEngP1Jhj6NvbhMVy4=";
+    hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 2cb2759a29e30eab527950ba3d9bd5d49422d298 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Apr 2025 12:35:48 +0000
Subject: [PATCH 62/87] butt: 1.44.0 -> 1.45.0

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

diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix
index dcbc83ed0c3f..deae52c17a82 100644
--- a/pkgs/by-name/bu/butt/package.nix
+++ b/pkgs/by-name/bu/butt/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "butt";
-  version = "1.44.0";
+  version = "1.45.0";
 
   src = fetchurl {
     url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc=";
+    hash = "sha256-iEmFEJRsTvHeKGYvnhzYXSC/q0DSw0Z/YgK4buDtg2Q=";
   };
 
   postPatch = ''

From 012fdbe02c4c59e1170a5b7ddf9245c03655895e Mon Sep 17 00:00:00 2001
From: Felix Stupp <me+github/security-7XJy2od8@banananet.work>
Date: Tue, 22 Apr 2025 10:07:43 +0200
Subject: [PATCH 63/87] nixos/nix-flakes: ref to man page about flake registry

---
 nixos/modules/config/nix-flakes.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/nix-flakes.nix b/nixos/modules/config/nix-flakes.nix
index 69388e791154..1a7b2724b486 100644
--- a/nixos/modules/config/nix-flakes.nix
+++ b/nixos/modules/config/nix-flakes.nix
@@ -19,6 +19,10 @@ let
 
   cfg = config.nix;
 
+  flakeRefFormat = ''
+    The format of flake references is described in {manpage}`nix3-flake(1)`.
+  '';
+
 in
 {
   options = {
@@ -46,7 +50,11 @@ in
                     type = "indirect";
                     id = "nixpkgs";
                   };
-                  description = "The flake reference to be rewritten.";
+                  description = ''
+                    The flake reference to be rewritten.
+
+                    ${flakeRefFormat}
+                  '';
                 };
                 to = mkOption {
                   type = referenceAttrs;
@@ -55,7 +63,11 @@ in
                     owner = "my-org";
                     repo = "my-nixpkgs";
                   };
-                  description = "The flake reference {option}`from` is rewritten to.";
+                  description = ''
+                    The flake reference {option}`from` is rewritten to.
+
+                    ${flakeRefFormat}
+                  '';
                 };
                 flake = mkOption {
                   type = types.nullOr types.attrs;
@@ -96,6 +108,8 @@ in
         default = { };
         description = ''
           A system-wide flake registry.
+
+          See {manpage}`nix3-registry(1)` for more information.
         '';
       };
     };

From ae11d4be17ad590be426a245b78c9d69375db9e3 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 23 Mar 2025 14:20:01 +0100
Subject: [PATCH 64/87] cassandra_3_0, cassandra_3_11: remove due to EOL

Cassandra 3.0 and 3.11 are End of Life.
https://cassandra.apache.org/_/blog/Apache-Cassandra-3.0.x-and-3.11.x-End-of-Life-Announcement.html
---
 doc/release-notes/rl-2505.section.md          |  2 ++
 .../modules/services/databases/cassandra.nix  | 34 ++++++-------------
 nixos/tests/all-tests.nix                     |  2 --
 pkgs/servers/nosql/cassandra/generic.nix      |  2 +-
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  8 -----
 6 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 5e867fedaa8e..5c7131be2f7d 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -93,6 +93,8 @@
   Packages wishing to maintain compatibility with Nixpkgs 24.11 must set `useFetchCargoVendor` to `true` explicitly.
   `rustPlatform.importCargoLock` may also be appropriate in some circumstances.
 
+- `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process.
+
 - NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes
   of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0)
   and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 0130564778e6..814f0e99a8a7 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -24,10 +24,6 @@ let
 
   cfg = config.services.cassandra;
 
-  atLeast3 = versionAtLeast cfg.package.version "3";
-  atLeast3_11 = versionAtLeast cfg.package.version "3.11";
-  atLeast4 = versionAtLeast cfg.package.version "4";
-
   defaultUser = "cassandra";
 
   cassandraConfig = flip recursiveUpdate cfg.extraConfig (
@@ -41,6 +37,7 @@ let
       data_file_directories = [ "${cfg.homeDir}/data" ];
       commitlog_directory = "${cfg.homeDir}/commitlog";
       saved_caches_directory = "${cfg.homeDir}/saved_caches";
+      hints_directory = "${cfg.homeDir}/hints";
     }
     // optionalAttrs (cfg.seedAddresses != [ ]) {
       seed_provider = [
@@ -50,9 +47,6 @@ let
         }
       ];
     }
-    // optionalAttrs atLeast3 {
-      hints_directory = "${cfg.homeDir}/hints";
-    }
   );
 
   cassandraConfigWithAddresses =
@@ -97,9 +91,7 @@ let
       # Delete default password file
       sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh"
 
-      ${lib.optionalString atLeast4 ''
-        cp $package/conf/jvm*.options $out/
-      ''}
+      cp $package/conf/jvm*.options $out/
     '';
   };
 
@@ -109,17 +101,17 @@ let
 
   fullJvmOptions =
     cfg.jvmOpts
+    ++ [
+      # Historically, we don't use a log dir, whereas the upstream scripts do
+      # expect this. We override those by providing our own -Xlog:gc flag.
+      "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning"
+    ]
     ++ optionals (cfg.jmxRoles != [ ]) [
       "-Dcom.sun.management.jmxremote.authenticate=true"
       "-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}"
     ]
     ++ optionals cfg.remoteJmx [
       "-Djava.rmi.server.hostname=${cfg.rpcAddress}"
-    ]
-    ++ optionals atLeast4 [
-      # Historically, we don't use a log dir, whereas the upstream scripts do
-      # expect this. We override those by providing our own -Xlog:gc flag.
-      "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning"
     ];
 
   commonEnv = {
@@ -169,7 +161,7 @@ in
     };
 
     package = mkPackageOption pkgs "cassandra" {
-      example = "cassandra_3_11";
+      example = "cassandra_4";
     };
 
     jvmOpts = mkOption {
@@ -462,14 +454,11 @@ in
 
     jmxRolesFile = mkOption {
       type = types.nullOr types.path;
-      default = if atLeast3_11 then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null;
-      defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`'';
+      default = pkgs.writeText "jmx-roles-file" defaultJmxRolesFile;
+      defaultText = "generated configuration file";
       example = "/var/lib/cassandra/jmx.password";
       description = ''
         Specify your own jmx roles file.
-
-        Make sure the permissions forbid "others" from reading the file if
-        you're using Cassandra below version 3.11.
       '';
     };
   };
@@ -492,8 +481,7 @@ in
         assertion = cfg.remoteJmx -> cfg.jmxRolesFile != null;
         message = ''
           If you want JMX available remotely you need to set a password using
-          <literal>jmxRoles</literal> or <literal>jmxRolesFile</literal> if
-          using Cassandra older than v3.11.
+          <literal>jmxRoles</literal>.
         '';
       }
     ];
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 42855e82ff08..dcd24c86d119 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -281,8 +281,6 @@ in
   calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
   canaille = handleTest ./canaille.nix { };
   castopod = handleTest ./castopod.nix { };
-  cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
-  cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
   cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
   centrifugo = runTest ./centrifugo.nix;
   ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { };
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 42708ce9b5c1..4cd3944d3156 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -11,7 +11,7 @@
   which,
   jre,
   nixosTests,
-  # generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
+  # generation is the attribute version suffix such as 4 in pkgs.cassandra_4
   generation,
   version,
   sha256,
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4e22c6ac92e1..86db4b1c974c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -394,6 +394,8 @@ mapAliases {
   cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09
   cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26
   cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
+  cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
+  cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
   cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
   centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   certmgr-selfsigned = certmgr; # Added 2023-11-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15866dc68366..67565dbdceeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11800,14 +11800,6 @@ with pkgs;
 
   appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
 
-  cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
-    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-    python = python2;
-  };
-  cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix {
-    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-    python = python2;
-  };
   cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix {
     # Effective Cassandra 4.0.2 there is full Java 11 support
     #  -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html

From 6c33cb7c4e0c5307bbe80f0c1443f182119aaf93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Apr 2025 09:32:03 +0000
Subject: [PATCH 65/87] python312Packages.apkinspector: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix
index eb03f304f101..3a5c57f1b0f0 100644
--- a/pkgs/development/python-modules/apkinspector/default.nix
+++ b/pkgs/development/python-modules/apkinspector/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "apkinspector";
-  version = "1.3.2";
+  version = "1.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "erev0s";
     repo = "apkInspector";
     tag = "v${version}";
-    hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ=";
+    hash = "sha256-KJ8B/KTT8oGKlON8/xDdxxZ61dGdOgyCrZlI5ENXpTw=";
   };
 
   build-system = [ poetry-core ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module designed to provide detailed insights into the zip structure of APK files";
     homepage = "https://github.com/erev0s/apkInspector";
-    changelog = "https://github.com/erev0s/apkInspector/releases/tag/v${version}";
+    changelog = "https://github.com/erev0s/apkInspector/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "apkInspector";

From afaf992b70cdf6feb833ab976b59ad48cbdd2fc4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 22 Apr 2025 11:41:39 +0200
Subject: [PATCH 66/87] firefox: do not set the executable bit on desktop file

This prevent Gnome to find the app correctly.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 64cc87a62425..f2e7b430f825 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -487,7 +487,7 @@ let
               done
           fi
 
-          install -D -t $out/share/applications $desktopItem/share/applications/*
+          install -m 644 -D -t $out/share/applications $desktopItem/share/applications/*
 
         ''
         + lib.optionalString hasMozSystemDirPatch ''

From 48c7c6a90473c410011c1a7d11edbcd8643efbf2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 09:56:29 +0200
Subject: [PATCH 67/87] electron-source.electron_33: 33.4.8 -> 33.4.9

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.8...v33.4.9
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 08673da08fec..7a666b5faf9c 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-mvDHVVjrKoeg2E2ucAGTsjnMRDqcrqr3QlDoCmxHQJY=",
+                    "hash": "sha256-hmOlSNtmPW1zOkDa3IwalB+mql/ShN+Vd62UPAYKCIc=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v33.4.8"
+                    "rev": "v33.4.9"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1258,7 +1258,7 @@
         "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
         "modules": "130",
         "node": "20.18.3",
-        "version": "33.4.8"
+        "version": "33.4.9"
     },
     "34": {
         "chrome": "132.0.6834.210",

From 7aefc00532c224e5d233b59bf99907abb8b5fc1f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 11:23:46 +0200
Subject: [PATCH 68/87] electron-source.electron_34: 34.5.0 -> 34.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.0...v34.5.1
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 7a666b5faf9c..4e01448c631e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1318,10 +1318,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-azo3XHWccI9jmmFx1Ck83861Eu/jF64J+rz3uudeFe0=",
+                    "hash": "sha256-Ka85ecw/PQ8lqWiQ/eJTOJqx8VYUej0b+YsG17eTdC8=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v34.5.0"
+                    "rev": "v34.5.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2535,7 +2535,7 @@
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
         "node": "20.19.0",
-        "version": "34.5.0"
+        "version": "34.5.1"
     },
     "35": {
         "chrome": "134.0.6998.179",

From 6372031f69e04e48efa6db7c137ac97f08776fb8 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 12:18:49 +0200
Subject: [PATCH 69/87] electron-source.electron_35: 35.1.4 -> 35.1.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.4...v35.1.5
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 4e01448c631e..56c85b448ee3 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2595,10 +2595,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-P7GjUmkATDOo2B/uLs5Pv3E+meFoenwe2FTkIEc/Go0=",
+                    "hash": "sha256-cOPfVqfSOiq+wI+3Nbz6ejQZ6UabeL5G/XvSXL8HozM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v35.1.4"
+                    "rev": "v35.1.5"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3844,6 +3844,6 @@
         "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
         "modules": "133",
         "node": "22.14.0",
-        "version": "35.1.4"
+        "version": "35.1.5"
     }
 }

From 5b3e3e19f0b38019d76b6e0e4ec2012fe1d8cb4d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:11:40 +0200
Subject: [PATCH 70/87] electron_33-bin: 33.4.8 -> 33.4.9

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.8...v33.4.9
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 9eb46415019a..17012b43528f 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "b1425938a053b47bdf1c3c28abd146defb7372a8e645adb0a2f2a9650ca6a36d",
-            "aarch64-linux": "0f7350d2aa0d03b4e57aced4cc921a71fa15a0a5528ee463651771cb415e0381",
-            "armv7l-linux": "153938fe15bf90e2ff6429d1f7db19144b01b8ec12a00a351fdb9fee56c585c3",
+            "aarch64-darwin": "daef5f578fdd274d4a5d662c5ed599e835a35c02ebeeb02df6a81c5488b97b2b",
+            "aarch64-linux": "405f01c3eb4bb054e611c9268e61bfbb46ac3b80f88786d7667a6710029cdb42",
+            "armv7l-linux": "b77649009ec91f4e7281cd4e99d8359da477f491b4f770087be665e6313690a7",
             "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
-            "x86_64-darwin": "38d247a3540650e21ee8d99a8e07b3c9f40439ad09cc176628adb2af948070f6",
-            "x86_64-linux": "ae5cb348d7697f4acfb6d19dddc4ffc9fae1a687be5bee66684279a82fd8621b"
+            "x86_64-darwin": "a36a81878c05b10d415323077320e0be0d99581728e565e30cf29aa228ca2dc0",
+            "x86_64-linux": "bdb3ef8f1700ed8a770b108d12a755038e49c6040c62d5396271ca7ccb30e6e5"
         },
-        "version": "33.4.8"
+        "version": "33.4.9"
     },
     "34": {
         "hashes": {

From 522a03b52640f7e1bdd60da818dfbb9a5ea37ad1 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:11:46 +0200
Subject: [PATCH 71/87] electron-chromedriver_33: 33.4.8 -> 33.4.9

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.8...v33.4.9
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 489a70b27547..f571232864d7 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "70fd7d0e788c76f750f50e09ac12956cb2393ae8160f412b48bd32da076d53c4",
-            "aarch64-linux": "e3edec29ac7a4dff69957b7848de324816c68215ba413d5536f934ea3b41c362",
-            "armv7l-linux": "67de15769a70713c7422bd6eb1390f4150e83218e5bdba7409eaaa429c640b1b",
-            "headers": "1ji9mxjh2pigx1ldvp6m9ydlkcyvl6mrrpqsbvzvxd2spppzih0d",
-            "x86_64-darwin": "476d91e836986d49518da86869a2b923417718d8be008ef50738ef5920a995ba",
-            "x86_64-linux": "8109a11081311b94b2fbf38cb9e505857aaf5dbc952cc5d0c2fd6477603084f6"
+            "aarch64-darwin": "f13e2d405a72749ba2c0a740a1d5606e2302b1b020694b08a6f1c0ce81430197",
+            "aarch64-linux": "7757dd128b538fbc4836724966ba5b041cbbc415cac245b3f992d9fa7bd43ed2",
+            "armv7l-linux": "506d9907d40066ef3a1cd87a00bdf141992e59303601104e1ae8f60a9e410c42",
+            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
+            "x86_64-darwin": "2330d31c8d3703e32fbb394bd005bb5d62a5a98ec2435bdd98df4cadb81f96d3",
+            "x86_64-linux": "1dcfbf6c6cf572b64565cfc3dfc52c7832a03c66a1e621b25d1fad36c244ea9c"
         },
-        "version": "33.4.8"
+        "version": "33.4.9"
     },
     "34": {
         "hashes": {

From 62fd038bf34c1124633e8ef986a36779e72ef35f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:12:00 +0200
Subject: [PATCH 72/87] electron_34-bin: 34.4.1 -> 34.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.4.1...v34.5.1
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 17012b43528f..250ef4dce8b1 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "5a142772493b25ad22dda774a1d4da78887024adae8e83b0e74ad0ba64a7f55a",
-            "aarch64-linux": "d22f1778894393414d7da01aa3f85d6f11f2cb5a5c7623d9d8339bcd824df4cb",
-            "armv7l-linux": "29af72e24c74da70c85bfdce1ed6492b7efbe85f88cfb3da642844b51e5d7259",
-            "headers": "1jyc5riakfry5gmlcx7nmvl29iq6a01013k7zcfrcmijpkdw0p9z",
-            "x86_64-darwin": "618156b4c923adcc2bf3d0a81d82dc874f27129893b7b3c349d0ca13651619e8",
-            "x86_64-linux": "18ebcf0d2b681e273eb003ea0d77bb4fb91ed891f39778ad9c22b41972ed1975"
+            "aarch64-darwin": "78411442b5bd2252cf4605b6a44c35ad6a06807d03c63c61726ad7693c6d5893",
+            "aarch64-linux": "4c0d5833faa01cc3a586087b82f719c2fe331515d26bb3fa098dc79bd3ea153f",
+            "armv7l-linux": "7ed517eeaff56960a01fe53fc445e4118135eeb8267d61c37ef9df943dcc35fb",
+            "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
+            "x86_64-darwin": "8d4bc5f4495ef952589891b6c70a86d8a9d143a1d4d90d15dd81926639822031",
+            "x86_64-linux": "3ae6f75fa08f5c1bdb7bbcec4dc9cf7d7f53ffcf6a4292e4a482b2ce515505e7"
         },
-        "version": "34.4.1"
+        "version": "34.5.1"
     },
     "35": {
         "hashes": {

From 4307c98d6faa884d7647b5540b4a489ba0815732 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:12:04 +0200
Subject: [PATCH 73/87] electron-chromedriver_34: 34.4.1 -> 34.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.4.1...v34.5.1
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index f571232864d7..d0a28a994af6 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "5b3ba7acb5eabf1a8651322138094ab26d313171f624456cf4b6243c74d35bc4",
-            "aarch64-linux": "1778d1c3903beaa33d75c82cb9b6769f2b303bd75c991f6e55382d916055efd4",
-            "armv7l-linux": "41b9afe8dbe5a0656d6e395ed0d00a26e5e6206a7399768066d91501f181e0d5",
-            "headers": "175n6wkz5gyj7plbjbcd6nkhbc108i2ng8ms2wvjya042mshzlqi",
-            "x86_64-darwin": "e16db516f323e30dc6fd54cac11f72bfdc8fe7852839b55a3609b30fee2318f0",
-            "x86_64-linux": "e49534cc2c68f8aa58df6f1f2c1706b579b54f9ae362dba6a04469c04f1da9f3"
+            "aarch64-darwin": "249f89d35cb6bd74edc07551b141bffc2045847c4cf9e57e21089d5082bdb4b4",
+            "aarch64-linux": "749f692603527e8743c81d05eb2de2e281e2b03b148ec00379f13e8da17ca7a4",
+            "armv7l-linux": "14bcc062457cf31d606451aa7fae1baae720a944dead06231fe2a55f17d39966",
+            "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
+            "x86_64-darwin": "7ff68fd26f225deaa8c6fbcd76dc80a00f9ef73f9118075f3e2ab54dfb0c810e",
+            "x86_64-linux": "57cf85eb9dafe28ccdd8ba4a095cb1fd5b8c71f0743bf532b132bc45e56630ef"
         },
-        "version": "34.4.1"
+        "version": "34.5.1"
     },
     "35": {
         "hashes": {

From 6a7f7b7ba4c6a7236e5cf1eb6138b62d81a0e602 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:12:17 +0200
Subject: [PATCH 74/87] electron_35-bin: 35.1.2 -> 35.1.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.2...v35.1.5
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 250ef4dce8b1..02774c5a4524 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "ad701bedd2b969eddad8676c8dfa69a21d18896ae58fbd7310a358dd21c7d0eb",
-            "aarch64-linux": "a1a71be2bb826b59a1da726a59895025481ee335896c175fcffdc2fcfc432675",
-            "armv7l-linux": "28186a0edb4e83c9d7afeb32923f26794d26c39f28a3706462a060d4b0e3bc5f",
+            "aarch64-darwin": "c6c3cf63aed986f0a7126c1fb1c3077fcce9ab79d044059a9d413e0fa6c97796",
+            "aarch64-linux": "9c987b7c2eb1fab7088164203fa639878f96354f3ed71cfe6dca83449589d4b4",
+            "armv7l-linux": "261c43e4a2c174753803ac1e1a008408c5911db4c40fa26905decf213edbc814",
             "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "858f17d67ea811711802b209d041cfca8caa14e6c8f0960de48df14892a0c632",
-            "x86_64-linux": "ab6d4bceff76a070ebf3264ee516a3f96a040947f462d26ba202aa754e54d852"
+            "x86_64-darwin": "efc7adb63ab3a9934ae6c7c433dbbe467fca0154db8e36eff16ee6ed7ac970c3",
+            "x86_64-linux": "c535af79229be495900cf6b3a3ea0c0e76676d49743e68cfa1b9e76f602c62c7"
         },
-        "version": "35.1.2"
+        "version": "35.1.5"
     }
 }

From 70b41fb797218129b4e16ea5bdfa886918d95852 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:12:21 +0200
Subject: [PATCH 75/87] electron-chromedriver_35: 35.1.2 -> 35.1.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.2...v35.1.5
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index d0a28a994af6..f5022d4cb686 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "df9ef717c02b38d9f5d85381d2f4f9f7604b74a439bd7998b351c2ba5fed7039",
-            "aarch64-linux": "47bafd3cce09a617b4fea65e6a7a440f2eb15f1419b93c037f52e4b50927922c",
-            "armv7l-linux": "9d95d2685426965c2dab2631ad07b91085967fc98ba9539bca65d2ce189d3574",
-            "headers": "1y6d1nygfg6hdcjlzzgdz12hvh8j3xihhg9sg7p6fkmqkll4fyyb",
-            "x86_64-darwin": "4a1e4b18fc9e7f8903d1041bd43d3b21a589525a83a87ca8a0f77b2615107cb2",
-            "x86_64-linux": "8dca29ef167b7afaaff6737bd1c17312a08b01ebd9fb4b2737491523c4e8a504"
+            "aarch64-darwin": "45973f88036225d42b1b41d2c548bd4b6644d0732fcff0812b947ab7ef7cc26d",
+            "aarch64-linux": "4d6d45aa412b208778b96e32f962280daaadb9665dc741de65b1a843dbf293fa",
+            "armv7l-linux": "823a47c6ba61833bba0cf19fe9f708559a9278c00ae45f3cf69b2f857f6401ac",
+            "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
+            "x86_64-darwin": "870e715f2d18279c0d1b12b07b035fa227851228d37b998e440b5bccf770b0e1",
+            "x86_64-linux": "d727308b69df75bdfdf893f39128f68b8bbac31ad292536cf0480b6e38e0488d"
         },
-        "version": "35.1.2"
+        "version": "35.1.5"
     }
 }

From f9b8a89d0efe741ce556b95955345324ea8fcafa Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:25:49 +0200
Subject: [PATCH 76/87] electron_35-bin: 35.1.5 -> 35.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.5...v35.2.0
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 02774c5a4524..8e2729108beb 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "c6c3cf63aed986f0a7126c1fb1c3077fcce9ab79d044059a9d413e0fa6c97796",
-            "aarch64-linux": "9c987b7c2eb1fab7088164203fa639878f96354f3ed71cfe6dca83449589d4b4",
-            "armv7l-linux": "261c43e4a2c174753803ac1e1a008408c5911db4c40fa26905decf213edbc814",
+            "aarch64-darwin": "8a8e1cb09ace8eb46164fa6154bc4695f19eba5fe6a8374d1e0b2ba0e177a28c",
+            "aarch64-linux": "c3b5224bbaac7b69890dbf6f69d78ad6dc2622231fa7554e5cf32333623a6d74",
+            "armv7l-linux": "2525cd09e54c4b33f7a9bcb5381716f88a933ee497df5fd465c9f3ceab01b0aa",
             "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "efc7adb63ab3a9934ae6c7c433dbbe467fca0154db8e36eff16ee6ed7ac970c3",
-            "x86_64-linux": "c535af79229be495900cf6b3a3ea0c0e76676d49743e68cfa1b9e76f602c62c7"
+            "x86_64-darwin": "022d90656d9b78f53e56329722c7209ed3711af443ccbbbcd50ada5176e72cf0",
+            "x86_64-linux": "c3bc0fefe238e092ab2a26276d6c4bd5d70b85d08d8bb298c5f7499a4456a119"
         },
-        "version": "35.1.5"
+        "version": "35.2.0"
     }
 }

From 9a05999c03def2dff81992f545602af515f46b04 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:25:53 +0200
Subject: [PATCH 77/87] electron-chromedriver_35: 35.1.5 -> 35.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.5...v35.2.0
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index f5022d4cb686..558abb648edd 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "45973f88036225d42b1b41d2c548bd4b6644d0732fcff0812b947ab7ef7cc26d",
-            "aarch64-linux": "4d6d45aa412b208778b96e32f962280daaadb9665dc741de65b1a843dbf293fa",
-            "armv7l-linux": "823a47c6ba61833bba0cf19fe9f708559a9278c00ae45f3cf69b2f857f6401ac",
+            "aarch64-darwin": "88d20f3398a8850ee7b7004e4f301e15705783e8860ca8f0de4ddc652e1cab4b",
+            "aarch64-linux": "4eae05fab28c9f0afff609bb13cfe1c999f02a0cf3539c715823a6bda327e1c6",
+            "armv7l-linux": "3bd32c34321e853d38453f30eb4a0ddabb278d95921e55abf01c22f53f074f4b",
             "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "870e715f2d18279c0d1b12b07b035fa227851228d37b998e440b5bccf770b0e1",
-            "x86_64-linux": "d727308b69df75bdfdf893f39128f68b8bbac31ad292536cf0480b6e38e0488d"
+            "x86_64-darwin": "852430a5121e3f4032845d2e562be78a0de87c616076cedc53505f3906921276",
+            "x86_64-linux": "702fdee68152c1baaf3d8fbbbdd16cceecd0b8989e223918714c56f7bea8f34a"
         },
-        "version": "35.1.5"
+        "version": "35.2.0"
     }
 }

From 6ddfd4041e46f05ce04f0f45eeff801962fb9e43 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:26:06 +0200
Subject: [PATCH 78/87] electron_34-bin: 34.5.1 -> 34.5.2

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.1...v34.5.2
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 8e2729108beb..529c6156be6a 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "78411442b5bd2252cf4605b6a44c35ad6a06807d03c63c61726ad7693c6d5893",
-            "aarch64-linux": "4c0d5833faa01cc3a586087b82f719c2fe331515d26bb3fa098dc79bd3ea153f",
-            "armv7l-linux": "7ed517eeaff56960a01fe53fc445e4118135eeb8267d61c37ef9df943dcc35fb",
+            "aarch64-darwin": "26cf72d9032fc99674a8404f6740df0cbba7599943feae82122c8d0b8c5cca43",
+            "aarch64-linux": "6d511e55631bf73d56729dd0798bc23d44aa16a78bc94e912cae465d54b749f7",
+            "armv7l-linux": "f119dbe8d4a3c0dac2683b82713bd8a3e65ab111bff6c2cf75ced2d52b1e00de",
             "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
-            "x86_64-darwin": "8d4bc5f4495ef952589891b6c70a86d8a9d143a1d4d90d15dd81926639822031",
-            "x86_64-linux": "3ae6f75fa08f5c1bdb7bbcec4dc9cf7d7f53ffcf6a4292e4a482b2ce515505e7"
+            "x86_64-darwin": "6003dfdc608b2b2ef1591659e7360c723e9b446f852030931bb9c66fadb9c4c0",
+            "x86_64-linux": "878c958cda5e2e48de1e5a89203bd2e3031f2dbbb25453fb75a305446eb282d0"
         },
-        "version": "34.5.1"
+        "version": "34.5.2"
     },
     "35": {
         "hashes": {

From 6ff55fbed16a0856bbed7b39f140b51bc6c966dc Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:26:09 +0200
Subject: [PATCH 79/87] electron-chromedriver_34: 34.5.1 -> 34.5.2

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.1...v34.5.2
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 558abb648edd..3b5daecdd817 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "249f89d35cb6bd74edc07551b141bffc2045847c4cf9e57e21089d5082bdb4b4",
-            "aarch64-linux": "749f692603527e8743c81d05eb2de2e281e2b03b148ec00379f13e8da17ca7a4",
-            "armv7l-linux": "14bcc062457cf31d606451aa7fae1baae720a944dead06231fe2a55f17d39966",
+            "aarch64-darwin": "fe1c9cd744f4c2542750ed96f99aff9cd3b28e6a62a21e2302f67cc7d9925b73",
+            "aarch64-linux": "fdfe6945ed870a8eb96f6d5119ed8f5b1704391fe9acfd8c3fa110ab6f74844d",
+            "armv7l-linux": "f0f567ffdb31f57124ceda3e81545b1525f69ef8b722c3493f55effce7a3266e",
             "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
-            "x86_64-darwin": "7ff68fd26f225deaa8c6fbcd76dc80a00f9ef73f9118075f3e2ab54dfb0c810e",
-            "x86_64-linux": "57cf85eb9dafe28ccdd8ba4a095cb1fd5b8c71f0743bf532b132bc45e56630ef"
+            "x86_64-darwin": "70d84569431b4cb108b8f0e5bec41160100b853e487d550171213b87b043d449",
+            "x86_64-linux": "18d685523669b6704d5af58515b91a39cd97e04e897806048178901241cc96e5"
         },
-        "version": "34.5.1"
+        "version": "34.5.2"
     },
     "35": {
         "hashes": {

From d1e293cdf7db1556b90ee2cf18cf8be5072214c3 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:26:19 +0200
Subject: [PATCH 80/87] electron_33-bin: 33.4.9 -> 33.4.10

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.10
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.9...v33.4.10
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 529c6156be6a..1b6af89e9202 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "daef5f578fdd274d4a5d662c5ed599e835a35c02ebeeb02df6a81c5488b97b2b",
-            "aarch64-linux": "405f01c3eb4bb054e611c9268e61bfbb46ac3b80f88786d7667a6710029cdb42",
-            "armv7l-linux": "b77649009ec91f4e7281cd4e99d8359da477f491b4f770087be665e6313690a7",
-            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
-            "x86_64-darwin": "a36a81878c05b10d415323077320e0be0d99581728e565e30cf29aa228ca2dc0",
-            "x86_64-linux": "bdb3ef8f1700ed8a770b108d12a755038e49c6040c62d5396271ca7ccb30e6e5"
+            "aarch64-darwin": "3baba8bb35cd193be1fa7b46c4e0e2191cc345f599894d1e117353a7abdf429c",
+            "aarch64-linux": "436bfb19fc298c852327db5636e28cb1607cb8c2c714b3d289097373bf0cf418",
+            "armv7l-linux": "3944193d4984e983cee5f678e43b957ef760f07d5a8fe34d3f0ac94fbe18c650",
+            "headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
+            "x86_64-darwin": "ec6bafaac0e422ebf6784c544b2623e8bb0c3c751a333df6a7e7a5ae6a2c8823",
+            "x86_64-linux": "4c49cb0a17e6b74efbf2066fd41a3c1d4a27a476f6b7e45f610a9d41afae2838"
         },
-        "version": "33.4.9"
+        "version": "33.4.10"
     },
     "34": {
         "hashes": {

From 5def263fbedff5dc12d3c9d509f002b449ceac30 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:26:24 +0200
Subject: [PATCH 81/87] electron-chromedriver_33: 33.4.9 -> 33.4.10

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.10
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.9...v33.4.10
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 3b5daecdd817..1444aa46244f 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "f13e2d405a72749ba2c0a740a1d5606e2302b1b020694b08a6f1c0ce81430197",
-            "aarch64-linux": "7757dd128b538fbc4836724966ba5b041cbbc415cac245b3f992d9fa7bd43ed2",
-            "armv7l-linux": "506d9907d40066ef3a1cd87a00bdf141992e59303601104e1ae8f60a9e410c42",
-            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
-            "x86_64-darwin": "2330d31c8d3703e32fbb394bd005bb5d62a5a98ec2435bdd98df4cadb81f96d3",
-            "x86_64-linux": "1dcfbf6c6cf572b64565cfc3dfc52c7832a03c66a1e621b25d1fad36c244ea9c"
+            "aarch64-darwin": "7673d1e80d42cea706a36af275c1a42061c7baa36e79e738671907f865c70725",
+            "aarch64-linux": "12c30544df2cfc2d678451dc62c8007d482394df08d6824fb91ccabf1a3bc794",
+            "armv7l-linux": "b96563ecb3433e28a2ea50a3d9e4ef0c8c349e8264a118558c5b5927d394330a",
+            "headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
+            "x86_64-darwin": "77cd5f40655a709a5eecfb9fe2fe4421bcd527a45ae0f02a2b34c71feae25f5c",
+            "x86_64-linux": "d932f18b72949832b13c446faddb2f56a16dfff08286251f14d69315c5f2dc9b"
         },
-        "version": "33.4.9"
+        "version": "33.4.10"
     },
     "34": {
         "hashes": {

From 367b9ac665b72e9e40d6c339b02ede4924571c15 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:42:12 +0200
Subject: [PATCH 82/87] electron-source.electron_35: 35.1.5 -> 35.2.0

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.1.5...v35.2.0
---
 pkgs/development/tools/electron/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 56c85b448ee3..6a4c92c019d7 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2538,7 +2538,7 @@
         "version": "34.5.1"
     },
     "35": {
-        "chrome": "134.0.6998.179",
+        "chrome": "134.0.6998.205",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2548,15 +2548,15 @@
                     "version": "2025-01-13"
                 }
             },
-            "version": "134.0.6998.179"
+            "version": "134.0.6998.205"
         },
         "chromium_npm_hash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-DI59KsXSy7xQIdHSpl++4S26sLP6lHqMGx1U1xi+pZY=",
+                    "hash": "sha256-LL0lmb23zTjOwi8Sbz0Vb3Nj3ptqpRL/5V5rI8vXu0U=",
                     "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "rev": "134.0.6998.179",
+                    "rev": "134.0.6998.205",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2595,10 +2595,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-cOPfVqfSOiq+wI+3Nbz6ejQZ6UabeL5G/XvSXL8HozM=",
+                    "hash": "sha256-9svv7kEnZqgwyE9LnuBTIiUguZdgCHUkkupxtpUGcKQ=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v35.1.5"
+                    "rev": "v35.2.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3511,8 +3511,8 @@
             },
             "src/third_party/skia": {
                 "args": {
-                    "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=",
-                    "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
+                    "hash": "sha256-QIWB5fVCo9r+AKE8MeeKLEpcWYG6lCfBzxNDR2yD3kg=",
+                    "rev": "b467149a72ca10a2e46345a1e5cd031ce8637023",
                     "url": "https://skia.googlesource.com/skia.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3844,6 +3844,6 @@
         "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
         "modules": "133",
         "node": "22.14.0",
-        "version": "35.1.5"
+        "version": "35.2.0"
     }
 }

From 557ad0b3f71b4038e5a0616d9fc3e92a15a2210b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:42:48 +0200
Subject: [PATCH 83/87] electron-source.electron_34: 34.5.1 -> 34.5.2

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.1...v34.5.2
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 6a4c92c019d7..6e8530a1925b 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1318,10 +1318,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Ka85ecw/PQ8lqWiQ/eJTOJqx8VYUej0b+YsG17eTdC8=",
+                    "hash": "sha256-o/luH8qWEMxgigE9Uo6lhv/jNj1bEOCVTvdHU2EuTlw=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v34.5.1"
+                    "rev": "v34.5.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2535,7 +2535,7 @@
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
         "node": "20.19.0",
-        "version": "34.5.1"
+        "version": "34.5.2"
     },
     "35": {
         "chrome": "134.0.6998.205",

From d5b9cf4f81f555036651e824a7691369c5a7c679 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:43:32 +0200
Subject: [PATCH 84/87] electron-source.electron_33: 33.4.9 -> 33.4.10

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.10
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.9...v33.4.10
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 6e8530a1925b..41f7c2dcd1bc 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-hmOlSNtmPW1zOkDa3IwalB+mql/ShN+Vd62UPAYKCIc=",
+                    "hash": "sha256-5r6sCfGOwMJhn20LIKxeaM1AyHbN0jgr1YxhFvCxZo0=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v33.4.9"
+                    "rev": "v33.4.10"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1258,7 +1258,7 @@
         "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
         "modules": "130",
         "node": "20.18.3",
-        "version": "33.4.9"
+        "version": "33.4.10"
     },
     "34": {
         "chrome": "132.0.6834.210",

From 81df2570ee8fd4ea947b3c93212d6ef412d6e353 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 16 Apr 2025 17:09:06 +0800
Subject: [PATCH 85/87] stdenv-bootstrap-tools: don't copy obsolete libutil
 from glibc

Starting from glibc 2.34, all functionality previously implemented in
libpthread, libdl, libutil and libanl are now integrated into libc.

https://lists.gnu.org/archive/html/info-gnu/2021-08/msg00001.html

As loongarch64 support was merged into glibc after 2.34, libutil.so is
no longer in there, thus breaking bootstrap.

https://github.com/loongson-community/discussions/issues/29

libdl is not removed because bash still links against it, and libpthread
is not removed because xgcc depends on it to build libatomic.
---
 pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
index 0bc472489c5f..14b8eb9581bd 100644
--- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
@@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
           cp -d ${libc.out}/lib/libnsl*.so* $out/lib
         ''
         + ''
-          cp -d ${libc.out}/lib/libutil*.so* $out/lib
           cp -d ${libc.out}/lib/libnss*.so* $out/lib
           cp -d ${libc.out}/lib/libresolv*.so* $out/lib
           # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds

From b814e3d946ae088ef4b49fe79029c116e3e7eb99 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 16 Apr 2025 19:19:26 +0800
Subject: [PATCH 86/87] stdenv-bootstrap-tools: use bashNonInteractive

Currently bash is bashInteractive, and it depends on readline. We don't
copy readline so bash from bootstrap-tools is broken.
---
 pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
index 14b8eb9581bd..5293240a4480 100644
--- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  bash,
+  bashNonInteractive,
   binutils,
   bootBinutils,
   bootGCC,
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
       cp -d ${coreutilsMinimal.out}/bin/* $out/bin
       (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
 
-      cp ${bash.out}/bin/bash $out/bin
+      cp ${bashNonInteractive.out}/bin/bash $out/bin
       cp ${findutils.out}/bin/find $out/bin
       cp ${findutils.out}/bin/xargs $out/bin
       cp -d ${diffutils.out}/bin/* $out/bin

From 00a57910300c595637ddbf971b0324ad08059939 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 16 Apr 2025 18:55:09 +0800
Subject: [PATCH 87/87] make-bootstrap-tools-cross: add
 loongarch64-unknown-linux-gnu

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 694d90d970e3..03003b20dc0c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -36,6 +36,7 @@ lib.mapAttrs (n: make) (
     powerpc64le-unknown-linux-gnu = powernv;
     riscv64-unknown-linux-gnu = riscv64;
     s390x-unknown-linux-gnu = s390x;
+    loongarch64-unknown-linux-gnu = loongarch64-linux;
 
     # musl
     aarch64-unknown-linux-musl = aarch64-multiplatform-musl;