From ee5a85e210de7bdca9e4d0a0c6a74cffe285d278 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Jan 2026 23:22:35 +0000
Subject: [PATCH 01/70] functionalplus: 0.2.25 -> 0.2.27

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

diff --git a/pkgs/by-name/fu/functionalplus/package.nix b/pkgs/by-name/fu/functionalplus/package.nix
index 4521f5d81e87..c954005ebc05 100644
--- a/pkgs/by-name/fu/functionalplus/package.nix
+++ b/pkgs/by-name/fu/functionalplus/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "functionalplus";
-  version = "0.2.25";
+  version = "0.2.27";
 
   src = fetchFromGitHub {
     owner = "Dobiasd";
     repo = "FunctionalPlus";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LlWdzxfFkbfkb9wAmpb86Ah97pWlW3w7DdW6JPu1xdc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 25f899cb08176f026bf4ed8b009e4e746ccd9cd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 05:36:17 +0000
Subject: [PATCH 02/70] flclash: 0.8.91 -> 0.8.92

---
 pkgs/by-name/fl/flclash/package.nix       |  6 +-
 pkgs/by-name/fl/flclash/pubspec.lock.json | 94 ++++++++++++++++++++++-
 2 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 08063580d0d5..de60a6a00c3d 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "flclash";
-  version = "0.8.91";
+  version = "0.8.92";
 
   src = fetchFromGitHub {
     owner = "chen08209";
@@ -23,7 +23,7 @@ let
       export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
       export GIT_CONFIG_VALUE_0=git@github.com:
     '';
-    hash = "sha256-jQ0phrTWlZZj5sVvnHAuC5h1nbJCcr/0wKw61mZMtes=";
+    hash = "sha256-bPz2QNwhlCZBmjU0ZpRTwNk0TKVTIHH4E6ZJ5+rtaTk=";
     fetchSubmodules = true;
   };
 
@@ -40,7 +40,7 @@ let
 
     modRoot = "core";
 
-    vendorHash = "sha256-/natNGWXF6be7kyLYF2fHg0o0C1zkBAg1k8BAH5Dl9E=";
+    vendorHash = "sha256-/p/Z5vIstuerR5jA0vXXLURSoPqS7IDEIXCa/SFCrLc=";
 
     env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
index 11ae906c9485..532d54f5a30e 100644
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -220,6 +220,16 @@
       "source": "hosted",
       "version": "1.4.0"
     },
+    "charcode": {
+      "dependency": "transitive",
+      "description": {
+        "name": "charcode",
+        "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
     "checked_yaml": {
       "dependency": "transitive",
       "description": {
@@ -460,6 +470,36 @@
       "source": "hosted",
       "version": "2.1.1"
     },
+    "drift": {
+      "dependency": "direct main",
+      "description": {
+        "name": "drift",
+        "sha256": "83290a32ae006a7535c5ecf300722cb77177250d9df4ee2becc5fa8a36095114",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.29.0"
+    },
+    "drift_dev": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "drift_dev",
+        "sha256": "6019f827544e77524ffd5134ae0cb75dfd92ef5ef3e269872af92840c929cd43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.29.0"
+    },
+    "drift_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "drift_flutter",
+        "sha256": "b7534bf320aac5213259aac120670ba67b63a1fd010505babc436ff86083818f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.7"
+    },
     "dynamic_color": {
       "dependency": "direct main",
       "description": {
@@ -665,6 +705,16 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "fractional_indexing": {
+      "dependency": "direct main",
+      "description": {
+        "name": "fractional_indexing",
+        "sha256": "d883a3c0cfd21cb66889e26c7db4366f1097c20dd7615b24269a8a17d76320f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "freezed": {
       "dependency": "direct dev",
       "description": {
@@ -939,11 +989,11 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.6.7"
     },
     "json_annotation": {
       "dependency": "direct main",
@@ -1324,6 +1374,16 @@
       "source": "hosted",
       "version": "0.0.3"
     },
+    "recase": {
+      "dependency": "transitive",
+      "description": {
+        "name": "recase",
+        "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.0"
+    },
     "riverpod": {
       "dependency": "direct main",
       "description": {
@@ -1660,6 +1720,36 @@
       "source": "hosted",
       "version": "2.4.0"
     },
+    "sqlite3": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqlite3",
+        "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.9.4"
+    },
+    "sqlite3_flutter_libs": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqlite3_flutter_libs",
+        "sha256": "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.41"
+    },
+    "sqlparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqlparser",
+        "sha256": "162435ede92bcc793ea939fdc0452eef0a73d11f8ed053b58a89792fba749da5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.42.1"
+    },
     "stack_trace": {
       "dependency": "transitive",
       "description": {

From c5a03ce1d2be53bc80024ced65a7455618b63e81 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Feb 2026 20:24:15 +0100
Subject: [PATCH 03/70] python313Packages.w3lib: 2.3.1 -> 2.4.0

Changelog: https://github.com/scrapy/w3lib/blob/v2.4.0/NEWS
---
 pkgs/development/python-modules/w3lib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 135270f49b43..28c2725b0b16 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -2,21 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "w3lib";
-  version = "2.3.1";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XIrAKjAnV2F0wrYeuaIXC6Gxl8rnZwgHcbbx/r2iSaQ=";
+    hash = "sha256-4jOtIWSbadDgR6EPMBga6Wd1JKKfb3H288dY3AyNJkg=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 9d5f2f3f289ccaeb6613f62cfb8883d1799d8e2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Feb 2026 20:26:06 +0100
Subject: [PATCH 04/70] python313Packages.w3lib: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 28c2725b0b16..2849f5e1285c 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -6,13 +6,13 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "w3lib";
   version = "2.4.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-4jOtIWSbadDgR6EPMBga6Wd1JKKfb3H288dY3AyNJkg=";
   };
 
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library of web-related functions";
     homepage = "https://github.com/scrapy/w3lib";
-    changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS";
+    changelog = "https://github.com/scrapy/w3lib/blob/${finalAttrs.version}/NEWS";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From 7f971a96e415843bc7640b77b7742943ab8abfde Mon Sep 17 00:00:00 2001
From: hensoko <hensoko@gssws.de>
Date: Mon, 16 Feb 2026 02:20:47 +0100
Subject: [PATCH 05/70] home-assistant-custom-components.tibber_local: init at
 2026.2.2

---
 .../tibber_local/package.nix                  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/tibber_local/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix b/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
new file mode 100644
index 000000000000..e79c5272f0e0
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  smllib,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "marq24";
+  domain = "tibber_local";
+  version = "2026.2.2";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "ha-tibber-pulse-local";
+    tag = version;
+    sha256 = "sha256-YHvhVAGOMkPwaxdQVv1cO6H8LitoG2PChOV1b8Z/4KU=";
+  };
+
+  dependencies = [
+    smllib
+  ];
+
+  meta = {
+    changelog = "https://github.com/marq24/ha-tibber-pulse-local/releases/tag/${version}";
+    description = "Home Assistant integration framework for (garbage collection) schedules";
+    homepage = "https://github.com/marq24/ha-tibber-pulse-local";
+    maintainers = with lib.maintainers; [ hensoko ];
+    license = lib.licenses.asl20;
+  };
+}

From 2fa1cb120e09f0694549559bcb19489f4f1353a8 Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Fri, 6 Mar 2026 11:38:24 +0100
Subject: [PATCH 06/70] maintainers: add twoneis

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3fb6c89bf258..075a9ff642e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27717,6 +27717,12 @@
     githubId = 131159000;
     name = "Nitin Passa";
   };
+  twoneis = {
+    email = "nix@chpu.eu";
+    github = "twoneis";
+    githubId = 48321566;
+    name = "Mira Chacku Purakal";
+  };
   twz123 = {
     name = "Tom Wieczorek";
     email = "tom@bibbu.net";

From 6b1aadc9627deae7d361d25e202c265c0ced4d31 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 6 Mar 2026 22:12:00 +0100
Subject: [PATCH 07/70] python3Packages.latexify-py: disable for python 3.14+

AttributeError: module 'ast' has no attribute 'Num'

https://docs.python.org/3/whatsnew/3.14.html#id9
---
 pkgs/development/python-modules/latexify-py/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/latexify-py/default.nix b/pkgs/development/python-modules/latexify-py/default.nix
index 2172e59dc39d..c647d7159e59 100644
--- a/pkgs/development/python-modules/latexify-py/default.nix
+++ b/pkgs/development/python-modules/latexify-py/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  pythonAtLeast,
   dill,
   fetchFromGitHub,
   hatchling,
@@ -12,6 +13,10 @@ buildPythonPackage rec {
   version = "0.4.4";
   pyproject = true;
 
+  # AttributeError: module 'ast' has no attribute 'Num'
+  # https://docs.python.org/3/whatsnew/3.14.html#id9
+  disabled = pythonAtLeast "3.14";
+
   src = fetchFromGitHub {
     owner = "google";
     repo = "latexify_py";

From 898febd83f521f5dfbee857869b5fbee89f408c1 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Wed, 11 Mar 2026 00:00:49 -0500
Subject: [PATCH 08/70] nixos/wivrn: remove defaultRuntime

This option shouldn't exist for WiVRn as it manages the active runtime itself.
It also causes apps that attempt to initialise OpenXR while WiVRn isn't running to hang.
---
 nixos/modules/services/video/wivrn.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 1f67c871eb0e..0446e9e670d5 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -80,14 +80,6 @@ in
 
       openFirewall = mkEnableOption "the default ports in the firewall for the WiVRn server";
 
-      defaultRuntime = mkEnableOption ''
-        WiVRn as the default OpenXR runtime on the system.
-        The config can be found at `/etc/xdg/openxr/1/active_runtime.json`.
-
-        Note that applications can bypass this option by setting an active
-        runtime in a writable XDG_CONFIG_DIRS location like `~/.config`
-      '';
-
       autoStart = mkEnableOption "starting the service by default";
 
       highPriority = mkEnableOption "high priority capability for asynchronous reprojection";
@@ -247,9 +239,6 @@ in
         PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = "1";
       };
       pathsToLink = [ "/share/openxr" ];
-      etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
-        source = "${cfg.package}/share/openxr/1/openxr_wivrn.json";
-      };
     };
   };
   meta.maintainers = with maintainers; [ passivelemon ];

From 7657429032e9709f08ca4552632b2517076b0606 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2026 23:21:30 +0000
Subject: [PATCH 09/70] python3Packages.microsoft-kiota-authentication-azure:
 1.9.8 -> 1.9.10

---
 .../microsoft-kiota-authentication-azure/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
index 2a74ff7b87fa..5f9d3e134e8e 100644
--- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-authentication-azure";
-  version = "1.9.8";
+  version = "1.9.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-authentication-azure-v${version}";
-    hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
+    hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
   };
 
   sourceRoot = "${src.name}/packages/authentication/azure/";

From 397a0607bedd1ef55dcac88be808944dcf45b7e7 Mon Sep 17 00:00:00 2001
From: Luna Simons <luna@bddvlpr.com>
Date: Fri, 13 Mar 2026 15:54:22 +0100
Subject: [PATCH 10/70] oq: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/by-name/oq/oq/package.nix b/pkgs/by-name/oq/oq/package.nix
index 7721912ed77f..966db6613904 100644
--- a/pkgs/by-name/oq/oq/package.nix
+++ b/pkgs/by-name/oq/oq/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   crystal,
   jq,
   libxml2,
@@ -10,22 +9,15 @@
 
 crystal.buildCrystalPackage rec {
   pname = "oq";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
     owner = "Blacksmoke16";
     repo = "oq";
-    rev = "v${version}";
-    sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE=";
+    tag = "v${version}";
+    sha256 = "sha256-AgUVHlk39J1V1Vv91FjglT4mSbP4IHiRlTrlfmrJxfY=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Blacksmoke16/oq/commit/4f9ef2a73770465bfe2348795461fc8a90a7b9b0.diff";
-      hash = "sha256-Ljvf2+1vsGv6wJHl27T7DufI9rTUCY/YQZziOWpW8Do=";
-    })
-  ];
-
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libxml2 ];
   nativeCheckInputs = [ jq ];

From fe0f32c52c183015258df2d8aec32aa9323526ad Mon Sep 17 00:00:00 2001
From: Luna Simons <luna@bddvlpr.com>
Date: Fri, 13 Mar 2026 16:20:35 +0100
Subject: [PATCH 11/70] amqpcat: 1.0.2 -> 1.1.0

---
 pkgs/by-name/am/amqpcat/package.nix | 10 ++++++++--
 pkgs/by-name/am/amqpcat/shards.nix  | 12 ++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/am/amqpcat/package.nix b/pkgs/by-name/am/amqpcat/package.nix
index 646773b0cd4e..662df6c45b03 100644
--- a/pkgs/by-name/am/amqpcat/package.nix
+++ b/pkgs/by-name/am/amqpcat/package.nix
@@ -9,13 +9,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "amqpcat";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "cloudamqp";
     repo = "amqpcat";
     tag = "v${version}";
-    hash = "sha256-fdDdMjeAlJ0H05LNVdRxwq6RK41d6rXLFQMw6RSlXZM=";
+    hash = "sha256-wUsDqatZVcfvtTlK4eOYvFFCyyO8nkrBksvN6Od4DG0=";
   };
 
   format = "shards";
@@ -23,6 +23,12 @@ crystal.buildCrystalPackage rec {
 
   buildInputs = [ openssl ];
 
+  preConfigure = ''
+    substituteInPlace "./src/version.cr" --replace-fail \
+      'VERSION = {{ `git describe 2>/dev/null || shards version`.stringify.gsub(/(^v|\n)/, "") }}' \
+      'VERSION = "${version}"'
+  '';
+
   # Tests require network access
   doCheck = false;
 
diff --git a/pkgs/by-name/am/amqpcat/shards.nix b/pkgs/by-name/am/amqpcat/shards.nix
index ccc12e229a95..6a867986f252 100644
--- a/pkgs/by-name/am/amqpcat/shards.nix
+++ b/pkgs/by-name/am/amqpcat/shards.nix
@@ -1,12 +1,12 @@
 {
-  amq-protocol = {
+  "amq-protocol" = {
     url = "https://github.com/cloudamqp/amq-protocol.cr.git";
-    tag = "v1.1.14";
-    sha256 = "1pr5h3lxfhjmarfqpvfldn8d6425g3i56k4p4szk2jkffa0z38nz";
+    rev = "v1.1.15";
+    sha256 = "0zjwhgr1rz1kwrh8qpawqspv8qnyk3khqprhgr4h6gqgckqxkkli";
   };
-  amqp-client = {
+  "amqp-client" = {
     url = "https://github.com/cloudamqp/amqp-client.cr.git";
-    tag = "v1.2.3";
-    sha256 = "1pbiq5srni87hd8q2x3vs4s2hpajlzzlwgalgnmb35dcyih1ff9k";
+    rev = "v1.3.1";
+    sha256 = "00gkfsa20ilbawbhg0c6rxgaf2s2lz4paikwizn182fm7vx67b16";
   };
 }

From c09419a699274bc64e65fb42adfa4e030619f717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2026 18:48:28 +0000
Subject: [PATCH 12/70] python3Packages.microsoft-kiota-serialization-json:
 1.9.8 -> 1.9.10

---
 .../microsoft-kiota-serialization-json/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
index cebb9937e102..7a46da8be5ca 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-json";
-  version = "1.9.8";
+  version = "1.9.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-json-v${version}";
-    hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
+    hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/json/";

From 5b90ef46d34f097fabd5a9d92a986ccd7e777c6f Mon Sep 17 00:00:00 2001
From: Nivayu <nivalux@web.de>
Date: Fri, 13 Mar 2026 10:15:42 +0100
Subject: [PATCH 13/70] nextcloud-talk-desktop: fix pipewire audio issue

---
 pkgs/by-name/ne/nextcloud-talk-desktop/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 446ce2205822..a22fa73bc2dc 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -28,6 +28,7 @@
   patchelf,
   undmg,
   makeWrapper,
+  libpulseaudio,
 }:
 let
   pname = "nextcloud-talk-desktop";
@@ -102,11 +103,17 @@ let
       libxrandr
       libxfixes
       libxcursor
+      libpulseaudio
     ];
 
-    # Required to launch the application and proceed past the zygote_linux fork() process
-    # Fixes `Zygote could not fork`
-    runtimeDependencies = [ systemd ];
+    runtimeDependencies = [
+      # Required to launch the application and proceed past the zygote_linux fork() process
+      # Fixes `Zygote could not fork`
+      systemd
+
+      # Fixes input/output audio device selection
+      libpulseaudio
+    ];
 
     desktopItems = [
       (makeDesktopItem {

From 17e65e0fc61e5a27f0e7fd72ec398bf08a82f605 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Fri, 13 Mar 2026 19:50:27 +0800
Subject: [PATCH 14/70] alisthelper: 0.2.0-unstable-2025-08-05 ->
 0.2.0-unstable-2026-03-13

---
 pkgs/by-name/al/alisthelper/package.nix       |  23 +-
 pkgs/by-name/al/alisthelper/pubspec.lock.json | 576 ++++++++++--------
 2 files changed, 324 insertions(+), 275 deletions(-)

diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix
index abc9520e1a88..0e79e0f962c0 100644
--- a/pkgs/by-name/al/alisthelper/package.nix
+++ b/pkgs/by-name/al/alisthelper/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter332,
+  flutter341,
   fetchFromGitHub,
   copyDesktopItems,
   libayatana-appindicator,
@@ -12,18 +12,16 @@
   nix-update-script,
 }:
 
-let
+flutter341.buildFlutterApplication (finalAttrs: {
+  pname = "alisthelper";
+  version = "0.2.0-unstable-2026-03-13";
+
   src = fetchFromGitHub {
     owner = "Xmarmalade";
     repo = "alisthelper";
-    rev = "84a4f025ce184eb9cd910b90397eef8edaa95127";
-    hash = "sha256-Ju7AnUq59sk15YCvXhunr5r2/e2i26lWF3+pVY3oWzo=";
+    rev = "6d7e1acb86a5c67bcf86d99bc6034f130b1d04c2";
+    hash = "sha256-EIE90R4lCnCLAi6D0YFdntB/tIhqKnoVhbqzk/4bj/k=";
   };
-in
-flutter332.buildFlutterApplication {
-  pname = "alisthelper";
-  version = "0.2.0-unstable-2025-08-05";
-  inherit src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
@@ -35,7 +33,8 @@ flutter332.buildFlutterApplication {
   buildInputs = [ libayatana-appindicator ];
 
   preBuild = ''
-    packageRun build_runner build
+    packageRun slang
+    packageRun build_runner build --delete-conflicting-outputs
   '';
 
   desktopItems = [
@@ -56,7 +55,7 @@ flutter332.buildFlutterApplication {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          inherit src;
+          inherit (finalAttrs) src;
           nativeBuildInputs = [ yq-go ];
         }
         ''
@@ -81,4 +80,4 @@ flutter332.buildFlutterApplication {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/al/alisthelper/pubspec.lock.json b/pkgs/by-name/al/alisthelper/pubspec.lock.json
index 593c5f3943b6..376bcbbf9d5b 100644
--- a/pkgs/by-name/al/alisthelper/pubspec.lock.json
+++ b/pkgs/by-name/al/alisthelper/pubspec.lock.json
@@ -4,41 +4,61 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "92.0.0"
+    },
+    "analysis_server_plugin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analysis_server_plugin",
+        "sha256": "44adba4d74a2541173bad4c11531d2a4d22810c29c5ddb458a38e9f4d0e5eac7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.4"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c",
+        "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.6.0"
+      "version": "9.0.0"
+    },
+    "analyzer_buffer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer_buffer",
+        "sha256": "ff4bd291778c7417fe53fe24ee0d0a1f1ffe281a2d4ea887e7094f16e36eace7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.0"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce",
+        "sha256": "6645a029da947ffd823d98118f385d4bd26b54eb069c006b22e0b94e451814b5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.13.4"
+      "version": "0.13.11"
     },
     "archive": {
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.7"
+      "version": "4.0.9"
     },
     "args": {
       "dependency": "transitive",
@@ -74,61 +94,41 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "build_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
-    "build_daemon": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_daemon",
-        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
+        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
       "version": "4.0.4"
     },
-    "build_resolvers": {
+    "build_config": {
       "dependency": "transitive",
       "description": {
-        "name": "build_resolvers",
-        "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2",
+        "name": "build_config",
+        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.0"
+      "version": "1.3.0"
+    },
+    "build_daemon": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d",
+        "sha256": "7981eb922842c77033026eb4341d5af651562008cdb116bdfa31fc46516b6462",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.2.0"
+      "version": "2.12.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -144,21 +144,21 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
+        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.0"
+      "version": "8.12.4"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -170,15 +170,15 @@
       "source": "hosted",
       "version": "2.0.4"
     },
-    "ci": {
+    "cli_config": {
       "dependency": "transitive",
       "description": {
-        "name": "ci",
-        "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13",
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.0"
+      "version": "0.2.0"
     },
     "cli_util": {
       "dependency": "transitive",
@@ -200,15 +200,25 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.1"
     },
     "collection": {
       "dependency": "direct main",
@@ -230,105 +240,65 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.4+2"
+      "version": "0.3.5+2"
     },
     "crypto": {
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
-    },
-    "csv": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csv",
-        "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "custom_lint": {
-      "dependency": "transitive",
-      "description": {
-        "name": "custom_lint",
-        "sha256": "9656925637516c5cf0f5da018b33df94025af2088fe09c8ae2ca54c53f2d9a84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.6"
-    },
-    "custom_lint_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "custom_lint_builder",
-        "sha256": "6cdc8e87e51baaaba9c43e283ed8d28e59a0c4732279df62f66f7b5984655414",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.6"
-    },
-    "custom_lint_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "custom_lint_core",
-        "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.5"
-    },
-    "custom_lint_visitor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "custom_lint_visitor",
-        "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0+7.7.0"
+      "version": "3.0.7"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
+        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.3"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
+        "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.8.0+1"
+      "version": "5.9.2"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
+        "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -354,11 +324,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "file": {
       "dependency": "transitive",
@@ -374,61 +344,61 @@
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.1.0"
     },
     "file_selector_android": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54",
+        "sha256": "51e8fd0446de75e4b62c065b76db2210c704562d072339d333bd89c57a7f8a7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+14"
+      "version": "0.5.2+4"
     },
     "file_selector_ios": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_ios",
-        "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
+        "sha256": "e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3+1"
+      "version": "0.5.3+5"
     },
     "file_selector_linux": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_linux",
-        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
+        "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+2"
+      "version": "0.9.4"
     },
     "file_selector_macos": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711",
+        "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+3"
+      "version": "0.9.5"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_platform_interface",
-        "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b",
+        "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.2"
+      "version": "2.7.0"
     },
     "file_selector_web": {
       "dependency": "transitive",
@@ -444,11 +414,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
+        "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+4"
+      "version": "0.9.3+5"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -496,11 +466,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_riverpod",
-        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "sha256": "4e166be88e1dbbaa34a280bdb744aeae73b7ef25fdf8db7a3bb776760a3648e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.3.1"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -518,11 +488,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c",
+        "sha256": "f23ea33b3863f119b58ed1b586e881a46bd28715ddcc4dbc33104524e3434131",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.5"
     },
     "freezed_annotation": {
       "dependency": "direct main",
@@ -564,25 +534,25 @@
       "source": "hosted",
       "version": "2.3.2"
     },
-    "hotreloader": {
+    "hooks": {
       "dependency": "transitive",
       "description": {
-        "name": "hotreloader",
-        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
+        "name": "hooks",
+        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "1.0.2"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.6.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -608,11 +578,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
     },
     "intl": {
       "dependency": "transitive",
@@ -638,21 +608,21 @@
       "dependency": "direct main",
       "description": {
         "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.9.0"
+      "version": "4.11.0"
     },
     "json_serializable": {
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
+        "sha256": "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.10.0"
+      "version": "6.13.0"
     },
     "launch_at_startup": {
       "dependency": "direct main",
@@ -668,51 +638,51 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.0"
     },
     "logger": {
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
+        "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "2.6.2"
     },
     "logging": {
       "dependency": "transitive",
@@ -728,21 +698,21 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "menu_base": {
       "dependency": "transitive",
@@ -758,11 +728,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -774,6 +744,36 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "native_toolchain_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "native_toolchain_c",
+        "sha256": "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.17.5"
+    },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.3.0"
+    },
     "package_config": {
       "dependency": "transitive",
       "description": {
@@ -788,21 +788,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "path": {
       "dependency": "transitive",
@@ -828,21 +828,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.22"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.6.0"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -878,11 +878,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.2"
     },
     "platform": {
       "dependency": "transitive",
@@ -908,21 +908,21 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "posix": {
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -948,41 +948,31 @@
       "dependency": "transitive",
       "description": {
         "name": "riverpod",
-        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+        "sha256": "8c22216be8ad3ef2b44af3a329693558c98eca7b8bd4ef495c92db0bba279f83",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.2.1"
     },
     "riverpod_analyzer_utils": {
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611",
+        "sha256": "e55bc08c084a424e1bbdc303fe8ea75daafe4269b68fd0e0f6f1678413715b66",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.10"
+      "version": "1.0.0-dev.9"
     },
     "riverpod_lint": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_lint",
-        "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35",
+        "sha256": "64e8debf5b719a37d48b9785dd595d34133fdcd84b8fd07157a621c54ab2156f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.5"
-    },
-    "rxdart": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rxdart",
-        "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.28.0"
+      "version": "3.1.3"
     },
     "screen_retriever": {
       "dependency": "direct main",
@@ -1034,35 +1024,45 @@
       "source": "hosted",
       "version": "0.2.0"
     },
+    "serial_csv": {
+      "dependency": "transitive",
+      "description": {
+        "name": "serial_csv",
+        "sha256": "2d62bb70cb3ce7251383fc86ea9aae1298ab1e57af6ef4e93b6a9751c5c268dd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.2"
+    },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.21"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.6"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1114,6 +1114,26 @@
       "source": "hosted",
       "version": "1.4.2"
     },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
@@ -1144,71 +1164,81 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "b02c531f453c328a1343818c64d730357ac140860147c9a29030fdfc82039266",
+        "sha256": "27f3490c7a9eb2908715ed7be6b11cc2cc35a51365f33041b561ded79636f136",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.1"
+      "version": "4.13.0"
     },
     "slang_build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "slang_build_runner",
-        "sha256": "3679d6ab1373a9e5c0894d29d612abd2f75f969b0ef2f19cafaed2d1b9e49d39",
+        "sha256": "137c359f6b692f3cfd69832f010b1473783389e88a88b7420ddb12d1a4387432",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.13.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "7a5e55f2b1ec99e06354a5213b992d34017efacccba8ffc6066cfc5517cc0282",
+        "sha256": "2200626c34540af594c31a052bc55a59febc353228feaa1232d60d6143a99680",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.13.0"
     },
     "source_gen": {
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134",
+        "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.0"
+      "version": "4.2.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
+        "sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.6"
+      "version": "1.3.10"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
-    },
-    "sprintf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sprintf",
-        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.0"
+      "version": "1.10.2"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1270,35 +1300,45 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "test": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test",
+        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.30.0"
+    },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.10"
     },
-    "timing": {
+    "test_core": {
       "dependency": "transitive",
       "description": {
-        "name": "timing",
-        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
+        "name": "test_core",
+        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "0.6.16"
     },
     "tray_manager": {
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
+        "sha256": "c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.2"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1324,41 +1364,41 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.28"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.5"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1374,61 +1414,51 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.4"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.5.1"
+      "version": "3.1.5"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.1"
     },
     "web": {
       "dependency": "transitive",
@@ -1460,15 +1490,25 @@
       "source": "hosted",
       "version": "3.0.3"
     },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.0"
+      "version": "5.15.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1504,11 +1544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -1519,10 +1559,20 @@
       },
       "source": "hosted",
       "version": "3.1.3"
+    },
+    "yaml_edit": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_edit",
+        "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.4"
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "dart": ">=3.10.3 <4.0.0",
+    "flutter": ">=3.38.4"
   }
 }

From 16e01c2268fc164293786b5f6e7414eaab68b89f Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 15 Mar 2026 14:51:28 +0100
Subject: [PATCH 15/70] app-icon-preview: init at 3.5.1

---
 pkgs/by-name/ap/app-icon-preview/package.nix | 62 ++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/ap/app-icon-preview/package.nix

diff --git a/pkgs/by-name/ap/app-icon-preview/package.nix b/pkgs/by-name/ap/app-icon-preview/package.nix
new file mode 100644
index 000000000000..61a93b60fd89
--- /dev/null
+++ b/pkgs/by-name/ap/app-icon-preview/package.nix
@@ -0,0 +1,62 @@
+{
+  cargo,
+  desktop-file-utils,
+  fetchFromGitLab,
+  lib,
+  libadwaita,
+  libxml2,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  rustc,
+  rustPlatform,
+  stdenv,
+  wrapGAppsHook4,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "app-icon-preview";
+  version = "3.5.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "design";
+    repo = "app-icon-preview";
+    tag = finalAttrs.version;
+    hash = "sha256-sfQFmQ27JUu92ArCi1dTnD3sWoUl/0tJguMvR1BoK/Q=";
+    forceFetchGit = true;
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-WGzXjIgZBwuBbSWK+EWDMW2kfqeoYHMsP4TXglR2Sc4=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustc
+    rustPlatform.cargoSetupHook
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+    libxml2
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for designing applications icons";
+    homepage = "https://gitlab.gnome.org/World/design/app-icon-preview";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "app-icon-preview";
+    maintainers = with lib.maintainers; [ hythera ];
+    platforms = lib.platforms.linux;
+  };
+})

From a84fe2dabb553fb12dd854e95f7df3b7a474b4cd Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 15 Mar 2026 15:01:52 +0100
Subject: [PATCH 16/70] palette: init at 3.0.0

---
 pkgs/by-name/pa/palette/package.nix | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/pa/palette/package.nix

diff --git a/pkgs/by-name/pa/palette/package.nix b/pkgs/by-name/pa/palette/package.nix
new file mode 100644
index 000000000000..d6596b8a0dbe
--- /dev/null
+++ b/pkgs/by-name/pa/palette/package.nix
@@ -0,0 +1,51 @@
+{
+  appstream,
+  desktop-file-utils,
+  fetchFromGitLab,
+  lib,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  stdenv,
+  vala,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "palette";
+  version = "3.0.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "design";
+    repo = "palette";
+    tag = finalAttrs.version;
+    hash = "sha256-DfLK5a2wJnwC8N90qOjSDNpMbM0jpauGTlgDwjQ5+kU=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    appstream
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Colour Palette tool";
+    homepage = "https://gitlab.gnome.org/World/design/palette";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "org.gnome.design.Palette";
+    maintainers = with lib.maintainers; [ hythera ];
+    platforms = lib.platforms.linux;
+  };
+})

From 6a52b287ccdc22bbee919c1759c9dfdf37e22da9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 15 Mar 2026 15:06:08 +0100
Subject: [PATCH 17/70] typography: init at 0.3.0

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

diff --git a/pkgs/by-name/ty/typography/package.nix b/pkgs/by-name/ty/typography/package.nix
new file mode 100644
index 000000000000..cbfc3d1a6b06
--- /dev/null
+++ b/pkgs/by-name/ty/typography/package.nix
@@ -0,0 +1,49 @@
+{
+  appstream,
+  desktop-file-utils,
+  fetchFromGitLab,
+  lib,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  stdenv,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "typography";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "design";
+    repo = "typography";
+    tag = finalAttrs.version;
+    hash = "sha256-XAoqB3Gvd/sRrbM4m5s3aYia7bZgPB9UEJ26Bzkj8Ws=";
+    forceFetchGit = true;
+  };
+
+  nativeBuildInputs = [
+    appstream
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for looking up text styles";
+    homepage = "https://gitlab.gnome.org/World/design/typography";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "org.gnome.design.Typography";
+    maintainers = with lib.maintainers; [ hythera ];
+    platforms = lib.platforms.linux;
+  };
+})

From 3f7e2ac81ef441784d6fe1a2df875364852e3fb4 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Sun, 15 Mar 2026 16:20:09 +0100
Subject: [PATCH 18/70] wayvr: install desktop file and icon

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/wa/wayvr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/wa/wayvr/package.nix b/pkgs/by-name/wa/wayvr/package.nix
index 4973bc262b3c..1272aa1af426 100644
--- a/pkgs/by-name/wa/wayvr/package.nix
+++ b/pkgs/by-name/wa/wayvr/package.nix
@@ -75,6 +75,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals withOpenVR [ "openvr" ];
 
+  postInstall = ''
+    install -D wayvr/wayvr.desktop -t $out/share/applications
+    install -D wayvr/wayvr.svg -t $out/share/icons/hicolor/scalable/apps
+  '';
+
   passthru = {
     tests.testVersion = testers.testVersion { package = wayvr; };
 

From ea40758e61a612fa399fb7ba7637cb8e4192020f Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Sun, 15 Mar 2026 16:26:44 +0100
Subject: [PATCH 19/70] nixos/wivrn: add option for Steam support

Add a new `services.wivrn.steam.enable` option to let the user enable or
disable Steam support. This option is enabled by default to not break
existing setups.

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 nixos/modules/services/video/wivrn.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 1f67c871eb0e..91d23c6a171a 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -106,6 +106,10 @@ in
       };
 
       steam = {
+        enable = lib.mkEnableOption "Steam support" // {
+          default = true;
+        };
+
         importOXRRuntimes = mkEnableOption ''
           Sets `PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES` system-wide to allow Steam to automatically discover the WiVRn server.
 
@@ -211,12 +215,12 @@ in
               }
           );
           # Needs Steam in the PATH to allow launching games from the headset
-          path = [ cfg.steam.package ];
+          path = mkIf cfg.steam.enable [ cfg.steam.package ];
           wantedBy = mkIf cfg.autoStart [ "default.target" ];
           restartTriggers = [
             cfg.package
-            cfg.steam.package
-          ];
+          ]
+          ++ lib.optionals cfg.steam.enable [ cfg.steam.package ];
         };
       };
     };

From e746eabfd16d4915b120f381f24a9ef09fb79932 Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Fri, 6 Mar 2026 13:12:08 +0100
Subject: [PATCH 20/70] osmium: init at 0.0.16

---
 pkgs/by-name/os/osmium/package.nix | 108 +++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 pkgs/by-name/os/osmium/package.nix

diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
new file mode 100644
index 000000000000..f3b7376034be
--- /dev/null
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -0,0 +1,108 @@
+{
+  stdenv,
+  fetchurl,
+  lib,
+  makeDesktopItem,
+  makeShellWrapper,
+  autoPatchelfHook,
+  libgcc,
+  libx11,
+  libxext,
+  libxcb,
+  libGL,
+  ffmpeg,
+  glib,
+  dbus,
+  pango,
+  libxcomposite,
+  libxdamage,
+  libxrandr,
+  libxkbcommon,
+  libgbm,
+  nss,
+  nspr,
+  gtk3,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "osmium";
+  version = "0.0.16";
+
+  src = fetchurl {
+    url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz";
+    hash = "sha256-dMOyZ9oPVnLt6MHeQwsMJ03wgvaKzalynwAL/PRfI28=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeShellWrapper
+  ];
+
+  buildInputs = [
+    libgcc
+    libx11
+    libxext
+    libxcb
+    ffmpeg
+    glib
+    dbus
+    pango
+    libxcomposite
+    libxdamage
+    libxrandr
+    libxkbcommon
+    libgbm
+    nss
+    nspr
+    gtk3
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,opt,share/{pixmaps,icons/hicolor/256x256/apps}}
+
+    mv * $out/opt/
+    chmod +x $out/opt/osmium
+
+    ln -s $out/opt/osmium $out/bin/
+
+    wrapProgramShell $out/opt/osmium \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
+
+    ln -s $out/opt/resources/assets/icons/256x256.png $out/share/pixmaps/osmium.png
+    ln -s $out/opt/resources/assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/osmium.png
+
+    runHook postInstall
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "osmium";
+    exec = "osmium";
+    icon = "osmium";
+    desktopName = "Osmium";
+    genericName = "A globally distributed community messaging and voice/video platform.";
+    categories = [
+      "Network"
+      "InstantMessaging"
+    ];
+    mimeTypes = [ "x-scheme-handler/osmium" ];
+    startupWMClass = "Osmium";
+  };
+
+  meta = {
+    description = "Globally distributed community messaging and voice/video platform";
+    homepage = "https://osmium.chat/";
+    license = lib.licenses.unfree;
+    mainProgram = "osmium";
+    maintainers = with lib.maintainers; [
+      twoneis
+    ];
+    platforms = [
+      "x86_64-linux"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}

From 02bbd59d1fc03c0d66874af99ea87fa88f598ed2 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Mon, 16 Mar 2026 13:21:36 +0100
Subject: [PATCH 21/70] samloader-rs: init at 1.1.0

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/sa/samloader-rs/package.nix | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/sa/samloader-rs/package.nix

diff --git a/pkgs/by-name/sa/samloader-rs/package.nix b/pkgs/by-name/sa/samloader-rs/package.nix
new file mode 100644
index 000000000000..37a1c4d40720
--- /dev/null
+++ b/pkgs/by-name/sa/samloader-rs/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  perl,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "samloader-rs";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "topjohnwu";
+    repo = "samloader-rs";
+    tag = finalAttrs.version;
+    hash = "sha256-LgN/vGfb5hdy9/YH4x3+vFUjH97omGu2iNtkDJRMmsk=";
+  };
+
+  cargoHash = "sha256-o0+Kb8teYhuhvl8U6FiAq8Z6vd4IWA8k4Z104Z9BkMw=";
+
+  nativeBuildInputs = [ perl ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Download firmware for Samsung devices";
+    homepage = "https://github.com/topjohnwu/samloader-rs";
+    changelog = "https://github.com/topjohnwu/samloader-rs/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "samloader";
+  };
+})

From ecba3b35496e4880ee4dd9c81010945f7672fb18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2026 10:40:06 +0000
Subject: [PATCH 22/70] python3Packages.microsoft-kiota-abstractions: 1.9.8 ->
 1.9.10

---
 .../python-modules/microsoft-kiota-abstractions/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
index cc175aa0a9d5..dc9024c51cae 100644
--- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-abstractions";
-  version = "1.9.8";
+  version = "1.9.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-abstractions-v${version}";
-    hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
+    hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
   };
 
   sourceRoot = "${src.name}/packages/abstractions/";

From 33beb863948e8d20196e0eff879cbe7720454757 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 18 Mar 2026 17:03:56 +0100
Subject: [PATCH 23/70] miro: env.RUSTFLAGS -> libcosmicAppHook

---
 pkgs/by-name/mi/miro/package.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix
index 8e234870e376..4bd122dfa231 100644
--- a/pkgs/by-name/mi/miro/package.nix
+++ b/pkgs/by-name/mi/miro/package.nix
@@ -2,11 +2,9 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  libcosmicAppHook,
   pkg-config,
   fontconfig,
-  wayland,
-  libxkbcommon,
-  libglvnd,
   versionCheckHook,
   nix-update-script,
 }:
@@ -26,26 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
+    libcosmicAppHook
     pkg-config
   ];
 
   buildInputs = [
-    wayland
     fontconfig
-    libxkbcommon
-    libglvnd
   ];
 
-  env.RUSTFLAGS = toString (
-    map (a: "-C link-arg=${a}") [
-      "-Wl,--push-state,--no-as-needed"
-      "-lEGL"
-      "-lwayland-client"
-      "-lxkbcommon"
-      "-Wl,--pop-state"
-    ]
-  );
-
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From d3fb0360357163560fad70799e5515db1808de49 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Fri, 13 Feb 2026 20:23:42 -0800
Subject: [PATCH 24/70] katawa-shoujo-re-engineered: compile rpy files in the
 build phase

---
 .../katawa-shoujo-re-engineered/package.nix   | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
index 7b1568e69aca..dbc3fbdafe72 100644
--- a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
+++ b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
@@ -25,26 +25,40 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       name = "katawa-shoujo-re-engineered";
       desktopName = "Katawa Shoujo: Re-Engineered";
       type = "Application";
-      icon = finalAttrs.meta.mainProgram;
+      icon = "katawa-shoujo-re-engineered";
       categories = [ "Game" ];
-      exec = finalAttrs.meta.mainProgram;
+      exec = "katawa-shoujo-re-engineered";
     })
   ];
 
   nativeBuildInputs = [
     makeWrapper
     copyDesktopItems
+    renpy
   ];
 
-  dontBuild = true;
+  postPatch = ''
+    substituteInPlace game/config.rpy --replace-fail 0.0.0-localbuild ${finalAttrs.version}
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    renpy . compile
+
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    makeWrapper ${lib.getExe' renpy "renpy"} $out/bin/${finalAttrs.meta.mainProgram} \
-      --add-flags ${finalAttrs.src} --add-flags run
-    install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/${finalAttrs.meta.mainProgram}.png
+    phome=$out/share/kataswa-shoujo-re-engineered
+    mkdir -p $phome
+    cp -r game $phome
+    find $phome -type f -name "*.rpy" -delete
+    makeWrapper ${lib.getExe renpy} $out/bin/katawa-shoujo-re-engineered \
+      --add-flags $phome --add-flags run
+    install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo-re-engineered.png
 
     runHook postInstall
   '';
@@ -64,6 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       quantenzitrone
       rapiteanu
+      ulysseszhan
     ];
     platforms = renpy.meta.platforms;
   };

From 9c01a0a04d3c46d46e4c8ec03694415b3b347608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2026 23:55:33 +0000
Subject: [PATCH 25/70] v2rayn: 7.16.9 -> 7.19.4

---
 pkgs/by-name/v2/v2rayn/deps.json   | 128 +++++++++++++----------------
 pkgs/by-name/v2/v2rayn/package.nix |   4 +-
 2 files changed, 61 insertions(+), 71 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 69d3bf82167a..b04ffc1014eb 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -11,19 +11,14 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.10",
-    "hash": "sha256-M5eDqPQ1Vt6dteY3ecgpffy5L6245TJcxaovpRF8PtA="
+    "version": "11.3.12",
+    "hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
   },
   {
     "pname": "Avalonia",
     "version": "11.3.7",
     "hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
   },
-  {
-    "pname": "Avalonia",
-    "version": "11.3.8",
-    "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
-  },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.25547.20250602",
@@ -31,8 +26,8 @@
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.3.0",
-    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+    "version": "11.4.1",
+    "hash": "sha256-OOozpi/5bq3dbZlXvFoXEtxTndJer0AjBYWPwgLR1xk="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -56,33 +51,33 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.10",
-    "hash": "sha256-d8VTsT6yYAa8uZAodX7SWgf4+izVHrP/hy/pDpT91Wk="
+    "version": "11.3.12",
+    "hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.10",
-    "hash": "sha256-M1o7/n7VR/TbeKNd/+mkG0ck+1vrRhkyjOuBzcuqW6g="
+    "version": "11.3.12",
+    "hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.10",
-    "hash": "sha256-ps3trTNzHClRg9VrupTd7+cIShkd0dA+Awy/39IHsjE="
+    "version": "11.3.12",
+    "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.10",
-    "hash": "sha256-9tvHMi/D6eJLC1K1jmQMvT6LbljojK94rVlfY8zNJug="
+    "version": "11.3.12",
+    "hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.10",
-    "hash": "sha256-XEmzwLsndS+l76quLpddzuBPL+BQie0Rv5HN3I5V2kA="
+    "version": "11.3.12",
+    "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.10",
-    "hash": "sha256-nd44zlwFNDrFa9OAT3zd2Yg12TOykQW2smXza6ZNmN4="
+    "version": "11.3.12",
+    "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -96,38 +91,33 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.10",
-    "hash": "sha256-DB7JzQjJs5XkPyUjQL4N0Bbm84QG20IZf8UEs7mhcqg="
+    "version": "11.3.12",
+    "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
     "version": "11.3.7",
     "hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
   },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.8",
-    "hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
-  },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.10",
-    "hash": "sha256-XJXyK19ow9mvcssdmjPvh8zyh4VExcVEoiIauqPNC5s="
+    "version": "11.3.12",
+    "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.10",
-    "hash": "sha256-5xOBZ+dHye75R28iQLieQgCPlcfQBHF7tzQsHIhTiDg="
+    "version": "11.3.12",
+    "hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.10",
-    "hash": "sha256-jV0VrDKLS8GqQkgyescrOfJPg4r/YQBJHbpmfRh0qFw="
+    "version": "11.3.12",
+    "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.10",
-    "hash": "sha256-fgp68h5siTweduPxKeKYwb4LJ7lhmtf7Fw2b1B4FrKo="
+    "version": "11.3.12",
+    "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
   },
   {
     "pname": "CliWrap",
@@ -141,8 +131,8 @@
   },
   {
     "pname": "Downloader",
-    "version": "4.0.3",
-    "hash": "sha256-QBSvvVmejnnK8QlS/OEkDXOpbrUW5pGpbPR+6zzFstg="
+    "version": "5.1.0",
+    "hash": "sha256-c5D5G3BYm79UrOsBX2UJahVrRYAvSi44o1uRDob4ZoI="
   },
   {
     "pname": "DynamicData",
@@ -181,8 +171,8 @@
   },
   {
     "pname": "MessageBox.Avalonia",
-    "version": "3.3.1",
-    "hash": "sha256-W726OnJQA0x7RJ6bzaLWKw1PSIL50WsVC5FIYXwOZ9U="
+    "version": "3.3.1.1",
+    "hash": "sha256-UvWCbuMuCxFpHvuUqJIfcOS/Vw57+ZdrZfSKRgPiNm0="
   },
   {
     "pname": "MicroCom.Runtime",
@@ -191,13 +181,13 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+    "version": "10.0.3",
+    "hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.3",
-    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+    "version": "10.0.3",
+    "hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
   },
   {
     "pname": "Microsoft.Win32.Registry",
@@ -211,8 +201,8 @@
   },
   {
     "pname": "NLog",
-    "version": "6.0.7",
-    "hash": "sha256-Le6ocjCN29rtgRiAroVfjUbMXCrjk0pSv2GEtZZy0qU="
+    "version": "6.1.1",
+    "hash": "sha256-4pxy5z5FyRxBmZNBw+n32SjgEQzMsgSHTuSSn+vxLzk="
   },
   {
     "pname": "QRCoder",
@@ -221,13 +211,13 @@
   },
   {
     "pname": "ReactiveUI",
-    "version": "22.3.1",
-    "hash": "sha256-NltfWhlz+99yaYEDkPXeBgPtqbqW5xJDEhedH5cesUk="
+    "version": "23.1.8",
+    "hash": "sha256-Of17kTxTQGTKUFv0fx7V90i06y9jQY9q5zkauPKZ+YQ="
   },
   {
     "pname": "ReactiveUI.Avalonia",
-    "version": "11.3.8",
-    "hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo="
+    "version": "11.4.12",
+    "hash": "sha256-QU9wchlOJtc6LqlksNhRW+2US30soucJIw5y4Wz7tYU="
   },
   {
     "pname": "ReactiveUI.Fody",
@@ -236,18 +226,18 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.3.7.1",
-    "hash": "sha256-LMf15T7QxgcQ43OG9NgfQGMwJ0IJkTdr42jI/Y3PAGg="
+    "version": "11.3.7.3",
+    "hash": "sha256-oIkE57AGb6FlUiFMnQZ/9uwwPxHaE8VsWHzYtEEvYQo="
   },
   {
     "pname": "Semi.Avalonia.AvaloniaEdit",
-    "version": "11.2.0.1",
-    "hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I="
+    "version": "11.2.0.2",
+    "hash": "sha256-60kyFqWVqz58W+sWcVFTD/o4CqXFZ01hr2Tp5HnslR0="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.3.7.1",
-    "hash": "sha256-xZAvVT8Sb9evv5DubKPUi3uYGWlx/KnCKqQgoghGX0A="
+    "version": "11.3.7.3",
+    "hash": "sha256-++8ksHadX5MO42CIU2GoC2Cub+9J4NstBUrbRk/4MjM="
   },
   {
     "pname": "SkiaSharp",
@@ -291,23 +281,23 @@
   },
   {
     "pname": "Splat",
-    "version": "17.1.1",
-    "hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo="
+    "version": "19.3.1",
+    "hash": "sha256-ri8qniMdAzAO4cjjVfuSFxMM6MvxFrG6+d2cPWJeLUE="
   },
   {
     "pname": "Splat.Builder",
-    "version": "17.1.1",
-    "hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI="
+    "version": "19.3.1",
+    "hash": "sha256-XN/3+5BEaq6v17eWKFUOqqCmVWJLEVQBm5cvejxetw8="
   },
   {
     "pname": "Splat.Core",
-    "version": "17.1.1",
-    "hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0="
+    "version": "19.3.1",
+    "hash": "sha256-Fav212nMhUGO5/1zFKevXVm21MH+x7NTqgq1jD1WRKw="
   },
   {
     "pname": "Splat.Logging",
-    "version": "17.1.1",
-    "hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY="
+    "version": "19.3.1",
+    "hash": "sha256-rTXD2bqIa/IjeN/mFv9n9mkL2rujEg1iIUPimVpYLBQ="
   },
   {
     "pname": "sqlite-net-pcl",
@@ -339,6 +329,11 @@
     "version": "4.5.0",
     "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "10.0.3",
+    "hash": "sha256-YQzu50E7/1slw8IcFkVpQd33/IyWw1hJapTIscnoF5Q="
+  },
   {
     "pname": "System.Diagnostics.EventLog",
     "version": "6.0.0",
@@ -359,11 +354,6 @@
     "version": "4.5.3",
     "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
-  {
-    "pname": "System.Reactive",
-    "version": "6.0.2",
-    "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE="
-  },
   {
     "pname": "System.Reactive",
     "version": "6.1.0",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 556e9fe5f4c3..9f4f27c148ac 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -26,13 +26,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.16.9";
+  version = "7.19.4";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-co2JLOlt2TafpSwxD6E/Q0dMbXADBdTL7C4DZTJQCNs=";
+    hash = "sha256-MkLJi+rMHhLjZ1huappvdxziYCNlKkoWTjjmvSPznFg=";
     fetchSubmodules = true;
   };
 

From ed573515f5d7978078815a794fc30452105381dd Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 21 Jul 2025 00:22:44 -0700
Subject: [PATCH 26/70] musicfree-desktop: init at 0.0.8

---
 .../mu/musicfree-desktop/bump-deps.patch      | 2179 +++++++++++++++++
 .../musicfree-desktop/electron-zip-dir.patch  |   12 +
 .../no-startup-dev-tools.patch                |   18 +
 pkgs/by-name/mu/musicfree-desktop/package.nix |  168 ++
 pkgs/by-name/mu/musicfree-desktop/update.sh   |   34 +
 5 files changed, 2411 insertions(+)
 create mode 100644 pkgs/by-name/mu/musicfree-desktop/bump-deps.patch
 create mode 100644 pkgs/by-name/mu/musicfree-desktop/electron-zip-dir.patch
 create mode 100644 pkgs/by-name/mu/musicfree-desktop/no-startup-dev-tools.patch
 create mode 100644 pkgs/by-name/mu/musicfree-desktop/package.nix
 create mode 100755 pkgs/by-name/mu/musicfree-desktop/update.sh

diff --git a/pkgs/by-name/mu/musicfree-desktop/bump-deps.patch b/pkgs/by-name/mu/musicfree-desktop/bump-deps.patch
new file mode 100644
index 000000000000..f9f13e693698
--- /dev/null
+++ b/pkgs/by-name/mu/musicfree-desktop/bump-deps.patch
@@ -0,0 +1,2179 @@
+diff --git a/package-lock.json b/package-lock.json
+index ce8be32..2f250c8 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -51,7 +51,7 @@
+         "react-toastify": "^9.1.3",
+         "react-tooltip": "^5.26.4",
+         "rimraf": "^5.0.7",
+-        "sharp": "^0.32.6",
++        "sharp": "^0.33.4",
+         "socket.io": "^4.7.5",
+         "unzipper": "^0.11.6",
+         "webdav": "^5.6.0"
+@@ -2952,6 +2952,16 @@
+         "node": ">=14.14"
+       }
+     },
++    "node_modules/@emnapi/runtime": {
++      "version": "1.9.0",
++      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.0.tgz",
++      "integrity": "sha512-QN75eB0IH2ywSpRpNddCRfQIhmJYBCJ1x5Lb3IscKAL8bMnVAKnRg8dCoXbHzVLLH7P38N2Z3mtulB7W0J0FKw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.4.0"
++      }
++    },
+     "node_modules/@eslint-community/eslint-utils": {
+       "version": "4.7.0",
+       "resolved": "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+@@ -3202,6 +3212,367 @@
+         "url": "https://github.com/sponsors/nzakas"
+       }
+     },
++    "node_modules/@img/sharp-darwin-arm64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
++      "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "darwin"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-darwin-arm64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-darwin-x64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
++      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "darwin"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-darwin-x64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-libvips-darwin-arm64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
++      "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "darwin"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-darwin-x64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
++      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "darwin"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linux-arm": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
++      "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
++      "cpu": [
++        "arm"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linux-arm64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
++      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linux-s390x": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz",
++      "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==",
++      "cpu": [
++        "s390x"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linux-x64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
++      "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz",
++      "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz",
++      "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-linux-arm": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
++      "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
++      "cpu": [
++        "arm"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linux-arm": "1.0.5"
++      }
++    },
++    "node_modules/@img/sharp-linux-arm64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
++      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linux-arm64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-linux-s390x": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz",
++      "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==",
++      "cpu": [
++        "s390x"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linux-s390x": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-linux-x64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
++      "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linux-x64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-linuxmusl-arm64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz",
++      "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==",
++      "cpu": [
++        "arm64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-linuxmusl-x64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz",
++      "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "Apache-2.0",
++      "optional": true,
++      "os": [
++        "linux"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
++      }
++    },
++    "node_modules/@img/sharp-wasm32": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz",
++      "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==",
++      "cpu": [
++        "wasm32"
++      ],
++      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
++      "optional": true,
++      "dependencies": {
++        "@emnapi/runtime": "^1.2.0"
++      },
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-win32-ia32": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz",
++      "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==",
++      "cpu": [
++        "ia32"
++      ],
++      "license": "Apache-2.0 AND LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "win32"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
++    "node_modules/@img/sharp-win32-x64": {
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
++      "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
++      "cpu": [
++        "x64"
++      ],
++      "license": "Apache-2.0 AND LGPL-3.0-or-later",
++      "optional": true,
++      "os": [
++        "win32"
++      ],
++      "engines": {
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      }
++    },
+     "node_modules/@isaacs/cliui": {
+       "version": "8.0.2",
+       "resolved": "https://registry.npmmirror.com/@isaacs/cliui/-/cliui-8.0.2.tgz",
+@@ -4602,27 +4973,11 @@
+       "dev": true,
+       "optional": true
+     },
+-    "node_modules/@types/minimist": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz",
+-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/@types/node": {
+       "version": "20.5.9",
+       "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.5.9.tgz",
+       "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="
+     },
+-    "node_modules/@types/normalize-package-data": {
+-      "version": "2.4.1",
+-      "resolved": "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/@types/object-path": {
+       "version": "0.11.4",
+       "resolved": "https://registry.npmmirror.com/@types/object-path/-/object-path-0.11.4.tgz",
+@@ -5581,17 +5936,6 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/arrify": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz",
+-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+     "node_modules/asar": {
+       "version": "3.2.0",
+       "resolved": "https://registry.npmmirror.com/asar/-/asar-3.2.0.tgz",
+@@ -5641,17 +5985,6 @@
+       "dev": true,
+       "optional": true
+     },
+-    "node_modules/async-foreach": {
+-      "version": "0.1.3",
+-      "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
+-      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": "*"
+-      }
+-    },
+     "node_modules/async-function": {
+       "version": "1.0.0",
+       "resolved": "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz",
+@@ -5712,11 +6045,6 @@
+         "proxy-from-env": "^1.1.0"
+       }
+     },
+-    "node_modules/b4a": {
+-      "version": "1.6.6",
+-      "resolved": "https://registry.npmmirror.com/b4a/-/b4a-1.6.6.tgz",
+-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
+-    },
+     "node_modules/babel-loader": {
+       "version": "9.1.3",
+       "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-9.1.3.tgz",
+@@ -5778,47 +6106,6 @@
+       "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+     },
+-    "node_modules/bare-events": {
+-      "version": "2.2.2",
+-      "resolved": "https://registry.npmmirror.com/bare-events/-/bare-events-2.2.2.tgz",
+-      "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==",
+-      "optional": true
+-    },
+-    "node_modules/bare-fs": {
+-      "version": "2.3.0",
+-      "resolved": "https://registry.npmmirror.com/bare-fs/-/bare-fs-2.3.0.tgz",
+-      "integrity": "sha512-TNFqa1B4N99pds2a5NYHR15o0ZpdNKbAeKTE/+G6ED/UeOavv8RY3dr/Fu99HW3zU3pXpo2kDNO8Sjsm2esfOw==",
+-      "optional": true,
+-      "dependencies": {
+-        "bare-events": "^2.0.0",
+-        "bare-path": "^2.0.0",
+-        "bare-stream": "^1.0.0"
+-      }
+-    },
+-    "node_modules/bare-os": {
+-      "version": "2.3.0",
+-      "resolved": "https://registry.npmmirror.com/bare-os/-/bare-os-2.3.0.tgz",
+-      "integrity": "sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==",
+-      "optional": true
+-    },
+-    "node_modules/bare-path": {
+-      "version": "2.1.2",
+-      "resolved": "https://registry.npmmirror.com/bare-path/-/bare-path-2.1.2.tgz",
+-      "integrity": "sha512-o7KSt4prEphWUHa3QUwCxUI00R86VdjiuxmJK0iNVDHYPGo+HsDaVCnqCmPbf/MiW1ok8F4p3m8RTHlWk8K2ig==",
+-      "optional": true,
+-      "dependencies": {
+-        "bare-os": "^2.1.0"
+-      }
+-    },
+-    "node_modules/bare-stream": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmmirror.com/bare-stream/-/bare-stream-1.0.0.tgz",
+-      "integrity": "sha512-KhNUoDL40iP4gFaLSsoGE479t0jHijfYdIcxRn/XtezA2BaUD0NRf/JGRpsMq6dMNM+SrCrB0YSSo/5wBY4rOQ==",
+-      "optional": true,
+-      "dependencies": {
+-        "streamx": "^2.16.1"
+-      }
+-    },
+     "node_modules/base-64": {
+       "version": "1.0.0",
+       "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
+@@ -6364,44 +6651,6 @@
+         "node": ">=10"
+       }
+     },
+-    "node_modules/camelcase-keys": {
+-      "version": "6.2.2",
+-      "resolved": "https://registry.npmmirror.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "camelcase": "^5.3.1",
+-        "map-obj": "^4.0.0",
+-        "quick-lru": "^4.0.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/camelcase-keys/node_modules/camelcase": {
+-      "version": "5.3.1",
+-      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=6"
+-      }
+-    },
+-    "node_modules/camelcase-keys/node_modules/quick-lru": {
+-      "version": "4.0.1",
+-      "resolved": "https://registry.npmmirror.com/quick-lru/-/quick-lru-4.0.1.tgz",
+-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+     "node_modules/caniuse-lite": {
+       "version": "1.0.30001525",
+       "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001525.tgz",
+@@ -7275,43 +7524,6 @@
+         }
+       }
+     },
+-    "node_modules/decamelize": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+-    "node_modules/decamelize-keys": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmmirror.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "decamelize": "^1.1.0",
+-        "map-obj": "^1.0.0"
+-      },
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+-    "node_modules/decamelize-keys/node_modules/map-obj": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz",
+-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+     "node_modules/decompress-response": {
+       "version": "6.0.0",
+       "resolved": "https://registry.npmmirror.com/decompress-response/-/decompress-response-6.0.0.tgz",
+@@ -9237,11 +9449,6 @@
+       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+       "dev": true
+     },
+-    "node_modules/fast-fifo": {
+-      "version": "1.3.2",
+-      "resolved": "https://registry.npmmirror.com/fast-fifo/-/fast-fifo-1.3.2.tgz",
+-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+-    },
+     "node_modules/fast-glob": {
+       "version": "3.3.3",
+       "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz",
+@@ -10025,20 +10232,6 @@
+         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+       }
+     },
+-    "node_modules/gaze": {
+-      "version": "1.1.3",
+-      "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
+-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "globule": "^1.0.0"
+-      },
+-      "engines": {
+-        "node": ">= 4.0.0"
+-      }
+-    },
+     "node_modules/generate-function": {
+       "version": "2.3.1",
+       "resolved": "https://registry.npmmirror.com/generate-function/-/generate-function-2.3.1.tgz",
+@@ -10176,17 +10369,6 @@
+         "node": ">= 0.4"
+       }
+     },
+-    "node_modules/get-stdin": {
+-      "version": "4.0.1",
+-      "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
+-      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+     "node_modules/get-stream": {
+       "version": "4.1.0",
+       "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-4.1.0.tgz",
+@@ -10394,55 +10576,6 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/globule": {
+-      "version": "1.3.4",
+-      "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.4.tgz",
+-      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "glob": "~7.1.1",
+-        "lodash": "^4.17.21",
+-        "minimatch": "~3.0.2"
+-      },
+-      "engines": {
+-        "node": ">= 0.10"
+-      }
+-    },
+-    "node_modules/globule/node_modules/glob": {
+-      "version": "7.1.7",
+-      "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
+-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "fs.realpath": "^1.0.0",
+-        "inflight": "^1.0.4",
+-        "inherits": "2",
+-        "minimatch": "^3.0.4",
+-        "once": "^1.3.0",
+-        "path-is-absolute": "^1.0.0"
+-      },
+-      "engines": {
+-        "node": "*"
+-      }
+-    },
+-    "node_modules/globule/node_modules/minimatch": {
+-      "version": "3.0.8",
+-      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
+-      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "brace-expansion": "^1.1.7"
+-      },
+-      "engines": {
+-        "node": "*"
+-      }
+-    },
+     "node_modules/gopd": {
+       "version": "1.2.0",
+       "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+@@ -10495,17 +10628,6 @@
+       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+       "dev": true
+     },
+-    "node_modules/hard-rejection": {
+-      "version": "2.1.0",
+-      "resolved": "https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz",
+-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=6"
+-      }
+-    },
+     "node_modules/has-bigints": {
+       "version": "1.1.0",
+       "resolved": "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz",
+@@ -10623,42 +10745,6 @@
+         "node": ">=0.10.0"
+       }
+     },
+-    "node_modules/hosted-git-info": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "lru-cache": "^6.0.0"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/hosted-git-info/node_modules/lru-cache": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "yallist": "^4.0.0"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/hosted-git-info/node_modules/yallist": {
+-      "version": "4.0.0",
+-      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/hot-patcher": {
+       "version": "2.0.1",
+       "resolved": "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz",
+@@ -11476,17 +11562,6 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/is-plain-obj": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=0.10.0"
+-      }
+-    },
+     "node_modules/is-plain-object": {
+       "version": "2.0.4",
+       "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
+@@ -11769,14 +11844,6 @@
+         "node": ">=10"
+       }
+     },
+-    "node_modules/js-base64": {
+-      "version": "2.6.4",
+-      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/js-tokens": {
+       "version": "4.0.0",
+       "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+@@ -12727,17 +12794,6 @@
+         "node": ">=6"
+       }
+     },
+-    "node_modules/map-obj": {
+-      "version": "4.3.0",
+-      "resolved": "https://registry.npmmirror.com/map-obj/-/map-obj-4.3.0.tgz",
+-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+     "node_modules/matcher": {
+       "version": "3.0.0",
+       "resolved": "https://registry.npmmirror.com/matcher/-/matcher-3.0.0.tgz",
+@@ -12820,251 +12876,59 @@
+         "node": ">= 4.0.0"
+       }
+     },
+-    "node_modules/meow": {
+-      "version": "9.0.0",
+-      "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
+-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
++    "node_modules/merge-descriptors": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
++      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
++      "dev": true
++    },
++    "node_modules/merge-stream": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
++      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
++      "dev": true
++    },
++    "node_modules/merge2": {
++      "version": "1.4.1",
++      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
++      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "@types/minimist": "^1.2.0",
+-        "camelcase-keys": "^6.2.2",
+-        "decamelize": "^1.2.0",
+-        "decamelize-keys": "^1.1.0",
+-        "hard-rejection": "^2.1.0",
+-        "minimist-options": "4.1.0",
+-        "normalize-package-data": "^3.0.0",
+-        "read-pkg-up": "^7.0.1",
+-        "redent": "^3.0.0",
+-        "trim-newlines": "^3.0.0",
+-        "type-fest": "^0.18.0",
+-        "yargs-parser": "^20.2.3"
+-      },
+       "engines": {
+-        "node": ">=10"
++        "node": ">= 8"
+       }
+     },
+-    "node_modules/meow/node_modules/find-up": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
++    "node_modules/methods": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
++      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "locate-path": "^5.0.0",
+-        "path-exists": "^4.0.0"
+-      },
+       "engines": {
+-        "node": ">=8"
++        "node": ">= 0.6"
+       }
+     },
+-    "node_modules/meow/node_modules/hosted-git-info": {
+-      "version": "2.8.9",
+-      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+-    "node_modules/meow/node_modules/locate-path": {
+-      "version": "5.0.0",
+-      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
++    "node_modules/micromatch": {
++      "version": "4.0.5",
++      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
++      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+       "dependencies": {
+-        "p-locate": "^4.1.0"
++        "braces": "^3.0.2",
++        "picomatch": "^2.3.1"
+       },
+       "engines": {
+-        "node": ">=8"
++        "node": ">=8.6"
+       }
+     },
+-    "node_modules/meow/node_modules/p-limit": {
+-      "version": "2.3.0",
+-      "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
++    "node_modules/mime": {
++      "version": "1.6.0",
++      "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
++      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "p-try": "^2.0.0"
++      "bin": {
++        "mime": "cli.js"
+       },
+       "engines": {
+-        "node": ">=6"
+-      }
+-    },
+-    "node_modules/meow/node_modules/p-locate": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "p-limit": "^2.2.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/meow/node_modules/read-pkg": {
+-      "version": "5.2.0",
+-      "resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz",
+-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "@types/normalize-package-data": "^2.4.0",
+-        "normalize-package-data": "^2.5.0",
+-        "parse-json": "^5.0.0",
+-        "type-fest": "^0.6.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/meow/node_modules/read-pkg-up": {
+-      "version": "7.0.1",
+-      "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "find-up": "^4.1.0",
+-        "read-pkg": "^5.2.0",
+-        "type-fest": "^0.8.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": {
+-      "version": "0.8.1",
+-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
+-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": {
+-      "version": "2.5.0",
+-      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "hosted-git-info": "^2.1.4",
+-        "resolve": "^1.10.0",
+-        "semver": "2 || 3 || 4 || 5",
+-        "validate-npm-package-license": "^3.0.1"
+-      }
+-    },
+-    "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": {
+-      "version": "0.6.0",
+-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz",
+-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/meow/node_modules/semver": {
+-      "version": "5.7.2",
+-      "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz",
+-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "bin": {
+-        "semver": "bin/semver"
+-      }
+-    },
+-    "node_modules/meow/node_modules/type-fest": {
+-      "version": "0.18.1",
+-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
+-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/meow/node_modules/yargs-parser": {
+-      "version": "20.2.9",
+-      "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
+-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/merge-descriptors": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+-      "dev": true
+-    },
+-    "node_modules/merge-stream": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+-      "dev": true
+-    },
+-    "node_modules/merge2": {
+-      "version": "1.4.1",
+-      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+-      "dev": true,
+-      "engines": {
+-        "node": ">= 8"
+-      }
+-    },
+-    "node_modules/methods": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
+-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+-      "dev": true,
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
+-    },
+-    "node_modules/micromatch": {
+-      "version": "4.0.5",
+-      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+-      "dev": true,
+-      "dependencies": {
+-        "braces": "^3.0.2",
+-        "picomatch": "^2.3.1"
+-      },
+-      "engines": {
+-        "node": ">=8.6"
+-      }
+-    },
+-    "node_modules/mime": {
+-      "version": "1.6.0",
+-      "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+-      "dev": true,
+-      "bin": {
+-        "mime": "cli.js"
+-      },
+-      "engines": {
+-        "node": ">=4"
++        "node": ">=4"
+       }
+     },
+     "node_modules/mime-db": {
+@@ -13104,17 +12968,6 @@
+         "node": ">=4"
+       }
+     },
+-    "node_modules/min-indent": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz",
+-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=4"
+-      }
+-    },
+     "node_modules/minimalistic-assert": {
+       "version": "1.0.1",
+       "resolved": "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+@@ -13137,22 +12990,6 @@
+       "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+     },
+-    "node_modules/minimist-options": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmmirror.com/minimist-options/-/minimist-options-4.1.0.tgz",
+-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "arrify": "^1.0.1",
+-        "is-plain-obj": "^1.1.0",
+-        "kind-of": "^6.0.3"
+-      },
+-      "engines": {
+-        "node": ">= 6"
+-      }
+-    },
+     "node_modules/minipass": {
+       "version": "5.0.0",
+       "resolved": "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz",
+@@ -13416,10 +13253,11 @@
+       }
+     },
+     "node_modules/nan": {
+-      "version": "2.17.0",
+-      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.17.0.tgz",
+-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
++      "version": "2.26.2",
++      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
++      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
+       "dev": true,
++      "license": "MIT",
+       "optional": true
+     },
+     "node_modules/nanoid": {
+@@ -13481,9 +13319,10 @@
+       }
+     },
+     "node_modules/node-abi": {
+-      "version": "3.47.0",
+-      "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.47.0.tgz",
+-      "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==",
++      "version": "3.89.0",
++      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz",
++      "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==",
++      "license": "MIT",
+       "dependencies": {
+         "semver": "^7.3.5"
+       },
+@@ -13527,11 +13366,6 @@
+       "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+       "dev": true
+     },
+-    "node_modules/node-addon-api": {
+-      "version": "6.1.0",
+-      "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-6.1.0.tgz",
+-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
+-    },
+     "node_modules/node-api-version": {
+       "version": "0.2.0",
+       "resolved": "https://registry.npmmirror.com/node-api-version/-/node-api-version-0.2.0.tgz",
+@@ -13572,466 +13406,54 @@
+       "engines": {
+         "node": "4.x || >=6.0.0"
+       },
+-      "peerDependencies": {
+-        "encoding": "^0.1.0"
+-      },
+-      "peerDependenciesMeta": {
+-        "encoding": {
+-          "optional": true
+-        }
+-      }
+-    },
+-    "node_modules/node-forge": {
+-      "version": "1.3.1",
+-      "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz",
+-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+-      "dev": true,
+-      "engines": {
+-        "node": ">= 6.13.0"
+-      }
+-    },
+-    "node_modules/node-gyp": {
+-      "version": "9.4.1",
+-      "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-9.4.1.tgz",
+-      "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
+-      "dev": true,
+-      "dependencies": {
+-        "env-paths": "^2.2.0",
+-        "exponential-backoff": "^3.1.1",
+-        "glob": "^7.1.4",
+-        "graceful-fs": "^4.2.6",
+-        "make-fetch-happen": "^10.0.3",
+-        "nopt": "^6.0.0",
+-        "npmlog": "^6.0.0",
+-        "rimraf": "^3.0.2",
+-        "semver": "^7.3.5",
+-        "tar": "^6.1.2",
+-        "which": "^2.0.2"
+-      },
+-      "bin": {
+-        "node-gyp": "bin/node-gyp.js"
+-      },
+-      "engines": {
+-        "node": "^12.13 || ^14.13 || >=16"
+-      }
+-    },
+-    "node_modules/node-gyp/node_modules/rimraf": {
+-      "version": "3.0.2",
+-      "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+-      "dev": true,
+-      "dependencies": {
+-        "glob": "^7.1.3"
+-      },
+-      "bin": {
+-        "rimraf": "bin.js"
+-      }
+-    },
+-    "node_modules/node-gyp/node_modules/semver": {
+-      "version": "7.6.2",
+-      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+-      "dev": true,
+-      "bin": {
+-        "semver": "bin/semver.js"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/node-loader": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmmirror.com/node-loader/-/node-loader-2.0.0.tgz",
+-      "integrity": "sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q==",
+-      "dev": true,
+-      "dependencies": {
+-        "loader-utils": "^2.0.0"
+-      },
+-      "engines": {
+-        "node": ">= 10.13.0"
+-      },
+-      "peerDependencies": {
+-        "webpack": "^5.0.0"
+-      }
+-    },
+-    "node_modules/node-releases": {
+-      "version": "2.0.13",
+-      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz",
+-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+-      "dev": true
+-    },
+-    "node_modules/node-sass": {
+-      "version": "9.0.0",
+-      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-9.0.0.tgz",
+-      "integrity": "sha512-yltEuuLrfH6M7Pq2gAj5B6Zm7m+gdZoG66wTqG6mIZV/zijq3M2OO2HswtT6oBspPyFhHDcaxWpsBm0fRNDHPg==",
+-      "dev": true,
+-      "hasInstallScript": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "async-foreach": "^0.1.3",
+-        "chalk": "^4.1.2",
+-        "cross-spawn": "^7.0.3",
+-        "gaze": "^1.0.0",
+-        "get-stdin": "^4.0.1",
+-        "glob": "^7.0.3",
+-        "lodash": "^4.17.15",
+-        "make-fetch-happen": "^10.0.4",
+-        "meow": "^9.0.0",
+-        "nan": "^2.17.0",
+-        "node-gyp": "^8.4.1",
+-        "sass-graph": "^4.0.1",
+-        "stdout-stream": "^1.4.0",
+-        "true-case-path": "^2.2.1"
+-      },
+-      "bin": {
+-        "node-sass": "bin/node-sass"
+-      },
+-      "engines": {
+-        "node": ">=16"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/@tootallnate/once": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz",
+-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">= 6"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/ansi-styles": {
+-      "version": "4.3.0",
+-      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "color-convert": "^2.0.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/chalk": {
+-      "version": "4.1.2",
+-      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "ansi-styles": "^4.1.0",
+-        "supports-color": "^7.1.0"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/color-convert": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "color-name": "~1.1.4"
+-      },
+-      "engines": {
+-        "node": ">=7.0.0"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/color-name": {
+-      "version": "1.1.4",
+-      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+-    "node_modules/node-sass/node_modules/has-flag": {
+-      "version": "4.0.0",
+-      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/https-proxy-agent": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "agent-base": "6",
+-        "debug": "4"
+-      },
+-      "engines": {
+-        "node": ">= 6"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/minipass": {
+-      "version": "3.3.6",
+-      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "yallist": "^4.0.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp": {
+-      "version": "8.4.1",
+-      "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-8.4.1.tgz",
+-      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "env-paths": "^2.2.0",
+-        "glob": "^7.1.4",
+-        "graceful-fs": "^4.2.6",
+-        "make-fetch-happen": "^9.1.0",
+-        "nopt": "^5.0.0",
+-        "npmlog": "^6.0.0",
+-        "rimraf": "^3.0.2",
+-        "semver": "^7.3.5",
+-        "tar": "^6.1.2",
+-        "which": "^2.0.2"
+-      },
+-      "bin": {
+-        "node-gyp": "bin/node-gyp.js"
+-      },
+-      "engines": {
+-        "node": ">= 10.12.0"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/@npmcli/fs": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz",
+-      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "@gar/promisify": "^1.0.1",
+-        "semver": "^7.3.5"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/@npmcli/move-file": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz",
+-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+-      "deprecated": "This functionality has been moved to @npmcli/fs",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "mkdirp": "^1.0.4",
+-        "rimraf": "^3.0.2"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/cacache": {
+-      "version": "15.3.0",
+-      "resolved": "https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz",
+-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "@npmcli/fs": "^1.0.0",
+-        "@npmcli/move-file": "^1.0.1",
+-        "chownr": "^2.0.0",
+-        "fs-minipass": "^2.0.0",
+-        "glob": "^7.1.4",
+-        "infer-owner": "^1.0.4",
+-        "lru-cache": "^6.0.0",
+-        "minipass": "^3.1.1",
+-        "minipass-collect": "^1.0.2",
+-        "minipass-flush": "^1.0.5",
+-        "minipass-pipeline": "^1.2.2",
+-        "mkdirp": "^1.0.3",
+-        "p-map": "^4.0.0",
+-        "promise-inflight": "^1.0.1",
+-        "rimraf": "^3.0.2",
+-        "ssri": "^8.0.1",
+-        "tar": "^6.0.2",
+-        "unique-filename": "^1.1.1"
+-      },
+-      "engines": {
+-        "node": ">= 10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/http-proxy-agent": {
+-      "version": "4.0.1",
+-      "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "@tootallnate/once": "1",
+-        "agent-base": "6",
+-        "debug": "4"
+-      },
+-      "engines": {
+-        "node": ">= 6"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/lru-cache": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "yallist": "^4.0.0"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/make-fetch-happen": {
+-      "version": "9.1.0",
+-      "resolved": "https://registry.npmmirror.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+-      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "agentkeepalive": "^4.1.3",
+-        "cacache": "^15.2.0",
+-        "http-cache-semantics": "^4.1.0",
+-        "http-proxy-agent": "^4.0.1",
+-        "https-proxy-agent": "^5.0.0",
+-        "is-lambda": "^1.0.1",
+-        "lru-cache": "^6.0.0",
+-        "minipass": "^3.1.3",
+-        "minipass-collect": "^1.0.2",
+-        "minipass-fetch": "^1.3.2",
+-        "minipass-flush": "^1.0.5",
+-        "minipass-pipeline": "^1.2.4",
+-        "negotiator": "^0.6.2",
+-        "promise-retry": "^2.0.1",
+-        "socks-proxy-agent": "^6.0.0",
+-        "ssri": "^8.0.0"
+-      },
+-      "engines": {
+-        "node": ">= 10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/minipass-fetch": {
+-      "version": "1.4.1",
+-      "resolved": "https://registry.npmmirror.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+-      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "minipass": "^3.1.0",
+-        "minipass-sized": "^1.0.3",
+-        "minizlib": "^2.0.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      },
+-      "optionalDependencies": {
+-        "encoding": "^0.1.12"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/socks-proxy-agent": {
+-      "version": "6.2.1",
+-      "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+-      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "agent-base": "^6.0.2",
+-        "debug": "^4.3.3",
+-        "socks": "^2.6.2"
+-      },
+-      "engines": {
+-        "node": ">= 10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/ssri": {
+-      "version": "8.0.1",
+-      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
+-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "minipass": "^3.1.1"
+-      },
+-      "engines": {
+-        "node": ">= 8"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/unique-filename": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmmirror.com/unique-filename/-/unique-filename-1.1.1.tgz",
+-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "unique-slug": "^2.0.0"
++      "peerDependencies": {
++        "encoding": "^0.1.0"
++      },
++      "peerDependenciesMeta": {
++        "encoding": {
++          "optional": true
++        }
+       }
+     },
+-    "node_modules/node-sass/node_modules/node-gyp/node_modules/unique-slug": {
+-      "version": "2.0.2",
+-      "resolved": "https://registry.npmmirror.com/unique-slug/-/unique-slug-2.0.2.tgz",
+-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
++    "node_modules/node-forge": {
++      "version": "1.3.1",
++      "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz",
++      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "imurmurhash": "^0.1.4"
++      "engines": {
++        "node": ">= 6.13.0"
+       }
+     },
+-    "node_modules/node-sass/node_modules/nopt": {
+-      "version": "5.0.0",
+-      "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
+-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
++    "node_modules/node-gyp": {
++      "version": "9.4.1",
++      "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-9.4.1.tgz",
++      "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+       "dependencies": {
+-        "abbrev": "1"
++        "env-paths": "^2.2.0",
++        "exponential-backoff": "^3.1.1",
++        "glob": "^7.1.4",
++        "graceful-fs": "^4.2.6",
++        "make-fetch-happen": "^10.0.3",
++        "nopt": "^6.0.0",
++        "npmlog": "^6.0.0",
++        "rimraf": "^3.0.2",
++        "semver": "^7.3.5",
++        "tar": "^6.1.2",
++        "which": "^2.0.2"
+       },
+       "bin": {
+-        "nopt": "bin/nopt.js"
++        "node-gyp": "bin/node-gyp.js"
+       },
+       "engines": {
+-        "node": ">=6"
++        "node": "^12.13 || ^14.13 || >=16"
+       }
+     },
+-    "node_modules/node-sass/node_modules/rimraf": {
++    "node_modules/node-gyp/node_modules/rimraf": {
+       "version": "3.0.2",
+       "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+       "dependencies": {
+         "glob": "^7.1.3"
+       },
+@@ -14039,16 +13461,11 @@
+         "rimraf": "bin.js"
+       }
+     },
+-    "node_modules/node-sass/node_modules/semver": {
+-      "version": "7.5.4",
+-      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz",
+-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
++    "node_modules/node-gyp/node_modules/semver": {
++      "version": "7.6.2",
++      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
++      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "lru-cache": "^6.0.0"
+-      },
+       "bin": {
+         "semver": "bin/semver.js"
+       },
+@@ -14056,41 +13473,26 @@
+         "node": ">=10"
+       }
+     },
+-    "node_modules/node-sass/node_modules/semver/node_modules/lru-cache": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
++    "node_modules/node-loader": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmmirror.com/node-loader/-/node-loader-2.0.0.tgz",
++      "integrity": "sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q==",
+       "dev": true,
+-      "optional": true,
+-      "peer": true,
+       "dependencies": {
+-        "yallist": "^4.0.0"
++        "loader-utils": "^2.0.0"
+       },
+       "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/node-sass/node_modules/supports-color": {
+-      "version": "7.2.0",
+-      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "has-flag": "^4.0.0"
++        "node": ">= 10.13.0"
+       },
+-      "engines": {
+-        "node": ">=8"
++      "peerDependencies": {
++        "webpack": "^5.0.0"
+       }
+     },
+-    "node_modules/node-sass/node_modules/yallist": {
+-      "version": "4.0.0",
+-      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
++    "node_modules/node-releases": {
++      "version": "2.0.13",
++      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz",
++      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
++      "dev": true
+     },
+     "node_modules/nopt": {
+       "version": "6.0.0",
+@@ -14107,62 +13509,6 @@
+         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+       }
+     },
+-    "node_modules/normalize-package-data": {
+-      "version": "3.0.3",
+-      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "hosted-git-info": "^4.0.1",
+-        "is-core-module": "^2.5.0",
+-        "semver": "^7.3.4",
+-        "validate-npm-package-license": "^3.0.1"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/normalize-package-data/node_modules/lru-cache": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "yallist": "^4.0.0"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/normalize-package-data/node_modules/semver": {
+-      "version": "7.5.4",
+-      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz",
+-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "lru-cache": "^6.0.0"
+-      },
+-      "bin": {
+-        "semver": "bin/semver.js"
+-      },
+-      "engines": {
+-        "node": ">=10"
+-      }
+-    },
+-    "node_modules/normalize-package-data/node_modules/yallist": {
+-      "version": "4.0.0",
+-      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/normalize-path": {
+       "version": "3.0.0",
+       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+@@ -15292,11 +14638,6 @@
+       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+       "dev": true
+     },
+-    "node_modules/queue-tick": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmmirror.com/queue-tick/-/queue-tick-1.0.1.tgz",
+-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+-    },
+     "node_modules/quick-lru": {
+       "version": "5.1.1",
+       "resolved": "https://registry.npmmirror.com/quick-lru/-/quick-lru-5.1.1.tgz",
+@@ -15743,21 +15084,6 @@
+         "node": ">= 10.13.0"
+       }
+     },
+-    "node_modules/redent": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
+-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "indent-string": "^4.0.0",
+-        "strip-indent": "^3.0.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+     "node_modules/reflect.getprototypeof": {
+       "version": "1.0.10",
+       "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+@@ -16285,26 +15611,6 @@
+         "@parcel/watcher": "^2.4.1"
+       }
+     },
+-    "node_modules/sass-graph": {
+-      "version": "4.0.1",
+-      "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-4.0.1.tgz",
+-      "integrity": "sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "glob": "^7.0.0",
+-        "lodash": "^4.17.11",
+-        "scss-tokenizer": "^0.4.3",
+-        "yargs": "^17.2.1"
+-      },
+-      "bin": {
+-        "sassgraph": "bin/sassgraph"
+-      },
+-      "engines": {
+-        "node": ">=12"
+-      }
+-    },
+     "node_modules/sass-loader": {
+       "version": "16.0.4",
+       "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-16.0.4.tgz",
+@@ -16429,29 +15735,6 @@
+       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+       "dev": true
+     },
+-    "node_modules/scss-tokenizer": {
+-      "version": "0.4.3",
+-      "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz",
+-      "integrity": "sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "js-base64": "^2.4.9",
+-        "source-map": "^0.7.3"
+-      }
+-    },
+-    "node_modules/scss-tokenizer/node_modules/source-map": {
+-      "version": "0.7.4",
+-      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">= 8"
+-      }
+-    },
+     "node_modules/select-hose": {
+       "version": "2.0.0",
+       "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
+@@ -16730,28 +16013,49 @@
+       }
+     },
+     "node_modules/sharp": {
+-      "version": "0.32.6",
+-      "resolved": "https://registry.npmmirror.com/sharp/-/sharp-0.32.6.tgz",
+-      "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
++      "version": "0.33.5",
++      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
++      "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
+       "hasInstallScript": true,
++      "license": "Apache-2.0",
+       "dependencies": {
+         "color": "^4.2.3",
+-        "detect-libc": "^2.0.2",
+-        "node-addon-api": "^6.1.0",
+-        "prebuild-install": "^7.1.1",
+-        "semver": "^7.5.4",
+-        "simple-get": "^4.0.1",
+-        "tar-fs": "^3.0.4",
+-        "tunnel-agent": "^0.6.0"
++        "detect-libc": "^2.0.3",
++        "semver": "^7.6.3"
+       },
+       "engines": {
+-        "node": ">=14.15.0"
++        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
++      },
++      "funding": {
++        "url": "https://opencollective.com/libvips"
++      },
++      "optionalDependencies": {
++        "@img/sharp-darwin-arm64": "0.33.5",
++        "@img/sharp-darwin-x64": "0.33.5",
++        "@img/sharp-libvips-darwin-arm64": "1.0.4",
++        "@img/sharp-libvips-darwin-x64": "1.0.4",
++        "@img/sharp-libvips-linux-arm": "1.0.5",
++        "@img/sharp-libvips-linux-arm64": "1.0.4",
++        "@img/sharp-libvips-linux-s390x": "1.0.4",
++        "@img/sharp-libvips-linux-x64": "1.0.4",
++        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
++        "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
++        "@img/sharp-linux-arm": "0.33.5",
++        "@img/sharp-linux-arm64": "0.33.5",
++        "@img/sharp-linux-s390x": "0.33.5",
++        "@img/sharp-linux-x64": "0.33.5",
++        "@img/sharp-linuxmusl-arm64": "0.33.5",
++        "@img/sharp-linuxmusl-x64": "0.33.5",
++        "@img/sharp-wasm32": "0.33.5",
++        "@img/sharp-win32-ia32": "0.33.5",
++        "@img/sharp-win32-x64": "0.33.5"
+       }
+     },
+     "node_modules/sharp/node_modules/semver": {
+-      "version": "7.6.2",
+-      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
++      "version": "7.7.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "license": "ISC",
+       "bin": {
+         "semver": "bin/semver.js"
+       },
+@@ -17173,61 +16477,6 @@
+         "node": ">= 0.8"
+       }
+     },
+-    "node_modules/stdout-stream": {
+-      "version": "1.4.1",
+-      "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
+-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "readable-stream": "^2.0.1"
+-      }
+-    },
+-    "node_modules/stdout-stream/node_modules/isarray": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+-    "node_modules/stdout-stream/node_modules/readable-stream": {
+-      "version": "2.3.8",
+-      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "core-util-is": "~1.0.0",
+-        "inherits": "~2.0.3",
+-        "isarray": "~1.0.0",
+-        "process-nextick-args": "~2.0.0",
+-        "safe-buffer": "~5.1.1",
+-        "string_decoder": "~1.1.1",
+-        "util-deprecate": "~1.0.1"
+-      }
+-    },
+-    "node_modules/stdout-stream/node_modules/safe-buffer": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+-    "node_modules/stdout-stream/node_modules/string_decoder": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "safe-buffer": "~5.1.0"
+-      }
+-    },
+     "node_modules/stop-iteration-iterator": {
+       "version": "1.1.0",
+       "resolved": "https://registry.npmmirror.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+@@ -17252,18 +16501,6 @@
+         "node": ">= 0.10.0"
+       }
+     },
+-    "node_modules/streamx": {
+-      "version": "2.16.1",
+-      "resolved": "https://registry.npmmirror.com/streamx/-/streamx-2.16.1.tgz",
+-      "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==",
+-      "dependencies": {
+-        "fast-fifo": "^1.1.0",
+-        "queue-tick": "^1.0.1"
+-      },
+-      "optionalDependencies": {
+-        "bare-events": "^2.2.0"
+-      }
+-    },
+     "node_modules/string_decoder": {
+       "version": "1.3.0",
+       "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+@@ -17417,20 +16654,6 @@
+         "node": ">=6"
+       }
+     },
+-    "node_modules/strip-indent": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz",
+-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "min-indent": "^1.0.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+     "node_modules/strip-json-comments": {
+       "version": "3.1.1",
+       "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+@@ -17585,29 +16808,6 @@
+         "node": ">=10"
+       }
+     },
+-    "node_modules/tar-fs": {
+-      "version": "3.0.6",
+-      "resolved": "https://registry.npmmirror.com/tar-fs/-/tar-fs-3.0.6.tgz",
+-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+-      "dependencies": {
+-        "pump": "^3.0.0",
+-        "tar-stream": "^3.1.5"
+-      },
+-      "optionalDependencies": {
+-        "bare-fs": "^2.1.1",
+-        "bare-path": "^2.1.0"
+-      }
+-    },
+-    "node_modules/tar-stream": {
+-      "version": "3.1.7",
+-      "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-3.1.7.tgz",
+-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+-      "dependencies": {
+-        "b4a": "^1.6.4",
+-        "fast-fifo": "^1.2.0",
+-        "streamx": "^2.15.0"
+-      }
+-    },
+     "node_modules/tar/node_modules/yallist": {
+       "version": "4.0.0",
+       "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+@@ -17845,17 +17045,6 @@
+       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+       "dev": true
+     },
+-    "node_modules/trim-newlines": {
+-      "version": "3.0.1",
+-      "resolved": "https://registry.npmmirror.com/trim-newlines/-/trim-newlines-3.0.1.tgz",
+-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+     "node_modules/trim-repeated": {
+       "version": "1.0.0",
+       "resolved": "https://registry.npmmirror.com/trim-repeated/-/trim-repeated-1.0.0.tgz",
+@@ -17868,14 +17057,6 @@
+         "node": ">=0.10.0"
+       }
+     },
+-    "node_modules/true-case-path": {
+-      "version": "2.2.1",
+-      "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-2.2.1.tgz",
+-      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==",
+-      "dev": true,
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/ts-api-utils": {
+       "version": "1.4.3",
+       "resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+@@ -18088,7 +17269,7 @@
+       "version": "2.6.2",
+       "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.2.tgz",
+       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+-      "dev": true
++      "devOptional": true
+     },
+     "node_modules/tunnel-agent": {
+       "version": "0.6.0",
+diff --git a/package.json b/package.json
+index 407730b..c1f7293 100644
+--- a/package.json
++++ b/package.json
+@@ -118,7 +118,7 @@
+     "react-toastify": "^9.1.3",
+     "react-tooltip": "^5.26.4",
+     "rimraf": "^5.0.7",
+-    "sharp": "^0.32.6",
++    "sharp": "^0.33.4",
+     "socket.io": "^4.7.5",
+     "unzipper": "^0.11.6",
+     "webdav": "^5.6.0"
diff --git a/pkgs/by-name/mu/musicfree-desktop/electron-zip-dir.patch b/pkgs/by-name/mu/musicfree-desktop/electron-zip-dir.patch
new file mode 100644
index 000000000000..346f801bd106
--- /dev/null
+++ b/pkgs/by-name/mu/musicfree-desktop/electron-zip-dir.patch
@@ -0,0 +1,12 @@
+diff --git a/forge.config.ts b/forge.config.ts
+index 0b0b282..d732b68 100644
+--- a/forge.config.ts
++++ b/forge.config.ts
+@@ -14,6 +14,7 @@ const config: ForgeConfig = {
+     icon: path.resolve(__dirname, "res/logo"),
+     executableName: "MusicFree",
+     extraResource: [path.resolve(__dirname, "res")],
++    electronZipDir: path.resolve(__dirname, ".electron-packager/electron-zips"),
+     protocols: [
+       {
+         name: "MusicFree",
diff --git a/pkgs/by-name/mu/musicfree-desktop/no-startup-dev-tools.patch b/pkgs/by-name/mu/musicfree-desktop/no-startup-dev-tools.patch
new file mode 100644
index 000000000000..1fc087ce557b
--- /dev/null
+++ b/pkgs/by-name/mu/musicfree-desktop/no-startup-dev-tools.patch
@@ -0,0 +1,18 @@
+diff --git a/src/main/window-manager/index.ts b/src/main/window-manager/index.ts
+index 42fd81c..45f93ab 100644
+--- a/src/main/window-manager/index.ts
++++ b/src/main/window-manager/index.ts
+@@ -129,13 +129,6 @@ class WindowManager implements IWindowManager {
+         initUrl.hash = `/main/musicsheet/${localPluginName}/favorite`;
+         mainWindow.loadURL(initUrl.toString()).then(voidCallback);
+ 
+-        // 3. 开发者工具
+-        if (!app.isPackaged) {
+-            mainWindow.on("ready-to-show", () => {
+-                mainWindow.webContents.openDevTools();
+-            });
+-        }
+-
+         // 4. 主窗口http hack逻辑
+         mainWindow.webContents.session.webRequest.onBeforeSendHeaders(
+             (details, callback) => {
diff --git a/pkgs/by-name/mu/musicfree-desktop/package.nix b/pkgs/by-name/mu/musicfree-desktop/package.nix
new file mode 100644
index 000000000000..04a2f9d9d88b
--- /dev/null
+++ b/pkgs/by-name/mu/musicfree-desktop/package.nix
@@ -0,0 +1,168 @@
+{
+  lib,
+  stdenv,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  makeWrapper,
+  nix-update-script,
+  electron,
+  python3,
+  nodejs,
+  vips,
+  gitMinimal,
+  removeReferencesTo,
+  xcodebuild,
+  zip,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "musicfree-desktop";
+  version = "0.0.8";
+
+  inherit nodejs;
+
+  src = fetchFromGitHub {
+    owner = "maotoumao";
+    repo = "MusicFreeDesktop";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gGGlWzd6LRrB5EbkXZWqg2cwMyZ5OMQm6otpnZFUbvo=";
+  };
+
+  patches = [
+    # update sharp to recognize SHARP_FORCE_GLOBAL_LIBVIPS
+    # update node-abi to support newer Electron
+    # update nan to fix build with newer Electron (https://github.com/nodejs/nan/issues/921)
+    # see update.sh for how this patch was generated
+    ./bump-deps.patch
+
+    # tell electron-packager to look for Electron zips in a local dir
+    # instead of downloading them from the internet
+    ./electron-zip-dir.patch
+
+    # Do not open devtools on startup.
+    # ELECTRON_FORCE_IS_PACKAGED=1 should also do the trick,
+    # but it causes weird problem of being unable to look up the resource dir
+    ./no-startup-dev-tools.patch
+  ];
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+    (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp
+    gitMinimal # Used by electron-forge
+    zip
+    removeReferencesTo
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; # Used by better-sqlite3
+
+  npmDepsHash = "sha256-lxDEbf++QH1/DaIEgXMnmqMD9d5Ak7IJMc5pQjysKBA=";
+
+  postConfigure = ''
+    # use Electron's headers to make node-gyp compile against the Electron ABI
+    export npm_config_nodedir="${electron.headers}"
+
+    # override the detected electron version
+    substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
+      --replace-fail "return version" "return '${electron.version}'"
+
+    # create the electron archive to be used by electron-packager
+    # the contents do not matter, but some files must be present, such as a file named "electron" intended to be the executable
+    electron_zip=$(pwd)/.electron-packager/electron-zips/electron-v${electron.version}-${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}.zip
+    mkdir -p $(dirname $electron_zip)
+    ${
+      if stdenv.hostPlatform.isDarwin then
+        ''
+          for app in Electron.app{,/Contents/Frameworks/Electron\ Helper.app}; do
+            mkdir -p "$app/Contents/MacOS"
+            cp "${electron.dist}/$app/Contents/Info.plist" "$app/Contents/Info.plist"
+            chmod +w "$app/Contents/Info.plist"
+            echo dummy > "$app/Contents/MacOS/$(basename "$app" .app)"
+          done
+          zip -r $electron_zip Electron.app
+          rm -r Electron.app
+        ''
+      else
+        ''
+          echo dummy > electron
+          zip $electron_zip electron
+          rm electron
+        ''
+    }
+  '';
+
+  buildInputs = [
+    vips # for sharp
+  ];
+
+  # sharp tries to write to npm-deps/_libvips when compiling
+  makeCacheWritable = true;
+
+  npmBuildScript = "package";
+
+  env = {
+    SHARP_FORCE_GLOBAL_LIBVIPS = "1";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    # Have more info in build logs and also prevent the fancy UI of electron-forge spamming the build logs
+    DEBUG = "electron-forge:*,electron-packager,@electron/get:*";
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "musicfree-desktop";
+      desktopName = "MusicFree";
+      exec = "MusicFree %U";
+      icon = "musicfree-desktop";
+      type = "Application";
+      comment = finalAttrs.meta.description;
+      categories = [ "Utility" ];
+      mimeTypes = [ "x-scheme-handler/musicfree" ];
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    # the output of electron-forge is here
+    build_dir=$(find out -type d -maxdepth 1 -mindepth 1 | head -n1)
+    build_dir=$build_dir/${
+      if stdenv.hostPlatform.isDarwin then "MusicFree.app/Contents/Resources" else "resources"
+    }
+
+    phome=$out/lib/node_modules/musicfree-desktop
+    mkdir -p $(dirname $phome)
+    cp -ar $build_dir/app $phome
+    cp -ar $build_dir/res $phome
+    find $phome/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
+
+    makeWrapper ${lib.getExe electron} $out/bin/MusicFree \
+      --add-flags $phome \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --inherit-argv0
+
+    mkdir -p $out/share/pixmaps
+    ln -s $phome/res/logo.png $out/share/pixmaps/musicfree-desktop.png
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications/MusicFree.app/Contents/{MacOS,Resources}
+      cp $build_dir/../Info.plist $out/Applications/MusicFree.app/Contents
+      ln -s $out/bin/MusicFree $out/Applications/MusicFree.app/Contents/MacOS/MusicFree
+      ln -s $phome/res/logo.icns $out/Applications/MusicFree.app/Contents/Resources/electron.icns
+    ''}
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Customizable music player with plugin support";
+    homepage = "https://musicfree.catcat.work";
+    changelog = "https://github.com/maotoumao/MusicFreeDesktop/blob/${finalAttrs.src.tag}/changelog.md";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    mainProgram = "MusicFree";
+    platforms = electron.meta.platforms;
+  };
+})
diff --git a/pkgs/by-name/mu/musicfree-desktop/update.sh b/pkgs/by-name/mu/musicfree-desktop/update.sh
new file mode 100755
index 000000000000..1d08930fc9e5
--- /dev/null
+++ b/pkgs/by-name/mu/musicfree-desktop/update.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs nix-update jq curl patch diffutils
+
+set -euo pipefail
+
+old_version=$(nix-instantiate --eval -A musicfree-desktop.version | tr -d '"')
+new_version=$(curl -sL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/maotoumao/MusicFreeDesktop/releases/latest | jq -r .tag_name | tr -d v)
+if [ "$old_version" == "$new_version" ]; then
+  echo "Already up to date" >&2
+  exit
+fi
+
+patch=$(dirname $(nix-instantiate --eval -A musicfree-desktop.meta.position | tr -d '"' | cut -d : -f 1))/bump-deps.patch
+
+export HOME=$(mktemp -d)
+pushd $HOME
+
+curl -L https://github.com/maotoumao/MusicFreeDesktop/raw/v$new_version/package.json -o package.json
+curl -L https://github.com/maotoumao/MusicFreeDesktop/raw/v$new_version/package-lock.json -o package-lock.json
+
+if patch --batch --dry-run -p1 -i $patch; then
+  echo "Old patch works, no need to update" >&2
+else
+  mv package.json package.json.old
+  jq '.dependencies.sharp |= (if . != null and . < "^0.33.4" then "^0.33.4" else . end)' package.json.old > package.json
+  cp package-lock.json package-lock.json.old
+  npm update sharp node-abi nan --package-lock-only
+  diff -u --label a/package.json package.json.old --label b/package.json package.json > $patch || true
+  diff -u --label a/package-lock.json package-lock.json.old --label b/package-lock.json package-lock.json >> $patch || true
+fi
+
+popd
+
+nix-update musicfree-desktop --version $new_version

From 22bae6619b6ec630e8d39c916a49614cb284c29b Mon Sep 17 00:00:00 2001
From: confus <con-f-use@gmx.net>
Date: Fri, 20 Mar 2026 00:38:07 +0100
Subject: [PATCH 27/70] python3Packages.devpi-web: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/development/python-modules/devpi-web/default.nix b/pkgs/development/python-modules/devpi-web/default.nix
index 258e5e2cb203..e4d7df24bf20 100644
--- a/pkgs/development/python-modules/devpi-web/default.nix
+++ b/pkgs/development/python-modules/devpi-web/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "devpi-web";
-  version = "5.0.1";
+  version = "5.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "devpi";
     repo = "devpi";
     tag = "web-${finalAttrs.version}";
-    hash = "sha256-p52uwkXeCPPsnD9BLfqEa8NK4bAfIdpYIzdNgmwucms=";
+    hash = "sha256-rAku3oHcmzFNA/MP/64382gCTgqopwjjy4S4HTEFZiY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/web";

From 268ab8e9ecf614f4d2523029aa53b8af47fd3514 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2026 04:16:01 +0000
Subject: [PATCH 28/70] nextcloud-spreed-signaling: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
index e17b9acb99d8..b23c98601fba 100644
--- a/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
+++ b/pkgs/by-name/ne/nextcloud-spreed-signaling/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nextcloud-spreed-signaling";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "nextcloud-spreed-signaling";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WEA5sbQzcsnHGVeog3lZXF3/veJxw39rF1++ejS4aWA=";
+    hash = "sha256-thXTIvaEufGOYWFMiqZxUcqhZbXRQgTj2FeZ2s/gqaI=";
   };
 
-  vendorHash = "sha256-osxQW5nR37bLKHOuC7jAWNjSgJZy8KzWDgC2Mo36ovA=";
+  vendorHash = "sha256-qLyehDoZZBCzlc8X/il1+8gtX6M/nhjqUKccebuxLVE=";
 
   strictDeps = true;
 

From dcaf75a1936c3d5894616702d13dc8dee9b6d61d Mon Sep 17 00:00:00 2001
From: confus <con-f-use@gmx.net>
Date: Fri, 20 Mar 2026 18:56:54 +0100
Subject: [PATCH 29/70] devpi-web: disable deleted mirror index test

Was newly added and fails only on darwin. The underlying feature seems
to work fine, see: https://github.com/devpi/devpi/issues/1114
---
 pkgs/development/python-modules/devpi-web/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/devpi-web/default.nix b/pkgs/development/python-modules/devpi-web/default.nix
index e4d7df24bf20..ac54b3525e73 100644
--- a/pkgs/development/python-modules/devpi-web/default.nix
+++ b/pkgs/development/python-modules/devpi-web/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   gitUpdater,
@@ -70,6 +71,11 @@ buildPythonPackage (finalAttrs: {
     webtest
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # https://github.com/devpi/devpi/issues/1114
+    "test_dont_index_deleted_mirror"
+  ];
+
   pythonImportsCheck = [ "devpi_web" ];
 
   # devpi uses a monorepo for server, common, client and web

From 505acabc2a1afbb59e16ad06924420e430eddfe9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2026 14:07:15 +0000
Subject: [PATCH 30/70] gcli: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index ce68dfada20c..3dfaee7f72d9 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gcli";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "herrhotzenplotz";
     repo = "gcli";
     rev = "v${version}";
-    hash = "sha256-2L6/ZYxRY2xrTxr/oD02xCRqdk7VWrPlFwr8wU8C2x8=";
+    hash = "sha256-KTXAmwLTOGvFlJ52w6PplVlF72CC5JJheGlhJirh2+I=";
   };
 
   nativeBuildInputs = [

From daca8fcb7ba9a3fa90b03390e0b2a34c01d95614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B3pez?= <hola@devel0pez.com>
Date: Sat, 21 Mar 2026 15:36:36 +0100
Subject: [PATCH 31/70] sail: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/sa/sail/package.nix b/pkgs/by-name/sa/sail/package.nix
index 478eaf7d48bb..7802eee190d1 100644
--- a/pkgs/by-name/sa/sail/package.nix
+++ b/pkgs/by-name/sa/sail/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sail";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "lakehq";
     repo = "sail";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z2XOce95VTlZSTaxRMkTYoXVRiT8cgAk/lK/zLu2Zpo=";
+    hash = "sha256-PPtA/I2M99wiO7XRsR5UfPejjDXk/6sag5lhqwCctqo=";
   };
 
-  cargoHash = "sha256-aZBABAFA3vVxTImRqZAZ/RwUQIQU+VvKzbRfIM0k8FU=";
+  cargoHash = "sha256-/NnaXzXvTT7ZRGGLjDpKFjcX65rz++MrWZYYO3JvBUU=";
 
   cargoBuildFlags = [
     "-p"

From 39667bac1674e067f5b00ff6d533469a354a893d Mon Sep 17 00:00:00 2001
From: azban <me@azban.net>
Date: Sat, 21 Mar 2026 18:52:14 -0600
Subject: [PATCH 32/70] openvpn3: fix unused result from proto ParseString

This was previously failing with an "unused-result" error. This patches
that fix, and builds properly afterwards. A patch has been submitted to
the development list.
---
 ...lt-from-DcoKeyConfig_ParseFromString.patch | 28 +++++++++++++++++++
 pkgs/by-name/op/openvpn3/package.nix          |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/op/openvpn3/0001-handle-result-from-DcoKeyConfig_ParseFromString.patch

diff --git a/pkgs/by-name/op/openvpn3/0001-handle-result-from-DcoKeyConfig_ParseFromString.patch b/pkgs/by-name/op/openvpn3/0001-handle-result-from-DcoKeyConfig_ParseFromString.patch
new file mode 100644
index 000000000000..38878fa02c1e
--- /dev/null
+++ b/pkgs/by-name/op/openvpn3/0001-handle-result-from-DcoKeyConfig_ParseFromString.patch
@@ -0,0 +1,28 @@
+From ee192f35d29ecae64dc00b4736e1870274b58cc8 Mon Sep 17 00:00:00 2001
+From: azban <me@azban.net>
+Date: Sat, 21 Mar 2026 18:41:34 -0600
+Subject: [PATCH] handle result from DcoKeyConfig_ParseFromString
+
+This previously failed with error unused-result. This checks the result and throws an exception if the parsing fails.
+---
+ src/netcfg/netcfg-dco.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/netcfg/netcfg-dco.cpp b/src/netcfg/netcfg-dco.cpp
+index 290c12a8..f41836bf 100644
+--- a/src/netcfg/netcfg-dco.cpp
++++ b/src/netcfg/netcfg-dco.cpp
+@@ -265,7 +265,9 @@ void NetCfgDCO::method_new_key(GVariant *params)
+     std::string key_config = glib2::Value::Extract<std::string>(params, 1);
+ 
+     DcoKeyConfig dco_kc;
+-    dco_kc.ParseFromString(base64->decode(key_config));
++    if (!dco_kc.ParseFromString(base64->decode(key_config))) {
++        throw NetCfgException("Failed to parse DCO key config");
++    }
+ 
+     auto copyKeyDirection = [](const DcoKeyConfig_KeyDirection &src, KoRekey::KeyDirection &dst)
+     {
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index d9e8b9ad99a8..58e4e73c1284 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
   patches = [
     # Should be fixed in v26: https://codeberg.org/OpenVPN/openvpn3-linux/issues/70
     ./v25-latest-linux-fix.patch
+    ./0001-handle-result-from-DcoKeyConfig_ParseFromString.patch
   ];
 
   postPatch = ''

From 51a40077dad07ef6e80fca1afca31586530a769a Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Fri, 6 Mar 2026 10:06:16 +0800
Subject: [PATCH 33/70] tts-mod-vault: 1.3.0 -> 2.0.0

---
 pkgs/by-name/tt/tts-mod-vault/package.nix     |   42 +-
 .../tt/tts-mod-vault/pubspec.lock.json        | 2848 +++++++++--------
 2 files changed, 1610 insertions(+), 1280 deletions(-)

diff --git a/pkgs/by-name/tt/tts-mod-vault/package.nix b/pkgs/by-name/tt/tts-mod-vault/package.nix
index 6464ce2ed4e8..addbe5f6c9d3 100644
--- a/pkgs/by-name/tt/tts-mod-vault/package.nix
+++ b/pkgs/by-name/tt/tts-mod-vault/package.nix
@@ -1,20 +1,24 @@
 {
   lib,
-  flutter329,
+  flutter341,
   makeDesktopItem,
   copyDesktopItems,
   fetchFromGitHub,
+  runCommand,
+  yq-go,
+  nix-update-script,
+  _experimental-update-script-combinators,
 }:
 
-flutter329.buildFlutterApplication rec {
+flutter341.buildFlutterApplication (finalAttrs: {
   pname = "tts-mod-vault";
-  version = "1.3.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "markomijic";
     repo = "TTS-Mod-Vault";
-    tag = "v${version}";
-    hash = "sha256-BTs+4QeyVJeg415uiNXww8twQwUInHfB8voWJjeVs20=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vreamzu+jzlgzjbEro5kE5bM1k6cL6XCG6Tsv+LEiyI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -32,10 +36,36 @@ flutter329.buildFlutterApplication rec {
 
   nativeBuildInputs = [ copyDesktopItems ];
 
+  preBuild = ''
+    echo 'SUPABASE_URL=https://pdrmmvvtindfbpxlcdps.supabase.co' > .env
+    echo 'SUPABASE_PUBLISHABLE_KEY=sb_publishable_CF6qzs1W8zd_hcVWHSCdVw__2SRB60p' >> .env
+  '';
+
   postInstall = ''
     install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts_mod_vault.png
   '';
 
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          inherit (finalAttrs) src;
+          nativeBuildInputs = [ yq-go ];
+        }
+        ''
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "tts-mod-vault.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+    ];
+  };
+
   meta = {
     description = "Download and backup assets for your Tabletop Simulator mods";
     homepage = "https://github.com/markomijic/TTS-Mod-Vault";
@@ -44,4 +74,4 @@ flutter329.buildFlutterApplication rec {
     mainProgram = "tts_mod_vault";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
index 8e0693d40d25..93ffa33d1d5b 100644
--- a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
+++ b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
@@ -1,1278 +1,1578 @@
 {
-    "packages": {
-        "_fe_analyzer_shared": {
-            "dependency": "transitive",
-            "description": {
-                "name": "_fe_analyzer_shared",
-                "sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "88.0.0"
-        },
-        "analyzer": {
-            "dependency": "transitive",
-            "description": {
-                "name": "analyzer",
-                "sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "8.1.1"
-        },
-        "archive": {
-            "dependency": "direct main",
-            "description": {
-                "name": "archive",
-                "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.0.7"
-        },
-        "args": {
-            "dependency": "transitive",
-            "description": {
-                "name": "args",
-                "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.7.0"
-        },
-        "async": {
-            "dependency": "transitive",
-            "description": {
-                "name": "async",
-                "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.12.0"
-        },
-        "boolean_selector": {
-            "dependency": "transitive",
-            "description": {
-                "name": "boolean_selector",
-                "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.2"
-        },
-        "bson": {
-            "dependency": "direct main",
-            "description": {
-                "name": "bson",
-                "sha256": "f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.0.7"
-        },
-        "build": {
-            "dependency": "transitive",
-            "description": {
-                "name": "build",
-                "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.0.0"
-        },
-        "build_config": {
-            "dependency": "transitive",
-            "description": {
-                "name": "build_config",
-                "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.2.0"
-        },
-        "build_daemon": {
-            "dependency": "transitive",
-            "description": {
-                "name": "build_daemon",
-                "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.0.4"
-        },
-        "build_runner": {
-            "dependency": "direct dev",
-            "description": {
-                "name": "build_runner",
-                "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.8.0"
-        },
-        "built_collection": {
-            "dependency": "transitive",
-            "description": {
-                "name": "built_collection",
-                "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.1.1"
-        },
-        "built_value": {
-            "dependency": "transitive",
-            "description": {
-                "name": "built_value",
-                "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "8.12.0"
-        },
-        "characters": {
-            "dependency": "transitive",
-            "description": {
-                "name": "characters",
-                "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.4.0"
-        },
-        "checked_yaml": {
-            "dependency": "transitive",
-            "description": {
-                "name": "checked_yaml",
-                "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.0.3"
-        },
-        "cli_util": {
-            "dependency": "transitive",
-            "description": {
-                "name": "cli_util",
-                "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.4.2"
-        },
-        "clock": {
-            "dependency": "transitive",
-            "description": {
-                "name": "clock",
-                "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.1.2"
-        },
-        "code_builder": {
-            "dependency": "transitive",
-            "description": {
-                "name": "code_builder",
-                "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.11.0"
-        },
-        "collection": {
-            "dependency": "direct main",
-            "description": {
-                "name": "collection",
-                "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.19.1"
-        },
-        "convert": {
-            "dependency": "transitive",
-            "description": {
-                "name": "convert",
-                "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.1.2"
-        },
-        "cross_file": {
-            "dependency": "transitive",
-            "description": {
-                "name": "cross_file",
-                "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.3.4+2"
-        },
-        "crypto": {
-            "dependency": "transitive",
-            "description": {
-                "name": "crypto",
-                "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.0.6"
-        },
-        "dart_style": {
-            "dependency": "transitive",
-            "description": {
-                "name": "dart_style",
-                "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.1.2"
-        },
-        "dbus": {
-            "dependency": "transitive",
-            "description": {
-                "name": "dbus",
-                "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.7.11"
-        },
-        "decimal": {
-            "dependency": "transitive",
-            "description": {
-                "name": "decimal",
-                "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.2.4"
-        },
-        "dio": {
-            "dependency": "direct main",
-            "description": {
-                "name": "dio",
-                "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.9.0"
-        },
-        "dio_web_adapter": {
-            "dependency": "transitive",
-            "description": {
-                "name": "dio_web_adapter",
-                "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.1"
-        },
-        "fake_async": {
-            "dependency": "transitive",
-            "description": {
-                "name": "fake_async",
-                "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.3.2"
-        },
-        "ffi": {
-            "dependency": "transitive",
-            "description": {
-                "name": "ffi",
-                "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.4"
-        },
-        "file": {
-            "dependency": "transitive",
-            "description": {
-                "name": "file",
-                "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "7.0.1"
-        },
-        "file_picker": {
-            "dependency": "direct main",
-            "description": {
-                "name": "file_picker",
-                "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "10.3.3"
-        },
-        "fixnum": {
-            "dependency": "transitive",
-            "description": {
-                "name": "fixnum",
-                "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.1.1"
-        },
-        "flutter": {
-            "dependency": "direct main",
-            "description": "flutter",
-            "source": "sdk",
-            "version": "0.0.0"
-        },
-        "flutter_archive": {
-            "dependency": "direct main",
-            "description": {
-                "name": "flutter_archive",
-                "sha256": "5ca235f304c12bf468979235f400f79846d204169d715939e39197106f5fc970",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.0.3"
-        },
-        "flutter_hooks": {
-            "dependency": "direct main",
-            "description": {
-                "name": "flutter_hooks",
-                "sha256": "b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.21.2"
-        },
-        "flutter_launcher_icons": {
-            "dependency": "direct dev",
-            "description": {
-                "name": "flutter_launcher_icons",
-                "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.14.4"
-        },
-        "flutter_lints": {
-            "dependency": "direct dev",
-            "description": {
-                "name": "flutter_lints",
-                "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.0.0"
-        },
-        "flutter_localizations": {
-            "dependency": "direct main",
-            "description": "flutter",
-            "source": "sdk",
-            "version": "0.0.0"
-        },
-        "flutter_plugin_android_lifecycle": {
-            "dependency": "transitive",
-            "description": {
-                "name": "flutter_plugin_android_lifecycle",
-                "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.0.30"
-        },
-        "flutter_riverpod": {
-            "dependency": "transitive",
-            "description": {
-                "name": "flutter_riverpod",
-                "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.6.1"
-        },
-        "flutter_test": {
-            "dependency": "direct dev",
-            "description": "flutter",
-            "source": "sdk",
-            "version": "0.0.0"
-        },
-        "flutter_web_plugins": {
-            "dependency": "transitive",
-            "description": "flutter",
-            "source": "sdk",
-            "version": "0.0.0"
-        },
-        "frontend_server_client": {
-            "dependency": "transitive",
-            "description": {
-                "name": "frontend_server_client",
-                "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.0.0"
-        },
-        "glob": {
-            "dependency": "transitive",
-            "description": {
-                "name": "glob",
-                "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.3"
-        },
-        "graphs": {
-            "dependency": "transitive",
-            "description": {
-                "name": "graphs",
-                "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.3.2"
-        },
-        "hive_ce": {
-            "dependency": "direct main",
-            "description": {
-                "name": "hive_ce",
-                "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.13.2"
-        },
-        "hive_ce_flutter": {
-            "dependency": "direct main",
-            "description": {
-                "name": "hive_ce_flutter",
-                "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.3.2"
-        },
-        "hive_ce_generator": {
-            "dependency": "direct dev",
-            "description": {
-                "name": "hive_ce_generator",
-                "sha256": "8c677690c8ead43778ddf7ed8ff17e852dd5d22d082c75182b072842c0dc5055",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.9.5"
-        },
-        "hooks_riverpod": {
-            "dependency": "direct main",
-            "description": {
-                "name": "hooks_riverpod",
-                "sha256": "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.6.1"
-        },
-        "http": {
-            "dependency": "direct main",
-            "description": {
-                "name": "http",
-                "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.5.0"
-        },
-        "http_multi_server": {
-            "dependency": "transitive",
-            "description": {
-                "name": "http_multi_server",
-                "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.2.2"
-        },
-        "http_parser": {
-            "dependency": "transitive",
-            "description": {
-                "name": "http_parser",
-                "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.1.2"
-        },
-        "image": {
-            "dependency": "direct main",
-            "description": {
-                "name": "image",
-                "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.5.4"
-        },
-        "intl": {
-            "dependency": "direct main",
-            "description": {
-                "name": "intl",
-                "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.19.0"
-        },
-        "io": {
-            "dependency": "transitive",
-            "description": {
-                "name": "io",
-                "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.0.5"
-        },
-        "isolate_channel": {
-            "dependency": "transitive",
-            "description": {
-                "name": "isolate_channel",
-                "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.2+1"
-        },
-        "json_annotation": {
-            "dependency": "transitive",
-            "description": {
-                "name": "json_annotation",
-                "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.9.0"
-        },
-        "leak_tracker": {
-            "dependency": "transitive",
-            "description": {
-                "name": "leak_tracker",
-                "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "10.0.8"
-        },
-        "leak_tracker_flutter_testing": {
-            "dependency": "transitive",
-            "description": {
-                "name": "leak_tracker_flutter_testing",
-                "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.0.9"
-        },
-        "leak_tracker_testing": {
-            "dependency": "transitive",
-            "description": {
-                "name": "leak_tracker_testing",
-                "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.0.1"
-        },
-        "lints": {
-            "dependency": "transitive",
-            "description": {
-                "name": "lints",
-                "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.1.1"
-        },
-        "logging": {
-            "dependency": "transitive",
-            "description": {
-                "name": "logging",
-                "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.3.0"
-        },
-        "matcher": {
-            "dependency": "transitive",
-            "description": {
-                "name": "matcher",
-                "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.12.17"
-        },
-        "material_color_utilities": {
-            "dependency": "transitive",
-            "description": {
-                "name": "material_color_utilities",
-                "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.11.1"
-        },
-        "meta": {
-            "dependency": "transitive",
-            "description": {
-                "name": "meta",
-                "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.16.0"
-        },
-        "mime": {
-            "dependency": "direct main",
-            "description": {
-                "name": "mime",
-                "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.0.0"
-        },
-        "open_filex": {
-            "dependency": "direct main",
-            "description": {
-                "name": "open_filex",
-                "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.7.0"
-        },
-        "package_config": {
-            "dependency": "transitive",
-            "description": {
-                "name": "package_config",
-                "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.2.0"
-        },
-        "package_info_plus": {
-            "dependency": "direct main",
-            "description": {
-                "name": "package_info_plus",
-                "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "9.0.0"
-        },
-        "package_info_plus_platform_interface": {
-            "dependency": "transitive",
-            "description": {
-                "name": "package_info_plus_platform_interface",
-                "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.2.1"
-        },
-        "packages_extensions": {
-            "dependency": "transitive",
-            "description": {
-                "name": "packages_extensions",
-                "sha256": "1fb328695a9828c80d275ce1650a2bb5947690070de082dfa1dfac7429378daf",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.1.1"
-        },
-        "path": {
-            "dependency": "direct main",
-            "description": {
-                "name": "path",
-                "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.9.1"
-        },
-        "path_provider": {
-            "dependency": "direct main",
-            "description": {
-                "name": "path_provider",
-                "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.5"
-        },
-        "path_provider_android": {
-            "dependency": "transitive",
-            "description": {
-                "name": "path_provider_android",
-                "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.2.18"
-        },
-        "path_provider_foundation": {
-            "dependency": "transitive",
-            "description": {
-                "name": "path_provider_foundation",
-                "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.4.2"
-        },
-        "path_provider_linux": {
-            "dependency": "transitive",
-            "description": {
-                "name": "path_provider_linux",
-                "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.2.1"
-        },
-        "path_provider_platform_interface": {
-            "dependency": "transitive",
-            "description": {
-                "name": "path_provider_platform_interface",
-                "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.2"
-        },
-        "path_provider_windows": {
-            "dependency": "transitive",
-            "description": {
-                "name": "path_provider_windows",
-                "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.3.0"
-        },
-        "petitparser": {
-            "dependency": "transitive",
-            "description": {
-                "name": "petitparser",
-                "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.1.0"
-        },
-        "platform": {
-            "dependency": "transitive",
-            "description": {
-                "name": "platform",
-                "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.1.6"
-        },
-        "plugin_platform_interface": {
-            "dependency": "transitive",
-            "description": {
-                "name": "plugin_platform_interface",
-                "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.8"
-        },
-        "pool": {
-            "dependency": "transitive",
-            "description": {
-                "name": "pool",
-                "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.5.2"
-        },
-        "posix": {
-            "dependency": "transitive",
-            "description": {
-                "name": "posix",
-                "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.0.3"
-        },
-        "power_extensions": {
-            "dependency": "transitive",
-            "description": {
-                "name": "power_extensions",
-                "sha256": "ad0e8b2420090d996fe8b7fd32cdf02b9b924b6d4fc0fb0b559ff6aa5e24d5b0",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.3"
-        },
-        "pub_semver": {
-            "dependency": "transitive",
-            "description": {
-                "name": "pub_semver",
-                "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.2.0"
-        },
-        "pubspec_parse": {
-            "dependency": "transitive",
-            "description": {
-                "name": "pubspec_parse",
-                "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.5.0"
-        },
-        "rational": {
-            "dependency": "transitive",
-            "description": {
-                "name": "rational",
-                "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.2.3"
-        },
-        "riverpod": {
-            "dependency": "transitive",
-            "description": {
-                "name": "riverpod",
-                "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.6.1"
-        },
-        "screen_retriever": {
-            "dependency": "transitive",
-            "description": {
-                "name": "screen_retriever",
-                "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.0"
-        },
-        "screen_retriever_linux": {
-            "dependency": "transitive",
-            "description": {
-                "name": "screen_retriever_linux",
-                "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.0"
-        },
-        "screen_retriever_macos": {
-            "dependency": "transitive",
-            "description": {
-                "name": "screen_retriever_macos",
-                "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.0"
-        },
-        "screen_retriever_platform_interface": {
-            "dependency": "transitive",
-            "description": {
-                "name": "screen_retriever_platform_interface",
-                "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.0"
-        },
-        "screen_retriever_windows": {
-            "dependency": "transitive",
-            "description": {
-                "name": "screen_retriever_windows",
-                "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.2.0"
-        },
-        "shelf": {
-            "dependency": "transitive",
-            "description": {
-                "name": "shelf",
-                "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.4.2"
-        },
-        "shelf_web_socket": {
-            "dependency": "transitive",
-            "description": {
-                "name": "shelf_web_socket",
-                "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.0.0"
-        },
-        "sky_engine": {
-            "dependency": "transitive",
-            "description": "flutter",
-            "source": "sdk",
-            "version": "0.0.0"
-        },
-        "source_gen": {
-            "dependency": "transitive",
-            "description": {
-                "name": "source_gen",
-                "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.0.1"
-        },
-        "source_helper": {
-            "dependency": "transitive",
-            "description": {
-                "name": "source_helper",
-                "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.3.8"
-        },
-        "source_span": {
-            "dependency": "transitive",
-            "description": {
-                "name": "source_span",
-                "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.10.1"
-        },
-        "sprintf": {
-            "dependency": "transitive",
-            "description": {
-                "name": "sprintf",
-                "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "7.0.0"
-        },
-        "stack_trace": {
-            "dependency": "transitive",
-            "description": {
-                "name": "stack_trace",
-                "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.12.1"
-        },
-        "state_notifier": {
-            "dependency": "transitive",
-            "description": {
-                "name": "state_notifier",
-                "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.0.0"
-        },
-        "stream_channel": {
-            "dependency": "transitive",
-            "description": {
-                "name": "stream_channel",
-                "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.4"
-        },
-        "stream_transform": {
-            "dependency": "transitive",
-            "description": {
-                "name": "stream_transform",
-                "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.1"
-        },
-        "string_scanner": {
-            "dependency": "transitive",
-            "description": {
-                "name": "string_scanner",
-                "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.4.1"
-        },
-        "term_glyph": {
-            "dependency": "transitive",
-            "description": {
-                "name": "term_glyph",
-                "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.2.2"
-        },
-        "test_api": {
-            "dependency": "transitive",
-            "description": {
-                "name": "test_api",
-                "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.7.4"
-        },
-        "typed_data": {
-            "dependency": "transitive",
-            "description": {
-                "name": "typed_data",
-                "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.4.0"
-        },
-        "url_launcher": {
-            "dependency": "direct main",
-            "description": {
-                "name": "url_launcher",
-                "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.3.2"
-        },
-        "url_launcher_android": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_android",
-                "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.3.20"
-        },
-        "url_launcher_ios": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_ios",
-                "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.3.4"
-        },
-        "url_launcher_linux": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_linux",
-                "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.2.1"
-        },
-        "url_launcher_macos": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_macos",
-                "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.2.3"
-        },
-        "url_launcher_platform_interface": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_platform_interface",
-                "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.3.2"
-        },
-        "url_launcher_web": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_web",
-                "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.4.1"
-        },
-        "url_launcher_windows": {
-            "dependency": "transitive",
-            "description": {
-                "name": "url_launcher_windows",
-                "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.1.4"
-        },
-        "uuid": {
-            "dependency": "transitive",
-            "description": {
-                "name": "uuid",
-                "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "4.5.1"
-        },
-        "vector_math": {
-            "dependency": "transitive",
-            "description": {
-                "name": "vector_math",
-                "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.4"
-        },
-        "vm_service": {
-            "dependency": "transitive",
-            "description": {
-                "name": "vm_service",
-                "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "14.3.1"
-        },
-        "watcher": {
-            "dependency": "transitive",
-            "description": {
-                "name": "watcher",
-                "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.1.3"
-        },
-        "web": {
-            "dependency": "transitive",
-            "description": {
-                "name": "web",
-                "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.1.1"
-        },
-        "web_socket": {
-            "dependency": "transitive",
-            "description": {
-                "name": "web_socket",
-                "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.0.1"
-        },
-        "web_socket_channel": {
-            "dependency": "transitive",
-            "description": {
-                "name": "web_socket_channel",
-                "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.0.3"
-        },
-        "win32": {
-            "dependency": "transitive",
-            "description": {
-                "name": "win32",
-                "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "5.13.0"
-        },
-        "window_manager": {
-            "dependency": "direct main",
-            "description": {
-                "name": "window_manager",
-                "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "0.5.1"
-        },
-        "xdg_directories": {
-            "dependency": "transitive",
-            "description": {
-                "name": "xdg_directories",
-                "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "1.1.0"
-        },
-        "xml": {
-            "dependency": "transitive",
-            "description": {
-                "name": "xml",
-                "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "6.5.0"
-        },
-        "yaml": {
-            "dependency": "transitive",
-            "description": {
-                "name": "yaml",
-                "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "3.1.3"
-        },
-        "yaml_writer": {
-            "dependency": "transitive",
-            "description": {
-                "name": "yaml_writer",
-                "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
-                "url": "https://pub.dev"
-            },
-            "source": "hosted",
-            "version": "2.1.0"
-        }
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "96.0.0"
     },
-    "sdks": {
-        "dart": ">=3.7.0 <4.0.0",
-        "flutter": ">=3.29.0"
+    "adaptive_number": {
+      "dependency": "transitive",
+      "description": {
+        "name": "adaptive_number",
+        "sha256": "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.2.0"
+    },
+    "app_links": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links",
+        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.4.1"
+    },
+    "app_links_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_linux",
+        "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.3"
+    },
+    "app_links_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_platform_interface",
+        "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "app_links_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_web",
+        "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "archive": {
+      "dependency": "direct main",
+      "description": {
+        "name": "archive",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.9"
+    },
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.0"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "bson": {
+      "dependency": "direct main",
+      "description": {
+        "name": "bson",
+        "sha256": "6e322cdf827db905ca48b018deed1804934840bce8ff6b3c2f5b2f81f99d8344",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.0.8"
+    },
+    "build": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build",
+        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.4"
+    },
+    "build_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_config",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "build_daemon": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "build_runner": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_runner",
+        "sha256": "39ad4ca8a2876779737c60e4228b4bcd35d4352ef7e14e47514093edc012c734",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.11.1"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.12.4"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "cli_util": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_util",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.2"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "code_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_builder",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.1"
+    },
+    "collection": {
+      "dependency": "direct main",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "cross_file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cross_file",
+        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.5+2"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "dart_jsonwebtoken": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_jsonwebtoken",
+        "sha256": "0de65691c1d736e9459f22f654ddd6fd8368a271d4e41aa07e53e6301eff5075",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.3.1"
+    },
+    "dart_style": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_style",
+        "sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.5"
+    },
+    "dbus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dbus",
+        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.12"
+    },
+    "decimal": {
+      "dependency": "transitive",
+      "description": {
+        "name": "decimal",
+        "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.4"
+    },
+    "dio": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dio",
+        "sha256": "b9d46faecab38fc8cc286f80bc4d61a3bb5d4ac49e51ed877b4d6706efe57b25",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.9.1"
+    },
+    "dio_web_adapter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dio_web_adapter",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "ed25519_edwards": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ed25519_edwards",
+        "sha256": "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.1"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.3"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "file_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file_picker",
+        "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.3.10"
+    },
+    "fixnum": {
+      "dependency": "direct main",
+      "description": {
+        "name": "fixnum",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_archive": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_archive",
+        "sha256": "e433389fde0bdfc20af40784fdb6d91753794b40cf708a43f95244fcd5d6c298",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.4"
+    },
+    "flutter_dotenv": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_dotenv",
+        "sha256": "d4130c4a43e0b13fefc593bc3961f2cb46e30cb79e253d4a526b1b5d24ae1ce4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.0"
+    },
+    "flutter_hooks": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_hooks",
+        "sha256": "8ae1f090e5f4ef5cfa6670ce1ab5dddadd33f3533a7f9ba19d9f958aa2a89f42",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.21.3+1"
+    },
+    "flutter_launcher_icons": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_launcher_icons",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.14.4"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.0"
+    },
+    "flutter_localizations": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_plugin_android_lifecycle": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_plugin_android_lifecycle",
+        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.33"
+    },
+    "flutter_riverpod": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_riverpod",
+        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "functions_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "functions_client",
+        "sha256": "94074d62167ae634127ef6095f536835063a7dc80f2b1aa306d2346ff9023996",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.0"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "gotrue": {
+      "dependency": "transitive",
+      "description": {
+        "name": "gotrue",
+        "sha256": "f7b52008311941a7c3e99f9590c4ee32dfc102a5442e43abf1b287d9f8cc39b2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.18.0"
+    },
+    "graphs": {
+      "dependency": "transitive",
+      "description": {
+        "name": "graphs",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "gtk": {
+      "dependency": "transitive",
+      "description": {
+        "name": "gtk",
+        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "hive_ce": {
+      "dependency": "direct main",
+      "description": {
+        "name": "hive_ce",
+        "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.19.3"
+    },
+    "hive_ce_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "hive_ce_flutter",
+        "sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.4"
+    },
+    "hive_ce_generator": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "hive_ce_generator",
+        "sha256": "c9a7cda57823ffec35846c051637ddcd105eafa253e7395d9c8c0ed5e87fbb72",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.11.1"
+    },
+    "hooks": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hooks",
+        "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "hooks_riverpod": {
+      "dependency": "direct main",
+      "description": {
+        "name": "hooks_riverpod",
+        "sha256": "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
+    },
+    "http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "http",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "image": {
+      "dependency": "direct main",
+      "description": {
+        "name": "image",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.8.0"
+    },
+    "intl": {
+      "dependency": "direct main",
+      "description": {
+        "name": "intl",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.20.2"
+    },
+    "io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "isolate_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_channel",
+        "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.1"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.0"
+    },
+    "jwt_decode": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jwt_decode",
+        "sha256": "d2e9f68c052b2225130977429d30f187aa1981d789c76ad104a32243cfdebfbb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.1"
+    },
+    "leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "11.0.2"
+    },
+    "leak_tracker_flutter_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_flutter_testing",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.10"
+    },
+    "leak_tracker_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_testing",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.0"
+    },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.18"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.13.0"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.1"
+    },
+    "mime": {
+      "dependency": "direct main",
+      "description": {
+        "name": "mime",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "native_toolchain_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "native_toolchain_c",
+        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.17.4"
+    },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.3.0"
+    },
+    "open_filex": {
+      "dependency": "direct main",
+      "description": {
+        "name": "open_filex",
+        "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.7.0"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.0.0"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "packages_extensions": {
+      "dependency": "transitive",
+      "description": {
+        "name": "packages_extensions",
+        "sha256": "a2e207f3345fc5cbea60155842e71be1c3059b427a61ed1c5d7c41f5d03264e7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "path_provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path_provider",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.5"
+    },
+    "path_provider_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_android",
+        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.22"
+    },
+    "path_provider_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_foundation",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.0"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "path_provider_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.2"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.6"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.8"
+    },
+    "pointycastle": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pointycastle",
+        "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "postgrest": {
+      "dependency": "transitive",
+      "description": {
+        "name": "postgrest",
+        "sha256": "f4b6bb24b465c47649243ef0140475de8a0ec311dc9c75ebe573b2dcabb10460",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.0"
+    },
+    "power_extensions": {
+      "dependency": "transitive",
+      "description": {
+        "name": "power_extensions",
+        "sha256": "ad4e27d040f80bb7e566d96399b6419343d946d7c37912e1bce56c9f2b32e525",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.4"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "pubspec_parse": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
+    },
+    "rational": {
+      "dependency": "transitive",
+      "description": {
+        "name": "rational",
+        "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.3"
+    },
+    "realtime_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "realtime_client",
+        "sha256": "5268afc208d02fb9109854d262c1ebf6ece224cd285199ae1d2f92d2ff49dbf1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "retry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "retry",
+        "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "riverpod": {
+      "dependency": "transitive",
+      "description": {
+        "name": "riverpod",
+        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
+    },
+    "rxdart": {
+      "dependency": "transitive",
+      "description": {
+        "name": "rxdart",
+        "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.28.0"
+    },
+    "screen_retriever": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "shared_preferences": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shared_preferences",
+        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.4"
+    },
+    "shared_preferences_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_android",
+        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.20"
+    },
+    "shared_preferences_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_foundation",
+        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.6"
+    },
+    "shared_preferences_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_linux",
+        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_platform_interface",
+        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_web",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.3"
+    },
+    "shared_preferences_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_windows",
+        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "source_gen": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_gen",
+        "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.2.0"
+    },
+    "source_helper": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_helper",
+        "sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.10"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.2"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "state_notifier": {
+      "dependency": "transitive",
+      "description": {
+        "name": "state_notifier",
+        "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "storage_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "storage_client",
+        "sha256": "1c61b19ed9e78f37fdd1ca8b729ab8484e6c8fe82e15c87e070b861951183657",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "stream_transform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "supabase": {
+      "dependency": "transitive",
+      "description": {
+        "name": "supabase",
+        "sha256": "cc039f63a3168386b3a4f338f3bff342c860d415a3578f3fbe854024aee6f911",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.10.2"
+    },
+    "supabase_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "supabase_flutter",
+        "sha256": "92b2416ecb6a5c3ed34cf6e382b35ce6cc8921b64f2a9299d5d28968d42b09bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.12.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.9"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.2"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.28"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.4.1"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.5"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.5"
+    },
+    "uuid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uuid",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.5.3"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "15.0.2"
+    },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.15.0"
+    },
+    "window_manager": {
+      "dependency": "direct main",
+      "description": {
+        "name": "window_manager",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
+    "xdg_directories": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.6.1"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    },
+    "yaml_writer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_writer",
+        "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "yet_another_json_isolate": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yet_another_json_isolate",
+        "sha256": "fe45897501fa156ccefbfb9359c9462ce5dec092f05e8a56109db30be864f01e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
     }
+  },
+  "sdks": {
+    "dart": ">=3.10.3 <4.0.0",
+    "flutter": ">=3.38.4"
+  }
 }

From d47fd282f8c5e5c1779a51fa468cf303bd75a97b Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 16 Feb 2026 13:43:16 -0800
Subject: [PATCH 34/70] pvz-portable{,-unwrapped}: init at 0.1.19

---
 .../pv/pvz-portable-unwrapped/package.nix     | 96 +++++++++++++++++++
 pkgs/by-name/pv/pvz-portable/package.nix      | 68 +++++++++++++
 2 files changed, 164 insertions(+)
 create mode 100644 pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
 create mode 100644 pkgs/by-name/pv/pvz-portable/package.nix

diff --git a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
new file mode 100644
index 000000000000..1b860fb96813
--- /dev/null
+++ b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
@@ -0,0 +1,96 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  desktopToDarwinBundle,
+  cmake,
+  ninja,
+  libogg,
+  libjpeg,
+  libopenmpt,
+  libpng,
+  libvorbis,
+  libmpg123,
+  SDL2,
+  python3,
+  imagemagick,
+  libicns,
+  nix-update-script,
+  pvzDebug ? false, # cheat keys and other debug features
+  limboPage ? true, # access to limbo page with hidden minigame levels
+  doFixBugs ? false, # fix bugs (which are usually considered features)
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pvz-portable-unwrapped";
+  version = "0.1.19";
+
+  src = fetchFromGitHub {
+    owner = "wszqkzqk";
+    repo = "PvZ-Portable";
+    tag = finalAttrs.version;
+    hash = "sha256-G+otMVg/RYpRSEGSvMYocMyN27ixJW9w+bNXCU9Otl0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    imagemagick
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+
+  buildInputs = [
+    libogg
+    libjpeg
+    libopenmpt
+    libpng
+    libvorbis
+    libmpg123
+    SDL2
+    (python3.withPackages (ps: [ ps.pyyaml ]))
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "PVZ_DEBUG" pvzDebug)
+    (lib.cmakeBool "LIMBO_PAGE" limboPage)
+    (lib.cmakeBool "DO_FIX_BUGS" doFixBugs)
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 pvz-portable $out/bin/pvz-portable
+
+    cd .. # exit cmake build dir
+
+    install -Dm755 scripts/pvzp-v4-converter.py $out/bin/pvzp-v4-converter
+    install -Dm644 LICENSE $out/share/licenses/pvz-portable/LICENSE
+    install -Dm644 COPYING $out/share/licenses/pvz-portable/COPYING
+
+    install -Dm664 archlinux/io.github.wszqkzqk.pvz-portable.desktop $out/share/applications/io.github.wszqkzqk.pvz-portable.desktop
+    substituteInPlace $out/share/applications/io.github.wszqkzqk.pvz-portable.desktop --replace-fail /usr/bin/ ""
+    install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/io.github.wszqkzqk.pvz-portable.png
+    for size in 16 32 48 64 128 256; do
+      mkdir -p $out/share/icons/hicolor/''${size}x$size/apps
+      magick icon.png -resize ''${size}x$size $out/share/icons/hicolor/''${size}x$size/apps/io.github.wszqkzqk.pvz-portable.png
+    done
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cross-platform community-driven reimplementation of Plants vs. Zombies GOTY";
+    homepage = "https://github.com/wszqkzqk/PvZ-Portable";
+    changelog = "https://github.com/wszqkzqk/PvZ-Portable/releases";
+    downloadPage = "https://github.com/wszqkzqk/PvZ-Portable/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      lgpl3Plus
+      free # PopCap Games Framework License: redistribution with or without modifications allowed
+    ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.all;
+    mainProgram = "pvz-portable";
+  };
+})
diff --git a/pkgs/by-name/pv/pvz-portable/package.nix b/pkgs/by-name/pv/pvz-portable/package.nix
new file mode 100644
index 000000000000..17d1e6aa3b66
--- /dev/null
+++ b/pkgs/by-name/pv/pvz-portable/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  fetchurl,
+  stdenvNoCC,
+  symlinkJoin,
+  makeWrapper,
+  p7zip,
+  pvz-portable-unwrapped,
+  # set it to a dir or a zip containing main.pak and properties; can be a path or a derivation
+  # example: ./Plants_vs._Zombies_1.2.0.1073_EN.zip
+  # https://github.com/wszqkzqk/PvZ-Portable/blob/main/archlinux/README.md#prepare-game-assets
+  gameAssets ? fetchurl {
+    url = "https://web.archive.org/web/20220717170711/http://static-www.ec.popcap.com/binaries/popcap_downloads/PlantsVsZombiesSetup.exe";
+    hash = "sha256-S0u00Z+2OeVpiYPjnXrQYcdme87BkFZWBTLHrQ1n0OQ=";
+    meta.license = lib.licenses.unfree;
+  },
+  pvzDebug ? false,
+  limboPage ? true,
+  doFixBugs ? false,
+}:
+
+let
+  unwrapped = pvz-portable-unwrapped.override { inherit pvzDebug limboPage doFixBugs; };
+
+  assets = stdenvNoCC.mkDerivation {
+    name = "pvz-portable-assets";
+
+    src = gameAssets;
+
+    nativeBuildInputs = [ p7zip ];
+
+    unpackCmd = ''
+      [[ -d $curSrc ]] && cp -ar $curSrc source || 7z x $curSrc -osource -ba -bd
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      dir="$(find -type f -name main.pak -printf %h -execdir test -d properties \; | head -n 1)"
+      if [[ -z "$dir" ]]; then
+        echo "main.pak and properties not found in $src"
+        exit 1
+      fi
+
+      mkdir -p $out/share/pvz-portable
+      cp -ar "$dir"/{main.pak,properties} $out/share/pvz-portable
+
+      runHook postInstall
+    '';
+  };
+
+in
+symlinkJoin (finalAttrs: {
+  pname = "pvz-portable";
+  inherit (finalAttrs.passthru.unwrapped) version meta;
+
+  paths = [
+    finalAttrs.passthru.unwrapped
+    finalAttrs.passthru.assets
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+  postBuild = ''
+    wrapProgram $out/bin/pvz-portable --add-flags -resdir=$out/share/pvz-portable
+  '';
+
+  passthru = { inherit unwrapped assets; };
+})

From 1cf9198c8dd93d6089e87422caaafb36218d0705 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sat, 28 Feb 2026 18:41:15 -0800
Subject: [PATCH 35/70] pvzge: init at 0.7.1

---
 pkgs/by-name/pv/pvzge/main.js     |  33 ++++++++++
 pkgs/by-name/pv/pvzge/package.nix | 105 ++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 pkgs/by-name/pv/pvzge/main.js
 create mode 100644 pkgs/by-name/pv/pvzge/package.nix

diff --git a/pkgs/by-name/pv/pvzge/main.js b/pkgs/by-name/pv/pvzge/main.js
new file mode 100644
index 000000000000..0c60c9005da7
--- /dev/null
+++ b/pkgs/by-name/pv/pvzge/main.js
@@ -0,0 +1,33 @@
+const { app, BrowserWindow } = require('electron/main')
+
+function createWindow() {
+  const win = new BrowserWindow({
+    useContentSize: true,
+    width: 975,
+    height: 608,
+    minWidth: 515,
+    minHeight: 304,
+    webPreferences: {
+      nodeIntegration: true,
+      enableRemoteModule: true,
+      contextIsolation: false,
+    },
+  });
+  win.loadFile('index.html');
+  win.removeMenu();
+}
+
+app.whenReady().then(() => {
+  createWindow();
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createWindow();
+    }
+  })
+});
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
diff --git a/pkgs/by-name/pv/pvzge/package.nix b/pkgs/by-name/pv/pvzge/package.nix
new file mode 100644
index 000000000000..36280da99b38
--- /dev/null
+++ b/pkgs/by-name/pv/pvzge/package.nix
@@ -0,0 +1,105 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  fetchFromGitHub,
+  copyDesktopItems,
+  makeWrapper,
+  makeDesktopItem,
+  desktopToDarwinBundle,
+  electron,
+  imagemagick,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pvzge";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "Gzh0821";
+    repo = "pvzge_web";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IZaJBbliudkVLOEgOwxXkUn9aET+NJrgdPi8FAA7HCE=";
+  };
+
+  iconSrc = fetchurl {
+    url = "https://raw.githubusercontent.com/Gzh0821/pvzg_site/refs/tags/${finalAttrs.version}/src/.vuepress/public/pvz_logo.webp";
+    hash = "sha256-PkUS4iESw+R8o+tZMDJ+PTyu6PTmKeRkq/VG3+egsQY=";
+    meta.license = lib.licenses.unfree;
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+    imagemagick
+  ]
+  ++ lib.optional stdenvNoCC.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+
+  postPatch = ''
+    sed -i "s|<title>.*</title>|<title>PvZ2: Gardendless</title>|" docs/index.html
+  '';
+
+  dontConfigure = true;
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    phome=$out/share/pvzge
+    mkdir -p $(dirname $phome)
+    cp -r docs $phome
+
+    tee $phome/package.json <<JSON
+    {
+      "name": "pvzge",
+      "version": "${finalAttrs.version}",
+      "description": "${finalAttrs.meta.description}",
+      "main": "main.js",
+      "author": "Gaozih"
+    }
+    JSON
+    # adapted from Electron tutorial: https://www.electronjs.org/docs/latest/tutorial/tutorial-first-app
+    # some boilerplate code to get Electron running
+    cp ${./main.js} $phome/main.js
+
+    makeWrapper ${lib.getExe electron} $out/bin/pvzge \
+      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
+      --add-flags $phome \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --inherit-argv0
+
+    for size in 16 32 48 64 128 256 512; do
+      mkdir -p $out/share/icons/hicolor/''${size}x$size/apps
+      magick $iconSrc -resize ''${size}x$size $out/share/icons/hicolor/''${size}x$size/apps/pvzge.png
+    done
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "pvzge";
+      exec = finalAttrs.meta.mainProgram;
+      icon = "pvzge";
+      desktopName = "PvZ2: Gardendless";
+      comment = finalAttrs.meta.description;
+      categories = [ "Game" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Completely remastered PvZ2 for all desktop platforms";
+    homepage = "https://pvzge.com";
+    downloadPage = "https://pvzge.com/en/download";
+    # upstream repo has GPL-3.0 in the LICENSE file,
+    # but only obfuscated code is available, and it contains proprietary assets
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.all;
+    mainProgram = "pvzge";
+  };
+})

From dc3d76a9463a969b2c256434a31bb1d34b0d5864 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 12:31:50 +0100
Subject: [PATCH 36/70] qt5Packages.ldutils: move env variables into env for
 structuredAttrs

---
 pkgs/development/libraries/ldutils/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix
index c34e77f19294..3a19c4902ecd 100644
--- a/pkgs/development/libraries/ldutils/default.nix
+++ b/pkgs/development/libraries/ldutils/default.nix
@@ -28,8 +28,10 @@ mkDerivation {
 
   qmakeFlags = [ "ldutils.pro" ];
 
-  LDUTILS_LIB = placeholder "out";
-  LDUTILS_INCLUDE = placeholder "out";
+  env = {
+    LDUTILS_LIB = placeholder "out";
+    LDUTILS_INCLUDE = placeholder "out";
+  };
 
   meta = {
     description = "Headers and link library for other ldutils projects";

From f818a8693594a0d1ac5fe4996c52cf1f2b2cecbf Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 12:32:59 +0100
Subject: [PATCH 37/70] qt5Packages.qtinstaller: move env variable into env for
 structuredAttrs

---
 pkgs/development/libraries/qtinstaller/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index c551ff49889b..258a6b7d2229 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   setOutputFlags = false;
-  NIX_QT_SUBMODULE = true;
+  env.NIX_QT_SUBMODULE = true;
   dontWrapQtApps = true;
 
   installPhase = ''

From e07f871210d893fb810aca2dcbd1d891961a7389 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 12:49:26 +0100
Subject: [PATCH 38/70] sbclPackages.cl-ana_dot_hdf-cffi: move NIX_LDFLAGS into
 env for structuredAttrs

---
 pkgs/development/lisp-modules/ql.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index 68812dfa6429..c4ebf589f0cf 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -185,7 +185,9 @@ let
       cl-ana_dot_hdf-cffi = super.cl-ana_dot_hdf-cffi.overrideLispAttrs (o: {
         nativeBuildInputs = [ pkgs.hdf5 ];
         nativeLibs = [ pkgs.hdf5 ];
-        NIX_LDFLAGS = [ "-lhdf5" ];
+        env = o.env or { } // {
+          NIX_LDFLAGS = toString [ "-lhdf5" ];
+        };
       });
       # The antik source archive contains a broken documentation.pdf symlink
       # pointing to documentation/build/latex/Antik.pdf which doesn't exist.

From 3439f9f9f8c53eb4fb22308b92283c19cb5e3604 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 13:01:05 +0100
Subject: [PATCH 39/70] luaPackages.lua-pam: move env variable into env for
 structuredAttrs

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 27dac458b558..b8555b679339 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -132,7 +132,7 @@ rec {
       };
 
       # The makefile tries to link to `-llua<luaversion>`
-      LUA_LIBS = "-llua";
+      env.LUA_LIBS = "-llua";
 
       buildInputs =
         lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]

From 5b4d1acbf5b85b827010cba6c3161ca958d08c0e Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 24 Mar 2026 13:46:44 +0100
Subject: [PATCH 40/70] nixos/lvm: add option for adding lvresize_fs_helper to
 config

Adding `lvresize_fs_helper` unconditionally to the config pulls in bash
and thus defeats the efforts of enabling lvm without pulling in bash.
---
 nixos/modules/tasks/lvm.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 8cf2db05dff4..4b33b3e79ed0 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -22,6 +22,10 @@ in
       '';
     };
 
+    resizeHelper.enable = mkEnableOption "lvresize_fs_helper" // {
+      default = true;
+    };
+
     package = mkOption {
       type = types.package;
       default = pkgs.lvm2;
@@ -60,7 +64,7 @@ in
 
       services.udev.packages = [ cfg.package.out ];
       environment.etc."lvm/lvm.conf".text =
-        "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";
+        mkIf cfg.resizeHelper.enable "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";
     })
     (mkIf config.boot.initrd.services.lvm.enable {
       # We need lvm2 for the device-mapper rules

From b2abc2a2fd97a73f35c39dd42f459fa553750ea8 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 24 Mar 2026 15:21:23 +0100
Subject: [PATCH 41/70] nixos/profiles: disable lvm resize helper in bashless
 profile

---
 nixos/modules/profiles/bashless.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/profiles/bashless.nix b/nixos/modules/profiles/bashless.nix
index 572f665bfede..501563b97b3d 100644
--- a/nixos/modules/profiles/bashless.nix
+++ b/nixos/modules/profiles/bashless.nix
@@ -35,6 +35,8 @@
   users.manageLingering = lib.mkDefault false;
   # Relies on the gzip command which depends on bash
   services.logrotate.enable = lib.mkDefault false;
+  # The resize helper pulls in bash
+  services.lvm.resizeHelper.enable = false;
 
   # Check that the system does not contain a Nix store path that contains the
   # string "bash".

From 46b409f34cb4be05d1faa1468481fbda3def434c Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sun, 15 Mar 2026 09:18:46 -0700
Subject: [PATCH 42/70] assetripper: 1.3.10 -> 1.3.12

---
 pkgs/by-name/as/assetripper/deps.json   | 112 ++++++++++++------------
 pkgs/by-name/as/assetripper/package.nix |  11 ++-
 2 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/pkgs/by-name/as/assetripper/deps.json b/pkgs/by-name/as/assetripper/deps.json
index fa09f39dc7f7..f1f5f8c75f77 100644
--- a/pkgs/by-name/as/assetripper/deps.json
+++ b/pkgs/by-name/as/assetripper/deps.json
@@ -46,8 +46,8 @@
   },
   {
     "pname": "AssetRipper.Cpp2IL.Core",
-    "version": "1.0.0",
-    "hash": "sha256-qS58t3OD2l/a1PJmfmKnHd9JXQEciMIgCnoVW70p5Dk="
+    "version": "1.0.1",
+    "hash": "sha256-K9+jeW0joMJGP+bC5wt5ru+gAvIPwAEGauFQ6r/MThE="
   },
   {
     "pname": "AssetRipper.Gee.External.Capstone",
@@ -71,13 +71,13 @@
   },
   {
     "pname": "AssetRipper.IO.Endian",
-    "version": "2.0.2",
-    "hash": "sha256-/oxfkQpCaERReRha+2fkPQaW9JNAyJdiujp1326Pcmw="
+    "version": "2.1.0",
+    "hash": "sha256-8wpIi9wYBkyeOSWb+HnLemqk9/Y9M3Bh+xX6B06WxMU="
   },
   {
     "pname": "AssetRipper.LibCpp2IL",
-    "version": "1.0.0",
-    "hash": "sha256-yZxcQSP5252fNeRUVUVfILXTxU54QrPb8G8GRKKS3bQ="
+    "version": "1.0.1",
+    "hash": "sha256-79mq6iK6fs8fx3CzYWaAtS+2LLqozCRSsLKb6L61Wws="
   },
   {
     "pname": "AssetRipper.Mining.PredefinedAssets",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "AssetRipper.NativeDialogs",
-    "version": "1.1.1",
-    "hash": "sha256-6ShudCx1WwuzmbElus3NxyxuNY5e8NthujoKkkgLFyE="
+    "version": "1.1.2",
+    "hash": "sha256-FiLz2N5gjpNi5vIiuO/FtL2okjkTdBNOSAvrZ5ZcAWY="
   },
   {
     "pname": "AssetRipper.Primitives",
@@ -121,8 +121,8 @@
   },
   {
     "pname": "AssetRipper.SourceGenerated",
-    "version": "1.3.10",
-    "hash": "sha256-CU8mSe7+vEmQ7QjRv0UDE9REOWniFz38BAtiKAtGsvo="
+    "version": "1.3.11.1",
+    "hash": "sha256-ZIVM61VLFQT4q8jnnZlmNcsLAPb0QsVN4V4LEGv+FKA="
   },
   {
     "pname": "AssetRipper.Text.Html",
@@ -131,13 +131,13 @@
   },
   {
     "pname": "AssetRipper.Text.SourceGeneration",
-    "version": "1.2.2",
-    "hash": "sha256-CsJuv8agq57DsjChX5CC9gyhnr0hwNpCdeCxxu62w48="
+    "version": "1.2.3",
+    "hash": "sha256-Og4v0ebFfqYKVK2xzlEdzUeHDcL6HgkOAVxB+RZpcmo="
   },
   {
     "pname": "AssetRipper.TextureDecoder",
-    "version": "2.6.0",
-    "hash": "sha256-qoecWzCXQq82wUTaw6A65pJYId/GxxkiKGZZ9AlbgWo="
+    "version": "2.6.1",
+    "hash": "sha256-m7X0ozt3x8I3ivS8dHRY24IdjF16KaYPcSnse8Ev9Cs="
   },
   {
     "pname": "AssetRipper.Tpk",
@@ -146,14 +146,14 @@
   },
   {
     "pname": "Disarm",
-    "version": "2022.1.0-master.57",
-    "hash": "sha256-KtLpcS+n+HVkHc/CKBoyx+PWKpxkkVvtsqf002KSbPI=",
-    "url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.57/disarm.2022.1.0-master.57.nupkg"
+    "version": "2022.1.0-master.99",
+    "hash": "sha256-g8JqGyig6M9TVM6OgK+2QVQBfdO7jTyCS3rEUxciuEw=",
+    "url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.99/disarm.2022.1.0-master.99.nupkg"
   },
   {
     "pname": "Fmod5Sharp",
-    "version": "3.0.1",
-    "hash": "sha256-Od9D7s20ONwuD1V6ZUCKkCyLR57pX8GRDuDs5oZzc+I="
+    "version": "3.1.0",
+    "hash": "sha256-C4tAa3rRqh/0bUjSoTiMT2HWhuMm2EWMvGTrRPzEDGQ="
   },
   {
     "pname": "Iced",
@@ -162,8 +162,8 @@
   },
   {
     "pname": "IndexRange",
-    "version": "1.0.2",
-    "hash": "sha256-bsoOY0HLG+nsjdeA3XiTOq0NSvXIz/xasFdSMe6svWQ="
+    "version": "1.1.0",
+    "hash": "sha256-WUBDXlrTDb2KbhoFFGSab6tqr+SL6wv5yamZ35PXD/k="
   },
   {
     "pname": "K4os.Compression.LZ4",
@@ -172,28 +172,33 @@
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "10.0.2",
-    "hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos="
+    "version": "10.0.5",
+    "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "10.0.2",
-    "hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ="
+    "version": "10.0.3",
+    "hash": "sha256-+wTcmczUD1qSnnWZ1miijr62/glcRbNWRpEZh/OBU2g="
+  },
+  {
+    "pname": "Microsoft.Bcl.Memory",
+    "version": "9.0.0",
+    "hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "4.14.0",
-    "hash": "sha256-zmTSI77qeBKTmb0m79mbVaW3/94t7AWPO1A2Tchowng="
+    "version": "5.3.0",
+    "hash": "sha256-eUjU7MDekcbDQxUButcWK7siHx6HmrgdDMLnpGYRVLM="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "5.0.0",
-    "hash": "sha256-g4ALvBSNyHEmSb1l5TFtWW7zEkiRmhqLx4XWZu9sr2U="
+    "version": "5.3.0",
+    "hash": "sha256-O5RVbqAWXL2FcCNtn+dPAVJ/5aiaxc8nQWojJSsx61w="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "5.0.0",
-    "hash": "sha256-ctBCkQGFpH/xT5rRE3xibu9YxPD108RuC4a4Z25koG8="
+    "version": "5.3.0",
+    "hash": "sha256-A3jxlZEyfgEn9unhoQqbOsA0wd/mA8aak6dRlu5mHIU="
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
@@ -212,8 +217,8 @@
   },
   {
     "pname": "Microsoft.OpenApi",
-    "version": "2.3.0",
-    "hash": "sha256-nfg+g85wy5q1dnRnCYXrINogyspNNTKr9Jd6bj7tXXM="
+    "version": "2.4.1",
+    "hash": "sha256-DXdbXq5Gpg3MJVBM0C8uF6mcLczVJAUFp6LAdFojgPs="
   },
   {
     "pname": "Microsoft.OpenApi",
@@ -225,11 +230,6 @@
     "version": "2.0.0",
     "hash": "sha256-rD5ubdSgpufNjNyCerO0N5Gg2brUMhjEOL5qaNwFhBM="
   },
-  {
-    "pname": "NAudio.Core",
-    "version": "2.1.0",
-    "hash": "sha256-cVfdq9B7wwojGiTOOrcnweQyI9q7U9+uDirqjisWrd8="
-  },
   {
     "pname": "NAudio.Core",
     "version": "2.2.1",
@@ -252,8 +252,8 @@
   },
   {
     "pname": "OggVorbisEncoder",
-    "version": "1.2.0",
-    "hash": "sha256-5UhHf3JJUTG968Bst/cLR30qMTe1AntntDIv8w1IkFY="
+    "version": "1.2.2",
+    "hash": "sha256-bT1OTDkotU1eN/AvNFzsP7jRm4y3GNGl7FjXChVhNB8="
   },
   {
     "pname": "Ookii.CommandLine",
@@ -282,8 +282,8 @@
   },
   {
     "pname": "SharpCompress",
-    "version": "0.44.4",
-    "hash": "sha256-woh8cQz+Qc6MiYhCSXmMERxzhqYDWoqo7qDfRh3Od/o="
+    "version": "0.47.1",
+    "hash": "sha256-rRzSU1SCGOj0E0or5odH7yEExH0IasSSx9RALH7QFYw="
   },
   {
     "pname": "SourceGenerator.Foundations",
@@ -297,23 +297,23 @@
   },
   {
     "pname": "Swashbuckle.AspNetCore",
-    "version": "10.1.0",
-    "hash": "sha256-28kzcCMc9Ypv/g0z8mexB2bKMS7vRw3ZU61p3QKMnlk="
+    "version": "10.1.5",
+    "hash": "sha256-Xyh9X/naQzXrQ/S6iij/NTCM+jRIWBJzT7qAiSIcHTI="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "10.1.0",
-    "hash": "sha256-UTNuin8H71zlm1RGqyV2Spk/K+2UeAt6nM3QPyXJSk4="
+    "version": "10.1.5",
+    "hash": "sha256-XXz1DIP7wD3tRJXOsL9qhzOaEAP2kyKIbwZFJdLhI2A="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerGen",
-    "version": "10.1.0",
-    "hash": "sha256-lDWEOYrgJWskM45+XvDmaxSZRU/ZFfGEr2bTh7eZsqE="
+    "version": "10.1.5",
+    "hash": "sha256-4NAg4PW934OglxtKgl5x0kvzRlNJThGDpyMX+8NFE+E="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerUI",
-    "version": "10.1.0",
-    "hash": "sha256-qxIhoxk9dfzRo4lX5I5J5WWFagVYqgjbjY4Q/yJr6dA="
+    "version": "10.1.5",
+    "hash": "sha256-/XIglebzW9xLEzX19K+lL9/rQDhrBGbfhPP4ZNPcIx0="
   },
   {
     "pname": "System.Buffers",
@@ -337,8 +337,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "10.0.2",
-    "hash": "sha256-Guh0w9aMQ5wNSI9ecuoH4tGOX4VFnlNgepvBTPGFgzc="
+    "version": "10.0.3",
+    "hash": "sha256-+LsHlaUFMFVb60U7GFcvD1l7IpEcjdm1+Iw2g+qrUik="
   },
   {
     "pname": "System.Memory",
@@ -402,13 +402,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "10.0.2",
-    "hash": "sha256-DWbSR+d8DJtkMclrKKbS5Ghlvi6YYrrxgHGfyDJx50o="
+    "version": "10.0.3",
+    "hash": "sha256-TuOSPfi9dfFnHvH5++zIi30JpRERp35HFpm2R0NWUAk="
   },
   {
     "pname": "System.Text.Json",
-    "version": "10.0.2",
-    "hash": "sha256-Gf6L3mxsdvmN8gDyoUhfZDSFWKpmn9UjJ2v/p1CDFmk="
+    "version": "10.0.3",
+    "hash": "sha256-E1gPHMAuk2tR4cyScCfsSlDDerhlLAQCUZZMiByIk18="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
diff --git a/pkgs/by-name/as/assetripper/package.nix b/pkgs/by-name/as/assetripper/package.nix
index 116a1cc9a6d8..f9a36049de1a 100644
--- a/pkgs/by-name/as/assetripper/package.nix
+++ b/pkgs/by-name/as/assetripper/package.nix
@@ -6,17 +6,18 @@
   fetchFromGitHub,
   dbus,
   dotnetCorePackages,
+  nix-update-script,
 }:
 
 buildDotnetModule (finalAttrs: {
   pname = "assetripper";
-  version = "1.3.10";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "AssetRipper";
     repo = "AssetRipper";
     tag = finalAttrs.version;
-    hash = "sha256-sqlZsUTeLyHHESNtC07F2FjgLXnuqgoPYRcgE57sq5k=";
+    hash = "sha256-pBza6yuMdExKqzhds8Ib5SzRzXRdD5TdEN/Yz7V+zGA=";
   };
 
   buildInputs = [
@@ -47,8 +48,8 @@ buildDotnetModule (finalAttrs: {
   fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
     runHook preFixup
 
-    autoPatchelf $out/lib/${finalAttrs.pname}/libnfd.so
-    autoPatchelf $out/lib/${finalAttrs.pname}/libTexture2DDecoderNative.so
+    autoPatchelf $out/lib/assetripper/libnfd.so
+    autoPatchelf $out/lib/assetripper/libTexture2DDecoderNative.so
 
     runHook postFixup
   '';
@@ -67,6 +68,8 @@ buildDotnetModule (finalAttrs: {
   dotnet-sdk = dotnetCorePackages.sdk_10_0;
   dotnet-runtime = finalAttrs.dotnet-sdk.aspnetcore;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tool for extracting assets from Unity serialized files and asset bundles";
     homepage = "https://github.com/AssetRipper/AssetRipper";

From 7dedd850f7f4adc49953b9216e5f49900c7a79be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2026 10:28:01 +0000
Subject: [PATCH 43/70] fasmg: l45p -> l4gs

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

diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index ed6f8d65485a..8b9618b5a498 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fasmg";
-  version = "l45p";
+  version = "l4gs";
 
   src = fetchzip {
     url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip";
-    sha256 = "sha256-0/P20DiRZbqZHoxWiBPs6wXqpbvRroisyF0dCdmd+j8=";
+    sha256 = "sha256-lx46RKXVu6z3+luIizSfGf697wJvS+ccwZaOgGwGXr4=";
     stripRoot = false;
   };
 

From f63852011d82160e3df2b80b4de88e48911351d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2026 10:45:36 +0000
Subject: [PATCH 44/70] chirpstack-concentratord: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index 7c26df207d6a..21f2bca59cdc 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chirpstack-concentratord";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7wTXotxf9tFSyIrBqn6EVpQJpz5XAPNxJMeaYN7k/so=";
+    hash = "sha256-945ZJZ/OLoR/3dAC/PZHRRziyuLDZ+xfitF8jpvZ420=";
   };
 
-  cargoHash = "sha256-QYmAFJEHLcgFuq34r9XLEwlpbzjAr4CpfluDW5MbfT0=";
+  cargoHash = "sha256-cwm8ZSfml9B/OO5QzH1eUhoF/3DPUEEV0T/YL427X80=";
 
   buildInputs = [
     libloragw-2g4

From 857513d94dc26eaaa7522753a7c6bc9275f9351f Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 25 Mar 2026 14:30:44 +0000
Subject: [PATCH 45/70] nextcloud{32,33}Apps: add oidc, update all

---
 pkgs/servers/nextcloud/packages/32.json       | 68 +++++++++-------
 pkgs/servers/nextcloud/packages/33.json       | 78 ++++++++++++-------
 .../nextcloud/packages/nextcloud-apps.json    |  1 +
 3 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index 79f722856c10..153d6547356a 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-oHIqgBFcXAbhCzuPH9q1RSeP0LilyPLQ//umVhrQfE4=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.5/contacts-v8.3.5.tar.gz",
-    "version": "8.3.5",
+    "hash": "sha256-UCBZNH5mVCm/OvMvUP5NACVg9LWgxIgY91IDY9HFe4s=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.6/contacts-v8.3.6.tar.gz",
+    "version": "8.3.6",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-LlfmKN8Nw7G6+9vE+letrAb1DccwSUbeoSUG+u3X6gs=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.3/mail-v5.7.3.tar.gz",
-    "version": "5.7.3",
+    "hash": "sha256-kUOJkC1l0Q/XTXLEXwdOk69IH/xg0VzU8jMhF+K3wpI=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.5/mail-v5.7.5.tar.gz",
+    "version": "5.7.5",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-53zwBxm/vUqQvc3h9od73RYxqJhh0M6lVS4//bJHMuA=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.0.1/news.tar.gz",
-    "version": "28.0.1",
+    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
+    "version": "28.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,18 +250,28 @@
     ]
   },
   "notes": {
-    "hash": "sha256-GXltbtQV15oKNz+PUdvXYOOKxgkVGPhLHUUlkvvDRss=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.0/notes-v4.13.0.tar.gz",
-    "version": "4.13.0",
+    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
+    "version": "4.13.1",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
       "agpl"
     ]
   },
+  "oidc": {
+    "hash": "sha256-pULnBdzO1F0cOZVIJL2zodeHQQAUhILgz9Z0uNOHfBw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.2/oidc-1.16.2.tar.gz",
+    "version": "1.16.2",
+    "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
+    "homepage": "https://github.com/H2CK/oidc",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "oidc_login": {
-    "hash": "sha256-AU938duXaI625chqgnnqnvOB0bMgRM3ZQVilstb4yRI=",
-    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.0/oidc_login.tar.gz",
+    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
     "version": "3.3.0",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
@@ -280,9 +290,9 @@
     ]
   },
   "phonetrack": {
-    "hash": "sha256-+JPK8Eh7RFHMreCdlA1F1jBUD04Fw0R952TBHOUXDQ0=",
-    "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.1/phonetrack-1.0.1.tar.gz",
-    "version": "1.0.1",
+    "hash": "sha256-AbQD26tChH+A8jlLh9TUEnqBxVtIeEeq6gmM7YTmwdc=",
+    "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.1.0/phonetrack-1.1.0.tar.gz",
+    "version": "1.1.0",
     "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- 📍 Display location history\n- ⛛ Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- ⛶ Define geofencing zones for devices\n- ⚇ Define proximity alerts for device pairs\n- 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n- 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n- 🗠 Display sessions statistics\n- 🔒 [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n- ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/phonetrack",
     "licenses": [
@@ -350,9 +360,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-WTcaX95WhIPL6rJI4VSkh313Vnh5CUd8nawnBuMkf48=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.0.3/richdocuments-v9.0.3.tar.gz",
-    "version": "9.0.3",
+    "hash": "sha256-1PeOyjCO3gymJ2UpI5WLymY2VjFs/JPg2JzchkWX4aE=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.0.5/richdocuments-v9.0.5.tar.gz",
+    "version": "9.0.5",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -360,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-BBl1zvZvggoznheW/p7re3/8dUYyybOhCYVLNLnAA64=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.1/release.tar.gz",
-    "version": "6.3.1",
+    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
+    "version": "6.4.1",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -370,9 +380,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-BEBjYaYuv3W9/agAO5ZF8T6MvDNt7qH0H+mWhfHPihA=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.9/spreed-v22.0.9.tar.gz",
-    "version": "22.0.9",
+    "hash": "sha256-UltCuZLVgTiPEgLubqVUsF6oH1Z4j+ASXI/VPrqnzeI=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.10/spreed-v22.0.10.tar.gz",
+    "version": "22.0.10",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -410,9 +420,9 @@
     ]
   },
   "twofactor_admin": {
-    "hash": "sha256-mxbjJ4y98RMK63BZdxy8StGmxyPLKFEioDvDB5mADb8=",
-    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.9.0/twofactor_admin.tar.gz",
-    "version": "4.9.0",
+    "hash": "sha256-tZG2NCd4WxnPwf1KJq5mBX7Zfy0rDjigJGOw2qypUlU=",
+    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.0/twofactor_admin-v4.11.0.tar.gz",
+    "version": "4.11.0",
     "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
     "homepage": "",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json
index 9ea95c784efa..593f7afdd3ad 100644
--- a/pkgs/servers/nextcloud/packages/33.json
+++ b/pkgs/servers/nextcloud/packages/33.json
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-/RNCZGmPJ2Feh506D5xIw09vX27H0IEVz+ipn7V7MfM=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.1/contacts-v8.4.1.tar.gz",
-    "version": "8.4.1",
+    "hash": "sha256-7QHnIBEZVMAriLKWE5Jr/vZXzgxqS87VYURLCcjlry8=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.2/contacts-v8.4.2.tar.gz",
+    "version": "8.4.2",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -120,9 +120,9 @@
     ]
   },
   "files_retention": {
-    "hash": "sha256-+BWPFD86OnNGeuAM49ST0AHsOpCxLhwRYVYJDAtSB8E=",
-    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v4.0.0/files_retention-v4.0.0.tar.gz",
-    "version": "4.0.0",
+    "hash": "sha256-67MPooGJuSX/sL/l44z/9CYSlv5/ACVRpl1Z5QTJ/xw=",
+    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v4.0.1/files_retention-v4.0.1.tar.gz",
+    "version": "4.0.1",
     "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.",
     "homepage": "https://github.com/nextcloud/files_retention",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-LlfmKN8Nw7G6+9vE+letrAb1DccwSUbeoSUG+u3X6gs=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.3/mail-v5.7.3.tar.gz",
-    "version": "5.7.3",
+    "hash": "sha256-kUOJkC1l0Q/XTXLEXwdOk69IH/xg0VzU8jMhF+K3wpI=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.5/mail-v5.7.5.tar.gz",
+    "version": "5.7.5",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-53zwBxm/vUqQvc3h9od73RYxqJhh0M6lVS4//bJHMuA=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.0.1/news.tar.gz",
-    "version": "28.0.1",
+    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
+    "version": "28.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,18 +250,28 @@
     ]
   },
   "notes": {
-    "hash": "sha256-GXltbtQV15oKNz+PUdvXYOOKxgkVGPhLHUUlkvvDRss=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.0/notes-v4.13.0.tar.gz",
-    "version": "4.13.0",
+    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
+    "version": "4.13.1",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
       "agpl"
     ]
   },
+  "oidc": {
+    "hash": "sha256-pULnBdzO1F0cOZVIJL2zodeHQQAUhILgz9Z0uNOHfBw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.2/oidc-1.16.2.tar.gz",
+    "version": "1.16.2",
+    "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
+    "homepage": "https://github.com/H2CK/oidc",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "oidc_login": {
-    "hash": "sha256-AU938duXaI625chqgnnqnvOB0bMgRM3ZQVilstb4yRI=",
-    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.0/oidc_login.tar.gz",
+    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
     "version": "3.3.0",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
@@ -280,9 +290,9 @@
     ]
   },
   "phonetrack": {
-    "hash": "sha256-+JPK8Eh7RFHMreCdlA1F1jBUD04Fw0R952TBHOUXDQ0=",
-    "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.0.1/phonetrack-1.0.1.tar.gz",
-    "version": "1.0.1",
+    "hash": "sha256-AbQD26tChH+A8jlLh9TUEnqBxVtIeEeq6gmM7YTmwdc=",
+    "url": "https://github.com/julien-nc/phonetrack/releases/download/v1.1.0/phonetrack-1.1.0.tar.gz",
+    "version": "1.1.0",
     "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n- Create a tracking session.\n- Give the logging link\\* to the mobile devices. Choose the [logging method](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#logging-methods) you prefer.\n- Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name.\nSetting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n- 📍 Display location history\n- ⛛ Filter points\n- ✎ Manually edit/add/delete points\n- ✎ Edit devices (rename, change colour/shape, move to another session)\n- ⛶ Define geofencing zones for devices\n- ⚇ Define proximity alerts for device pairs\n- 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n- 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n- 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n- 🗠 Display sessions statistics\n- 🔒 [Reserve a device name](https://github.com/julien-nc/phonetrack/blob/main/doc/user.md#device-name-reservation) to make sure only authorized user can log with this name\n- 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n- ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n- PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://github.com/julien-nc/phonetrack/blob/main/doc/admin.md#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/phonetrack",
     "licenses": [
@@ -350,9 +360,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-A/8pGeoGW/lsNU9izR6E3Jr79GJED3fh4OEf+kVwV6E=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v10.1.0/richdocuments-v10.1.0.tar.gz",
-    "version": "10.1.0",
+    "hash": "sha256-W7kd00/5jmZlMRQ/xDB3+WHlKjCq/hgRXRyeWyu2LKI=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v10.1.2/richdocuments-v10.1.2.tar.gz",
+    "version": "10.1.2",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -360,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-BBl1zvZvggoznheW/p7re3/8dUYyybOhCYVLNLnAA64=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.1/release.tar.gz",
-    "version": "6.3.1",
+    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
+    "version": "6.4.1",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -370,9 +380,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-Z9Gf1FiPz+OC38W3nD0yTGnjp3QnFeattR9S714Dol8=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v23.0.1/spreed-v23.0.1.tar.gz",
-    "version": "23.0.1",
+    "hash": "sha256-xVM+SjXyc9qzO1UQ5qfZVLD+zr5brP65u4+B3YtiicA=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v23.0.2/spreed-v23.0.2.tar.gz",
+    "version": "23.0.2",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -409,6 +419,16 @@
       "agpl"
     ]
   },
+  "twofactor_admin": {
+    "hash": "sha256-tZG2NCd4WxnPwf1KJq5mBX7Zfy0rDjigJGOw2qypUlU=",
+    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.0/twofactor_admin-v4.11.0.tar.gz",
+    "version": "4.11.0",
+    "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "twofactor_webauthn": {
     "hash": "sha256-21lUwF1uC7vJKqpC144jbtKaX25UhVDzgU/E7XoMSos=",
     "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.6.0/twofactor_webauthn-v2.6.0.tar.gz",
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 1b6514a61083..cb451cbe40f5 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -30,6 +30,7 @@
 , "news": "agpl3Plus"
 , "nextpod": "agpl3Only"
 , "notes": "agpl3Plus"
+, "oidc": "agpl3Only"
 , "oidc_login": "agpl3Only"
 , "onlyoffice": "asl20"
 , "phonetrack": "agpl3Plus"

From ad798619ae7743933943f22d60acbefb073a251a Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Wed, 25 Mar 2026 17:00:19 +0100
Subject: [PATCH 46/70] neovim: expose derivations instead of just src

which is strictly better as you can still access the original url via
`neovim-unwrapped.treesitter-parsers.c.src`

Initial motivation started while developing on neovim via the following
devShell:
https://github.com/nix-community/neovim-nightly-overlay/blob/0fcef258e524f08cdcaaa163c37f14b892f6fd88/flake/dev/devshells.nix#L32

I've had neovim built from source complaining about missing grammars.
I am not sure why, I think it's because we disable bundled dependencies.
Exposing the derivations avoid users having to express the grammars
themselves.

This changes the type for outside consumers but for the better I think.
I dont know anyone using it ?
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 46 +++++++++++---------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index b480f18a3827..3ea83dfa8bef 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -123,18 +123,31 @@ stdenv.mkDerivation (
 
     inherit lua;
     treesitter-parsers =
-      treesitter-parsers
-      // {
-        markdown = treesitter-parsers.markdown // {
-          location = "tree-sitter-markdown";
-        };
-      }
-      // {
-        markdown_inline = treesitter-parsers.markdown // {
-          language = "markdown_inline";
-          location = "tree-sitter-markdown-inline";
-        };
-      };
+      lib.mapAttrs
+        (
+          language: grammar:
+          tree-sitter.buildGrammar {
+            inherit (grammar) src;
+            version = "neovim-${finalAttrs.version}";
+            language = grammar.language or language;
+            location = grammar.location or null;
+          }
+        )
+        (
+          treesitter-parsers
+
+          // {
+            markdown = treesitter-parsers.markdown // {
+              location = "tree-sitter-markdown";
+            };
+          }
+          // {
+            markdown_inline = treesitter-parsers.markdown // {
+              language = "markdown_inline";
+              location = "tree-sitter-markdown-inline";
+            };
+          }
+        );
 
     buildInputs = [
       libuv
@@ -226,14 +239,7 @@ stdenv.mkDerivation (
     + lib.concatStrings (
       lib.mapAttrsToList (language: grammar: ''
         ln -s \
-          ${
-            tree-sitter.buildGrammar {
-              inherit (grammar) src;
-              version = "neovim-${finalAttrs.version}";
-              language = grammar.language or language;
-              location = grammar.location or null;
-            }
-          }/parser \
+          ${grammar}/parser \
           $out/lib/nvim/parser/${language}.so
       '') finalAttrs.treesitter-parsers
     );

From 9e989295e0fc98b4e8da3b5d5cf9f190659c6f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2026 21:32:06 +0000
Subject: [PATCH 47/70] umu-launcher-unwrapped: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
index a6956822da8e..7654caff923f 100644
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -14,18 +14,18 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "umu-launcher-unwrapped";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "Open-Wine-Components";
     repo = "umu-launcher";
     tag = version;
-    hash = "sha256-ELFOffP3KabvyOu4Fl7Z4zvPhamZrmhuuqz1aTYdbnE=";
+    hash = "sha256-7BdA/iAAIn2NR/uLzxdvsIh5/1SZacSfkiXJVJBT3EQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-qGkEc4VPShMMNgSB4JmSf7Mq4jEOxEK+BqlR680ZO9k=";
+    hash = "sha256-CVcbktCBRZGnEuDVvl2iJpRgKh+ShFe5mjT6oMHIjtQ=";
   };
 
   nativeCheckInputs = [

From 55629619b64a80b3bb678c16d9882829fc22dc04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 00:54:17 +0000
Subject: [PATCH 48/70] intel-gmmlib: 22.9.0 -> 22.10.0

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

diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix
index 20f9387152e4..0fe1f6a0d62d 100644
--- a/pkgs/by-name/in/intel-gmmlib/package.nix
+++ b/pkgs/by-name/in/intel-gmmlib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-gmmlib";
-  version = "22.9.0";
+  version = "22.10.0";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     tag = "intel-gmmlib-${finalAttrs.version}";
-    hash = "sha256-hgVdUTbPLEKVZpg+73kxpeMQ5gOjBHeRAJgTYds9lYQ=";
+    hash = "sha256-1JF9zb5aqvUkiPVyDxrmhEC90NwRi/AGQEamEub3gS4=";
   };
 
   nativeBuildInputs = [ cmake ];

From c450986952a7dee8b90f0b33b32aa52a74e88c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 25 Mar 2026 17:56:23 -0700
Subject: [PATCH 49/70] flare-signal: 0.20.0 -> 0.20.1

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.20.0...0.20.1

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.20.1/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index e3b22c4846b6..0da369dc3475 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-vkN7XkViJI+GndhKZ403JGbCJ+Z+wfa09avzMQ3ducQ=";
+    hash = "sha256-DVbN+VUk7K2CBwQ4rOGIJj+KYOlB9TeDUGE+s5docok=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-nfUGyPjR6Q35YXs+v1WWkJ58mNFj8o+Vj+evJ1d5uvg=";
+    hash = "sha256-/3xcouWXUxoVFHV05eD4IEuQbPAn+iFIwB8tP+jJm+4=";
   };
 
   nativeBuildInputs = [

From eb511ce1c525c4d8d5e5167f1de3bbddcb46c12e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 01:00:48 +0000
Subject: [PATCH 50/70] promtail: 3.6.7 -> 3.6.8

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

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index dccaba214f4c..ea2b8aae4816 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule (finalAttrs: {
-  version = "3.6.7";
+  version = "3.6.8";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Gg86aV/7/VoLHGLO40kxng6tYOMpbmSCwV1BRlrW+qc=";
+    hash = "sha256-KyTuVNpBsjsO/0jkhuDzdvrCWQGIf27KGFni8k4aqZ4=";
   };
 
   vendorHash = null;

From 79c6e8a78d92c7943c0740077bcf220f45821e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 25 Mar 2026 20:25:08 -0700
Subject: [PATCH 51/70] python3Packages.pynintendoparental: 2.3.2.1 -> 2.3.3

Diff: https://github.com/pantherale0/pynintendoparental/compare/2.3.2.1...2.3.3

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

diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
index 917524e83b92..a8c1978a498b 100644
--- a/pkgs/development/python-modules/pynintendoparental/default.nix
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pynintendoparental";
-  version = "2.3.2.1";
+  version = "2.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pynintendoparental";
     tag = finalAttrs.version;
-    hash = "sha256-dQoYollXElYU1j/O5D6kt3d1lpbVyhAtekA9o5eV0Ws=";
+    hash = "sha256-2qcupx+x578E+n+YsmB81XrVE5M0QFZPP82H5KxEkss=";
   };
 
   postPatch = ''

From 155724e76e502a6e52d2149d5ef304131795a5e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 04:25:35 +0000
Subject: [PATCH 52/70] rclone: 1.73.2 -> 1.73.3

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

diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index c7e7b05ba69b..62d6cc68f377 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -17,7 +17,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "rclone";
-  version = "1.73.2";
+  version = "1.73.3";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
     owner = "rclone";
     repo = "rclone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ICq0VEy0i5Q/9Fd9rsZmMZGMnAW2tGsIhluHFGlmI/Q=";
+    hash = "sha256-jPY+sPNQwashbbrjt4RewFRc5FwsvCZBQwMy+kLpCUQ=";
   };
 
-  vendorHash = "sha256-4WLtVzlboBRO5HVYUVfwt6xGaaG2mt8GVHcS4K+fgvA=";
+  vendorHash = "sha256-XRIwSMwq8SwgZuIXNHJtasFtUbE3U2YgdVjN+DiXDlg=";
 
   subPackages = [ "." ];
 

From 6ebed2be1225b38763d9e793e2d75711c4548e68 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 26 Mar 2026 07:12:38 +0000
Subject: [PATCH 53/70] linux_xanmod: 6.18.19 -> 6.18.20

- Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.20-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.19-xanmod1..6.18.20-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 24f8d0169699..5a47f2caa8bf 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.19";
-      hash = "sha256-m0EYkUY4EfNaWKJ7XE+3CCcJubcZEBbkV8wumykZH+Y=";
+      version = "6.18.20";
+      hash = "sha256-CVwMRXmDq+vmepTs9Aja7+xJztz2my6Z5AZrUk3VoOA=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 9e8c9c407d8aff80d68839738962c0f3e42c3375 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 26 Mar 2026 07:16:02 +0000
Subject: [PATCH 54/70] linux_xanmod_latest: 6.19.9 -> 6.19.10

- Changelog: https://dl.xanmod.org/changelog/6.19/ChangeLog-6.19.10-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.19.9-xanmod1..6.19.10-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 5a47f2caa8bf..04c016ec1650 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.19.9";
-      hash = "sha256-O3R19FuTw2Q80I8HEJM3gzl/yWWF40TRZvMLUfI6N3Y=";
+      version = "6.19.10";
+      hash = "sha256-siYXwGPt/wO1DcYeCM7XPwwG6HkbT9c0oQai7QFJFBA=";
     };
   };
 

From 92d46588f639d344b09c0f19e5bdeb772ad22a45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 09:12:05 +0000
Subject: [PATCH 55/70] textcompare: 0.1.8 -> 0.1.9

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

diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix
index 4da399b744fc..46caebaad5ec 100644
--- a/pkgs/by-name/te/textcompare/package.nix
+++ b/pkgs/by-name/te/textcompare/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "textcompare";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "josephmawa";
     repo = "TextCompare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N4oFAfYUYWaFeAVyuf/bKz+540bOzRiltPfHXFydzzc=";
+    hash = "sha256-/K+aBcaC5N24RkduWf2VMyF6oPxKnLyDDdTA+Iucen0=";
   };
 
   strictDeps = true;

From 52898be599960da44db0ac6d8357c51b78e6cf17 Mon Sep 17 00:00:00 2001
From: Andreas Wendleder <andreas.wendleder@gmail.com>
Date: Thu, 26 Mar 2026 10:42:03 +0100
Subject: [PATCH 56/70] magic-vlsi: 8.3.602 -> 8.3.628

- Update to latest stable revision to include GDSII and property fixes.
- Disable fortify hardening to prevent "buffer overflow detected" crashes
  caused by long environment strings/paths in Nix.
---
 pkgs/by-name/ma/magic-vlsi/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 77d4ea616d2c..81db3ab0532c 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -20,16 +20,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "magic-vlsi";
-  version = "8.3.602";
+  version = "8.3.628";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "magic";
     tag = finalAttrs.version;
-    hash = "sha256-jNcuTdBHyVUEvdavIaB2LfMBKhHZkCxFOYyA2kBezqc=";
+    hash = "sha256-Zs9M2UgN+tIty7/DwLKVLjrPZxfd0qpM90F9QjUI6wM=";
     leaveDotGit = true;
   };
 
+  hardeningDisable = [ "fortify" ];
+
   patches = [
     (fetchpatch {
       name = "fix-buffer-overflow-runstats.patch";

From 97abdaa3879a1b4e0b6ac92d772efe4624accb96 Mon Sep 17 00:00:00 2001
From: Andreas Wendleder <andreas.wendleder@gmail.com>
Date: Thu, 26 Mar 2026 10:42:59 +0100
Subject: [PATCH 57/70] librelane: 3.0.0rc1 -> 3.0.0

- Update to stable release 3.0.0.
- Update source hash to match the new tag.
---
 pkgs/by-name/li/librelane/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/librelane/package.nix b/pkgs/by-name/li/librelane/package.nix
index 74cfa0d7eb0b..bd8bc20ab0f2 100644
--- a/pkgs/by-name/li/librelane/package.nix
+++ b/pkgs/by-name/li/librelane/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "librelane";
-  version = "3.0.0rc1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "librelane";
     repo = "librelane";
     tag = finalAttrs.version;
-    hash = "sha256-oEMybXxnOyCbUEsJWtBMuV+6XSg9Y8wKrbR9pm/GI5U=";
+    hash = "sha256-BZmoneeMpnnQ2wUb5sorLFsFZsLaKclhAtCIiMsW8Qc=";
   };
 
   build-system = [

From c47f6b8d5fe31fbbfc4e2b03caf4a83cfc5e7a23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 11:01:24 +0000
Subject: [PATCH 58/70] kanban: 0.2.0 -> 0.3.5

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

diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix
index c4f9ff3d37cc..f435fcbdfb7c 100644
--- a/pkgs/by-name/ka/kanban/package.nix
+++ b/pkgs/by-name/ka/kanban/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanban";
-  version = "0.2.0";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "fulsomenko";
     repo = "kanban";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-w1NoWgaUBny//3t1S5z/juPOYFomwJKtTq/M4qKoNv0=";
+    hash = "sha256-MIj1wSCKYg7bLj9sPGU/5peZX0i3J5crUzjcuJeF6O8=";
   };
 
   env.GIT_COMMIT_HASH = finalAttrs.src.rev;
 
-  cargoHash = "sha256-N+c2jnJ7a+Nh2UibkaOByh4tKDX52VovYIpeHTpawXo=";
+  cargoHash = "sha256-vCBHnYUpyyZcatAVaBVslng9EBrRkk5BzePcPZ07vtc=";
 
   passthru.updateScript = nix-update-script { };
 

From 3bd668f90c457708831798fa74c71ed5c84f8632 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 12:49:57 +0000
Subject: [PATCH 59/70] tiscamera: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index 1d7856dd6fc3..f2a3bddd28ef 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tiscamera";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "TheImagingSource";
     repo = "tiscamera";
     rev = "v-tiscamera-${finalAttrs.version}";
-    hash = "sha256-33U/8CbqNWIRwfDHXCZSN466WEQj9fip+Z5EJ7kIwRM=";
+    hash = "sha256-3qAPUcP+Rh1aA1qNWq0NWMpJftinm32r52esikH804Y=";
   };
 
   postPatch = ''

From 63319932a364c9904545ecb2020f3762a87e8d1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Mar 2026 13:57:55 +0100
Subject: [PATCH 60/70] python3Packages.kanidm: 1.8.0 -> 1.3.0

Track the PyPi releases. The Git tags are only for Kanidm itself.
---
 .../python-modules/kanidm/default.nix         | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix
index caf784b8f063..3824fbff2e83 100644
--- a/pkgs/development/python-modules/kanidm/default.nix
+++ b/pkgs/development/python-modules/kanidm/default.nix
@@ -1,18 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
 
   # build
   pdm-backend,
 
   # propagates
   aiohttp,
+  aiohttp-retry,
   authlib,
   pydantic,
+  python-dateutil,
   toml,
+  typing-extensions,
 
   # tests
+  openapi-spec-validator,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
@@ -20,34 +24,41 @@
 
 buildPythonPackage rec {
   pname = "kanidm";
-  version = "1.8.5";
+  version = "1.3.0";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "kanidm";
-    repo = "kanidm";
-    tag = "v${version}";
-    hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-KlUxW/bJByQnzPdRd9Z5pStH27SpWrCijZc5jlVT5jE=";
   };
 
-  sourceRoot = "${src.name}/pykanidm";
-
   build-system = [ pdm-backend ];
 
   dependencies = [
     aiohttp
+    aiohttp-retry
     authlib
     pydantic
+    python-dateutil
     toml
+    typing-extensions
   ];
 
   nativeCheckInputs = [
+    openapi-spec-validator
     pytest-asyncio
     pytest-mock
     pytestCheckHook
   ];
 
-  disabledTestMarks = [ "network" ];
+  disabledTests = [
+    "test_tokenstuff"
+  ];
+
+  disabledTestMarks = [
+    "network"
+    "openapi"
+  ];
 
   pythonImportsCheck = [ "kanidm" ];
 

From d95261b435c455fa43fe98dcbda32e2cc83e7cbe Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 26 Mar 2026 10:22:42 +0100
Subject: [PATCH 61/70] nixos-test-driver: Make overridable

---
 nixos/doc/manual/default.nix    |  1 +
 nixos/doc/manual/redirects.json |  3 +++
 nixos/lib/testing/driver.nix    | 13 +++++++------
 pkgs/top-level/all-packages.nix |  8 ++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index b552986f526b..bdede559d1df 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -64,6 +64,7 @@ let
       eval = nixos-lib.evalTest {
         # Avoid evaluating a NixOS config prototype.
         config.node.type = types.deferredModule;
+        config.hostPkgs = pkgs;
         options._module.args = mkOption { internal = true; };
       };
     in
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 43de7ee3011d..7bf88472148e 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -211,6 +211,9 @@
   "test-opt-nodeDefaults": [
     "index.html#test-opt-nodeDefaults"
   ],
+  "test-opt-pythonTestDriverPackage": [
+    "index.html#test-opt-pythonTestDriverPackage"
+  ],
   "test-opt-rawTestDerivationArg": [
     "index.html#test-opt-rawTestDerivationArg"
   ],
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 63ad51147743..5cd7c2ebb806 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -9,15 +9,10 @@ let
 
   # Reifies and correctly wraps the python test driver for
   # the respective qemu version and with or without ocr support
-  testDriver = hostPkgs.python3Packages.callPackage ../test-driver {
+  testDriver = config.pythonTestDriverPackage.override {
     inherit (config) enableOCR extraPythonPackages;
     qemu_pkg = config.qemu.package;
-    imagemagick_light = hostPkgs.imagemagick_light.override { inherit (hostPkgs) libtiff; };
-    tesseract4 = hostPkgs.tesseract4.override { enableLanguages = [ "eng" ]; };
-
     enableNspawn = config.containers != { };
-    # We want `pkgs.systemd`, *not* `python3Packages.system`.
-    systemd = hostPkgs.systemd;
   };
 
   vlans = map (
@@ -135,6 +130,12 @@ let
 in
 {
   options = {
+    pythonTestDriverPackage = mkOption {
+      description = "Package containing the python NixOS test driver implemetnation";
+      type = types.package;
+      default = hostPkgs.nixos-test-driver;
+      readOnly = true;
+    };
 
     driver = mkOption {
       description = "Package containing a script that runs the test.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13bbd539c786..f1c2f437c098 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -146,6 +146,14 @@ with pkgs;
 
   inherit (nix-update) nix-update-script;
 
+  nixos-test-driver = pkgs.python3Packages.callPackage ../../nixos/lib/test-driver {
+    qemu_pkg = pkgs.qemu;
+    imagemagick_light = pkgs.imagemagick_light.override { inherit (pkgs) libtiff; };
+    tesseract4 = pkgs.tesseract4.override { enableLanguages = [ "eng" ]; };
+    # We want `pkgs.systemd`, *not* `python3Packages.system`.
+    systemd = pkgs.systemd;
+  };
+
   ### Push NixOS tests inside the fixed point
 
   # See also allTestsForSystem in nixos/release.nix

From 1853b925cd3af625b29152d17536745d54c15e18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 13:11:40 +0000
Subject: [PATCH 62/70] qdmr: 0.13.3 -> 0.14.0

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

diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix
index 19da04d327f3..3aecb74a2d66 100644
--- a/pkgs/by-name/qd/qdmr/package.nix
+++ b/pkgs/by-name/qd/qdmr/package.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qdmr";
-  version = "0.13.3";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Nw5B0vbYlGkH/8SAAT4DdTp2qiiLst3hWV4n6uF7oUo=";
+    hash = "sha256-9YYMU64AWBp3YAyWEQiER0lH8OeI7AczEztw6UHqmOE=";
   };
 
   nativeBuildInputs = [

From 42d11bee78eaf83f9c91db87a3f71bb63dffa76f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 13:36:16 +0000
Subject: [PATCH 63/70] go-cover-treemap: 1.4.2 -> 1.5.1

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

diff --git a/pkgs/by-name/go/go-cover-treemap/package.nix b/pkgs/by-name/go/go-cover-treemap/package.nix
index 9f924594b7d5..0ecd931de750 100644
--- a/pkgs/by-name/go/go-cover-treemap/package.nix
+++ b/pkgs/by-name/go/go-cover-treemap/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-cover-treemap";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "nikolaydubina";
     repo = "go-cover-treemap";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA=";
+    hash = "sha256-y5hy+2uqMjeACjmel16Uf0vgiMSVySdxpSDKOBuxVds=";
   };
 
-  vendorHash = "sha256-k/k+EGkuBnZFHrcWxnzLG8efWgb2i35Agf/sWbgTc4g=";
+  vendorHash = "sha256-JWeCwsPFbQWI60i60GFSQcy7MJ0nDraRb0xf1t4H8RY=";
 
   ldflags = [
     "-s"

From 51cdd0f964686b52f0e63a49bccdf60b161787e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 13:50:42 +0000
Subject: [PATCH 64/70] python3Packages.gliner: 0.2.25 -> 0.2.26

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

diff --git a/pkgs/development/python-modules/gliner/default.nix b/pkgs/development/python-modules/gliner/default.nix
index 9d8eaeaf0e5a..30173893c70e 100644
--- a/pkgs/development/python-modules/gliner/default.nix
+++ b/pkgs/development/python-modules/gliner/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gliner";
-  version = "0.2.25";
+  version = "0.2.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "urchade";
     repo = "GLiNER";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4IPT8mW3I998T9W/qDJRZifZYRJUyjeu54gtsOnFNWY=";
+    hash = "sha256-tiQrb04SfloVJySyKu5XhOaE8Y3RcwBbW2l13UtZL0w=";
   };
 
   build-system = [

From 56e60b65191c99b0781a6f1d3b87d03563feb855 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 26 Mar 2026 11:03:53 -0400
Subject: [PATCH 65/70] vimPlugins.rainbow-delimiters-nvim: 0.10.0 -> 0.11.0

---
 .../plugins/non-generated/rainbow-delimiters-nvim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
index 500386290c92..1a31a0656a61 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin rec {
   pname = "rainbow-delimiters.nvim";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitLab {
     owner = "HiPhish";
     repo = "rainbow-delimiters.nvim";
     tag = "v${version}";
-    hash = "sha256-E0ZPi9Vzc3TwhNHsGyABY+sgn/vO6Oyun6eRd7/RFgU=";
+    hash = "sha256-zQgnNN8QvboOHWaMcLw1uRt/9AxV1asvTnpCcJ/qVS4=";
   };
 
   nvimSkipModules = [

From 569e5ef8a03f1590df6488eb277454ec5e5e3920 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 15:56:49 +0000
Subject: [PATCH 66/70] stackit-cli: 0.56.0 -> 0.57.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index ccea6230ea7b..ee443579f80b 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "stackit-cli";
-  version = "0.56.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4//JuIlGbYUPGr8Zc3fgDl4AMhWZoLYuBSvGhn3Ev5w=";
+    hash = "sha256-rkgDMS2Blc5RSRP/Itx4yOOfzYO9n092dWbPPC6gGmI=";
   };
 
-  vendorHash = "sha256-IW0pWghQ4GHwanGciCCZ+2/9xUtMUbgHJE8KAOU/k04=";
+  vendorHash = "sha256-WnGLi2C6Vk26I/Uzh/bvcnLVRPxUJFt19MUqasov/iU=";
 
   subPackages = [ "." ];
 

From eac3d9d3689df75f5f5e16ce44cf89ec67daa001 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 16:06:55 +0000
Subject: [PATCH 67/70] _1password-cli: 2.33.0-beta.01 -> 2.33.1

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

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index cb9899f940ef..deb4e6b7424c 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -24,13 +24,13 @@ let
     if extension == "zip" then fetchzip args else fetchurl args;
 
   pname = "1password-cli";
-  version = "2.33.0-beta.01";
+  version = "2.33.1";
   sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-jCz7m3X38SM4DwBDYu7J7rxzLECKftETrXvZwzWjfXA=" "zip";
-    i686-linux = fetch "linux_386" "sha256-kM4RD1hqa1JOcsDmPcGeojL5wu359UZkJnVbwlpEgFM=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-CWYKsd3TpTUaORgXrM1CVjBMJPPhMvSAb7kJARy+oVo=" "zip";
+    aarch64-linux = fetch "linux_arm64" "sha256-rBXJ5BT/1TFySOgC1wpgOz4tcOF9flHplfonYGOA9Ac=" "zip";
+    i686-linux = fetch "linux_386" "sha256-2Hh+ML+hewwZATrh01kPXoNBdYWN3dI2ZqfLBiH/gK8=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-ge+4thdTnymQYFQ2G9qwh9i3zsY13W1M5za1CXybUqI=" "zip";
     aarch64-darwin =
-      fetch "apple_universal" "sha256-+rdXdnpX0ucoecv/dNRA5L/GOe0bVgEPKl7pn0qNxm8="
+      fetch "apple_universal" "sha256-+3NI4BIazI21m6teLBvKalCTN8cx6RhFqwXnkNK6tjQ="
         "pkg";
     x86_64-darwin = aarch64-darwin;
   };

From 4f01430431e1b6aa227286c3032c9fc80f7beffe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Mar 2026 17:17:19 +0100
Subject: [PATCH 68/70] python3Packages.css-inline: 0.20.0 -> 0.20.1

https://github.com/Stranger6667/css-inline/blob/python-v0.20.1/CHANGELOG.md
---
 .../python-modules/css-inline/Cargo.lock      | 114 +++++++++---------
 .../python-modules/css-inline/default.nix     |   6 +-
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock
index 8ab072e40461..c221cc6c82e2 100644
--- a/pkgs/development/python-modules/css-inline/Cargo.lock
+++ b/pkgs/development/python-modules/css-inline/Cargo.lock
@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -141,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "css-inline"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "cssparser",
  "html5ever",
@@ -157,7 +157,7 @@ dependencies = [
 
 [[package]]
 name = "css-inline-python"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
  "built",
  "css-inline",
@@ -371,9 +371,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "html5ever"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
 dependencies = [
  "log",
  "markup5ever",
@@ -617,15 +617,15 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "iri-string"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
 dependencies = [
  "memchr",
  "serde",
@@ -633,15 +633,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "js-sys"
-version = "0.3.89"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4eacb0641a310445a4c513f2a5e23e19952e269c6a38887254d5f837a305506"
+checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -649,9 +649,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "litemap"
@@ -691,9 +691,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "markup5ever"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
 dependencies = [
  "log",
  "tendril",
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parking_lot"
@@ -822,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -957,9 +957,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
  "bytes",
  "getrandom 0.3.4",
@@ -992,9 +992,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -1134,9 +1134,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.36"
+version = "0.23.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
+checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
 dependencies = [
  "once_cell",
  "ring",
@@ -1158,9 +1158,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1187,9 +1187,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "selectors"
-version = "0.35.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fdfed56cd634f04fe8b9ddf947ae3dc493483e819593d2ba17df9ad05db8b2"
+checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
 dependencies = [
  "bitflags",
  "cssparser",
@@ -1313,12 +1313,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1436,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1451,9 +1451,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "bytes",
  "libc",
@@ -1646,9 +1646,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.112"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d7d0fce354c88b7982aec4400b3e7fcf723c32737cef571bd165f7613557ee"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -1659,9 +1659,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.62"
+version = "0.4.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee85afca410ac4abba5b584b12e77ea225db6ee5471d0aebaae0861166f9378a"
+checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1673,9 +1673,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.112"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55839b71ba921e4f75b674cb16f843f4b1f3b26ddfcb3454de1cf65cc021ec0f"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1683,9 +1683,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.112"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf2e969c2d60ff52e7e98b7392ff1588bffdd1ccd4769eba27222fd3d621571"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -1696,18 +1696,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.112"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0861f0dcdf46ea819407495634953cdcc8a8c7215ab799a7a7ce366be71c7b30"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.89"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10053fbf9a374174094915bbce141e87a6bf32ecd9a002980db4b638405e8962"
+checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1961,9 +1961,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
  "memchr",
 ]
@@ -2005,18 +2005,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.39"
+version = "0.8.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
+checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.39"
+version = "0.8.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
+checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index 91cc29afbc6a..e122828eadb1 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "css-inline";
-  version = "0.20.0";
+  version = "0.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "css-inline";
     rev = "python-v${version}";
-    hash = "sha256-T/oNrRZjW8GMzdf1I00y2nylaCrl6oVdSv2bEVADKsY=";
+    hash = "sha256-8Se0Ehzsh5TWwdfpwriTOjEY50eTFuA2qOonLK/XuNk=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       cd bindings/python
       ln -s ${./Cargo.lock} Cargo.lock
     '';
-    hash = "sha256-XX4R+HRXw2sGJwZPW+qaaE2eGLkFFaaWjZfAYvHs9qQ=";
+    hash = "sha256-mj+/WTm/etglMj32gwhOmpW3/DyrvQ+TxUBSYDd7YZE=";
   };
 
   nativeBuildInputs = [

From 134c91e56f5aa1016eaad69e920063982f75b1d9 Mon Sep 17 00:00:00 2001
From: Saad Nadeem <saadndm.sn@gmail.com>
Date: Thu, 26 Mar 2026 12:17:29 -0400
Subject: [PATCH 69/70] vimPlugins.fff-nvim:
 0.4.3-nightly.dd56a3a-unstable-2026-03-20 ->
 0.4.3-nightly.0a18692-unstable-2026-03-24

---
 .../vim/plugins/non-generated/fff-nvim/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 244f3bf6cf96..e91e668584d1 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -11,18 +11,18 @@
   vimUtils,
 }:
 let
-  version = "0.4.3-nightly.dd56a3a-unstable-2026-03-20";
+  version = "0.4.3-nightly.0a18692-unstable-2026-03-24";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
-    rev = "dd56a3a8a8a5a85522badaf6485f28c8f7a7c840";
-    hash = "sha256-F9fnjCwBEJfuK0TuRr7XjMcacMep5K0SuzGft2IFXtQ=";
+    rev = "eb577ea4f39f7b9296ff8c6b4bf2b2899d017ded";
+    hash = "sha256-m/KykUyhE3xUVmmE84xUaqW0T4fbuRp6iAVBbCioiCI=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-Xhn+EpVF7XQOgHQpmoHHrZ/swi2xgdEFYh8D6mYJMSc=";
+    cargoHash = "sha256-hMwPyPc4V0pTxpn1U3ay31KttFeoU54h6Z4HGv8nFYQ=";
 
     nativeBuildInputs = [
       pkg-config

From 6b74cf77bde9a9c7bacc6a435c21c522de3d8003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 16:41:53 +0000
Subject: [PATCH 70/70] python3Packages.arcam-fmj: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index 869a7f59d763..8605bff8ca6c 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "arcam-fmj";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "arcam_fmj";
     tag = version;
-    hash = "sha256-OiBTlAcSLhaMWbp5k+0yU1amSpLKnJA+3Q56lyiSDUA=";
+    hash = "sha256-qcSqsfbA5maGDTf07fz4dwlrMUF5wnWPsWcYWbsFiwQ=";
   };
 
   build-system = [ setuptools ];