From 809d70e46ad81bafdcc6f1995d2933f57e44eaf1 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:31:46 +0100
Subject: [PATCH 01/67] zabbix70: 7.0.16 -> 7.0.17

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 4378c4aac1cc..2f04eefd4822 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -8,8 +8,8 @@ generic: {
     hash = "sha256-US+TP6qtCT3LlnELWR93t7nf8A1Y1xRPI+300GA1v8g=";
   };
   v70 = generic {
-    version = "7.0.16";
-    hash = "sha256-puolxEye+RpDJcyobH8UFaiWRE9ECbHLY5b2i5NW0WM=";
+    version = "7.0.17";
+    hash = "sha256-FLdfMpurJ0xiW73Z1EcR3MlmoxdVWsH5G1vSfE31iAw=";
   };
   v60 = generic {
     version = "6.0.36";

From 471c0b53d2da13b8bf1b66e69155069561afa156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ha=CC=88cker?= <mhaecker@mac.com>
Date: Mon, 3 Mar 2025 19:59:37 +0100
Subject: [PATCH 02/67] mumble: Add build option CMAKE_UNITY_BUILD for
 compilation speed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This provides a significant speed boost to the compilation. Almost 70%
improvement in my experiments.

# plain build
❯ nx hyperfine 'nix build .#mumble --rebuild' --warmup 1
--ignore-failure
Benchmark 1: nix build .#mumble --rebuild
  Time (mean ± σ):     73.287 s ±  2.462 s    [User: 0.679 s, System:
3.338 s]
  Range (min … max):   69.478 s … 77.686 s    10 runs

# unity build
❯ nx hyperfine 'nix build .#mumble --rebuild' --warmup 1
--ignore-failure
Benchmark 1: nix build .#mumble --rebuild
  Time (mean ± σ):     42.713 s ±  1.435 s    [User: 0.089 s, System:
1.216 s]
  Range (min … max):   39.891 s … 44.800 s    10 runs
---
 pkgs/applications/networking/mumble/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index fda05185adff..f97d0f44bf77 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -72,6 +72,7 @@ let
           "-D g15=OFF"
           "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
           "-D BUILD_NUMBER=${lib.versions.patch source.version}"
+          "-D CMAKE_UNITY_BUILD=ON" # Upstream uses this in their build pipeline to speed up builds
           "-D bundled-gsl=OFF"
           "-D bundled-json=OFF"
         ]

From 4f81d58a5db81cb927ff117cc26d33833ead4e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 15:26:03 +0000
Subject: [PATCH 03/67] lint-staged: 16.1.2 -> 16.1.3

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

diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index f10411d8a4a6..ab97d87014d8 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "16.1.2";
+  version = "16.1.3";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-fpUZ4OAkbitsR/eCUVRFuJ+FWtIwZVgDz4dG/RGojP4=";
+    hash = "sha256-Aviq2FJBA2R2w8WkvafD7uwM6RxBNCbiawqrvy/VyEw=";
   };
 
-  npmDepsHash = "sha256-2TXGwQRy+IMksICDy5drCqxP+ng644fQlhG+lvJrCUA=";
+  npmDepsHash = "sha256-l/t/TS7Yj2ti35mL0Ol3mug0I87Xtcx+RCv8Z6hK7AY=";
 
   dontNpmBuild = true;
 

From 2f66b2cbdacee0b4cc9143e87496b3a3d075a71b Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 4 Aug 2025 14:15:37 +0800
Subject: [PATCH 04/67] python3Packages.warp-lang: 1.8.0 -> 1.8.1

---
 pkgs/development/python-modules/warp-lang/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index 746e9b4ca8cd..a740b73ef614 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -37,13 +37,13 @@ let
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
   stdenv = builtins.throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
 
-  version = "1.8.0";
+  version = "1.8.1";
 
   libmathdx = effectiveStdenv.mkDerivation (finalAttrs: {
     # NOTE: The version used should match the version Warp requires:
     # https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
     pname = "libmathdx";
-    version = "0.2.1";
+    version = "0.2.2";
 
     outputs = [
       "out"
@@ -62,8 +62,8 @@ let
 
         # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
         hashes = {
-          aarch64-linux = "sha256-smB13xev2TG1xUx4+06KRgYEnPMczpjBOOX7uC1APbE=";
-          x86_64-linux = "sha256-+3TbLuL5Y2flLRicQgPVLs8KZQBqNYJYJ8P3etgX7g0=";
+          aarch64-linux = "sha256-uadBl2HTWIzpYyUxHqnLZtqq42v13KYXSOJXz0Wgtrk=";
+          x86_64-linux = "sha256-YU26l3q+HH1fyBD96oMrl+e96gmiC/krzJv6VJss3mY=";
         };
       in
       lib.mapNullable (
@@ -139,7 +139,7 @@ buildPythonPackage {
     owner = "NVIDIA";
     repo = "warp";
     tag = "v${version}";
-    hash = "sha256-zCRB92acxOiIFGjfRh2Cr1qq8pbhm+Rd011quMP/D88=";
+    hash = "sha256-cSG8uncJMl4rbQ48L8XJY1Illr6usVX8no0jDhECwbo=";
   };
 
   patches =

From 42b73d667f04a4464fb923e2428f78fe5b1e6393 Mon Sep 17 00:00:00 2001
From: Joachim Ernst <joachim.ernst@helsinki-systems.de>
Date: Tue, 5 Aug 2025 15:00:40 +0200
Subject: [PATCH 05/67] rustdesk-flutter: 1.4.0 -> 1.4.1

---
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  10 +-
 .../ru/rustdesk-flutter/pubspec.lock.json     | 476 ++++++++++--------
 2 files changed, 271 insertions(+), 215 deletions(-)

diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 9920e05af097..7e0ba759d9d1 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -33,7 +33,7 @@
 let
   flutterRustBridge = rustPlatform.buildRustPackage rec {
     pname = "flutter_rust_bridge_codegen";
-    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10
+    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.1/.github/workflows/bridge.yml#L10
 
     src = fetchFromGitHub {
       owner = "fzyzcjy";
@@ -63,14 +63,14 @@ let
 in
 flutter.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-fuS2ENrMlzk1AIZGZp4M3ZbsHks5TFW2pRQEGzsTThQ=";
+    hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
   };
 
   strictDeps = true;
@@ -78,7 +78,7 @@ flutter.buildFlutterApplication rec {
 
   # Configure the Flutter/Dart build
   sourceRoot = "${src.name}/flutter";
-  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.9/flutter/pubspec.lock | yq > pubspec.lock.json
+  # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.1/flutter/pubspec.lock | yq > pubspec.lock.json
   pubspecLock = lib.importJSON ./pubspec.lock.json;
   gitHashes = {
     dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
@@ -100,7 +100,7 @@ flutter.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I=";
+    hash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
   };
 
   dontCargoBuild = true;
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index ac6c4d9d8573..98d5e9d4d772 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -4,11 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "64.0.0"
+      "version": "72.0.0"
+    },
+    "_macros": {
+      "dependency": "transitive",
+      "description": "dart",
+      "source": "sdk",
+      "version": "0.3.2"
     },
     "after_layout": {
       "dependency": "transitive",
@@ -24,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.0"
+      "version": "6.7.0"
     },
     "animations": {
       "dependency": "transitive",
@@ -54,21 +60,21 @@
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -84,11 +90,11 @@
       "dependency": "direct main",
       "description": {
         "name": "auto_size_text_field",
-        "sha256": "d47c81ffa9b61d219f6c50492dc03ea28fa9346561b2ec33b46ccdc000ddb0aa",
+        "sha256": "41c90b2270e38edc6ce5c02e5a17737a863e65e246bdfc94565a38f3ec399144",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.2.4"
     },
     "back_button_interceptor": {
       "dependency": "direct main",
@@ -104,11 +110,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "bot_toast": {
       "dependency": "direct main",
@@ -154,11 +160,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1",
+        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.2"
     },
     "build_resolvers": {
       "dependency": "transitive",
@@ -174,21 +180,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21",
+        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.8"
+      "version": "2.4.13"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.3.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -204,11 +210,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.10.1"
     },
     "cached_network_image": {
       "dependency": "transitive",
@@ -234,11 +240,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cached_network_image_web",
-        "sha256": "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316",
+        "sha256": "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.2.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -254,11 +260,11 @@
       "dependency": "transitive",
       "description": {
         "name": "charcode",
-        "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
+        "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -274,11 +280,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clock": {
       "dependency": "transitive",
@@ -294,11 +300,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
     },
     "collection": {
       "dependency": "transitive",
@@ -324,51 +330,51 @@
       "dependency": "transitive",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "cross_file": {
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e",
+        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.3+8"
+      "version": "0.3.4+2"
     },
     "crypto": {
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.0.6"
     },
     "csslib": {
       "dependency": "transitive",
       "description": {
         "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.2"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368",
+        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.3.7"
     },
     "dash_chat_2": {
       "dependency": "direct main",
@@ -385,11 +391,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "debounce_throttle": {
       "dependency": "direct main",
@@ -416,7 +422,7 @@
       "description": {
         "path": ".",
         "ref": "HEAD",
-        "resolved-ref": "4f562ab49d289cfa36bfda7cff12746ec0200033",
+        "resolved-ref": "b47e8385e5a75d38319ad706a64b0ead3108b093",
         "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
       },
       "source": "git",
@@ -436,11 +442,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
+        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.2"
     },
     "draggable_float_widget": {
       "dependency": "direct main",
@@ -473,6 +479,16 @@
       "source": "git",
       "version": "0.0.1+1"
     },
+    "equatable": {
+      "dependency": "transitive",
+      "description": {
+        "name": "equatable",
+        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.7"
+    },
     "extended_text": {
       "dependency": "direct main",
       "description": {
@@ -487,11 +503,11 @@
       "dependency": "transitive",
       "description": {
         "name": "extended_text_library",
-        "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829",
+        "sha256": "13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.0"
+      "version": "12.0.1"
     },
     "external_path": {
       "dependency": "direct main",
@@ -547,21 +563,21 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_linux",
-        "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492",
+        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.2+1"
+      "version": "0.9.3+2"
     },
     "file_selector_macos": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6",
+        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.4+2"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -577,41 +593,41 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+1"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "transitive",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flex_color_picker": {
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "0871edc170153cfc3de316d30625f40a85daecfa76ce541641f3cc0ec7757cbf",
+        "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.1"
+      "version": "3.6.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f",
+        "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "3.4.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -757,7 +773,7 @@
       "version": "2.2.1"
     },
     "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
         "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da",
@@ -780,11 +796,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.9"
+      "version": "2.1.0"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -796,24 +812,24 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5",
+        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.7"
+      "version": "2.5.7"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d",
+        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.4"
     },
     "frontend_server_client": {
-      "dependency": "direct overridden",
+      "dependency": "transitive",
       "description": {
         "name": "frontend_server_client",
         "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
@@ -826,61 +842,71 @@
       "dependency": "direct main",
       "description": {
         "name": "get",
-        "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e",
+        "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.6.6"
+      "version": "4.7.2"
     },
     "glob": {
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
+    },
+    "google_fonts": {
+      "dependency": "direct main",
+      "description": {
+        "name": "google_fonts",
+        "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.2.1"
     },
     "graphs": {
       "dependency": "transitive",
       "description": {
         "name": "graphs",
-        "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "html": {
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.4"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -906,11 +932,11 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e",
+        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.7"
+      "version": "4.3.0"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -926,61 +952,61 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1",
+        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.9+3"
+      "version": "0.8.12+21"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0",
+        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "3.0.6"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3",
+        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.9+1"
+      "version": "0.8.12+2"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.10.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
@@ -1006,11 +1032,11 @@
       "dependency": "transitive",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "js": {
       "dependency": "transitive",
@@ -1026,11 +1052,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.1"
+      "version": "4.9.0"
     },
     "lints": {
       "dependency": "transitive",
@@ -1046,21 +1072,31 @@
       "dependency": "transitive",
       "description": {
         "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
+    },
+    "macros": {
+      "dependency": "transitive",
+      "description": {
+        "name": "macros",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2-main.4"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1086,11 +1122,11 @@
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "2.0.0"
     },
     "nested": {
       "dependency": "transitive",
@@ -1106,21 +1142,21 @@
       "dependency": "transitive",
       "description": {
         "name": "octo_image",
-        "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d",
+        "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.0"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
@@ -1166,41 +1202,41 @@
       "dependency": "transitive",
       "description": {
         "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+        "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.1.0"
     },
     "path_provider": {
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668",
+        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.2.15"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1226,11 +1262,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_windows",
-        "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.3.0"
     },
     "pedantic": {
       "dependency": "transitive",
@@ -1246,11 +1282,11 @@
       "dependency": "direct main",
       "description": {
         "name": "percent_indicator",
-        "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c",
+        "sha256": "157d29133bbc6ecb11f923d36e7960a96a3f28837549a20b65e5135729f0f9fd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.3"
+      "version": "4.2.5"
     },
     "petitparser": {
       "dependency": "transitive",
@@ -1266,11 +1302,11 @@
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.4"
+      "version": "3.1.6"
     },
     "plugin_platform_interface": {
       "dependency": "transitive",
@@ -1296,61 +1332,61 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.1"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
+        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.4.0"
     },
     "pull_down_button": {
       "dependency": "direct main",
       "description": {
         "name": "pull_down_button",
-        "sha256": "235b302701ce029fd9e9470975069376a6700935bb47a5f1b3ec8a5efba07e6f",
+        "sha256": "48b928203afdeafa4a8be5dc96980523bc8a2ddbd04569f766071a722be22379",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3"
+      "version": "0.9.4"
     },
     "puppeteer": {
       "dependency": "transitive",
       "description": {
         "name": "puppeteer",
-        "sha256": "eedeaae6ec5d2e54f9ae22ab4d6b3dda2e8791c356cc783046d06c287ffe11d8",
+        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.16.0"
     },
     "qr": {
       "dependency": "transitive",
       "description": {
         "name": "qr",
-        "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3",
+        "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "qr_code_scanner": {
       "dependency": "direct main",
@@ -1376,11 +1412,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1436,11 +1472,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_static",
-        "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "shelf_web_socket": {
       "dependency": "transitive",
@@ -1482,101 +1518,101 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sqflite": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "sqflite",
-        "sha256": "a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6",
+        "sha256": "a9a8c6dfdf315f87f2a23a7bad2b60c8d5af0f88a5fde92cf9205202770c2753",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.2.0"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5",
+        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4+6"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "synchronized": {
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558",
+        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0+1"
+      "version": "3.3.0+3"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "texture_rgba_renderer": {
       "dependency": "direct main",
@@ -1593,21 +1629,21 @@
       "dependency": "transitive",
       "description": {
         "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "toggle_switch": {
       "dependency": "direct main",
       "description": {
         "name": "toggle_switch",
-        "sha256": "9e6af1f0c5a97d9de41109dc7b9e1b3bbe73417f89b10e0e44dc834fb493d4cb",
+        "sha256": "dca04512d7c23ed320d6c5ede1211a404f177d54d353bf785b07d15546a86ce5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.3.0"
     },
     "tuple": {
       "dependency": "direct main",
@@ -1623,11 +1659,11 @@
       "dependency": "transitive",
       "description": {
         "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "uni_links": {
       "dependency": "direct main",
@@ -1704,61 +1740,61 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_platform_interface",
-        "sha256": "a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "url_launcher_web": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b",
+        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "direct main",
@@ -1774,31 +1810,31 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752",
+        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.18"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_codec",
-        "sha256": "f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33",
+        "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.13"
     },
     "vector_graphics_compiler": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a",
+        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.10+1"
+      "version": "1.1.16"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1814,51 +1850,51 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player",
-        "sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2",
+        "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.8.2"
+      "version": "2.9.5"
     },
     "video_player_android": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_android",
-        "sha256": "7f8f25d7ad56819a82b2948357f3c3af071f6a678db33833b26ec36bbc221316",
+        "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.11"
+      "version": "2.7.16"
     },
     "video_player_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_avfoundation",
-        "sha256": "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed",
+        "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.7.1"
     },
     "video_player_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_platform_interface",
-        "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6",
+        "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.2"
+      "version": "6.3.0"
     },
     "video_player_web": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_web",
-        "sha256": "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb",
+        "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.3.5"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -1874,61 +1910,61 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d",
+        "sha256": "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
+      "version": "1.2.1"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385",
+        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.2.3"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
+        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.2"
+      "version": "0.5.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
+        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.5"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.4"
+      "version": "5.10.1"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1966,11 +2002,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.1.0"
     },
     "xml": {
       "dependency": "transitive",
@@ -1982,35 +2018,55 @@
       "source": "hosted",
       "version": "6.5.0"
     },
+    "xterm": {
+      "dependency": "direct main",
+      "description": {
+        "name": "xterm",
+        "sha256": "168dfedca77cba33fdb6f52e2cd001e9fde216e398e89335c19b524bb22da3a2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "yaml_edit": {
       "dependency": "transitive",
       "description": {
         "name": "yaml_edit",
-        "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd",
+        "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.2"
+    },
+    "zmodem": {
+      "dependency": "transitive",
+      "description": {
+        "name": "zmodem",
+        "sha256": "3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.6"
     },
     "zxing2": {
       "dependency": "direct main",
       "description": {
         "name": "zxing2",
-        "sha256": "a042961441bd400f59595f9125ef5fca4c888daf0ea59c17f41e0e151f8a12b5",
+        "sha256": "2677c49a3b9ca9457cb1d294fd4bd5041cac6aab8cdb07b216ba4e98945c684f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1"
+      "version": "0.2.4"
     }
   },
   "sdks": {

From f976e535645f0498324316998cb6e775a5cd21c3 Mon Sep 17 00:00:00 2001
From: Joachim Ernst <joachim.ernst@helsinki-systems.de>
Date: Wed, 6 Aug 2025 19:10:26 +0200
Subject: [PATCH 06/67] nixos/oxidized: allow for providing config by other
 means

- especially usefull, when secrets are used in configFile
  and `replace-secret` or `scalpel` should be used
---
 nixos/modules/services/admin/oxidized.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
index a00a5d388101..d581f1baa826 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -36,7 +36,7 @@ in
     };
 
     configFile = lib.mkOption {
-      type = lib.types.path;
+      type = lib.types.nullOr lib.types.path;
       example = lib.literalExpression ''
         pkgs.writeText "oxidized-config.yml" '''
           ---
@@ -122,6 +122,8 @@ in
         };
       };
 
+    }
+    // lib.optionalAttrs (cfg.configFile != null) {
       "${cfg.dataDir}/.config/oxidized/config" = {
         "L+" = {
           argument = "${cfg.configFile}";

From 68621945fa8796b3cbb1fa62f680994eed8662e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 23:45:05 +0000
Subject: [PATCH 07/67] improv-setup: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/by-name/im/improv-setup/package.nix b/pkgs/by-name/im/improv-setup/package.nix
index 9e0948754846..a3756a82672f 100644
--- a/pkgs/by-name/im/improv-setup/package.nix
+++ b/pkgs/by-name/im/improv-setup/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "improv-setup";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitea {
     domain = "git.clerie.de";
     owner = "clerie";
     repo = "improv-setup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3vF8StD2qk3S87Rw7hphmIW2udlFK9e4YQfHF12yFwI=";
+    hash = "sha256-N/HMvyZfWuxzNg0IDvyNVJiNBh7gb+v38mjVYmt2vw4=";
   };
 
-  cargoHash = "sha256-H2X1hpynOIZOHBx8nZz09Yr4zk/7Ikn6TNhx3cCmOuA=";
+  cargoHash = "sha256-vv7i+RsOjYaVWLmyBcvYNdiKsPOP4GyKyWAYB718Liw=";
 
   passthru.updateScript = nix-update-script { };
 

From f1b187201bcdeb47dc79d4001742f500e31e5ca4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 04:49:27 +0000
Subject: [PATCH 08/67] upsun: 5.1.1 -> 5.2.0

---
 pkgs/by-name/up/upsun/versions.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json
index 82b10f1f7e80..7d7a3b2e7525 100644
--- a/pkgs/by-name/up/upsun/versions.json
+++ b/pkgs/by-name/up/upsun/versions.json
@@ -1,19 +1,19 @@
 {
-  "version": "5.1.1",
+  "version": "5.2.0",
   "darwin-amd64": {
-    "hash": "sha256-oOM+CP4wWjfWBEejhmDM1hjyWistigPfIqotyOJJU/o=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_darwin_all.tar.gz"
+    "hash": "sha256-4hqTqRX3lGbE06CjPV2DkqUZP5Xzkcq1tvinKVRck0A=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_darwin_all.tar.gz"
   },
   "darwin-arm64": {
-    "hash": "sha256-oOM+CP4wWjfWBEejhmDM1hjyWistigPfIqotyOJJU/o=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_darwin_all.tar.gz"
+    "hash": "sha256-4hqTqRX3lGbE06CjPV2DkqUZP5Xzkcq1tvinKVRck0A=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_darwin_all.tar.gz"
   },
   "linux-amd64": {
-    "hash": "sha256-aozHXVnWGGIsOi5AopGbTLzah8AunaUrUoWnakM1+vs=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_linux_amd64.tar.gz"
+    "hash": "sha256-bLzeY95f+CbcdMOFUQs0kbRSAYTf95nSkupVwbR2HBs=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_linux_amd64.tar.gz"
   },
   "linux-arm64": {
-    "hash": "sha256-MHb++8FXYo7YRq2HO5IypnyxxCQ7jZ5qysiuqmm0YJg=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_linux_arm64.tar.gz"
+    "hash": "sha256-fvXb1+JOsExA6KBCCb7ULYUBaKbgStiEjpyLw/OIFUM=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_linux_arm64.tar.gz"
   }
 }

From baa8dd2c45492591f980067788b41276cc443cf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 06:59:27 +0000
Subject: [PATCH 09/67] firezone-gateway: 1.4.12 -> 1.4.15

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

diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 817c2b323e38..ba7fa393af76 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-gateway";
-  version = "1.4.12";
+  version = "1.4.15";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${version}";
-    hash = "sha256-isWtx9DwJqPwlbA7MTW1r+VFpy7+xzVx86XvKlsQ+SY=";
+    hash = "sha256-eIef5csbrZdh2e2fxBSBYAgHSpSfHCMTbatTsHZR8DY=";
   };
 
-  cargoHash = "sha256-w/FHN3EQBqM32O1zHEFXvg8c5JBeM14MUbq29APCrVI=";
+  cargoHash = "sha256-OAWPO18s9749nfkyPEaArRkxdqnCKo69k8ZSRS2Tyw0=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
   RUSTFLAGS = "--cfg system_certs";

From 85c5d4b2fa1a808f049a854c9a140f2de847ba86 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 5 Aug 2025 21:30:29 -0400
Subject: [PATCH 10/67] blink-qt: init at 6.0.4

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/bl/blink-qt/package.nix | 85 ++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 pkgs/by-name/bl/blink-qt/package.nix

diff --git a/pkgs/by-name/bl/blink-qt/package.nix b/pkgs/by-name/bl/blink-qt/package.nix
new file mode 100644
index 000000000000..4c6dde719b68
--- /dev/null
+++ b/pkgs/by-name/bl/blink-qt/package.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch2,
+  python3Packages,
+  qt6Packages,
+  libvncserver,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "blink-qt";
+  version = "6.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AGProjects";
+    repo = "blink-qt";
+    tag = version;
+    hash = "sha256-QESg9yo5oddYqSKuFLSMI2Oju3FCq97+j0uJDK85Yy8=";
+  };
+
+  patches = [
+    # Remove when version > 6.0.4
+    (fetchpatch2 {
+      url = "https://github.com/AGProjects/blink-qt/commit/45343c90ae0680a3d03589fa8a12ac1eb85a6925.patch";
+      hash = "sha256-XwV5L3r0IqWkhlaJypS2cHkDCcoumOgEEqDpdcaTviE=";
+    })
+  ];
+
+  nativeBuildInputs = [ qt6Packages.wrapQtAppsHook ];
+
+  build-system = with python3Packages; [
+    cython
+    setuptools
+  ];
+
+  buildInputs = [
+    libvncserver
+    qt6Packages.qtbase
+    qt6Packages.qtsvg
+  ];
+
+  dependencies = with python3Packages; [
+    dateutils
+    dnspython
+    google-api-python-client
+    lxml
+    lxml-html-clean
+    msrplib
+    oauth2client
+    otr
+    pgpy
+    pyqt6
+    pyqt6-webengine
+    python3-application
+    python3-eventlib
+    python3-gnutls
+    sipsimple
+    sqlobject
+    standard-imghdr
+    xcaplib
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  pythonImportsCheck = [ "blink" ];
+
+  # no upstream tests exist
+  doCheck = false;
+
+  meta = {
+    description = "Blink SIP Client";
+    homepage = "https://icanblink.com";
+    downloadPage = "https://github.com/agprojects/blink-qt";
+    changelog = "https://github.com/AGProjects/blink-qt/releases/tag/${version}";
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.ngi ];
+    platforms = lib.platforms.unix;
+    mainProgram = "blink";
+  };
+}

From 19c07e7541d132f314cbf91b78e613048ca6a977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 19:59:13 +0000
Subject: [PATCH 11/67] clickable: 8.3.1 -> 8.4.0

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

diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 5c47cbf6d919..afab7d22bcba 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "clickable";
-  version = "8.3.1";
+  version = "8.4.0";
   format = "pyproject";
 
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
     rev = "v${version}";
-    hash = "sha256-Vn2PyALaRrE+jJRdZzW+jjCm3f2GfpgrQcFGB7kr4EM=";
+    hash = "sha256-mqAJBxYHOsMiSjWjtam/GvxjNBZ8mkOuBibmFORGhEg=";
   };
 
   build-system = [ python3Packages.setuptools ];

From fd6649a37406e46600b0f6680ab00d2f24534f94 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:24:20 +0300
Subject: [PATCH 12/67] gnomeExtensions.gsconnect: no with lib; in meta

---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index a9283b808027..a34faf4c0857 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -116,12 +116,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "KDE Connect implementation for Gnome Shell";
     homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.doronbehar ];
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }

From ea703a07b9719ff3abf5786fbe4f29e2cd743cdc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:25:28 +0300
Subject: [PATCH 13/67] gnomeExtensions.gsconnect: use finalAttrs

---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index a34faf4c0857..98b9b11d0202 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -21,7 +21,7 @@
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extension-gsconnect";
   version = "62";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-HFm04XC61AjkJSt4YBc4dO9v563w+LsYDSaZckPYE14=";
   };
 
@@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
 
     # slightly janky fix for gsettings_schemadir being removed
     substituteInPlace data/config.js.in \
-      --subst-var-by GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
+      --subst-var-by GSETTINGS_SCHEMA_DIR \
+        ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
   '';
 
   postFixup = ''
@@ -124,4 +125,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 4a2b05d457092be8ca48c198730544a6c674084c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Aug 2025 22:27:37 +0300
Subject: [PATCH 14/67] gnomeExtensions.gsconnect: 62 -> 66

Diff: https://github.com/GSConnect/gnome-shell-extension-gsconnect/compare/v62...v66
---
 pkgs/desktops/gnome/extensions/gsconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 98b9b11d0202..3dc94311f766 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extension-gsconnect";
-  version = "62";
+  version = "66";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HFm04XC61AjkJSt4YBc4dO9v563w+LsYDSaZckPYE14=";
+    hash = "sha256-QPvdSmt4aUkPvaOUonovrCxW4pxrgoopXGi3KSukVD8=";
   };
 
   patches = [

From 67be233269c6e02f32616b416ae21a5a28e312db Mon Sep 17 00:00:00 2001
From: Andrew Benbow <andrew.benbow@posteo.com>
Date: Sat, 9 Aug 2025 17:11:56 -0400
Subject: [PATCH 15/67] drupal: fix update script

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

diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix
index 03e532bcd82c..dacc22f0acb0 100644
--- a/pkgs/by-name/dr/drupal/package.nix
+++ b/pkgs/by-name/dr/drupal/package.nix
@@ -27,10 +27,10 @@ php.buildComposerProject2 (finalAttrs: {
     };
     updateScript = writeScript "update.sh" ''
       #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p common-updater-scripts xmlstarlet
+      #!nix-shell -i bash -p nix-update xmlstarlet
       set -eu -o pipefail
       version=$(curl -k --silent --globoff "https://updates.drupal.org/release-history/drupal/current" | xmlstarlet sel -t -v "project/releases/release[1]/tag")
-      update-source-version drupal $version --file=./pkgs/by-name/dr/drupal/package.nix
+      nix-update drupal --version $version
     '';
   };
 

From 6e0e9a8d03f051827e6d618ad500dd501ff1b1be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 06:53:33 +0000
Subject: [PATCH 16/67] nezha-theme-admin: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
index b48defe8edb3..3a638401dc4f 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -89,7 +89,7 @@
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
             "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "dev": true,
+            "devOptional": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@jridgewell/gen-mapping": "^0.3.5",
@@ -114,32 +114,32 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
-            "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
-            "dev": true,
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+            "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.27.4",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.4.tgz",
-            "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==",
-            "dev": true,
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+            "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.27.3",
+                "@babel/generator": "^7.28.0",
                 "@babel/helper-compilation-targets": "^7.27.2",
                 "@babel/helper-module-transforms": "^7.27.3",
-                "@babel/helpers": "^7.27.4",
-                "@babel/parser": "^7.27.4",
+                "@babel/helpers": "^7.27.6",
+                "@babel/parser": "^7.28.0",
                 "@babel/template": "^7.27.2",
-                "@babel/traverse": "^7.27.4",
-                "@babel/types": "^7.27.3",
+                "@babel/traverse": "^7.28.0",
+                "@babel/types": "^7.28.0",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -155,15 +155,15 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
-            "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+            "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.5",
-                "@babel/types": "^7.27.3",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
+                "@babel/parser": "^7.28.0",
+                "@babel/types": "^7.28.0",
+                "@jridgewell/gen-mapping": "^0.3.12",
+                "@jridgewell/trace-mapping": "^0.3.28",
                 "jsesc": "^3.0.2"
             },
             "engines": {
@@ -174,7 +174,7 @@
             "version": "7.27.2",
             "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
             "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/compat-data": "^7.27.2",
@@ -187,11 +187,20 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/helper-globals": {
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+            "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/helper-module-imports": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
             "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/traverse": "^7.27.1",
@@ -205,7 +214,7 @@
             "version": "7.27.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
             "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-module-imports": "^7.27.1",
@@ -251,33 +260,33 @@
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
             "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
-            "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
-            "dev": true,
+            "version": "7.28.2",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz",
+            "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==",
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.27.6"
+                "@babel/types": "^7.28.2"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.27.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
-            "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+            "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.27.3"
+                "@babel/types": "^7.28.0"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -319,9 +328,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-            "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+            "version": "7.28.2",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
+            "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -342,36 +351,27 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.27.4",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz",
-            "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+            "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.27.3",
-                "@babel/parser": "^7.27.4",
+                "@babel/generator": "^7.28.0",
+                "@babel/helper-globals": "^7.28.0",
+                "@babel/parser": "^7.28.0",
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.27.3",
-                "debug": "^4.3.1",
-                "globals": "^11.1.0"
+                "@babel/types": "^7.28.0",
+                "debug": "^4.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/traverse/node_modules/globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/@babel/types": {
-            "version": "7.27.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
-            "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
+            "version": "7.28.2",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+            "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.27.1",
@@ -382,15 +382,15 @@
             }
         },
         "node_modules/@biomejs/js-api": {
-            "version": "0.8.0-beta.3",
-            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.8.0-beta.3.tgz",
-            "integrity": "sha512-Rlljal9Wwdt2OgOnTUdlvzUEVKNzTCeEPekXTjQT6uwZE21akpviljo5u3HNPkW55Sh8zqHDZ/3d9gI4yoEv2A==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-2.0.3.tgz",
+            "integrity": "sha512-fg4hGhg1LtohDqLdG9uggROlVsydcuFwZhPoUOTi9+bkvGMULDKL9dEP5iN6++CIA/AN0T20U82rLYuaxc+VDQ==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
-                "@biomejs/wasm-bundler": "^1.9.4",
-                "@biomejs/wasm-nodejs": "^1.9.4",
-                "@biomejs/wasm-web": "^1.9.4"
+                "@biomejs/wasm-bundler": "^2.1.1",
+                "@biomejs/wasm-nodejs": "^2.1.1",
+                "@biomejs/wasm-web": "^2.1.1"
             },
             "peerDependenciesMeta": {
                 "@biomejs/wasm-bundler": {
@@ -405,18 +405,16 @@
             }
         },
         "node_modules/@biomejs/wasm-nodejs": {
-            "version": "1.9.4",
-            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-1.9.4.tgz",
-            "integrity": "sha512-ZqNlhKcZW6MW1LxWIOfh9YVrBykvzyFad3bOh6JJFraDnNa3NXboRDiaI8dmrbb0ZHXCU1Tsq6WQsKV2Vpp5dw==",
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.1.4.tgz",
+            "integrity": "sha512-BuvuOiXtTJg9w5+ApMXeJDD5H+XkIJSazIjPJeIxfkCqzVtCByLjCqPC6gbECbylRl9IhrZMWVIskTD6aJ9MzA==",
             "dev": true,
-            "license": "MIT OR Apache-2.0",
-            "optional": true,
-            "peer": true
+            "license": "MIT OR Apache-2.0"
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-            "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
+            "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
             "cpu": [
                 "ppc64"
             ],
@@ -431,9 +429,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-            "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
+            "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
             "cpu": [
                 "arm"
             ],
@@ -448,9 +446,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-            "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
+            "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
             "cpu": [
                 "arm64"
             ],
@@ -465,9 +463,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-            "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
+            "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
             "cpu": [
                 "x64"
             ],
@@ -482,9 +480,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-            "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
+            "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
             "cpu": [
                 "arm64"
             ],
@@ -499,9 +497,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-            "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
+            "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
             "cpu": [
                 "x64"
             ],
@@ -516,9 +514,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-            "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
+            "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
             "cpu": [
                 "arm64"
             ],
@@ -533,9 +531,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-            "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
+            "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
             "cpu": [
                 "x64"
             ],
@@ -550,9 +548,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-            "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
+            "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
             "cpu": [
                 "arm"
             ],
@@ -567,9 +565,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-            "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
+            "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
             "cpu": [
                 "arm64"
             ],
@@ -584,9 +582,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-            "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
+            "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
             "cpu": [
                 "ia32"
             ],
@@ -601,9 +599,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-            "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
+            "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
             "cpu": [
                 "loong64"
             ],
@@ -618,9 +616,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-            "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
+            "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
             "cpu": [
                 "mips64el"
             ],
@@ -635,9 +633,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-            "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
+            "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -652,9 +650,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-            "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
+            "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
             "cpu": [
                 "riscv64"
             ],
@@ -669,9 +667,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-            "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
+            "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
             "cpu": [
                 "s390x"
             ],
@@ -686,9 +684,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-            "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
+            "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
             "cpu": [
                 "x64"
             ],
@@ -703,9 +701,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-            "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
+            "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
             "cpu": [
                 "arm64"
             ],
@@ -720,9 +718,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-            "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
+            "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
             "cpu": [
                 "x64"
             ],
@@ -737,9 +735,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-            "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
+            "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
             "cpu": [
                 "arm64"
             ],
@@ -754,9 +752,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-            "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
+            "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
             "cpu": [
                 "x64"
             ],
@@ -770,10 +768,27 @@
                 "node": ">=18"
             }
         },
+        "node_modules/@esbuild/openharmony-arm64": {
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
+            "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-            "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
+            "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
             "cpu": [
                 "x64"
             ],
@@ -788,9 +803,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-            "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
+            "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
             "cpu": [
                 "arm64"
             ],
@@ -805,9 +820,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-            "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
+            "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
             "cpu": [
                 "ia32"
             ],
@@ -822,9 +837,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-            "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
+            "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
             "cpu": [
                 "x64"
             ],
@@ -881,9 +896,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.20.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-            "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
+            "version": "0.21.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+            "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -896,9 +911,9 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-            "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+            "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -906,9 +921,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+            "version": "0.15.2",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+            "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -956,9 +971,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.29.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-            "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+            "version": "9.33.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+            "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -979,32 +994,19 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.2.tgz",
-            "integrity": "sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==",
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+            "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.15.0",
+                "@eslint/core": "^0.15.2",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-            "version": "0.15.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
-            "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/@exodus/schemasafe": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
@@ -1013,31 +1015,31 @@
             "license": "MIT"
         },
         "node_modules/@floating-ui/core": {
-            "version": "1.7.1",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.1.tgz",
-            "integrity": "sha512-azI0DrjMMfIug/ExbBaeDVJXcY0a7EPvPjb2xAJPa4HeimBX+Z18HK8QQR3jb6356SnDDdxx+hinMLcJEDdOjw==",
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
+            "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/utils": "^0.2.9"
+                "@floating-ui/utils": "^0.2.10"
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.7.1",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.1.tgz",
-            "integrity": "sha512-cwsmW/zyw5ltYTUeeYJ60CnQuPqmGwuGVhG9w0PRaRKkAyi38BT5CKrpIbb+jtahSwUl04cWzSx9ZOIxeS6RsQ==",
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.3.tgz",
+            "integrity": "sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/core": "^1.7.1",
-                "@floating-ui/utils": "^0.2.9"
+                "@floating-ui/core": "^1.7.3",
+                "@floating-ui/utils": "^0.2.10"
             }
         },
         "node_modules/@floating-ui/react-dom": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.3.tgz",
-            "integrity": "sha512-huMBfiU9UnQ2oBwIhgzyIiSpVgvlDstU8CX0AF+wS+KzmYMs0J2a3GwuFHV1Lz+jlrQGeC1fF+Nv0QoumyV0bA==",
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.5.tgz",
+            "integrity": "sha512-HDO/1/1oH9fjj4eLgegrlH3dklZpHtUYYFiVwMUwfGvk9jWDRWqkklA2/NFScknrcNSspbV868WjXORvreDX+Q==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/dom": "^1.0.0"
+                "@floating-ui/dom": "^1.7.3"
             },
             "peerDependencies": {
                 "react": ">=16.8.0",
@@ -1045,9 +1047,9 @@
             }
         },
         "node_modules/@floating-ui/utils": {
-            "version": "0.2.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
-            "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+            "version": "0.2.10",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+            "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
             "license": "MIT"
         },
         "node_modules/@hookform/resolvers": {
@@ -1143,17 +1145,13 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.8",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-            "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+            "version": "0.3.12",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+            "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
             "license": "MIT",
             "dependencies": {
-                "@jridgewell/set-array": "^1.2.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/sourcemap-codec": "^1.5.0",
                 "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
             }
         },
         "node_modules/@jridgewell/resolve-uri": {
@@ -1165,25 +1163,16 @@
                 "node": ">=6.0.0"
             }
         },
-        "node_modules/@jridgewell/set-array": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "version": "1.5.4",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+            "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.25",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "version": "0.3.29",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+            "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -2175,16 +2164,16 @@
             "license": "MIT"
         },
         "node_modules/@rolldown/pluginutils": {
-            "version": "1.0.0-beta.11",
-            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.11.tgz",
-            "integrity": "sha512-L/gAA/hyCSuzTF1ftlzUSI/IKr2POHsv1Dd78GfqkR83KMNuswWD61JxGV2L7nRwBBBSDr6R1gCkdTmoN7W4ag==",
+            "version": "1.0.0-beta.27",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
+            "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.43.0.tgz",
-            "integrity": "sha512-Krjy9awJl6rKbruhQDgivNbD1WuLb8xAclM4IR4cN5pHGAs2oIMMQJEiC3IC/9TZJ+QZkmZhlMO/6MBGxPidpw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
+            "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
             "cpu": [
                 "arm"
             ],
@@ -2196,9 +2185,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.43.0.tgz",
-            "integrity": "sha512-ss4YJwRt5I63454Rpj+mXCXicakdFmKnUNxr1dLK+5rv5FJgAxnN7s31a5VchRYxCFWdmnDWKd0wbAdTr0J5EA==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
+            "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2210,9 +2199,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.43.0.tgz",
-            "integrity": "sha512-eKoL8ykZ7zz8MjgBenEF2OoTNFAPFz1/lyJ5UmmFSz5jW+7XbH1+MAgCVHy72aG59rbuQLcJeiMrP8qP5d/N0A==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
+            "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2224,9 +2213,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.43.0.tgz",
-            "integrity": "sha512-SYwXJgaBYW33Wi/q4ubN+ldWC4DzQY62S4Ll2dgfr/dbPoF50dlQwEaEHSKrQdSjC6oIe1WgzosoaNoHCdNuMg==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
+            "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
             "cpu": [
                 "x64"
             ],
@@ -2238,9 +2227,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.43.0.tgz",
-            "integrity": "sha512-SV+U5sSo0yujrjzBF7/YidieK2iF6E7MdF6EbYxNz94lA+R0wKl3SiixGyG/9Klab6uNBIqsN7j4Y/Fya7wAjQ==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
+            "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
             "cpu": [
                 "arm64"
             ],
@@ -2252,9 +2241,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.43.0.tgz",
-            "integrity": "sha512-J7uCsiV13L/VOeHJBo5SjasKiGxJ0g+nQTrBkAsmQBIdil3KhPnSE9GnRon4ejX1XDdsmK/l30IYLiAaQEO0Cg==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
+            "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
             "cpu": [
                 "x64"
             ],
@@ -2266,9 +2255,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.43.0.tgz",
-            "integrity": "sha512-gTJ/JnnjCMc15uwB10TTATBEhK9meBIY+gXP4s0sHD1zHOaIh4Dmy1X9wup18IiY9tTNk5gJc4yx9ctj/fjrIw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
+            "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
             "cpu": [
                 "arm"
             ],
@@ -2280,9 +2269,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.43.0.tgz",
-            "integrity": "sha512-ZJ3gZynL1LDSIvRfz0qXtTNs56n5DI2Mq+WACWZ7yGHFUEirHBRt7fyIk0NsCKhmRhn7WAcjgSkSVVxKlPNFFw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
+            "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
             "cpu": [
                 "arm"
             ],
@@ -2294,9 +2283,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.43.0.tgz",
-            "integrity": "sha512-8FnkipasmOOSSlfucGYEu58U8cxEdhziKjPD2FIa0ONVMxvl/hmONtX/7y4vGjdUhjcTHlKlDhw3H9t98fPvyA==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
+            "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
             "cpu": [
                 "arm64"
             ],
@@ -2308,9 +2297,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.43.0.tgz",
-            "integrity": "sha512-KPPyAdlcIZ6S9C3S2cndXDkV0Bb1OSMsX0Eelr2Bay4EsF9yi9u9uzc9RniK3mcUGCLhWY9oLr6er80P5DE6XA==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
+            "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
             "cpu": [
                 "arm64"
             ],
@@ -2322,9 +2311,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.43.0.tgz",
-            "integrity": "sha512-HPGDIH0/ZzAZjvtlXj6g+KDQ9ZMHfSP553za7o2Odegb/BEfwJcR0Sw0RLNpQ9nC6Gy8s+3mSS9xjZ0n3rhcYg==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
+            "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
             "cpu": [
                 "loong64"
             ],
@@ -2335,10 +2324,10 @@
                 "linux"
             ]
         },
-        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.43.0.tgz",
-            "integrity": "sha512-gEmwbOws4U4GLAJDhhtSPWPXUzDfMRedT3hFMyRAvM9Mrnj+dJIFIeL7otsv2WF3D7GrV0GIewW0y28dOYWkmw==",
+        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
+            "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2350,9 +2339,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.43.0.tgz",
-            "integrity": "sha512-XXKvo2e+wFtXZF/9xoWohHg+MuRnvO29TI5Hqe9xwN5uN8NKUYy7tXUG3EZAlfchufNCTHNGjEx7uN78KsBo0g==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
+            "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -2364,9 +2353,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.43.0.tgz",
-            "integrity": "sha512-ruf3hPWhjw6uDFsOAzmbNIvlXFXlBQ4nk57Sec8E8rUxs/AI4HD6xmiiasOOx/3QxS2f5eQMKTAwk7KHwpzr/Q==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
+            "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2378,9 +2367,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.43.0.tgz",
-            "integrity": "sha512-QmNIAqDiEMEvFV15rsSnjoSmO0+eJLoKRD9EAa9rrYNwO/XRCtOGM3A5A0X+wmG+XRrw9Fxdsw+LnyYiZWWcVw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
+            "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
             "cpu": [
                 "s390x"
             ],
@@ -2392,9 +2381,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.43.0.tgz",
-            "integrity": "sha512-jAHr/S0iiBtFyzjhOkAics/2SrXE092qyqEg96e90L3t9Op8OTzS6+IX0Fy5wCt2+KqeHAkti+eitV0wvblEoQ==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
+            "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
             "cpu": [
                 "x64"
             ],
@@ -2406,9 +2395,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.43.0.tgz",
-            "integrity": "sha512-3yATWgdeXyuHtBhrLt98w+5fKurdqvs8B53LaoKD7P7H7FKOONLsBVMNl9ghPQZQuYcceV5CDyPfyfGpMWD9mQ==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
+            "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
             "cpu": [
                 "x64"
             ],
@@ -2420,9 +2409,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.43.0.tgz",
-            "integrity": "sha512-wVzXp2qDSCOpcBCT5WRWLmpJRIzv23valvcTwMHEobkjippNf+C3ys/+wf07poPkeNix0paTNemB2XrHr2TnGw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
+            "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
             "cpu": [
                 "arm64"
             ],
@@ -2434,9 +2423,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.43.0.tgz",
-            "integrity": "sha512-fYCTEyzf8d+7diCw8b+asvWDCLMjsCEA8alvtAutqJOJp/wL5hs1rWSqJ1vkjgW0L2NB4bsYJrpKkiIPRR9dvw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
+            "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2448,9 +2437,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.43.0.tgz",
-            "integrity": "sha512-SnGhLiE5rlK0ofq8kzuDkM0g7FN1s5VYY+YSMTibP7CqShxCQvqtNxTARS4xX4PFJfHjG0ZQYX9iGzI3FQh5Aw==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
+            "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
             "cpu": [
                 "x64"
             ],
@@ -2564,13 +2553,13 @@
             }
         },
         "node_modules/@types/babel__traverse": {
-            "version": "7.20.7",
-            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
-            "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+            "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.20.7"
+                "@babel/types": "^7.28.2"
             }
         },
         "node_modules/@types/estree": {
@@ -2588,15 +2577,15 @@
             "license": "MIT"
         },
         "node_modules/@types/luxon": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
-            "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
+            "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.15.32",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-            "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+            "version": "22.17.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
+            "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2639,17 +2628,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.34.1.tgz",
-            "integrity": "sha512-STXcN6ebF6li4PxwNeFnqF8/2BNDvBupf2OPx2yWNzr6mKNGF7q49VM00Pz5FaomJyqvbXpY6PhO+T9w139YEQ==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz",
+            "integrity": "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.34.1",
-                "@typescript-eslint/type-utils": "8.34.1",
-                "@typescript-eslint/utils": "8.34.1",
-                "@typescript-eslint/visitor-keys": "8.34.1",
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/type-utils": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^7.0.0",
                 "natural-compare": "^1.4.0",
@@ -2663,9 +2652,9 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.34.1",
+                "@typescript-eslint/parser": "^8.39.0",
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -2679,16 +2668,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.34.1.tgz",
-            "integrity": "sha512-4O3idHxhyzjClSMJ0a29AcoK0+YwnEqzI6oz3vlRf3xw0zbzt15MzXwItOlnr5nIth6zlY2RENLsOPvhyrKAQA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.0.tgz",
+            "integrity": "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.34.1",
-                "@typescript-eslint/types": "8.34.1",
-                "@typescript-eslint/typescript-estree": "8.34.1",
-                "@typescript-eslint/visitor-keys": "8.34.1",
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2700,18 +2689,18 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/project-service": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.34.1.tgz",
-            "integrity": "sha512-nuHlOmFZfuRwLJKDGQOVc0xnQrAmuq1Mj/ISou5044y1ajGNp2BNliIqp7F2LPQ5sForz8lempMFCovfeS1XoA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.0.tgz",
+            "integrity": "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/tsconfig-utils": "^8.34.1",
-                "@typescript-eslint/types": "^8.34.1",
+                "@typescript-eslint/tsconfig-utils": "^8.39.0",
+                "@typescript-eslint/types": "^8.39.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2722,18 +2711,18 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.34.1.tgz",
-            "integrity": "sha512-beu6o6QY4hJAgL1E8RaXNC071G4Kso2MGmJskCFQhRhg8VOH/FDbC8soP8NHN7e/Hdphwp8G8cE6OBzC8o41ZA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz",
+            "integrity": "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.34.1",
-                "@typescript-eslint/visitor-keys": "8.34.1"
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2744,9 +2733,9 @@
             }
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.34.1.tgz",
-            "integrity": "sha512-K4Sjdo4/xF9NEeA2khOb7Y5nY6NSXBnod87uniVYW9kHP+hNlDV8trUSFeynA2uxWam4gIWgWoygPrv9VMWrYg==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz",
+            "integrity": "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2757,18 +2746,19 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.34.1.tgz",
-            "integrity": "sha512-Tv7tCCr6e5m8hP4+xFugcrwTOucB8lshffJ6zf1mF1TbU67R+ntCc6DzLNKM+s/uzDyv8gLq7tufaAhIBYeV8g==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz",
+            "integrity": "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.34.1",
-                "@typescript-eslint/utils": "8.34.1",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.1.0"
             },
@@ -2781,13 +2771,13 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.34.1.tgz",
-            "integrity": "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.0.tgz",
+            "integrity": "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2799,16 +2789,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.34.1.tgz",
-            "integrity": "sha512-rjCNqqYPuMUF5ODD+hWBNmOitjBWghkGKJg6hiCHzUvXRy6rK22Jd3rwbP2Xi+R7oYVvIKhokHVhH41BxPV5mA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz",
+            "integrity": "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/project-service": "8.34.1",
-                "@typescript-eslint/tsconfig-utils": "8.34.1",
-                "@typescript-eslint/types": "8.34.1",
-                "@typescript-eslint/visitor-keys": "8.34.1",
+                "@typescript-eslint/project-service": "8.39.0",
+                "@typescript-eslint/tsconfig-utils": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2824,7 +2814,7 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -2867,16 +2857,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.34.1.tgz",
-            "integrity": "sha512-mqOwUdZ3KjtGk7xJJnLbHxTuWVn3GO2WZZuM+Slhkun4+qthLdXx32C8xIXbO1kfCECb3jIs3eoxK3eryk7aoQ==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.0.tgz",
+            "integrity": "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.7.0",
-                "@typescript-eslint/scope-manager": "8.34.1",
-                "@typescript-eslint/types": "8.34.1",
-                "@typescript-eslint/typescript-estree": "8.34.1"
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2887,17 +2877,17 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.34.1.tgz",
-            "integrity": "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz",
+            "integrity": "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.34.1",
+                "@typescript-eslint/types": "8.39.0",
                 "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
@@ -2909,16 +2899,16 @@
             }
         },
         "node_modules/@vitejs/plugin-react": {
-            "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.5.2.tgz",
-            "integrity": "sha512-QNVT3/Lxx99nMQWJWF7K4N6apUEuT0KlZA3mx/mVaoGj3smm/8rc8ezz15J1pcbcjDK0V15rpHetVfya08r76Q==",
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
+            "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.27.4",
+                "@babel/core": "^7.28.0",
                 "@babel/plugin-transform-react-jsx-self": "^7.27.1",
                 "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-                "@rolldown/pluginutils": "1.0.0-beta.11",
+                "@rolldown/pluginutils": "1.0.0-beta.27",
                 "@types/babel__core": "^7.20.5",
                 "react-refresh": "^0.17.0"
             },
@@ -2926,7 +2916,7 @@
                 "node": "^14.18.0 || >=16.0.0"
             },
             "peerDependencies": {
-                "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
+                "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
             }
         },
         "node_modules/@xterm/addon-attach": {
@@ -3144,10 +3134,10 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.25.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-            "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-            "dev": true,
+            "version": "4.25.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
+            "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
+            "devOptional": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -3164,8 +3154,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001718",
-                "electron-to-chromium": "^1.5.160",
+                "caniuse-lite": "^1.0.30001733",
+                "electron-to-chromium": "^1.5.199",
                 "node-releases": "^2.0.19",
                 "update-browserslist-db": "^1.1.3"
             },
@@ -3177,23 +3167,23 @@
             }
         },
         "node_modules/c12": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.4.tgz",
-            "integrity": "sha512-t5FaZTYbbCtvxuZq9xxIruYydrAGsJ+8UdP0pZzMiK2xl/gNiSOy0OxhLzHUEEb0m1QXYqfzfvyIFEmz/g9lqg==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.2.0.tgz",
+            "integrity": "sha512-ixkEtbYafL56E6HiFuonMm1ZjoKtIo7TH68/uiEq4DAwv9NcUX2nJ95F8TrbMeNjqIkZpruo3ojXQJ+MGG5gcQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "chokidar": "^4.0.3",
                 "confbox": "^0.2.2",
                 "defu": "^6.1.4",
-                "dotenv": "^16.5.0",
-                "exsolve": "^1.0.5",
+                "dotenv": "^17.2.1",
+                "exsolve": "^1.0.7",
                 "giget": "^2.0.0",
-                "jiti": "^2.4.2",
+                "jiti": "^2.5.1",
                 "ohash": "^2.0.11",
                 "pathe": "^2.0.3",
                 "perfect-debounce": "^1.0.0",
-                "pkg-types": "^2.1.0",
+                "pkg-types": "^2.2.0",
                 "rc9": "^2.1.2"
             },
             "peerDependencies": {
@@ -3232,10 +3222,10 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001723",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",
-            "integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==",
-            "dev": true,
+            "version": "1.0.30001733",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001733.tgz",
+            "integrity": "sha512-e4QKw/O2Kavj2VQTKZWrwzkt3IxOmIlU6ajRb6LP64LHpBo1J67k2Hi4Vu/TgJWsNtynurfS0uK3MaUTCPfu5Q==",
+            "devOptional": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -3465,7 +3455,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
             "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/cookie": {
@@ -3585,9 +3575,9 @@
             "license": "MIT"
         },
         "node_modules/dotenv": {
-            "version": "16.5.0",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
-            "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+            "version": "17.2.1",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
+            "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
             "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
@@ -3604,10 +3594,10 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.168",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.168.tgz",
-            "integrity": "sha512-RUNQmFLNIWVW6+z32EJQ5+qx8ci6RGvdtDC0Ls+F89wz6I2AthpXF0w0DIrn2jpLX0/PU9ZCo+Qp7bg/EckJmA==",
-            "dev": true,
+            "version": "1.5.199",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
+            "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/emoji-regex": {
@@ -3624,9 +3614,9 @@
             "license": "MIT"
         },
         "node_modules/esbuild": {
-            "version": "0.25.5",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-            "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+            "version": "0.25.8",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
+            "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -3637,38 +3627,39 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.5",
-                "@esbuild/android-arm": "0.25.5",
-                "@esbuild/android-arm64": "0.25.5",
-                "@esbuild/android-x64": "0.25.5",
-                "@esbuild/darwin-arm64": "0.25.5",
-                "@esbuild/darwin-x64": "0.25.5",
-                "@esbuild/freebsd-arm64": "0.25.5",
-                "@esbuild/freebsd-x64": "0.25.5",
-                "@esbuild/linux-arm": "0.25.5",
-                "@esbuild/linux-arm64": "0.25.5",
-                "@esbuild/linux-ia32": "0.25.5",
-                "@esbuild/linux-loong64": "0.25.5",
-                "@esbuild/linux-mips64el": "0.25.5",
-                "@esbuild/linux-ppc64": "0.25.5",
-                "@esbuild/linux-riscv64": "0.25.5",
-                "@esbuild/linux-s390x": "0.25.5",
-                "@esbuild/linux-x64": "0.25.5",
-                "@esbuild/netbsd-arm64": "0.25.5",
-                "@esbuild/netbsd-x64": "0.25.5",
-                "@esbuild/openbsd-arm64": "0.25.5",
-                "@esbuild/openbsd-x64": "0.25.5",
-                "@esbuild/sunos-x64": "0.25.5",
-                "@esbuild/win32-arm64": "0.25.5",
-                "@esbuild/win32-ia32": "0.25.5",
-                "@esbuild/win32-x64": "0.25.5"
+                "@esbuild/aix-ppc64": "0.25.8",
+                "@esbuild/android-arm": "0.25.8",
+                "@esbuild/android-arm64": "0.25.8",
+                "@esbuild/android-x64": "0.25.8",
+                "@esbuild/darwin-arm64": "0.25.8",
+                "@esbuild/darwin-x64": "0.25.8",
+                "@esbuild/freebsd-arm64": "0.25.8",
+                "@esbuild/freebsd-x64": "0.25.8",
+                "@esbuild/linux-arm": "0.25.8",
+                "@esbuild/linux-arm64": "0.25.8",
+                "@esbuild/linux-ia32": "0.25.8",
+                "@esbuild/linux-loong64": "0.25.8",
+                "@esbuild/linux-mips64el": "0.25.8",
+                "@esbuild/linux-ppc64": "0.25.8",
+                "@esbuild/linux-riscv64": "0.25.8",
+                "@esbuild/linux-s390x": "0.25.8",
+                "@esbuild/linux-x64": "0.25.8",
+                "@esbuild/netbsd-arm64": "0.25.8",
+                "@esbuild/netbsd-x64": "0.25.8",
+                "@esbuild/openbsd-arm64": "0.25.8",
+                "@esbuild/openbsd-x64": "0.25.8",
+                "@esbuild/openharmony-arm64": "0.25.8",
+                "@esbuild/sunos-x64": "0.25.8",
+                "@esbuild/win32-arm64": "0.25.8",
+                "@esbuild/win32-ia32": "0.25.8",
+                "@esbuild/win32-x64": "0.25.8"
             }
         },
         "node_modules/escalade": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
             "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=6"
@@ -3688,20 +3679,20 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.29.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
-            "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
+            "version": "9.33.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
+            "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.20.1",
-                "@eslint/config-helpers": "^0.2.1",
-                "@eslint/core": "^0.14.0",
+                "@eslint/config-array": "^0.21.0",
+                "@eslint/config-helpers": "^0.3.1",
+                "@eslint/core": "^0.15.2",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.29.0",
-                "@eslint/plugin-kit": "^0.3.1",
+                "@eslint/js": "9.33.0",
+                "@eslint/plugin-kit": "^0.3.5",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
@@ -3879,9 +3870,9 @@
             }
         },
         "node_modules/exsolve": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz",
-            "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz",
+            "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
             "dev": true,
             "license": "MIT"
         },
@@ -4097,7 +4088,7 @@
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
             "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -4425,9 +4416,9 @@
             "license": "MIT"
         },
         "node_modules/jiti": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-            "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
+            "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -4435,19 +4426,27 @@
             }
         },
         "node_modules/jotai": {
-            "version": "2.12.5",
-            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.5.tgz",
-            "integrity": "sha512-G8m32HW3lSmcz/4mbqx0hgJIQ0ekndKWiYP7kWVKi0p6saLXdSoye+FZiOFyonnd7Q482LCzm8sMDl7Ar1NWDw==",
+            "version": "2.13.0",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.13.0.tgz",
+            "integrity": "sha512-H43zXdanNTdpfOEJ4NVbm4hgmrctpXLZagjJNcqAywhUv+sTE7esvFjwm5oBg/ywT9Qw63lIkM6fjrhFuW8UDg==",
             "license": "MIT",
             "peer": true,
             "engines": {
                 "node": ">=12.20.0"
             },
             "peerDependencies": {
+                "@babel/core": ">=7.0.0",
+                "@babel/template": ">=7.0.0",
                 "@types/react": ">=17.0.0",
                 "react": ">=17.0.0"
             },
             "peerDependenciesMeta": {
+                "@babel/core": {
+                    "optional": true
+                },
+                "@babel/template": {
+                    "optional": true
+                },
                 "@types/react": {
                     "optional": true
                 },
@@ -4521,7 +4520,7 @@
             "version": "2.2.3",
             "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
             "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "bin": {
                 "json5": "lib/cli.js"
@@ -4605,7 +4604,7 @@
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
             "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "yallist": "^3.0.2"
@@ -4621,9 +4620,9 @@
             }
         },
         "node_modules/luxon": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
-            "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+            "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
             "license": "MIT",
             "engines": {
                 "node": ">=12"
@@ -4775,9 +4774,9 @@
             }
         },
         "node_modules/node-fetch-native": {
-            "version": "1.6.6",
-            "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz",
-            "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==",
+            "version": "1.6.7",
+            "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz",
+            "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==",
             "dev": true,
             "license": "MIT"
         },
@@ -4795,7 +4794,7 @@
             "version": "2.0.19",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
             "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/normalize-path": {
@@ -4818,17 +4817,17 @@
             }
         },
         "node_modules/nypm": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.0.tgz",
-            "integrity": "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==",
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.1.tgz",
+            "integrity": "sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "citty": "^0.1.6",
-                "consola": "^3.4.0",
+                "consola": "^3.4.2",
                 "pathe": "^2.0.3",
-                "pkg-types": "^2.0.0",
-                "tinyexec": "^0.3.2"
+                "pkg-types": "^2.2.0",
+                "tinyexec": "^1.0.1"
             },
             "bin": {
                 "nypm": "dist/cli.mjs"
@@ -5134,14 +5133,14 @@
             }
         },
         "node_modules/pkg-types": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz",
-            "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
+            "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "confbox": "^0.2.1",
-                "exsolve": "^1.0.1",
+                "confbox": "^0.2.2",
+                "exsolve": "^1.0.7",
                 "pathe": "^2.0.3"
             }
         },
@@ -5299,9 +5298,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-            "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+            "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
             "license": "MIT",
             "peer": true,
             "bin": {
@@ -5315,15 +5314,17 @@
             }
         },
         "node_modules/prettier-plugin-tailwindcss": {
-            "version": "0.6.12",
-            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.12.tgz",
-            "integrity": "sha512-OuTQKoqNwV7RnxTPwXWzOFXy6Jc4z8oeRZYGuMpRyG3WbuR3jjXdQFK8qFBMBx8UHWdHrddARz2fgUenild6aw==",
+            "version": "0.6.14",
+            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz",
+            "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.21.3"
             },
             "peerDependencies": {
                 "@ianvs/prettier-plugin-sort-imports": "*",
+                "@prettier/plugin-hermes": "*",
+                "@prettier/plugin-oxc": "*",
                 "@prettier/plugin-pug": "*",
                 "@shopify/prettier-plugin-liquid": "*",
                 "@trivago/prettier-plugin-sort-imports": "*",
@@ -5345,6 +5346,12 @@
                 "@ianvs/prettier-plugin-sort-imports": {
                     "optional": true
                 },
+                "@prettier/plugin-hermes": {
+                    "optional": true
+                },
+                "@prettier/plugin-oxc": {
+                    "optional": true
+                },
                 "@prettier/plugin-pug": {
                     "optional": true
                 },
@@ -5434,30 +5441,30 @@
             }
         },
         "node_modules/react": {
-            "version": "19.1.0",
-            "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
-            "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
+            "version": "19.1.1",
+            "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
+            "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/react-dom": {
-            "version": "19.1.0",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz",
-            "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
+            "version": "19.1.1",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
+            "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
             "license": "MIT",
             "dependencies": {
                 "scheduler": "^0.26.0"
             },
             "peerDependencies": {
-                "react": "^19.1.0"
+                "react": "^19.1.1"
             }
         },
         "node_modules/react-hook-form": {
-            "version": "7.58.0",
-            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.58.0.tgz",
-            "integrity": "sha512-zGijmEed35oNfOfy7ub99jfjkiLhHwA3dl5AgyKdWC6QQzhnc7tkWewSa+T+A2EpLrc6wo5DUoZctS9kufWJjA==",
+            "version": "7.62.0",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
+            "integrity": "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.0.0"
@@ -5471,9 +5478,9 @@
             }
         },
         "node_modules/react-i18next": {
-            "version": "15.5.3",
-            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.5.3.tgz",
-            "integrity": "sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw==",
+            "version": "15.6.1",
+            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.6.1.tgz",
+            "integrity": "sha512-uGrzSsOUUe2sDBG/+FJq2J1MM+Y4368/QW8OLEKSFvnDflHBbZhSd1u3UkW0Z06rMhZmnB/AQrhCpYfE5/5XNg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.27.6",
@@ -5554,9 +5561,9 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.6.2",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.2.tgz",
-            "integrity": "sha512-U7Nv3y+bMimgWjhlT5CRdzHPu2/KVmqPwKUCChW8en5P3znxUqwlYFlbmyj8Rgp1SF6zs5X4+77kBVknkg6a0w==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.8.0.tgz",
+            "integrity": "sha512-r15M3+LHKgM4SOapNmsH3smAizWds1vJ0Z9C4mWaKnT9/wD7+d/0jYcj6LmOvonkrO4Rgdyp4KQ/29gWN2i1eg==",
             "license": "MIT",
             "dependencies": {
                 "cookie": "^1.0.1",
@@ -5576,12 +5583,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.6.2",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.2.tgz",
-            "integrity": "sha512-Q8zb6VlTbdYKK5JJBLQEN06oTUa/RAbG/oQS1auK1I0TbJOXktqm+QENEVJU6QvWynlXPRBXI3fiOQcSEA78rA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.8.0.tgz",
+            "integrity": "sha512-ntInsnDVnVRdtSu6ODmTQ41cbluak/ENeTif7GBce0L6eztFg6/e1hXAysFQI8X25C8ipKmT9cClbJwxx3Kaqw==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.6.2"
+                "react-router": "7.8.0"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5707,13 +5714,13 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.43.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.43.0.tgz",
-            "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==",
+            "version": "4.46.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
+            "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/estree": "1.0.7"
+                "@types/estree": "1.0.8"
             },
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -5723,36 +5730,29 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.43.0",
-                "@rollup/rollup-android-arm64": "4.43.0",
-                "@rollup/rollup-darwin-arm64": "4.43.0",
-                "@rollup/rollup-darwin-x64": "4.43.0",
-                "@rollup/rollup-freebsd-arm64": "4.43.0",
-                "@rollup/rollup-freebsd-x64": "4.43.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.43.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.43.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.43.0",
-                "@rollup/rollup-linux-arm64-musl": "4.43.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.43.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.43.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.43.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.43.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.43.0",
-                "@rollup/rollup-linux-x64-gnu": "4.43.0",
-                "@rollup/rollup-linux-x64-musl": "4.43.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.43.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.43.0",
-                "@rollup/rollup-win32-x64-msvc": "4.43.0",
+                "@rollup/rollup-android-arm-eabi": "4.46.2",
+                "@rollup/rollup-android-arm64": "4.46.2",
+                "@rollup/rollup-darwin-arm64": "4.46.2",
+                "@rollup/rollup-darwin-x64": "4.46.2",
+                "@rollup/rollup-freebsd-arm64": "4.46.2",
+                "@rollup/rollup-freebsd-x64": "4.46.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.46.2",
+                "@rollup/rollup-linux-arm64-musl": "4.46.2",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
+                "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
+                "@rollup/rollup-linux-riscv64-musl": "4.46.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.46.2",
+                "@rollup/rollup-linux-x64-gnu": "4.46.2",
+                "@rollup/rollup-linux-x64-musl": "4.46.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.46.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.46.2",
+                "@rollup/rollup-win32-x64-msvc": "4.46.2",
                 "fsevents": "~2.3.2"
             }
         },
-        "node_modules/rollup/node_modules/@types/estree": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/run-parallel": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -5786,7 +5786,7 @@
             "version": "6.3.1",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
             "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
@@ -6074,14 +6074,14 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.2.2",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.2.tgz",
-            "integrity": "sha512-g67Bn18qujAu7L7EWexjR4R0MDiSYo+HT5EkV/5IJ5HuuP8N8Pcj4mrbBY1GX5BTeGGw7Vd5nSE9jgLj0IxinQ==",
+            "version": "13.2.8",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.8.tgz",
+            "integrity": "sha512-TgC8cB2GwrQctiUrLW9cVcPkiH5/zGbUCD3Y5zjeeFAtcCBGxLlBp9Df/UK+ux/oQ2J8x3C5a4TOz+tAZ8jOkQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@biomejs/js-api": "0.8.0-beta.3",
-                "@biomejs/wasm-nodejs": "2.0.0-beta.6",
+                "@biomejs/js-api": "2.0.3",
+                "@biomejs/wasm-nodejs": "2.1.4",
                 "@types/swagger-schema-official": "^2.0.25",
                 "c12": "^3.0.4",
                 "citty": "^0.1.6",
@@ -6092,7 +6092,7 @@
                 "nanoid": "^5.1.5",
                 "swagger-schema-official": "2.0.0-bab6bed",
                 "swagger2openapi": "^7.0.8",
-                "typescript": "~5.8.3"
+                "typescript": "~5.9.2"
             },
             "bin": {
                 "sta": "dist/cli.js",
@@ -6102,13 +6102,6 @@
                 "node": ">=20"
             }
         },
-        "node_modules/swagger-typescript-api/node_modules/@biomejs/wasm-nodejs": {
-            "version": "2.0.0-beta.6",
-            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.0.0-beta.6.tgz",
-            "integrity": "sha512-UI8uhz8YUjROBqr8OX3M8aK5Dw+MQfpE3D8sODCoE1CHH/4lvYdYksO/hU6qUe7qOYTI/Dyf2/DOQA5XRvRtAg==",
-            "dev": true,
-            "license": "MIT OR Apache-2.0"
-        },
         "node_modules/swagger-typescript-api/node_modules/nanoid": {
             "version": "5.1.5",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
@@ -6129,9 +6122,9 @@
             }
         },
         "node_modules/swagger-typescript-api/node_modules/typescript": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+            "version": "5.9.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+            "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -6181,9 +6174,9 @@
             }
         },
         "node_modules/swr": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.3.tgz",
-            "integrity": "sha512-dshNvs3ExOqtZ6kJBaAsabhPdHyeY4P2cKwRCniDVifBMoG/SVI7tfLWqPXriVspf2Rg4tPzXJTnwaihIeFw2A==",
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.5.tgz",
+            "integrity": "sha512-4e7pjTVulZTIL+b/S0RYFsgDcTcXPLUOvBPqyh9YdD+PkHeEMoaPwDmF9Kv6I1nnPg1OFKhiiEYpsYaaE2W2jA==",
             "license": "MIT",
             "dependencies": {
                 "dequal": "^2.0.3",
@@ -6328,9 +6321,9 @@
             }
         },
         "node_modules/tinyexec": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-            "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.1.tgz",
+            "integrity": "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==",
             "dev": true,
             "license": "MIT"
         },
@@ -6367,9 +6360,9 @@
             }
         },
         "node_modules/tinyglobby/node_modules/picomatch": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -6457,15 +6450,16 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.34.1",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.34.1.tgz",
-            "integrity": "sha512-XjS+b6Vg9oT1BaIUfkW3M3LvqZE++rbzAMEHuccCfO/YkP43ha6w3jTEMilQxMF92nVOYCcdjv1ZUhAa1D/0ow==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.0.tgz",
+            "integrity": "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.34.1",
-                "@typescript-eslint/parser": "8.34.1",
-                "@typescript-eslint/utils": "8.34.1"
+                "@typescript-eslint/eslint-plugin": "8.39.0",
+                "@typescript-eslint/parser": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6476,7 +6470,7 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/undici-types": {
@@ -6490,7 +6484,7 @@
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
             "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
-            "dev": true,
+            "devOptional": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -6689,9 +6683,9 @@
             }
         },
         "node_modules/vite/node_modules/picomatch": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -6855,13 +6849,13 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
             "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
-            "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+            "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
@@ -6958,18 +6952,18 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.25.67",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
-            "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
+            "version": "3.25.76",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
         },
         "node_modules/zustand": {
-            "version": "5.0.5",
-            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.5.tgz",
-            "integrity": "sha512-mILtRfKW9xM47hqxGIxCv12gXusoY/xTSHBYApXozR0HmQv299whhBeeAcRy+KrPPybzosvJBCOmVjq6x12fCg==",
+            "version": "5.0.7",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.7.tgz",
+            "integrity": "sha512-Ot6uqHDW/O2VdYsKLLU8GQu8sCOM1LcoE8RwvLv9uuRT9s6SOHCKs0ZEOhxg+I1Ld+A1Q5lwx+UlKXXUoCZITg==",
             "license": "MIT",
             "engines": {
                 "node": ">=12.20.0"
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index 5d97590122dd..a0672d82fc53 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-9/lrbVfC+CRQCSJNx7dwKWPgemM6hbd6ZR5xG3tj8wA=";
+    hash = "sha256-VHj6eUIBdIUJ1eUoa2Yog3maee89aMF5yEO9NbDXflQ=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-2iX3/Pw6i2zXH+cpMC6ttn5D/C8G/P9WgRApO7Br5p4=";
+  npmDepsHash = "sha256-th0rnTrS/gZ5gMuZda0/fllVc8g9iPc8/gEos+3E3kU=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From 6a5abb7dbc402c34f08f22a2970b72315ac8c24d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 12:09:43 +0000
Subject: [PATCH 17/67] cloudflared: 2025.7.0 -> 2025.8.0

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

diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index fe34aa61a3d4..cb065f6407fc 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2025.7.0";
+  version = "2025.8.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = version;
-    hash = "sha256-GAmSWdyFQYtGQ5Ml+10Xy7OpKc1bXuAc3hy7Ly6+yC8=";
+    hash = "sha256-kvhDdgnAkYvs+W0TE8Pu3nlEp2n7tHDphDwqCc4J0eE=";
   };
 
   vendorHash = null;

From bea21945c0c2336d356a1855eb61776b5acfb268 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 12:49:38 +0000
Subject: [PATCH 18/67] easytier: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix
index 7faa2c4661cc..e76bfd0c977b 100644
--- a/pkgs/by-name/ea/easytier/package.nix
+++ b/pkgs/by-name/ea/easytier/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-GNHF15FJDLZKYrNuvaTQfsPGS6BabEhk5BZm7OzFbvU=";
+    hash = "sha256-H7mFBARxElegXeUsp+wTHy8X19Lk5FUL3GuU88+8UVs=";
   };
 
-  cargoHash = "sha256-rwwrCiTiLn1DM3LaTNKzQi0tUWGzAYMXku9LHjq2K7g=";
+  cargoHash = "sha256-BNEc4R3Jzqx4ncMmmeZygM8peHqHGZ/HMy4eJyuvxv0=";
 
   nativeBuildInputs = [
     protobuf

From f3cd67c5b79544706a5a4bc057758d208f950c35 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 18:55:04 +0200
Subject: [PATCH 19/67] nixos/pam: enable lastlog2 import service if any pam
 service uses lastlog

---
 nixos/modules/security/pam.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index fb42bba9d01c..a02bf460a9eb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2311,11 +2311,14 @@ in
 
     environment.etc = lib.mapAttrs' makePAMService enabledServices;
 
-    systemd = lib.optionalAttrs config.security.pam.services.login.updateWtmp {
-      tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
-      services.lastlog2-import.enable = true;
-      packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
-    };
+    systemd =
+      lib.optionalAttrs
+        (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services))
+        {
+          tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
+          services.lastlog2-import.enable = true;
+          packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
+        };
 
     security.pam.services = {
       other.text = ''

From a79d80de677be0c8b051ed7c26b9eab052f3ea4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sun, 10 Aug 2025 17:53:20 +0100
Subject: [PATCH 20/67] vuetorrent: 2.28.1 -> 2.28.2

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

diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix
index 2115af44f864..d0730b5f5ada 100644
--- a/pkgs/by-name/vu/vuetorrent/package.nix
+++ b/pkgs/by-name/vu/vuetorrent/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "vuetorrent";
-  version = "2.28.1";
+  version = "2.28.2";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-YIhZREiHFRYgPvI0DVMHaD4TU7mQyigEDUwOaNheqdw=";
+    hash = "sha256-8n5OM55Z5xGLAXU6jqt2bKmrYa5ZnWatW0LsjOkJeDg=";
   };
 
-  npmDepsHash = "sha256-VS6cjwKsNo0TNEF/71u2PTb2ZhSz5AG9YVh/FTIopzg=";
+  npmDepsHash = "sha256-Sh6s7zACAUu8j9ugST71j5u5nEWGVxC6dOniE+xjP6E=";
 
   installPhase = ''
     runHook preInstall

From 68d137383da7e67dc6c6de0e30a3dd77b833ba98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 19:53:12 +0000
Subject: [PATCH 21/67] python3Packages.recipe-scrapers: 15.8.0 -> 15.9.0

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

diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix
index 831721ca7bc3..068891872cdf 100644
--- a/pkgs/development/python-modules/recipe-scrapers/default.nix
+++ b/pkgs/development/python-modules/recipe-scrapers/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "recipe-scrapers";
-  version = "15.8.0";
+  version = "15.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "hhursev";
     repo = "recipe-scrapers";
     tag = version;
-    hash = "sha256-G2FKv4HZ6Kf4u/EDflkYqiY1uelWBuIE+UrqeCp2XL8=";
+    hash = "sha256-pbcIAr0yKGSWfuVMsOfriUUW1dhlvjX2JfDPJ8akldg=";
   };
 
   build-system = [ setuptools ];

From 7e8402ce4e67aa0bba19ed90e6be1b8c8fa65cd9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 10 Aug 2025 22:39:05 +0200
Subject: [PATCH 22/67] wlx-overlay-s: make openvr support optional, disable on
 aarch64-linux

wlx-overlay-s uses
https://github.com/galister/ovr_overlay_oyasumi/pull/2, which pulls in a
version of ovr_overlay_sys with a build.rs file that doesn't build on
aarch64-linux.

https://github.com/galister/ovr_overlay_oyasumi is a fork of
https://github.com/Raphiiko/ovr_overlay_oyasumi, which is a fork of
https://github.com/TheButlah/ovr_overlay, with the latter not updated in
two years.

Luckily openvr is kinda discouraged, and openxr is the new kid on the
block, and openvr support can be feature-flagged out.

So let's do this, by adding a withOpenVr option to the derivation, that
defaults to false on aarch64-linux, unbreaking it there.

We still keep openvr support for x86_64-linux enabled, to not regress
experience for people already using openvr on x86_64-linux.
---
 pkgs/by-name/wl/wlx-overlay-s/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index a6a77dd7a82a..597225f104b6 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -22,6 +22,8 @@
   testers,
   wayland,
   wlx-overlay-s,
+  # openvr support is broken on aarch64-linux
+  withOpenVr ? !stdenv.hostPlatform.isAarch64,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -37,6 +39,17 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k=";
 
+  # explicitly only add openvr if withOpenVr is set to true.
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "openxr"
+    "osc"
+    "x11"
+    "wayland"
+    "wayvr"
+  ]
+  ++ lib.optional withOpenVr "openvr";
+
   nativeBuildInputs = [
     makeWrapper
     pkg-config
@@ -52,11 +65,11 @@ rustPlatform.buildRustPackage rec {
     libXext
     libXrandr
     libxkbcommon
-    openvr
     openxr-loader
     pipewire
     wayland
-  ];
+  ]
+  ++ lib.optional withOpenVr openvr;
 
   env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
 
@@ -79,7 +92,7 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
     platforms = lib.platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64;
+    broken = stdenv.hostPlatform.isAarch64 && withOpenVr;
     mainProgram = "wlx-overlay-s";
   };
 }

From 41f5c900377043cf153b55c6295e8a1e3f440db9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 00:06:54 +0000
Subject: [PATCH 23/67] libretro.snes9x: 0-unstable-2025-07-03 ->
 0-unstable-2025-08-10

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index e69f561a9cbb..7e0bc8f367bb 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2025-07-03";
+  version = "0-unstable-2025-08-10";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "68acd5bfa3146d7124233e3e372f6ffb5d8d0dcf";
-    hash = "sha256-X3O4GirNXzjMNYH7UrItNpYGT+8NWPsKl+sAs036OCU=";
+    rev = "f6c78e954d7f38498f82145d20a916acea6cbc57";
+    hash = "sha256-oFKO9y6t0BXeykuqZYfe2KKJpkm7Y2b7JuMJYspkL3g=";
   };
 
   makefile = "Makefile";

From 6999b03d62cf27efe6ed09576e638b5cd65b9c18 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 18:57:35 -0700
Subject: [PATCH 24/67] python3Packages.pyoppleio-legacy: init at 1.0.8

---
 .../pyoppleio-legacy/default.nix              | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyoppleio-legacy/default.nix

diff --git a/pkgs/development/python-modules/pyoppleio-legacy/default.nix b/pkgs/development/python-modules/pyoppleio-legacy/default.nix
new file mode 100644
index 000000000000..11a6b481b59b
--- /dev/null
+++ b/pkgs/development/python-modules/pyoppleio-legacy/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  crc16,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage {
+  pname = "pyoppleio-legacy";
+  version = "1.0.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tinysnake";
+    repo = "python-oppleio-legacy";
+    rev = "90c57f778554fcf3a00e42757d0e92caebcfd149";
+    hash = "sha256-ccvMn/jQSkW11uMwG3P+i53NiDj+MNZgJYEkouQ1tvU=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Package has a runtime dependency on 'pycrc16' but we provide 'crc16'
+  # They provide the same crc16 module
+  pythonRemoveDeps = [ "pycrc16" ];
+
+  dependencies = [ crc16 ];
+
+  # Package has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python library for interfacing with Opple WiFi lights (legacy firmware support)";
+    homepage = "https://github.com/tinysnake/python-oppleio-legacy";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..d5b8253608e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13470,6 +13470,8 @@ self: super: with self; {
 
   pyoppleio = callPackage ../development/python-modules/pyoppleio { };
 
+  pyoppleio-legacy = callPackage ../development/python-modules/pyoppleio-legacy { };
+
   pyorc = callPackage ../development/python-modules/pyorc { };
 
   pyorthanc = callPackage ../development/python-modules/pyorthanc { };

From c0e6cc65747e6a18894379f6abd54562cadbb577 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 18:58:11 -0700
Subject: [PATCH 25/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..65eae8890784 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4250,7 +4250,8 @@
       ];
     "opple" =
       ps: with ps; [
-      ]; # missing inputs: pyoppleio-legacy
+        pyoppleio-legacy
+      ];
     "oralb" =
       ps: with ps; [
         aioesphomeapi

From f6a46d05584e59c5bf69dff4cc38c25bc64e85e4 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 19:17:52 -0700
Subject: [PATCH 26/67] python3Packages.electrickiwi-api: init at 0.9.14

---
 .../electrickiwi-api/default.nix              | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/electrickiwi-api/default.nix

diff --git a/pkgs/development/python-modules/electrickiwi-api/default.nix b/pkgs/development/python-modules/electrickiwi-api/default.nix
new file mode 100644
index 000000000000..a71b5d43405e
--- /dev/null
+++ b/pkgs/development/python-modules/electrickiwi-api/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+}:
+
+buildPythonPackage rec {
+  pname = "electrickiwi-api";
+  version = "0.9.14";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mikey0000";
+    repo = "EK-API";
+    tag = "v${version}";
+    hash = "sha256-UXweOz5olwx3ZI2M7eI1n729tqfLiWszV2zTWbrA9CM=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "electrickiwi_api" ];
+
+  # Tests require authentication credentials
+  doCheck = false;
+
+  meta = {
+    description = "Python library for interfacing with the Electric Kiwi power company API";
+    homepage = "https://github.com/mikey0000/EK-API";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..152f58205ba4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4581,6 +4581,8 @@ self: super: with self; {
 
   elasticsearchdsl = self.elasticsearch-dsl;
 
+  electrickiwi-api = callPackage ../development/python-modules/electrickiwi-api { };
+
   electrum-aionostr = callPackage ../development/python-modules/electrum-aionostr { };
 
   electrum-ecc = callPackage ../development/python-modules/electrum-ecc { };

From 0e127ec5253024bc28cd25c1bf5d5c596ca26f30 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 19:18:29 -0700
Subject: [PATCH 27/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..d7680d732f76 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1424,7 +1424,8 @@
       ];
     "electric_kiwi" =
       ps: with ps; [
-      ]; # missing inputs: electrickiwi-api
+        electrickiwi-api
+      ];
     "elevenlabs" =
       ps: with ps; [
         elevenlabs
@@ -7057,6 +7058,7 @@
     "eheimdigital"
     "eight_sleep"
     "electrasmart"
+    "electric_kiwi"
     "elevenlabs"
     "elgato"
     "elkm1"

From 27eac9f0b8e5632dc55b1eee8f89b55b56c4075f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Mon, 11 Aug 2025 04:56:44 +0200
Subject: [PATCH 28/67] python3Packages.home-assistant-chip-wheels: fix
 building with newer gn

This fixes the following error caused by https://gn-review.googlesource.com/c/gn/+/18820
and the gn bump in b59bfde89d116c180cc20962fdecbf40d92f8ce7 by
backporting https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/300272

~~~
Running phase: configurePhase
gn flags: chip_project_config_include_dirs=\[\"//..\"\] chip_crypto=\"openssl\" [...]
  generated_file("$target_name._includes") {
  ^-----------------------------------------
Two or more targets generate the same output:
  protocol_buffer/gen/third_party/pigweed/repo/pw_chrono/protos.proto_library/includes.txt

This is can often be fixed by changing one of the target names, or by
setting an output_name on one of them.

Collisions:
  //third_party/pigweed/repo/pw_chrono:protos._includes(//build/toolchain/custom:custom)
~~~
---
 .../home-assistant-chip-wheels/default.nix         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index f91196342039..5665f7eb2c9d 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -12,6 +12,7 @@
   cryptography,
   diskcache,
   fetchFromGitHub,
+  fetchpatch,
   glib,
   gn,
   googleapis-common-protos,
@@ -128,6 +129,19 @@ stdenv.mkDerivation rec {
     libnl
   ];
 
+  patches = [
+    (fetchpatch {
+      # Fix building with newer gn version
+      name = "pw_protobuf_compiler-Create-a-new-includes.txt-for-each-toolchain.patch";
+      # https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/300272
+      url = "https://pigweed.googlesource.com/pigweed/pigweed/+/b66729b90fcb9df2ee4818f6d4fff59385cdbc80^!?format=TEXT";
+      decode = "base64 -d";
+      stripLen = 1;
+      extraPrefix = "connectedhomeip/third_party/pigweed/repo/";
+      hash = "sha256-6ss3j8j69w7EMio9mFP/EL2oPqQ2sLh67eWsJjHdDa8=";
+    })
+  ];
+
   postPatch = ''
     cd connectedhomeip
     export HOME=$(mktemp -d)

From 3d69b45f894e1e1fc2e32dff36fb93d19adf6d90 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 20:39:54 -0700
Subject: [PATCH 29/67] python3Packages.pymochad: init at 0.3.0

---
 .../python-modules/pymochad/default.nix       | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymochad/default.nix

diff --git a/pkgs/development/python-modules/pymochad/default.nix b/pkgs/development/python-modules/pymochad/default.nix
new file mode 100644
index 000000000000..0ac6ba8931de
--- /dev/null
+++ b/pkgs/development/python-modules/pymochad/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pbr,
+  setuptools,
+  six,
+  pytestCheckHook,
+  mock,
+  fixtures,
+  testtools,
+}:
+
+buildPythonPackage rec {
+  pname = "pymochad";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mtreinish";
+    repo = "pymochad";
+    tag = version;
+    hash = "sha256-nwh97sbYkt4F/u02zTDemWEztSco27oJCemd6kTnCMk=";
+  };
+
+  env.PBR_VERSION = version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  dependencies = [
+    six
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+    fixtures
+    testtools
+  ];
+
+  pythonImportsCheck = [
+    "pymochad"
+  ];
+
+  meta = {
+    description = "Python library for sending commands to the mochad TCP gateway daemon for the X10 CMA15A controller";
+    homepage = "https://github.com/mtreinish/pymochad";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..26e1c75675ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13296,6 +13296,8 @@ self: super: with self; {
 
   pymitv = callPackage ../development/python-modules/pymitv { };
 
+  pymochad = callPackage ../development/python-modules/pymochad { };
+
   pymodbus = callPackage ../development/python-modules/pymodbus { };
 
   pymodbus-repl = callPackage ../development/python-modules/pymodbus-repl { };

From b7ed20a4d59e9d256a8ef0e1bc95872394488e4b Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 20:40:31 -0700
Subject: [PATCH 30/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..970b8d9a4b67 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3679,7 +3679,8 @@
       ];
     "mochad" =
       ps: with ps; [
-      ]; # missing inputs: pymochad
+        pymochad
+      ];
     "modbus" =
       ps: with ps; [
         pymodbus
@@ -7370,6 +7371,7 @@
     "mjpeg"
     "moat"
     "mobile_app"
+    "mochad"
     "modbus"
     "modem_callerid"
     "modern_forms"

From 14508b9964dfff15f4fb52ad4094bfe5f3e9e767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 04:20:47 +0000
Subject: [PATCH 31/67] simdutf: 7.3.4 -> 7.3.5

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index ebb2d126084d..f0913c68e175 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "7.3.4";
+  version = "7.3.5";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vIsM/i1RrtCqcnrMSyipgrtsdO32nqSbnYGdmjTyrN8=";
+    hash = "sha256-tRdm7kps4YfEeFCqk3gxFTrySRfVM7aN6F9uFeicXwk=";
   };
 
   # Fix build on darwin

From d5f29a5b5504fd7f4185cb48db6a70b4cb4cc882 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:38:46 -0700
Subject: [PATCH 32/67] python3Packages.pyrepetierng: init at 0.1.0

---
 .../python-modules/pyrepetierng/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyrepetierng/default.nix

diff --git a/pkgs/development/python-modules/pyrepetierng/default.nix b/pkgs/development/python-modules/pyrepetierng/default.nix
new file mode 100644
index 000000000000..c919e34f9608
--- /dev/null
+++ b/pkgs/development/python-modules/pyrepetierng/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyrepetierng";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-0+Qr2yrjk1/K4Yg55d8sdmI6BtBYI76DCQiPlp6dzrc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyrepetierng" ];
+
+  meta = {
+    description = "An updated python Repetier-Server library based on Mtrabs library";
+    homepage = "https://github.com/ShadowBr0ther/pyrepetier-ng";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..222e86a36b96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13772,6 +13772,8 @@ self: super: with self; {
     inherit (pkgs) mesa;
   };
 
+  pyrepetierng = callPackage ../development/python-modules/pyrepetierng { };
+
   pyrevolve = callPackage ../development/python-modules/pyrevolve { };
 
   pyrfc3339 = callPackage ../development/python-modules/pyrfc3339 { };

From 660d4f411afd2528e92f277ea3892a02201a8c83 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:39:39 -0700
Subject: [PATCH 33/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..748698ae5339 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4933,7 +4933,8 @@
       ];
     "repetier" =
       ps: with ps; [
-      ]; # missing inputs: pyrepetierng
+        pyrepetierng
+      ];
     "rest" =
       ps: with ps; [
         jsonpath

From ed8c0bf5bf169f62246764b9cd18574a3e19dcbd Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:45:20 -0700
Subject: [PATCH 34/67] python3Packages.starlingbank: init at 3.2

---
 .../python-modules/starlingbank/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/starlingbank/default.nix

diff --git a/pkgs/development/python-modules/starlingbank/default.nix b/pkgs/development/python-modules/starlingbank/default.nix
new file mode 100644
index 000000000000..57913fce043a
--- /dev/null
+++ b/pkgs/development/python-modules/starlingbank/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "starlingbank";
+  version = "3.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-pqWnRyCAc50KQmbqYq9Mje+PWXCFmTAjs8jA13YM0nA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "starlingbank" ];
+
+  meta = {
+    description = "An unofficial python package that provides access to parts of the Starling bank API";
+    homepage = "https://github.com/Dullage/starlingbank";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..af5757e92db4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17322,6 +17322,8 @@ self: super: with self; {
 
   starline = callPackage ../development/python-modules/starline { };
 
+  starlingbank = callPackage ../development/python-modules/starlingbank { };
+
   starlink-grpc-core = callPackage ../development/python-modules/starlink-grpc-core { };
 
   stashy = callPackage ../development/python-modules/stashy { };

From e3d0eee673457f8d3d6f4496b6ec43da560c64a3 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:45:59 -0700
Subject: [PATCH 35/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..2e785d129e5f 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5622,7 +5622,8 @@
       ];
     "starlingbank" =
       ps: with ps; [
-      ]; # missing inputs: starlingbank
+        starlingbank
+      ];
     "starlink" =
       ps: with ps; [
         starlink-grpc-core

From af92342df56a2bb14308eab86ea9f940f165db8f Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:55:05 -0700
Subject: [PATCH 36/67] python3Packages.python-blockchain-api: init at 0.0.2

---
 .../python-blockchain-api/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-blockchain-api/default.nix

diff --git a/pkgs/development/python-modules/python-blockchain-api/default.nix b/pkgs/development/python-modules/python-blockchain-api/default.nix
new file mode 100644
index 000000000000..8f966a7354f5
--- /dev/null
+++ b/pkgs/development/python-modules/python-blockchain-api/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-blockchain-api";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-JC/FWkSq+Rc/XX39RQgLBnlncuRRumFNArODNJDzAHw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  pythonImportsCheck = [ "pyblockchain" ];
+
+  # Package has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python API for interacting with blockchain.info";
+    homepage = "https://github.com/nkgilley/python-blockchain-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..03592863684b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14479,6 +14479,8 @@ self: super: with self; {
 
   python-bitcoinlib = callPackage ../development/python-modules/python-bitcoinlib { };
 
+  python-blockchain-api = callPackage ../development/python-modules/python-blockchain-api { };
+
   python-box = callPackage ../development/python-modules/python-box { };
 
   python-bring-api = callPackage ../development/python-modules/python-bring-api { };

From 4196da127648ae078f0b4c320049bada19ad6bdb Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 22:55:50 -0700
Subject: [PATCH 37/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..e02a6e2b07f3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -596,7 +596,8 @@
       ];
     "blockchain" =
       ps: with ps; [
-      ]; # missing inputs: python-blockchain-api
+        python-blockchain-api
+      ];
     "blue_current" =
       ps: with ps; [
         bluecurrent-api

From f006d6460d8d8925003b6cb4b08bbef951b3021c Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:08:38 -0700
Subject: [PATCH 38/67] python3Packages.xs1-api-client: init at 3.0.1

---
 .../python-modules/xs1-api-client/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/xs1-api-client/default.nix

diff --git a/pkgs/development/python-modules/xs1-api-client/default.nix b/pkgs/development/python-modules/xs1-api-client/default.nix
new file mode 100644
index 000000000000..5561e44abb92
--- /dev/null
+++ b/pkgs/development/python-modules/xs1-api-client/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  requests,
+  urllib3,
+}:
+
+buildPythonPackage rec {
+  pname = "xs1-api-client";
+  version = "3.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "markusressel";
+    repo = "xs1-api-client";
+    tag = "v${version}";
+    hash = "sha256-bAxrqtjoJaPkTzeeOeXSTpJN3rPszi5W4q6Q7ZRo0hc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    urllib3
+  ];
+
+  pythonImportsCheck = [ "xs1_api_client" ];
+
+  meta = {
+    description = "Python library for accessing actuator and sensor data on the EZcontrol XS1 Gateway";
+    homepage = "https://github.com/markusressel/xs1-api-client";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..d3228e4a0b33 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19958,6 +19958,8 @@ self: super: with self; {
 
   xrootd = callPackage ../development/python-modules/xrootd { inherit (pkgs) xrootd; };
 
+  xs1-api-client = callPackage ../development/python-modules/xs1-api-client { };
+
   xsdata = callPackage ../development/python-modules/xsdata { };
 
   xstatic = callPackage ../development/python-modules/xstatic { };

From e3b85f0aaa5d97af1433c104c28d91627101e7b4 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:09:18 -0700
Subject: [PATCH 39/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..742521f275eb 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -6683,7 +6683,8 @@
       ];
     "xs1" =
       ps: with ps; [
-      ]; # missing inputs: xs1-api-client
+        xs1-api-client
+      ];
     "yale" =
       ps: with ps; [
         aiohasupervisor

From 40fe4dee250f2cac8f5dca422f2cb3034d88a55c Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:17:54 -0700
Subject: [PATCH 40/67] python3Packages.pystiebeleltron: init at 0.2.3

---
 .../pystiebeleltron/default.nix               | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pystiebeleltron/default.nix

diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix
new file mode 100644
index 000000000000..84ad1e0736be
--- /dev/null
+++ b/pkgs/development/python-modules/pystiebeleltron/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pymodbus,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-mock,
+}:
+
+buildPythonPackage rec {
+  pname = "pystiebeleltron";
+  version = "0.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ThyMYthOS";
+    repo = "python-stiebel-eltron";
+    tag = "v${version}";
+    hash = "sha256-vJo9fjtbGuWJ1JcK6u0Cnol1Ev3eobD14YjH+S256og=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ pymodbus ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-mock
+  ];
+
+  pythonImportsCheck = [ "pystiebeleltron" ];
+
+  meta = {
+    description = "Python API for interacting with the Stiebel Eltron ISG web gateway via Modbus";
+    homepage = "https://github.com/ThyMYthOS/python-stiebel-eltron";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..38975dc8e779 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14086,6 +14086,8 @@ self: super: with self; {
 
   pystemmer = callPackage ../development/python-modules/pystemmer { };
 
+  pystiebeleltron = callPackage ../development/python-modules/pystiebeleltron { };
+
   pystray = callPackage ../development/python-modules/pystray { };
 
   pysubs2 = callPackage ../development/python-modules/pysubs2 { };

From 14a73b02fa52a6985279a25d754f8d5c7ed47201 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:18:31 -0700
Subject: [PATCH 41/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..b67e09476e90 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5653,7 +5653,8 @@
       ];
     "stiebel_eltron" =
       ps: with ps; [
-      ]; # missing inputs: pystiebeleltron
+        pystiebeleltron
+      ];
     "stookwijzer" =
       ps: with ps; [
         stookwijzer
@@ -7656,6 +7657,7 @@
     "statsd"
     "steam_online"
     "steamist"
+    "stiebel_eltron"
     "stookwijzer"
     "stream"
     "streamlabswater"

From defc725219d1fb9b56662370e014012929e557af Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Mon, 11 Aug 2025 08:20:10 +0200
Subject: [PATCH 42/67] hashcat: patch helper scripts (#430633)

---
 .../ha/hashcat/0001-python-shebangs.patch     | 42 +++++++++++++++++++
 pkgs/by-name/ha/hashcat/package.nix           | 17 ++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/ha/hashcat/0001-python-shebangs.patch

diff --git a/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch b/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch
new file mode 100644
index 000000000000..d9715b864036
--- /dev/null
+++ b/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch
@@ -0,0 +1,42 @@
+diff --git a/tools/bitlocker2hashcat.py b/tools/bitlocker2hashcat.py
+index f7501a37b..a72fb8c78 100755
+--- a/tools/bitlocker2hashcat.py
++++ b/tools/bitlocker2hashcat.py
+@@ -1,3 +1,5 @@
++#!/usr/bin/env python3
++
+ # Construct a hash for use with hashcat mode 22100
+ # Usage: python3 bitlocker2hashcat.py <bitlocker_image> -o <bitlocker_partition_offset>
+ # Hashcat supports modes $bitlocker$0$ and $bitlocker$1$ and therefore this script will output hashes that relate to a VMK protected by a user password only.
+diff --git a/tools/keybag2hashcat.py b/tools/keybag2hashcat.py
+index 83da25c5e..6a30384ac 100755
+--- a/tools/keybag2hashcat.py
++++ b/tools/keybag2hashcat.py
+@@ -1,3 +1,5 @@
++#!/usr/bin/env python3
++
+ import argparse
+ import logging
+ import sys
+diff --git a/tools/shiro1-to-hashcat.py b/tools/shiro1-to-hashcat.py
+old mode 100755
+new mode 100644
+index 9619530ef..86ee8e502
+--- a/tools/shiro1-to-hashcat.py
++++ b/tools/shiro1-to-hashcat.py
+@@ -1,3 +1,5 @@
++#!/usr/bin/env python3
++
+ import os
+ import re
+ import glob
+diff --git a/tools/veeamvbk2hashcat.py b/tools/veeamvbk2hashcat.py
+index e8d6ac05c..5f6d1977a 100755
+--- a/tools/veeamvbk2hashcat.py
++++ b/tools/veeamvbk2hashcat.py
+@@ -1,3 +1,5 @@
++#!/usr/bin/env python3
++
+ import argparse
+ import binascii
+ 
diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index ddc90d75be08..c4f8f9f6b295 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -10,6 +10,8 @@
   minizip,
   opencl-headers,
   ocl-icd,
+  perl,
+  python3,
   xxHash,
   zlib,
   libiconv,
@@ -24,6 +26,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-hCtx0NNLAgAFiCR6rp/smg/BMnfyzTpqSSWw8Jszv3U=";
   };
 
+  patches = [
+    ./0001-python-shebangs.patch
+  ];
+
   postPatch = ''
      # MACOSX_DEPLOYMENT_TARGET is defined by the enviroment
      # Remove hardcoded paths on darwin
@@ -44,6 +50,17 @@ stdenv.mkDerivation rec {
   buildInputs = [
     minizip
     opencl-headers
+    perl
+    (python3.withPackages (
+      ps: with ps; [
+        # leveldb # Required for bitwarden2hashcat.py, broken since python 3.12 https://github.com/NixOS/nixpkgs/pull/342756
+        protobuf
+        pyasn1
+        pycryptodome
+        python-snappy
+        simplejson
+      ]
+    ))
     xxHash
     zlib
   ]

From 576fde128ae73b212c038e10b590148761d0ba82 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:01:52 +0800
Subject: [PATCH 43/67] android-tools: 35.0.1 -> 35.0.2

Diff: https://github.com/nmeum/android-tools/compare/35.0.1...35.0.2
---
 pkgs/tools/misc/android-tools/default.nix | 41 +++++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix
index c1acd5e5320d..2fae172c1649 100644
--- a/pkgs/tools/misc/android-tools/default.nix
+++ b/pkgs/tools/misc/android-tools/default.nix
@@ -8,14 +8,16 @@
   perl,
   go,
   python3,
-  protobuf_29, # does not build with 30+
+  protobuf,
   zlib,
   gtest,
   brotli,
   lz4,
   zstd,
-  libusb1,
   pcre2,
+  fetchpatch2,
+  fmt,
+  udev,
 }:
 
 let
@@ -24,13 +26,22 @@ in
 
 stdenv.mkDerivation rec {
   pname = "android-tools";
-  version = "35.0.1";
+  version = "35.0.2";
 
   src = fetchurl {
     url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
-    hash = "sha256-ZUAwx/ltJdciTNaGH6wUoEPPHTmA9AKIzfviGflP+vk=";
+    hash = "sha256-0sMiIoAxXzbYv6XALXYytH42W/4ud+maNWT7ZXbwQJc=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/dd0234790b42b48567b64a3024fc2ec6c7ab6c21/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch";
+      stripLen = 1;
+      extraPrefix = "vendor/extras/";
+      hash = "sha256-WSfU+0XIrxxlCjAIR49l9JvX9C6xCXirhLFHMMvNmJk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -39,14 +50,15 @@ stdenv.mkDerivation rec {
     go
   ];
   buildInputs = [
-    protobuf_29
+    protobuf
     zlib
     gtest
     brotli
     lz4
     zstd
-    libusb1
     pcre2
+    fmt
+    udev
   ];
   propagatedBuildInputs = [ pythonEnv ];
 
@@ -54,7 +66,14 @@ stdenv.mkDerivation rec {
     export GOCACHE=$TMPDIR/go-cache
   '';
 
-  meta = with lib; {
+  cmakeFlags = [
+    (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
+    (lib.cmakeBool "protobuf_MODULE_COMPATIBLE" true)
+    (lib.cmakeBool "ANDROID_TOOLS_LIBUSB_ENABLE_UDEV" true)
+    (lib.cmakeBool "ANDROID_TOOLS_USE_BUNDLED_LIBUSB" true)
+  ];
+
+  meta = {
     description = "Android SDK platform tools";
     longDescription = ''
       Android SDK Platform-Tools is a component for the Android SDK. It
@@ -74,12 +93,12 @@ stdenv.mkDerivation rec {
     # https://developer.android.com/studio/command-line#tools-platform
     # https://developer.android.com/studio/releases/platform-tools
     homepage = "https://github.com/nmeum/android-tools";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       unicode-dfs-2015
+      mit
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-    teams = [ teams.android ];
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.android ];
   };
 }

From 77ca22945cd29af467679dd95c458a37be7727f5 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:38:05 -0700
Subject: [PATCH 44/67] python3Packages.py-melissa-climate: init at 2.1.2

---
 .../py-melissa-climate/default.nix            | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-melissa-climate/default.nix

diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix
new file mode 100644
index 000000000000..019b84bbf9fc
--- /dev/null
+++ b/pkgs/development/python-modules/py-melissa-climate/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  requests,
+  requests-futures,
+  pytestCheckHook,
+  mock,
+}:
+
+buildPythonPackage rec {
+  pname = "py-melissa-climate";
+  version = "2.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kennedyshead";
+    repo = "py-melissa-climate";
+    tag = "V${version}";
+    hash = "sha256-Z1A0G3g8dyoG+zUxUTqI/OxczvUVy2kSI04YP0WeXso=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "setup_requires=['setuptools-markdown']," ""
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    requests
+    requests-futures
+  ];
+
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Disable failing tests due to upstream bugs
+    "test_have_connection"
+    "test_send"
+    "test_send_ok"
+  ];
+
+  pythonImportsCheck = [ "melissa" ];
+
+  meta = {
+    description = "API wrapper for Melissa Climate";
+    homepage = "https://github.com/kennedyshead/py-melissa-climate";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a62538ad78..8fb45c24ea65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12260,6 +12260,8 @@ self: super: with self; {
 
   py-madvr2 = callPackage ../development/python-modules/py-madvr2 { };
 
+  py-melissa-climate = callPackage ../development/python-modules/py-melissa-climate { };
+
   py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
 
   py-multibase = callPackage ../development/python-modules/py-multibase { };

From 1b914b28e02995f30072f26960be015f7237101b Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 23:38:43 -0700
Subject: [PATCH 45/67] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d3dab1154da8..9ad797e9f576 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3512,7 +3512,8 @@
       ];
     "melissa" =
       ps: with ps; [
-      ]; # missing inputs: py-melissa-climate
+        py-melissa-climate
+      ];
     "melnor" =
       ps: with ps; [
         aioesphomeapi
@@ -7349,6 +7350,7 @@
     "media_player"
     "media_source"
     "melcloud"
+    "melissa"
     "melnor"
     "meraki"
     "met"

From 228a8678542c86b5cf05bd4b5a8822a61a88602c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 06:39:53 +0000
Subject: [PATCH 46/67] cargo-tally: 1.0.66 -> 1.0.67

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

diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index e675d9be7c0f..f341b57c8037 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tally";
-  version = "1.0.66";
+  version = "1.0.67";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-PC/gscMO7oYcsd/cVcP5WZYweWRsh23Z7Do/qeGjAOc=";
+    hash = "sha256-Jt7pEpy06xoYWLIMustYvVB81fcGEK7GYvh5ukDUiQ0=";
   };
 
-  cargoHash = "sha256-00J8ip2fr/nphY0OXVOLKv7gaHitMziwsdJ4YBaYxog=";
+  cargoHash = "sha256-gXFcsaXaCkX4wQ9/eHr9CUI/r6KEAfZ8HYiDqBRtQeA=";
 
   meta = {
     description = "Graph the number of crates that depend on your crate over time";

From cce4f95e5a5fb35d30a762e7dcd31b760c28efda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 06:43:25 +0000
Subject: [PATCH 47/67] alpaca-proxy: 2.0.10 -> 2.0.11

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

diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix
index 072b4c8c5214..7489aadc3675 100644
--- a/pkgs/by-name/al/alpaca-proxy/package.nix
+++ b/pkgs/by-name/al/alpaca-proxy/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "alpaca-proxy";
-  version = "2.0.10";
+  version = "2.0.11";
 
   src = fetchFromGitHub {
     owner = "samuong";
     repo = "alpaca";
     tag = "v${version}";
-    hash = "sha256-1CMuZl1bVlofogPwA2wRuQPlXNE2EM1B8rDDDaJGq64=";
+    hash = "sha256-74JQ9ltJ7+sasySgNN3AaXlBILP7VgFN06adoNJG+Bc=";
   };
 
   vendorHash = "sha256-N9qpyCQg6H1v/JGJ2wCxDX+ZTM9x6/BM6wQ26xC+dlE=";

From ba04f97d4e4f664a4f9c73cfb01ad9982f936cd6 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 19 Mar 2025 18:13:03 +0100
Subject: [PATCH 48/67] nixos/config/sysfs: init module

---
 nixos/modules/config/sysfs.nix | 266 +++++++++++++++++++++++++++++++++
 nixos/modules/module-list.nix  |   1 +
 nixos/tests/all-tests.nix      |   1 +
 nixos/tests/sysfs.nix          |  37 +++++
 4 files changed, 305 insertions(+)
 create mode 100644 nixos/modules/config/sysfs.nix
 create mode 100644 nixos/tests/sysfs.nix

diff --git a/nixos/modules/config/sysfs.nix b/nixos/modules/config/sysfs.nix
new file mode 100644
index 000000000000..7be2070684b2
--- /dev/null
+++ b/nixos/modules/config/sysfs.nix
@@ -0,0 +1,266 @@
+{
+  lib,
+  config,
+  utils,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    all
+    any
+    concatLines
+    concatStringsSep
+    escapeShellArg
+    flatten
+    floatToString
+    foldl'
+    head
+    isAttrs
+    isDerivation
+    isFloat
+    isList
+    length
+    listToAttrs
+    match
+    mapAttrsToList
+    nameValuePair
+    removePrefix
+    tail
+    throwIf
+    ;
+
+  inherit (lib.options)
+    showDefs
+    showOption
+    ;
+
+  inherit (lib.strings)
+    escapeC
+    isConvertibleWithToString
+    ;
+
+  inherit (lib.path.subpath) join;
+
+  inherit (utils) escapeSystemdPath;
+
+  cfg = config.boot.kernel.sysfs;
+
+  sysfsAttrs = with lib.types; nullOr (either sysfsValue (attrsOf sysfsAttrs));
+  sysfsValue = lib.mkOptionType {
+    name = "sysfs value";
+    description = "sysfs attribute value";
+    descriptionClass = "noun";
+    check = v: isConvertibleWithToString v;
+    merge =
+      loc: defs:
+      if length defs == 1 then
+        (head defs).value
+      else
+        (foldl' (
+          first: def:
+          # merge definitions if they produce the same value string
+          throwIf (mkValueString first.value != mkValueString def.value)
+            "The option \"${showOption loc}\" has conflicting definition values:${
+              showDefs [
+                first
+                def
+              ]
+            }"
+            first
+        ) (head defs) (tail defs)).value;
+  };
+
+  mapAttrsToListRecursive =
+    fn: set:
+    let
+      recurse =
+        p: v:
+        if isAttrs v && !isDerivation v then mapAttrsToList (n: v: recurse (p ++ [ n ]) v) v else fn p v;
+    in
+    flatten (recurse [ ] set);
+
+  mkPath = p: "/sys" + removePrefix "." (join p);
+  hasGlob = p: any (n: match ''(.*[^\\])?[*?[].*'' n != null) p;
+
+  mkValueString =
+    v:
+    # true will be converted to "1" by toString, saving one branch
+    if v == false then
+      "0"
+    else if isFloat v then
+      floatToString v # warn about loss of precision
+    else if isList v then
+      concatStringsSep "," (map mkValueString v)
+    else
+      toString v;
+
+  # escape whitespace and linebreaks, as well as the escape character itself,
+  # to ensure that field boundaries are always preserved
+  escapeTmpfiles = escapeC [
+    "\t"
+    "\n"
+    "\r"
+    " "
+    "\\"
+  ];
+
+  tmpfiles = pkgs.runCommand "nixos-sysfs-tmpfiles.d" { } (
+    ''
+      mkdir "$out"
+    ''
+    + concatLines (
+      mapAttrsToListRecursive (
+        p: v:
+        let
+          path = mkPath p;
+        in
+        if v == null then
+          [ ]
+        else
+          ''
+            printf 'w %s - - - - %s\n' \
+              ${escapeShellArg (escapeTmpfiles path)} \
+              ${escapeShellArg (escapeTmpfiles (mkValueString v))} \
+              >"$out"/${escapeShellArg (escapeSystemdPath path)}.conf
+          ''
+      ) cfg
+    )
+  );
+in
+{
+  options = {
+    boot.kernel.sysfs = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = lib.types.attrsOf sysfsAttrs // {
+          description = "nested attribute set of null or sysfs attribute values";
+        };
+      };
+
+      description = ''
+        sysfs attributes to be set as soon as they become available.
+
+        Attribute names represent path components in the sysfs filesystem and
+        cannot be `.` or `..` nor contain any slash character (`/`).
+
+        Names may contain shell‐style glob patterns (`*`, `?` and `[…]`)
+        matching a single path component, these should however be used with
+        caution, as they may produce unexpected results if attribute paths
+        overlap.
+
+        Values will be converted to strings, with list elements concatenated
+        with commata and booleans converted to numeric values (`0` or `1`).
+
+        `null` values are ignored, allowing removal of values defined in other
+        modules, as are empty attribute sets.
+
+        List values defined in different modules will _not_ be concatenated.
+
+        This option may only be used for attributes which can be set
+        idempotently, as the configured values might be written more than once.
+      '';
+
+      default = { };
+
+      example = lib.literalExpression ''
+        {
+          # enable transparent hugepages with deferred defragmentaion
+          kernel.mm.transparent_hugepage = {
+            enabled = "always";
+            defrag = "defer";
+            shmem_enabled = "within_size";
+          };
+
+          devices.system.cpu = {
+            # configure powesave frequency governor for all CPUs
+            # the [0-9]* glob pattern ensures that other paths
+            # like cpufreq or cpuidle are not matched
+            "cpu[0-9]*" = {
+              scaling_governor = "powersave";
+              energy_performance_preference = 8;
+            };
+
+            # disable frequency boost
+            intel_pstate.no_turbo = true;
+          };
+        }
+      '';
+    };
+  };
+
+  config = lib.mkIf (cfg != { }) {
+    systemd = {
+      paths =
+        {
+          "nixos-sysfs@" = {
+            description = "/%I attribute watcher";
+            pathConfig.PathExistsGlob = "/%I";
+            unitConfig.DefaultDependencies = false;
+          };
+        }
+        // listToAttrs (
+          mapAttrsToListRecursive (
+            p: v:
+            if v == null then
+              [ ]
+            else
+              nameValuePair "nixos-sysfs@${escapeSystemdPath (mkPath p)}" {
+                overrideStrategy = "asDropin";
+                wantedBy = [ "sysinit.target" ];
+                before = [ "sysinit.target" ];
+              }
+          ) cfg
+        );
+
+      services."nixos-sysfs@" = {
+        description = "/%I attribute setter";
+
+        unitConfig = {
+          DefaultDependencies = false;
+          AssertPathIsMountPoint = "/sys";
+          AssertPathExistsGlob = "/%I";
+        };
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+
+          # while we could be tempted to use simple shell script to set the
+          # sysfs attributes specified by the path or glob pattern, it is
+          # almost impossible to properly escape a glob pattern so that it
+          # can be used safely in a shell script
+          ExecStart = "${lib.getExe' config.systemd.package "systemd-tmpfiles"} --prefix=/sys --create ${tmpfiles}/%i.conf";
+
+          # hardening may be overkill for such a simple and short‐lived
+          # service, the following settings would however be suitable to deny
+          # access to anything but /sys
+          #ProtectProc = "noaccess";
+          #ProcSubset = "pid";
+          #ProtectSystem = "strict";
+          #PrivateDevices = true;
+          #SystemCallErrorNumber = "EPERM";
+          #SystemCallFilter = [
+          #  "@basic-io"
+          #  "@file-system"
+          #];
+        };
+      };
+    };
+
+    warnings = mapAttrsToListRecursive (
+      p: v:
+      if hasGlob p then
+        "Attribute path \"${concatStringsSep "." p}\" contains glob patterns. Please ensure that it does not overlap with other paths."
+      else
+        [ ]
+    ) cfg;
+
+    assertions = mapAttrsToListRecursive (p: v: {
+      assertion = all (n: match ''(\.\.?|.*/.*)'' n == null) p;
+      message = "Attribute path \"${concatStringsSep "." p}\" has invalid components.";
+    }) cfg;
+  };
+
+  meta.maintainers = with lib.maintainers; [ mvs ];
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7f0ac3970cd1..22205eee8396 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -31,6 +31,7 @@
   ./config/stub-ld.nix
   ./config/swap.nix
   ./config/sysctl.nix
+  ./config/sysfs.nix
   ./config/system-environment.nix
   ./config/system-path.nix
   ./config/terminfo.nix
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index bbc66e837e56..fd52943f093e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1394,6 +1394,7 @@ in
   syncthing-folders = runTest ./syncthing-folders.nix;
   syncthing-relay = runTest ./syncthing-relay.nix;
   sysinit-reactivation = runTest ./sysinit-reactivation.nix;
+  sysfs = runTest ./sysfs.nix;
   systemd = runTest ./systemd.nix;
   systemd-analyze = runTest ./systemd-analyze.nix;
   systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { };
diff --git a/nixos/tests/sysfs.nix b/nixos/tests/sysfs.nix
new file mode 100644
index 000000000000..c8d0bdb884f8
--- /dev/null
+++ b/nixos/tests/sysfs.nix
@@ -0,0 +1,37 @@
+{ lib, ... }:
+
+{
+  name = "sysfs";
+  meta.maintainers = with lib.maintainers; [ mvs ];
+
+  nodes.machine = {
+    boot.kernel.sysfs = {
+      kernel.mm.transparent_hugepage = {
+        enabled = "always";
+        defrag = "defer";
+        shmem_enabled = "within_size";
+      };
+
+      block."*".queue.scheduler = "none";
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      inherit (nodes.machine.boot.kernel) sysfs;
+    in
+    ''
+      from shlex import quote
+
+      def check(filename, contents):
+        machine.succeed('grep -F -q {} {}'.format(quote(contents), quote(filename)))
+
+      check('/sys/kernel/mm/transparent_hugepage/enabled',
+        '[${sysfs.kernel.mm.transparent_hugepage.enabled}]')
+      check('/sys/kernel/mm/transparent_hugepage/defrag',
+        '[${sysfs.kernel.mm.transparent_hugepage.defrag}]')
+      check('/sys/kernel/mm/transparent_hugepage/shmem_enabled',
+        '[${sysfs.kernel.mm.transparent_hugepage.shmem_enabled}]')
+    '';
+}

From 6d98ba9b24df3863d35bf32c52cf8078a5f591e2 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 19 Mar 2025 20:16:53 +0100
Subject: [PATCH 49/67] nixos/doc/rl-2511: mention boot.kernel.sysfs addition

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

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index cf7fff41de48..c8ef4f0c0bcf 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -48,6 +48,8 @@
 
 - [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable).
 
+- [boot.kernel.sysfs](options.html#opt-boot.kernel.sysfs) allows setting of sysfs attributes.
+
 - Docker now defaults to 28.x, because version 27.x stopped receiving security updates and bug fixes after [May 2, 2025](https://github.com/moby/moby/pull/49910).
 
 - [Corteza](https://cortezaproject.org/), a low-code platform. Available as [services.corteza](#opt-services.corteza.enable).

From f96d58f0c8c9fead0b818fb4034c99baefd80c76 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 09:16:28 +0200
Subject: [PATCH 50/67] nixos/config/sysfs: run treefmt

---
 nixos/modules/config/sysfs.nix | 41 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/config/sysfs.nix b/nixos/modules/config/sysfs.nix
index 7be2070684b2..a8cb283c5d0c 100644
--- a/nixos/modules/config/sysfs.nix
+++ b/nixos/modules/config/sysfs.nix
@@ -191,27 +191,26 @@ in
 
   config = lib.mkIf (cfg != { }) {
     systemd = {
-      paths =
-        {
-          "nixos-sysfs@" = {
-            description = "/%I attribute watcher";
-            pathConfig.PathExistsGlob = "/%I";
-            unitConfig.DefaultDependencies = false;
-          };
-        }
-        // listToAttrs (
-          mapAttrsToListRecursive (
-            p: v:
-            if v == null then
-              [ ]
-            else
-              nameValuePair "nixos-sysfs@${escapeSystemdPath (mkPath p)}" {
-                overrideStrategy = "asDropin";
-                wantedBy = [ "sysinit.target" ];
-                before = [ "sysinit.target" ];
-              }
-          ) cfg
-        );
+      paths = {
+        "nixos-sysfs@" = {
+          description = "/%I attribute watcher";
+          pathConfig.PathExistsGlob = "/%I";
+          unitConfig.DefaultDependencies = false;
+        };
+      }
+      // listToAttrs (
+        mapAttrsToListRecursive (
+          p: v:
+          if v == null then
+            [ ]
+          else
+            nameValuePair "nixos-sysfs@${escapeSystemdPath (mkPath p)}" {
+              overrideStrategy = "asDropin";
+              wantedBy = [ "sysinit.target" ];
+              before = [ "sysinit.target" ];
+            }
+        ) cfg
+      );
 
       services."nixos-sysfs@" = {
         description = "/%I attribute setter";

From 7ddd9ce3dd8beef824bb52bc4660670a293801f6 Mon Sep 17 00:00:00 2001
From: bdim404 <i@bdim.moe>
Date: Fri, 8 Aug 2025 22:14:05 +0800
Subject: [PATCH 51/67] =?UTF-8?q?gemini-cli:=200.1.14=20=E2=80=94>=200.1.1?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 pkgs/by-name/ge/gemini-cli/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 8ce9af0c20dd..c39edbfc02ae 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -2,25 +2,30 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  fetchNpmDeps,
+  fetchpatch,
   gitUpdater,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.1.14";
+  version = "0.1.18";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u73aqh7WnfetHj/64/HyzSR6aJXRKt0OXg3bddhhQq8=";
+    hash = "sha256-vO70olSAG6NaZjyERU22lc8MbVivyJFieGcy0xOErrc=";
   };
 
-  npmDeps = fetchNpmDeps {
-    inherit (finalAttrs) src;
-    hash = "sha256-9T31QlffPP6+ryRVN/7t0iMo+2AgwPb6l6CkYh6839U=";
-  };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/google-gemini/gemini-cli/pull/5336/commits/c1aef417d559237bf4d147c584449b74d6fbc1f8.patch";
+      name = "restore-missing-dependencies-fields.patch";
+      hash = "sha256-euRoLpbv075KIpYF9QPMba5FxG4+h/kxwLRetaay33s=";
+    })
+  ];
+
+  npmDepsHash = "sha256-8dn0i2laR4LFZk/sFDdvblvrHSnraGcLl3WAthCOKc0=";
 
   preConfigure = ''
     mkdir -p packages/generated
@@ -35,6 +40,7 @@ buildNpmPackage (finalAttrs: {
 
     rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli
     rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core
+    rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-test-utils
     rm -f $out/share/gemini-cli/node_modules/gemini-cli-vscode-ide-companion
     cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli
     cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core

From 04b0a4711b54af98cb55f68263cf8e3d904c6b7a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 11 Aug 2025 00:32:59 -0700
Subject: [PATCH 52/67] treewide: standardize descriptions according to style
 guide (#430180)

---
 .../science/math/yacas/default.nix            |  2 +-
 .../test/writeShellApplication.nix            |  4 +-
 pkgs/by-name/ar/arpack/package.nix            |  5 +-
 pkgs/by-name/bu/buzztrax/package.nix          |  2 +-
 pkgs/by-name/ca/cardo/package.nix             |  2 +-
 pkgs/by-name/ca/casadi/package.nix            | 10 +-
 pkgs/by-name/cb/cbmc/package.nix              |  2 +-
 pkgs/by-name/cd/cdecl/package.nix             |  2 +-
 pkgs/by-name/ce/certinfo-go/package.nix       |  2 +-
 pkgs/by-name/cf/cf-vault/package.nix          |  4 +-
 pkgs/by-name/cg/cgif/package.nix              |  2 +-
 pkgs/by-name/ch/checkinstall/package.nix      |  2 +-
 pkgs/by-name/ch/chez-matchable/package.nix    |  2 +-
 pkgs/by-name/ch/chez-mit/package.nix          |  2 +-
 pkgs/by-name/ch/chez-scmutils/package.nix     |  2 +-
 pkgs/by-name/cl/click/package.nix             |  2 +-
 .../cl/client-ip-echo/client-ip-echo.nix      |  2 +-
 pkgs/by-name/co/codefresh/package.nix         |  2 +-
 pkgs/by-name/co/colobot/package.nix           |  2 +-
 pkgs/by-name/co/commit/package.nix            |  2 +-
 pkgs/by-name/co/compsize/package.nix          |  2 +-
 pkgs/by-name/co/construct/package.nix         |  2 +-
 pkgs/by-name/co/convos/package.nix            |  2 +-
 pkgs/by-name/cr/crowdsec/package.nix          |  2 +-
 pkgs/by-name/cu/cutecapture/package.nix       |  2 +-
 pkgs/by-name/d-/d-seams/package.nix           |  2 +-
 pkgs/by-name/da/dashy-ui/package.nix          |  2 +-
 pkgs/by-name/de/der-ascii/package.nix         |  2 +-
 pkgs/by-name/de/devour/package.nix            |  2 +-
 pkgs/by-name/df/dfl-applications/package.nix  |  2 +-
 pkgs/by-name/dh/dhcpm/package.nix             |  2 +-
 pkgs/by-name/di/digital/package.nix           |  2 +-
 pkgs/by-name/dj/djenrandom/package.nix        |  2 +-
 pkgs/by-name/dj/djent/package.nix             |  2 +-
 pkgs/by-name/do/dog/package.nix               |  2 +-
 pkgs/by-name/do/dotter/package.nix            |  2 +-
 pkgs/by-name/dp/dps8m/package.nix             |  2 +-
 pkgs/by-name/ds/dsda-launcher/package.nix     |  2 +-
 pkgs/by-name/du/dust/package.nix              |  2 +-
 pkgs/by-name/e1/e1s/package.nix               |  2 +-
 pkgs/by-name/ea/each/package.nix              |  2 +-
 pkgs/by-name/el/electron-mail/package.nix     |  2 +-
 pkgs/by-name/el/elogind/package.nix           |  2 +-
 pkgs/by-name/ep/epgstation/package.nix        |  2 +-
 pkgs/by-name/ex/excalifont/package.nix        |  2 +-
 pkgs/by-name/ex/exult/package.nix             |  2 +-
 pkgs/by-name/fa/fable/package.nix             |  2 +-
 pkgs/by-name/fe/febio/package.nix             |  2 +-
 pkgs/by-name/fi/fiji/package.nix              |  2 +-
 pkgs/by-name/fi/filebrowser/package.nix       |  2 +-
 pkgs/by-name/fi/fileshelter/package.nix       |  2 +-
 pkgs/by-name/fi/fira/package.nix              |  2 +-
 pkgs/by-name/fl/flarum/package.nix            |  2 +-
 pkgs/by-name/fl/flatito/package.nix           |  2 +-
 pkgs/by-name/fl/flatter/package.nix           |  2 +-
 pkgs/by-name/fo/fontmatrix/package.nix        |  2 +-
 pkgs/by-name/fo/form/package.nix              |  2 +-
 pkgs/by-name/fs/fsautocomplete/package.nix    |  2 +-
 pkgs/by-name/gi/ginac/package.nix             |  2 +-
 pkgs/by-name/gi/git-fame/package.nix          |  4 +-
 pkgs/by-name/gi/git-quickfix/package.nix      |  2 +-
 pkgs/by-name/gl/gluesql/package.nix           |  2 +-
 pkgs/by-name/go/go-jsonschema/package.nix     |  2 +-
 pkgs/by-name/go/gobble/package.nix            |  2 +-
 pkgs/by-name/go/gocover-cobertura/package.nix |  2 +-
 pkgs/by-name/gr/grafana-to-ntfy/package.nix   |  2 +-
 pkgs/by-name/gu/guile-zlib/package.nix        |  2 +-
 pkgs/by-name/gx/gxml/package.nix              |  2 +-
 pkgs/by-name/ht/htcondor/package.nix          |  2 +-
 pkgs/by-name/ht/httperf/package.nix           |  2 +-
 pkgs/by-name/hu/husky/package.nix             |  2 +-
 pkgs/by-name/hy/hyperbeam/package.nix         |  2 +-
 pkgs/by-name/hy/hyperspeedcube/package.nix    |  2 +-
 pkgs/by-name/hy/hyprshot/package.nix          |  2 +-
 pkgs/by-name/im/imaginer/package.nix          |  2 +-
 pkgs/by-name/im/imath/package.nix             |  2 +-
 pkgs/by-name/im/imposm/package.nix            |  2 +-
 pkgs/by-name/in/infra/package.nix             |  2 +-
 pkgs/by-name/in/inspec/package.nix            |  2 +-
 pkgs/by-name/in/integresql/package.nix        |  2 +-
 pkgs/by-name/io/iotop-c/package.nix           |  2 +-
 pkgs/by-name/io/iozone/package.nix            |  2 +-
 pkgs/by-name/it/itsycal/package.nix           |  2 +-
 pkgs/by-name/ja/jackass/package.nix           |  2 +-
 pkgs/by-name/ja/jan/package.nix               |  2 +-
 pkgs/by-name/ja/jankyborders/package.nix      |  2 +-
 pkgs/by-name/ji/jiq/package.nix               |  2 +-
 .../by-name/ji/jitterentropy-rngd/package.nix |  2 +-
 pkgs/by-name/jm/jmespath/package.nix          |  2 +-
 pkgs/by-name/ka/kacst/package.nix             |  2 +-
 pkgs/by-name/ka/kamal/package.nix             |  2 +-
 .../by-name/ka/karabiner-elements/package.nix |  2 +-
 pkgs/by-name/kd/kdotool/package.nix           |  2 +-
 .../by-name/ke/keepass-otpkeyprov/package.nix |  2 +-
 pkgs/by-name/ke/keychain/package.nix          |  2 +-
 pkgs/by-name/kh/khmeros/package.nix           |  2 +-
 pkgs/by-name/ki/kine/package.nix              |  2 +-
 pkgs/by-name/km/kminion/package.nix           |  2 +-
 pkgs/by-name/ko/kontroll/package.nix          |  2 +-
 pkgs/by-name/ku/kubectl-df-pv/package.nix     |  2 +-
 pkgs/by-name/ku/kubemqctl/package.nix         |  2 +-
 pkgs/by-name/la/lab/package.nix               |  2 +-
 pkgs/by-name/le/leetcode-cli/package.nix      |  3 +-
 pkgs/by-name/le/lenmus/package.nix            |  2 +-
 pkgs/by-name/le/lexbor/package.nix            |  2 +-
 pkgs/by-name/le/lexical/package.nix           |  2 +-
 pkgs/by-name/lh/lha/package.nix               |  2 +-
 pkgs/by-name/li/libfreefare/package.nix       |  2 +-
 pkgs/by-name/li/libipfix/package.nix          |  2 +-
 pkgs/by-name/li/libiscsi/package.nix          |  2 +-
 pkgs/by-name/li/libshout/package.nix          |  2 +-
 pkgs/by-name/li/libtpms/package.nix           |  2 +-
 pkgs/by-name/lo/lora/package.nix              |  2 +-
 pkgs/by-name/lp/lprint/package.nix            |  2 +-
 pkgs/by-name/ma/mactracker/package.nix        |  2 +-
 pkgs/by-name/ma/mapscii/package.nix           |  2 +-
 pkgs/by-name/ma/mattermost/package.nix        |  2 +-
 pkgs/by-name/md/mdbook-emojicodes/package.nix |  2 +-
 .../me/merge-ut-dictionaries/package.nix      |  2 +-
 pkgs/by-name/mi/mirakurun/package.nix         |  2 +-
 pkgs/by-name/mo/mockgen/package.nix           |  2 +-
 pkgs/by-name/mo/mozlz4a/package.nix           |  2 +-
 pkgs/by-name/mu/multimon-ng/package.nix       |  2 +-
 pkgs/by-name/mu/multitail/package.nix         |  2 +-
 .../by-name/mu/multiviewer-for-f1/package.nix |  2 +-
 pkgs/by-name/my/myanon/package.nix            |  2 +-
 pkgs/by-name/na/nap/package.nix               |  2 +-
 pkgs/by-name/na/navidrome/package.nix         |  2 +-
 pkgs/by-name/ne/neovide/package.nix           |  2 +-
 pkgs/by-name/ne/nerdfix/package.nix           |  2 +-
 pkgs/by-name/ni/nix-pin/package.nix           |  2 +-
 pkgs/by-name/no/notify/package.nix            |  2 +-
 pkgs/by-name/ob/obs-cli/package.nix           |  2 +-
 pkgs/by-name/og/ograc/package.nix             |  2 +-
 pkgs/by-name/ok/okapi/package.nix             |  6 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/op/opensoldat/package.nix        |  2 +-
 pkgs/by-name/op/openvino/package.nix          |  2 +-
 pkgs/by-name/op/openwsman/package.nix         |  2 +-
 pkgs/by-name/or/oras/package.nix              |  2 +-
 pkgs/by-name/or/orthanc/package.nix           |  2 +-
 pkgs/by-name/or/ory/package.nix               |  2 +-
 pkgs/by-name/os/osmo-hnodeb/package.nix       |  2 +-
 pkgs/by-name/pa/pacemaker/package.nix         |  2 +-
 pkgs/by-name/pa/pageedit/package.nix          |  2 +-
 pkgs/by-name/pa/pat/package.nix               |  2 +-
 pkgs/by-name/pd/pdal/package.nix              |  2 +-
 pkgs/by-name/pd/pdi/package.nix               |  2 +-
 pkgs/by-name/pg/pgscv/package.nix             |  2 +-
 pkgs/by-name/ph/phel/package.nix              |  2 +-
 pkgs/by-name/po/postmoogle/package.nix        |  2 +-
 pkgs/by-name/pr/prefect/package.nix           |  2 +-
 pkgs/by-name/pr/procyon/package.nix           |  2 +-
 pkgs/by-name/pu/pulumi/package.nix            |  2 +-
 pkgs/by-name/pu/pupdate/package.nix           |  2 +-
 pkgs/by-name/qu/quarkus/package.nix           |  2 +-
 pkgs/by-name/qu/quickfix/package.nix          |  2 +-
 pkgs/by-name/qu/quill-qr/package.nix          |  2 +-
 pkgs/by-name/ra/ran/package.nix               |  2 +-
 pkgs/by-name/ra/rancher/package.nix           |  2 +-
 pkgs/by-name/re/reindeer/package.nix          |  2 +-
 pkgs/by-name/re/retry/package.nix             |  2 +-
 pkgs/by-name/ro/rotonda/package.nix           |  2 +-
 pkgs/by-name/ro/round/package.nix             |  2 +-
 pkgs/by-name/s5/s5/package.nix                |  2 +-
 pkgs/by-name/sc/scaleft/package.nix           |  2 +-
 pkgs/by-name/sc/scarlett2/package.nix         |  2 +-
 pkgs/by-name/sc/scd2html/package.nix          |  2 +-
 pkgs/by-name/si/simplesamlphp/package.nix     |  2 +-
 pkgs/by-name/si/sing-geosite/package.nix      |  2 +-
 pkgs/by-name/sk/skimpdf/package.nix           |  2 +-
 pkgs/by-name/sm/smooth/package.nix            |  2 +-
 pkgs/by-name/sm/smug/package.nix              |  2 +-
 pkgs/by-name/sn/snore/package.nix             |  2 +-
 pkgs/by-name/sp/splat/package.nix             |  2 +-
 pkgs/by-name/sr/srb2kart/package.nix          |  2 +-
 pkgs/by-name/sr/srt-live-server/package.nix   |  2 +-
 pkgs/by-name/ss/ssh-agents/package.nix        |  2 +-
 pkgs/by-name/st/stderred/package.nix          |  2 +-
 pkgs/by-name/st/step-kms-plugin/package.nix   |  2 +-
 pkgs/by-name/st/sticky/package.nix            |  2 +-
 pkgs/by-name/st/strfry/package.nix            |  2 +-
 pkgs/by-name/st/stuntman/package.nix          |  2 +-
 pkgs/by-name/su/subnetcalc/package.nix        |  2 +-
 pkgs/by-name/su/surrealist/package.nix        |  2 +-
 pkgs/by-name/sw/sway-overfocus/package.nix    |  2 +-
 pkgs/by-name/sw/swaylock-fancy/package.nix    |  2 +-
 pkgs/by-name/sy/symfpu/package.nix            |  2 +-
 pkgs/by-name/sy/symphony/package.nix          |  2 +-
 pkgs/by-name/ta/taizen/package.nix            |  2 +-
 pkgs/by-name/ta/tana/package.nix              |  2 +-
 pkgs/by-name/te/tectonic/package.nix          |  2 +-
 pkgs/by-name/te/telescope/package.nix         |  2 +-
 pkgs/by-name/th/therion/package.nix           |  2 +-
 pkgs/by-name/th/thunderbolt/package.nix       |  2 +-
 pkgs/by-name/ti/tiledb/package.nix            |  2 +-
 pkgs/by-name/ti/tinymist/package.nix          |  2 +-
 pkgs/by-name/tp/tpm2-pkcs11/package.nix       |  2 +-
 pkgs/by-name/tu/tun2socks/package.nix         |  2 +-
 pkgs/by-name/tu/turso-cli/package.nix         |  2 +-
 pkgs/by-name/ty/typesense/package.nix         |  2 +-
 pkgs/by-name/uf/uftpd/package.nix             |  2 +-
 pkgs/by-name/uh/uhk-agent/package.nix         |  2 +-
 pkgs/by-name/um/umoci/package.nix             |  2 +-
 pkgs/by-name/un/unicode-idna/package.nix      |  2 +-
 pkgs/by-name/ut/ut/package.nix                |  2 +-
 pkgs/by-name/vc/vcs_query/package.nix         |  2 +-
 pkgs/by-name/ve/vencord/package.nix           |  2 +-
 pkgs/by-name/vi/viceroy/package.nix           |  2 +-
 pkgs/by-name/vu/vultr/package.nix             |  2 +-
 pkgs/by-name/wa/wait4x/package.nix            |  2 +-
 pkgs/by-name/wa/wallabag/package.nix          |  2 +-
 pkgs/by-name/wa/wastebin/package.nix          |  2 +-
 pkgs/by-name/we/weggli/package.nix            |  2 +-
 pkgs/by-name/wq/wqy_microhei/package.nix      |  2 +-
 pkgs/by-name/wq/wqy_zenhei/package.nix        |  2 +-
 pkgs/by-name/xf/xfitter/package.nix           |  2 +-
 pkgs/by-name/xk/xkbd/package.nix              |  2 +-
 pkgs/by-name/xl/xlights/package.nix           |  2 +-
 pkgs/by-name/xl/xlink/package.nix             |  2 +-
 pkgs/by-name/xm/xmloscopy/package.nix         |  2 +-
 pkgs/by-name/ya/yazi/plugins/nord/default.nix |  2 +-
 pkgs/by-name/yu/yubihsm-connector/package.nix |  2 +-
 pkgs/by-name/yu/yubihsm-shell/package.nix     |  2 +-
 pkgs/by-name/za/zammad/package.nix            |  2 +-
 pkgs/by-name/zi/zile/package.nix              |  2 +-
 pkgs/by-name/zi/zipkin/package.nix            |  2 +-
 pkgs/by-name/zl/zluda/package.nix             |  2 +-
 .../ocaml-modules/janestreet/0.12.nix         | 10 +-
 .../ocaml-modules/janestreet/0.14.nix         | 30 +++---
 .../ocaml-modules/janestreet/0.15.nix         | 50 +++++-----
 .../ocaml-modules/janestreet/0.16.nix         | 86 ++++++++---------
 .../ocaml-modules/janestreet/0.17.nix         | 94 +++++++++----------
 .../python-modules/clevercsv/default.nix      |  2 +-
 .../python-modules/gawd/default.nix           |  2 +-
 .../python-modules/hocr-tools/default.nix     |  3 +-
 .../python-modules/magika/default.nix         |  2 +-
 .../python-modules/molecule/default.nix       |  2 +-
 .../python-modules/svgdigitizer/default.nix   |  2 +-
 .../tools/java/jprofiler/default.nix          |  8 +-
 pkgs/development/tools/lerna/generic.nix      |  2 +-
 pkgs/games/arx-libertatis/default.nix         |  3 +-
 pkgs/games/scummvm/games.nix                  |  2 +-
 .../experienced-pixel-dungeon/default.nix     |  2 +-
 .../rat-king-adventure/default.nix            |  2 +-
 .../shorter-pixel-dungeon/default.nix         |  2 +-
 .../summoning-pixel-dungeon/default.nix       |  2 +-
 .../os-specific/linux/displaylink/default.nix |  2 +-
 pkgs/servers/web-apps/discourse/default.nix   |  2 +-
 pkgs/servers/web-apps/wordpress/generic.nix   |  2 +-
 pkgs/tools/package-management/rpm/default.nix |  2 +-
 pkgs/tools/security/b2sum/default.nix         |  2 +-
 pkgs/tools/security/schleuder/default.nix     |  2 +-
 pkgs/tools/system/nvtop/build-nvtop.nix       |  2 +-
 pkgs/top-level/haxe-packages.nix              |  4 +-
 255 files changed, 400 insertions(+), 402 deletions(-)

diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 27617bf98b52..d028f3fc93df 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
+    description = "Easy to use, general purpose Computer Algebra System, optionally with GUI";
     homepage = "http://www.yacas.org/";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
diff --git a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
index aec15f00aafc..3c9e695486c2 100644
--- a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
+++ b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
@@ -38,7 +38,7 @@ linkFarm "writeShellApplication-tests" {
       script = writeShellApplication {
         name = "test-meta";
         text = "";
-        meta.description = "A test for the `writeShellApplication` `meta` argument";
+        meta.description = "Test for the `writeShellApplication` `meta` argument";
       };
     in
     assert script.meta.mainProgram == "test-meta";
@@ -101,7 +101,7 @@ linkFarm "writeShellApplication-tests" {
         exit 1
       fi
     '';
-    meta.description = "A test checking that `writeShellApplication` forwards extra arguments to `stdenv.mkDerivation`";
+    meta.description = "Test checking that `writeShellApplication` forwards extra arguments to `stdenv.mkDerivation`";
     expected = "";
   };
 
diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 488f5257fe87..494e0c0db673 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -90,10 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/opencollab/arpack-ng";
     changelog = "https://github.com/opencollab/arpack-ng/blob/${finalAttrs.version}/CHANGES";
-    description = ''
-      A collection of Fortran77 subroutines to solve large scale eigenvalue
-      problems.
-    '';
+    description = "Collection of Fortran77 subroutines to solve large scale eigenvalue problems";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       ttuegel
diff --git a/pkgs/by-name/bu/buzztrax/package.nix b/pkgs/by-name/bu/buzztrax/package.nix
index e23e2dd81fc0..a00c53a6050c 100644
--- a/pkgs/by-name/bu/buzztrax/package.nix
+++ b/pkgs/by-name/bu/buzztrax/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
     + lib.optionalString stdenv.cc.isClang " -Wno-error=incompatible-function-pointer-types";
 
   meta = with lib; {
-    description = "Buzztrax is a modular music composer for Linux";
+    description = "Modular music composer for Linux";
     homepage = "https://www.buzztrax.org/";
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.bendlas ];
diff --git a/pkgs/by-name/ca/cardo/package.nix b/pkgs/by-name/ca/cardo/package.nix
index becc77735bed..d0ad44b5bb8d 100644
--- a/pkgs/by-name/ca/cardo/package.nix
+++ b/pkgs/by-name/ca/cardo/package.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Cardo is a large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists";
+    description = "Large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists";
     longDescription = ''
       Cardo is a large Unicode font specifically designed for the needs of
       classicists, Biblical scholars, medievalists, and linguists. It also
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index 139aa6dce48d..d1d99a38388c 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -200,7 +200,15 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   meta = {
-    description = "CasADi is a symbolic framework for numeric optimization implementing automatic differentiation in forward and reverse modes on sparse matrix-valued computational graphs. It supports self-contained C-code generation and interfaces state-of-the-art codes such as SUNDIALS, IPOPT etc. It can be used from C++, Python or Matlab/Octave";
+    description = "Symbolic framework for numeric optimization";
+    longDescription = ''
+      CasADi is a symbolic framework for numeric optimization
+      implementing automatic differentiation in forward and reverse
+      modes on sparse matrix-valued computational graphs. It supports
+      self-contained C-code generation and interfaces state-of-the-art
+      codes such as SUNDIALS, IPOPT etc. It can be used from C++,
+      Python or Matlab/Octave
+    '';
     homepage = "https://github.com/casadi/casadi";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ nim65s ];
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index e82c400614ea..0966cad02a6c 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "CBMC is a Bounded Model Checker for C and C++ programs";
+    description = "Bounded Model Checker for C and C++ programs";
     homepage = "http://www.cprover.org/cbmc/";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ jiegec ];
diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix
index 5145c51882cd..8295f1653575 100644
--- a/pkgs/by-name/cd/cdecl/package.nix
+++ b/pkgs/by-name/cd/cdecl/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Composing and deciphering C (or C++) declarations or casts, aka ''gibberish.''";
+    description = "Composing and deciphering C (or C++) declarations or casts, aka 'gibberish'";
     homepage = "https://github.com/paul-j-lucas/cdecl";
     changelog = "https://github.com/paul-j-lucas/cdecl/blob/cdecl-${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix
index 2736ffdeba93..33db352e5158 100644
--- a/pkgs/by-name/ce/certinfo-go/package.nix
+++ b/pkgs/by-name/ce/certinfo-go/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   meta = {
     changelog = "https://github.com/paepckehh/certinfo/releases/tag/v${version}";
     homepage = "https://paepcke.de/certinfo";
-    description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys, ...";
+    description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys";
     license = lib.licenses.bsd3;
     mainProgram = "certinfo";
     maintainers = with lib.maintainers; [ paepcke ];
diff --git a/pkgs/by-name/cf/cf-vault/package.nix b/pkgs/by-name/cf/cf-vault/package.nix
index 1619ab764142..d5707d959ca0 100644
--- a/pkgs/by-name/cf/cf-vault/package.nix
+++ b/pkgs/by-name/cf/cf-vault/package.nix
@@ -30,9 +30,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = ''
-      A tool for managing your Cloudflare credentials, securely..
-    '';
+    description = "Tool for managing your Cloudflare credentials, securely";
     homepage = "https://github.com/jacobbednarz/cf-vault/";
     license = licenses.mit;
     maintainers = with maintainers; [ viraptor ];
diff --git a/pkgs/by-name/cg/cgif/package.nix b/pkgs/by-name/cg/cgif/package.nix
index dddd1d67a1a2..5df4f1277961 100644
--- a/pkgs/by-name/cg/cgif/package.nix
+++ b/pkgs/by-name/cg/cgif/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/dloebl/cgif";
-    description = "CGIF, a GIF encoder written in C";
+    description = "GIF encoder written in C";
     license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ch/checkinstall/package.nix b/pkgs/by-name/ch/checkinstall/package.nix
index 71ff625361b3..f92fbee0b79d 100644
--- a/pkgs/by-name/ch/checkinstall/package.nix
+++ b/pkgs/by-name/ch/checkinstall/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://checkinstall.izto.org/";
-    description = "Tool for automatically generating Slackware, RPM or Debian packages when doing `make install'";
+    description = "Tool for automatically generating Slackware, RPM or Debian packages when doing `make install`";
     maintainers = [ ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/ch/chez-matchable/package.nix b/pkgs/by-name/ch/chez-matchable/package.nix
index 86c3095fe375..621983e5b41c 100644
--- a/pkgs/by-name/ch/chez-matchable/package.nix
+++ b/pkgs/by-name/ch/chez-matchable/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "This is a Library for ChezScheme providing the portable hygenic pattern matcher by Alex Shinn";
+    description = "Library for ChezScheme providing the portable hygenic pattern matcher by Alex Shinn";
     homepage = "https://github.com/fedeinthemix/chez-matchable/";
     maintainers = [ maintainers.jitwit ];
     license = licenses.publicDomain;
diff --git a/pkgs/by-name/ch/chez-mit/package.nix b/pkgs/by-name/ch/chez-mit/package.nix
index 00e5e9d2f81d..bba42958b0c3 100644
--- a/pkgs/by-name/ch/chez-mit/package.nix
+++ b/pkgs/by-name/ch/chez-mit/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme";
+    description = "MIT/GNU Scheme compatibility library for Chez Scheme";
     homepage = "https://github.com/fedeinthemix/chez-mit/";
     maintainers = [ maintainers.jitwit ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/ch/chez-scmutils/package.nix b/pkgs/by-name/ch/chez-scmutils/package.nix
index 853a4aa1a72d..faecbe619935 100644
--- a/pkgs/by-name/ch/chez-scmutils/package.nix
+++ b/pkgs/by-name/ch/chez-scmutils/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme";
+    description = "Port of the 'MIT Scmutils' library to Chez Scheme";
     homepage = "https://github.com/fedeinthemix/chez-scmutils/";
     maintainers = [ maintainers.jitwit ];
     license = licenses.gpl3;
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index e1e7d8491cd7..9dd9464a2c56 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   meta = with lib; {
-    description = ''The "Command Line Interactive Controller for Kubernetes"'';
+    description = "Command Line Interactive Controller for Kubernetes";
     homepage = "https://github.com/databricks/click";
     license = [ licenses.asl20 ];
     maintainers = [ maintainers.mbode ];
diff --git a/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix b/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
index 2de93fb1a3d0..b3aadc755b01 100644
--- a/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
+++ b/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
@@ -22,7 +22,7 @@ mkDerivation {
     bytestring
     network
   ];
-  description = "accepts TCP connections and echoes the client's IP address back to it";
+  description = "Accepts TCP connections and echoes the client's IP address back to it";
   license = lib.licenses.lgpl3;
   mainProgram = "client-ip-echo";
 }
diff --git a/pkgs/by-name/co/codefresh/package.nix b/pkgs/by-name/co/codefresh/package.nix
index 4d7cc60d9ce3..f825c2b9f0d8 100644
--- a/pkgs/by-name/co/codefresh/package.nix
+++ b/pkgs/by-name/co/codefresh/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/codefresh-io/cli/releases/tag/v${finalAttrs.version}";
-    description = "Codefresh CLI tool to interact with Codefresh services";
+    description = "CLI tool to interact with Codefresh services";
     homepage = "https://github.com/codefresh-io/cli";
     license = lib.licenses.mit;
     mainProgram = "codefresh";
diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix
index e720c73fe40d..694df7627516 100644
--- a/pkgs/by-name/co/colobot/package.nix
+++ b/pkgs/by-name/co/colobot/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://colobot.info/";
-    description = "Colobot: Gold Edition is a real-time strategy game, where you can program your bots";
+    description = "Real-time strategy game with programmable bots";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ freezeboy ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index c07cd82dceac..954e5ff444b8 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Commit message editor";
+    description = "Git commit message editor";
     homepage = "https://github.com/sonnyp/Commit";
     license = lib.licenses.gpl3Only;
     teams = [ lib.teams.gnome-circle ];
diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 069d792e9f09..519b4f9f4b91 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Find compression type/ratio on a file or set of files in Btrfs filesystem";
+    description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem";
     mainProgram = "compsize";
     homepage = "https://github.com/kilobyte/compsize";
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix
index 1869e1acd7ad..fd37ca5deb7b 100644
--- a/pkgs/by-name/co/construct/package.nix
+++ b/pkgs/by-name/co/construct/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "Construct is an abstraction over x86 NASM Assembly";
+    description = "Abstraction over x86 NASM Assembly";
     longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly.";
     homepage = "https://github.com/Thomas-de-Bock/construct";
     maintainers = with maintainers; [ rucadi ];
diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix
index d9ccbff23519..aa65ed66b656 100644
--- a/pkgs/by-name/co/convos/package.nix
+++ b/pkgs/by-name/co/convos/package.nix
@@ -119,7 +119,7 @@ perlPackages.buildPerlPackage rec {
 
   meta = {
     homepage = "https://convos.chat";
-    description = "Convos is the simplest way to use IRC in your browser";
+    description = "IRC browser client";
     mainProgram = "convos";
     license = lib.licenses.artistic2;
     maintainers = with lib.maintainers; [ sgo ];
diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index bde17e611c88..57a6d4f060ba 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -65,7 +65,7 @@ buildGoModule rec {
   meta = {
     homepage = "https://crowdsec.net/";
     changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}";
-    description = "CrowdSec is a free, open-source and collaborative IPS";
+    description = "Free, open-source and collaborative IPS";
     longDescription = ''
       CrowdSec is a free, modern & collaborative behavior detection engine,
       coupled with a global IP reputation network. It stacks on fail2ban's
diff --git a/pkgs/by-name/cu/cutecapture/package.nix b/pkgs/by-name/cu/cutecapture/package.nix
index 17b8a059a88b..3cd1f8d044c3 100644
--- a/pkgs/by-name/cu/cutecapture/package.nix
+++ b/pkgs/by-name/cu/cutecapture/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "(3)DS capture software for Linux and Mac";
+    description = "Nintendo DS and 3DS capture software for Linux and Mac";
     homepage = "https://github.com/Gotos/CuteCapture";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix
index 2ac502514a8a..d70e0a7b9de2 100644
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -53,7 +53,7 @@ clangStdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "d-SEAMS: Deferred Structural Elucidation Analysis for Molecular Simulations";
+    description = "Deferred Structural Elucidation Analysis for Molecular Simulations";
     mainProgram = "yodaStruct";
     longDescription = ''
       d-SEAMS, is a free and open-source postprocessing engine for the analysis
diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix
index d5fcbff2a4f2..77c5ac85ed81 100644
--- a/pkgs/by-name/da/dashy-ui/package.nix
+++ b/pkgs/by-name/da/dashy-ui/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doDist = false;
   meta = {
-    description = "dashy";
+    description = "Open source, highly customizable, easy-to-use, privacy-respecting dashboard app";
     homepage = "https://dashy.to";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.therealgramdalf ];
diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index 218d973d4314..af2bb299196f 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = ''
-      A small human-editable language to emit DER or BER encodings of ASN.1
+      Small human-editable language to emit DER or BER encodings of ASN.1
       structures and malformed variants of them
     '';
     homepage = "https://github.com/google/der-ascii";
diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix
index 3550652c54b5..2885bb2ed9e9 100644
--- a/pkgs/by-name/de/devour/package.nix
+++ b/pkgs/by-name/de/devour/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 ];
 
   meta = with lib; {
-    description = "Devour hides your current window when launching an external program";
+    description = "Hides your current window when launching an external program";
     longDescription = "Devour hides your current window before launching an external program and unhides it after quitting";
     homepage = "https://github.com/salman-abedin/devour";
     license = licenses.gpl2Only;
diff --git a/pkgs/by-name/df/dfl-applications/package.nix b/pkgs/by-name/df/dfl-applications/package.nix
index 82a1ab286ee1..b1926a99ab20 100644
--- a/pkgs/by-name/df/dfl-applications/package.nix
+++ b/pkgs/by-name/df/dfl-applications/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Library provides a thin wrapper around QApplication, QGuiApplication and QCoreApplication";
+    description = "Thin wrapper around QApplication, QGuiApplication and QCoreApplication";
     homepage = "https://gitlab.com/desktop-frameworks/applications";
     changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/dh/dhcpm/package.nix b/pkgs/by-name/dh/dhcpm/package.nix
index 30b308595ae7..36b8e0ef12f6 100644
--- a/pkgs/by-name/dh/dhcpm/package.nix
+++ b/pkgs/by-name/dh/dhcpm/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Dhcpm is a CLI tool for constructing & sending DHCP messages";
+    description = "CLI tool for constructing & sending DHCP messages";
     homepage = "https://github.com/leshow/dhcpm";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.jmbaur ];
diff --git a/pkgs/by-name/di/digital/package.nix b/pkgs/by-name/di/digital/package.nix
index 2925915ea9bf..a72c54362be7 100644
--- a/pkgs/by-name/di/digital/package.nix
+++ b/pkgs/by-name/di/digital/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "digital";
-  pkgDescription = "A digital logic designer and circuit simulator.";
+  pkgDescription = "Digital logic designer and circuit simulator";
   version = "0.31";
   buildDate = "2024-09-03T14:02:31+02:00"; # v0.31 commit date
 
diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix
index 1130e3fe0550..f7aafdb775f1 100644
--- a/pkgs/by-name/dj/djenrandom/package.nix
+++ b/pkgs/by-name/dj/djenrandom/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.deadhat.com/";
     description = ''
-      A C program to generate random data using several random models,
+      C program to generate random data using several random models,
       with parameterized non uniformities and flexible output formats
     '';
     license = lib.licenses.gpl2Only;
diff --git a/pkgs/by-name/dj/djent/package.nix b/pkgs/by-name/dj/djent/package.nix
index 8a1e404f67e2..141c7aff3509 100644
--- a/pkgs/by-name/dj/djent/package.nix
+++ b/pkgs/by-name/dj/djent/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.deadhat.com/";
     description = ''
-      A reimplementation of the Fourmilab/John Walker random number test program
+      Reimplementation of the Fourmilab/John Walker random number test program
       ent with several improvements
     '';
     mainProgram = "djent";
diff --git a/pkgs/by-name/do/dog/package.nix b/pkgs/by-name/do/dog/package.nix
index 3d58405bee9a..7ee84f5ffb05 100644
--- a/pkgs/by-name/do/dog/package.nix
+++ b/pkgs/by-name/do/dog/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://lwn.net/Articles/421072/";
-    description = "cat replacement";
+    description = "'cat' replacement";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ qknight ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index a6f6747886d3..0608d94c871f 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "Dotfile manager and templater written in rust 🦀";
+    description = "Dotfile manager and templater written in Rust";
     homepage = "https://github.com/SuperCuber/dotter";
     license = licenses.unlicense;
     maintainers = with maintainers; [ linsui ];
diff --git a/pkgs/by-name/dp/dps8m/package.nix b/pkgs/by-name/dp/dps8m/package.nix
index 5b11f6fd8eeb..d61be37d2a7b 100644
--- a/pkgs/by-name/dp/dps8m/package.nix
+++ b/pkgs/by-name/dp/dps8m/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "DPS8M: GE / Honeywell / Bull DPS‑8/M mainframe simulator";
+    description = "GE / Honeywell / Bull DPS-8/M mainframe simulator";
     homepage = "https://gitlab.com/dps8m/dps8m";
     changelog = "https://gitlab.com/dps8m/dps8m/-/wikis/DPS8M-${src.rev}-Release-Notes";
     license = licenses.icu;
diff --git a/pkgs/by-name/ds/dsda-launcher/package.nix b/pkgs/by-name/ds/dsda-launcher/package.nix
index 7ebc3178172b..19ef44d887df 100644
--- a/pkgs/by-name/ds/dsda-launcher/package.nix
+++ b/pkgs/by-name/ds/dsda-launcher/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/Pedro-Beirao/dsda-launcher";
-    description = "This is a launcher GUI for the dsda-doom source port";
+    description = "Launcher GUI for the dsda-doom source port";
     mainProgram = "dsda-launcher";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index c977a62d1498..35d3afef4632 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "du + rust = dust. Like du but more intuitive";
+    description = "du, but more intuitive";
     homepage = "https://github.com/bootandy/dust";
     changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index ed0179947aad..0b6b98695f59 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -20,7 +20,7 @@ buildGoModule {
   vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
 
   meta = {
-    description = "Easily Manage AWS ECS Resources in Terminal 🐱";
+    description = "Easily Manage AWS ECS Resources in Terminal";
     homepage = "https://github.com/keidarcy/e1s";
     changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index 38017e580083..1c08b1157f2f 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-TfAT36/JeBjBxymnX1gIyCEPZcxTW4fPVIOhHF3z9wA=";
 
   meta = with lib; {
-    description = "A better way of working with structured data on the command line";
+    description = "Command-line tool for processing CSV, JSON and other structured data";
     mainProgram = "each";
     homepage = "https://github.com/arraypad/each";
     license = with licenses; [ mit ];
diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 9425bae778e8..490165cf6d7a 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -34,7 +34,7 @@ appimageTools.wrapType2 {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
+    description = "Unofficial Election-based ProtonMail desktop client";
     mainProgram = "electron-mail";
     homepage = "https://github.com/vladimiry/ElectronMail";
     license = lib.licenses.gpl3;
diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index c22056ac24f9..0492c338af66 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/elogind/elogind";
-    description = ''The systemd project's "logind", extracted to a standalone package'';
+    description = "systemd project's 'logind', extracted to a standalone package";
     platforms = platforms.linux; # probably more
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ nh2 ];
diff --git a/pkgs/by-name/ep/epgstation/package.nix b/pkgs/by-name/ep/epgstation/package.nix
index 5d71ece6e0cc..e16be2ca0e10 100644
--- a/pkgs/by-name/ep/epgstation/package.nix
+++ b/pkgs/by-name/ep/epgstation/package.nix
@@ -127,7 +127,7 @@ buildNpmPackage rec {
     '';
 
   meta = with lib; {
-    description = "DVR software compatible with Mirakurun.";
+    description = "DVR software compatible with Mirakurun";
     homepage = "https://github.com/l3tnun/EPGStation";
     license = licenses.mit;
     maintainers = with maintainers; [ midchildan ];
diff --git a/pkgs/by-name/ex/excalifont/package.nix b/pkgs/by-name/ex/excalifont/package.nix
index 0fbb675b4b8c..01f0c7add920 100644
--- a/pkgs/by-name/ex/excalifont/package.nix
+++ b/pkgs/by-name/ex/excalifont/package.nix
@@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://plus.excalidraw.com/excalifont";
-    description = "Excalifont is based on the original handwritten Virgil font carefully curated to improve legibility while preserving its hand-drawn nature";
+    description = "Font based on the original handwritten Virgil font carefully curated to improve legibility while preserving its hand-drawn nature";
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ drupol ];
     license = lib.licenses.ofl;
diff --git a/pkgs/by-name/ex/exult/package.nix b/pkgs/by-name/ex/exult/package.nix
index 1be937d0a0d4..edccebafd030 100644
--- a/pkgs/by-name/ex/exult/package.nix
+++ b/pkgs/by-name/ex/exult/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   configureFlags = lib.optional (!enableTools) "--disable-tools";
 
   meta = with lib; {
-    description = "Exult is a project to recreate Ultima VII for modern operating systems";
+    description = "Recreation of Ultima VII for modern operating systems";
     longDescription = ''
       Ultima VII, an RPG from the early 1990's, still has a huge following. But,
       being a DOS game with a very nonstandard memory manager, it is difficult
diff --git a/pkgs/by-name/fa/fable/package.nix b/pkgs/by-name/fa/fable/package.nix
index e7765a80563a..dbcd495da1d9 100644
--- a/pkgs/by-name/fa/fable/package.nix
+++ b/pkgs/by-name/fa/fable/package.nix
@@ -18,7 +18,7 @@ buildDotnetGlobalTool (finalAttrs: {
   };
 
   meta = {
-    description = "Fable is an F# to JavaScript compiler";
+    description = "F# to JavaScript compiler";
     mainProgram = "fable";
     homepage = "https://github.com/fable-compiler/fable";
     changelog = "https://github.com/fable-compiler/fable/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 2ee2ca525185..28427d15792b 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ];
 
   meta = {
-    description = "FEBio Suite Solver";
+    description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics";
     license = with lib.licenses; [ mit ];
     homepage = "https://febio.org/";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/fi/fiji/package.nix b/pkgs/by-name/fi/fiji/package.nix
index a0594e38dd4f..bd8ed519fa52 100644
--- a/pkgs/by-name/fi/fiji/package.nix
+++ b/pkgs/by-name/fi/fiji/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://imagej.net/software/fiji/";
-    description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis";
+    description = "Batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis";
     mainProgram = "fiji";
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 9a3cb604eabe..47524bc3b457 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -78,7 +78,7 @@ buildGo123Module {
   };
 
   meta = with lib; {
-    description = "Filebrowser is a web application for managing files and directories";
+    description = "Web application for managing files and directories";
     homepage = "https://filebrowser.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ oakenshield ];
diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix
index 38f254a383d2..d6c463cfb259 100644
--- a/pkgs/by-name/fi/fileshelter/package.nix
+++ b/pkgs/by-name/fi/fileshelter/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/epoupon/fileshelter";
-    description = "FileShelter is a 'one-click' file sharing web application";
+    description = "One-click file sharing web application";
     mainProgram = "fileshelter";
     maintainers = [ ];
     license = lib.licenses.gpl3;
diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix
index b2aa6c6acd0f..6c317c016808 100644
--- a/pkgs/by-name/fi/fira/package.nix
+++ b/pkgs/by-name/fi/fira/package.nix
@@ -16,7 +16,7 @@ symlinkJoin rec {
   ];
 
   meta = {
-    description = "Fira font family including Fira Sans and Fira Mono";
+    description = "Font family including Fira Sans and Fira Mono";
     homepage = "https://bboxtype.com/fira/";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix
index 35b741646672..9d83dacbca08 100644
--- a/pkgs/by-name/fl/flarum/package.nix
+++ b/pkgs/by-name/fl/flarum/package.nix
@@ -21,7 +21,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   meta = with lib; {
     changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md";
-    description = "Flarum is a delightfully simple discussion platform for your website";
+    description = "Delightfully simple discussion platform for your website";
     homepage = "https://github.com/flarum/flarum";
     license = lib.licenses.mit;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/fl/flatito/package.nix b/pkgs/by-name/fl/flatito/package.nix
index 47d2323403d2..6232248492ea 100644
--- a/pkgs/by-name/fl/flatito/package.nix
+++ b/pkgs/by-name/fl/flatito/package.nix
@@ -34,7 +34,7 @@ buildRubyGem rec {
   passthru.updateScript = bundlerUpdateScript "${pname}";
 
   meta = with lib; {
-    description = "It allows you to search for a key and get the value and the line number where it is located in YAML and JSON files";
+    description = "Grep for keys in YAML and JSON files";
     homepage = "https://github.com/ceritium/flatito";
     license = licenses.mit;
     maintainers = with maintainers; [ rucadi ];
diff --git a/pkgs/by-name/fl/flatter/package.nix b/pkgs/by-name/fl/flatter/package.nix
index d1e69a658fe0..216dc3138cbd 100644
--- a/pkgs/by-name/fl/flatter/package.nix
+++ b/pkgs/by-name/fl/flatter/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   passthru.updateScript = unstableGitUpdater { };
 
   meta = with lib; {
-    description = "(F)ast (lat)tice (r)eduction of integer lattice bases";
+    description = "Fast lattice reduction of integer lattice bases";
     homepage = "https://github.com/keeganryan/flatter";
     license = licenses.lgpl3Only;
     mainProgram = "flatter";
diff --git a/pkgs/by-name/fo/fontmatrix/package.nix b/pkgs/by-name/fo/fontmatrix/package.nix
index 81e25a88101d..9a846d75ca93 100644
--- a/pkgs/by-name/fo/fontmatrix/package.nix
+++ b/pkgs/by-name/fo/fontmatrix/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
+    description = "Free/libre font explorer for Linux, Windows and Mac";
     homepage = "https://github.com/fontmatrix/fontmatrix";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/by-name/fo/form/package.nix b/pkgs/by-name/fo/form/package.nix
index b8a55c074cc6..93521daca0f4 100644
--- a/pkgs/by-name/fo/form/package.nix
+++ b/pkgs/by-name/fo/form/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   ];
 
   meta = with lib; {
-    description = "FORM project for symbolic manipulation of very big expressions";
+    description = "Symbolic manipulation of very big expressions";
     homepage = "https://www.nikhef.nl/~form/";
     license = licenses.gpl3;
     maintainers = [ maintainers.veprbl ];
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 8c6e9e98d1cb..d337fa4cb467 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -41,7 +41,7 @@ buildDotnetModule (finalAttrs: {
   };
 
   meta = {
-    description = "FsAutoComplete project (FSAC) provides a backend service for rich editing or intellisense features for editors";
+    description = "Backend service for rich editing or intellisense features for editors";
     mainProgram = "fsautocomplete";
     homepage = "https://github.com/fsharp/FsAutoComplete";
     changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/${finalAttrs.src.tag}";
diff --git a/pkgs/by-name/gi/ginac/package.nix b/pkgs/by-name/gi/ginac/package.nix
index bdce4af9121f..21c5e9129eb1 100644
--- a/pkgs/by-name/gi/ginac/package.nix
+++ b/pkgs/by-name/gi/ginac/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-rpath" ];
 
   meta = with lib; {
-    description = "GiNaC is Not a CAS";
+    description = "GiNaC C++ library for symbolic manipulations";
     homepage = "https://www.ginac.de/";
     maintainers = with maintainers; [ lovek323 ];
     license = licenses.gpl2;
diff --git a/pkgs/by-name/gi/git-fame/package.nix b/pkgs/by-name/gi/git-fame/package.nix
index 92ce90465b83..2caa22981c83 100644
--- a/pkgs/by-name/gi/git-fame/package.nix
+++ b/pkgs/by-name/gi/git-fame/package.nix
@@ -15,9 +15,7 @@ bundlerEnv {
   passthru.updateScript = bundlerUpdateScript "git-fame";
 
   meta = with lib; {
-    description = ''
-      A command-line tool that helps you summarize and pretty-print collaborators based on contributions
-    '';
+    description = "Command-line tool that helps you summarize and pretty-print collaborators based on contributions";
     homepage = "http://oleander.io/git-fame-rb";
     license = licenses.mit;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/gi/git-quickfix/package.nix b/pkgs/by-name/gi/git-quickfix/package.nix
index 01455f8023eb..f8d99537e5f4 100644
--- a/pkgs/by-name/gi/git-quickfix/package.nix
+++ b/pkgs/by-name/gi/git-quickfix/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-2VhbvhGeQHAbQLW0iBAgl0ICAX/X+PnwcGdodJG2Hsw=";
 
   meta = with lib; {
-    description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";
+    description = "Commit changes in your git repository to a new branch without leaving the current branch";
     homepage = "https://github.com/siedentop/git-quickfix";
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix
index 72c3cf92502e..f0f5b6e53669 100644
--- a/pkgs/by-name/gl/gluesql/package.nix
+++ b/pkgs/by-name/gl/gluesql/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "GlueSQL is quite sticky. It attaches to anywhere";
+    description = "Rust library for SQL databases";
     homepage = "https://github.com/gluesql/gluesql";
     license = licenses.asl20;
     maintainers = with maintainers; [ happysalada ];
diff --git a/pkgs/by-name/go/go-jsonschema/package.nix b/pkgs/by-name/go/go-jsonschema/package.nix
index 791122bbe7a9..3c2b4695f428 100644
--- a/pkgs/by-name/go/go-jsonschema/package.nix
+++ b/pkgs/by-name/go/go-jsonschema/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A tool to generate Go data types from JSON Schema definitions.";
+    description = "Tool to generate Go data types from JSON Schema definitions";
     homepage = "https://github.com/omissis/go-jsonschema";
     changelog = "https://github.com/omissis/go-jsonschema/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix
index 1a7bdba0814c..31d3a75a3b76 100644
--- a/pkgs/by-name/go/gobble/package.nix
+++ b/pkgs/by-name/go/gobble/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    description = "gobbles your terminal";
+    description = "Rust rewrite of Devour";
     homepage = "https://github.com/EmperorPenguin18/gobble";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ vuimuich ];
diff --git a/pkgs/by-name/go/gocover-cobertura/package.nix b/pkgs/by-name/go/gocover-cobertura/package.nix
index 13cd99cfe8a8..42510a5ee28b 100644
--- a/pkgs/by-name/go/gocover-cobertura/package.nix
+++ b/pkgs/by-name/go/gocover-cobertura/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/boumenot/gocover-cobertura";
-    description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output";
+    description = "Simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output";
     mainProgram = "gocover-cobertura";
     license = licenses.mit;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/gr/grafana-to-ntfy/package.nix b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
index 400d2b3d6365..fa364ca6d01c 100644
--- a/pkgs/by-name/gr/grafana-to-ntfy/package.nix
+++ b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-w4HSxdihElPz0q05vWjajQ9arZjAzd82L0kEKk1Uk8s=";
 
   meta = {
-    description = "Grafana-to-ntfy (ntfy.sh) alerts channel";
+    description = "Bridge to forward Grafana alerts to ntfy.sh notification service";
     homepage = "https://github.com/kittyandrew/grafana-to-ntfy";
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix
index 3f9d0ba3e871..26a9c01d914e 100644
--- a/pkgs/by-name/gu/guile-zlib/package.nix
+++ b/pkgs/by-name/gu/guile-zlib/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with lib; {
-    description = "Guile-zlib is a GNU Guile library providing bindings to zlib";
+    description = "GNU Guile library providing bindings to zlib";
     homepage = "https://notabug.org/guile-zlib/guile-zlib";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ foo-dogsquared ];
diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index f28c16d9ff6a..a36a8dcda9e7 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML";
+    description = "Provides a GObject API for manipulating XML and a Serializable framework from GObject to XML";
     homepage = "https://gitlab.gnome.org/GNOME/gxml";
     changelog = "https://gitlab.gnome.org/GNOME/gxml/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix
index 1474ea8dfa38..8ecebe5f9118 100644
--- a/pkgs/by-name/ht/htcondor/package.nix
+++ b/pkgs/by-name/ht/htcondor/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://htcondor.org/";
-    description = "HTCondor is a software system that creates a High-Throughput Computing (HTC) environment";
+    description = "Software system that creates a High-Throughput Computing (HTC) environment";
     platforms = platforms.linux;
     license = licenses.asl20;
     maintainers = with maintainers; [ evey ];
diff --git a/pkgs/by-name/ht/httperf/package.nix b/pkgs/by-name/ht/httperf/package.nix
index 46bc4c6a643c..8747acc1169b 100644
--- a/pkgs/by-name/ht/httperf/package.nix
+++ b/pkgs/by-name/ht/httperf/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Httperf HTTP load generator";
+    description = "HTTP load generator";
     homepage = "https://github.com/httperf/httperf";
     maintainers = [ ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/hu/husky/package.nix b/pkgs/by-name/hu/husky/package.nix
index 7ba0dd68e715..b83b28763ab9 100644
--- a/pkgs/by-name/hu/husky/package.nix
+++ b/pkgs/by-name/hu/husky/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-u1dndTKvInobva+71yI2vPiwrW9vqzAJ2sDAqT9YJsg=";
 
   meta = {
-    description = "Git hooks made easy 🐶 woof!";
+    description = "Git hooks made easy";
     mainProgram = "husky";
     homepage = "https://github.com/typicode/husky";
     changelog = "https://github.com/typicode/husky/releases/tag/v${version}";
diff --git a/pkgs/by-name/hy/hyperbeam/package.nix b/pkgs/by-name/hy/hyperbeam/package.nix
index 02df044476b0..05503e38491c 100644
--- a/pkgs/by-name/hy/hyperbeam/package.nix
+++ b/pkgs/by-name/hy/hyperbeam/package.nix
@@ -27,7 +27,7 @@ buildNpmPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "1-1 End-to-End Encrypted Internet Pipe Powered by Hyperswarm ";
+    description = "1-1 End-to-End Encrypted Internet Pipe Powered by Hyperswarm";
     homepage = "https://github.com/holepunchto/hyperbeam";
     mainProgram = "hyperbeam";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix
index f8813b2dc33e..51dd533f7726 100644
--- a/pkgs/by-name/hy/hyperspeedcube/package.nix
+++ b/pkgs/by-name/hy/hyperspeedcube/package.nix
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    description = "Hyperspeedcube is a 3D and 4D Rubik's cube simulator";
+    description = "3D and 4D Rubik's cube simulator";
     longDescription = ''
       Hyperspeedcube is a modern, beginner-friendly 3D and 4D Rubik's cube
       simulator with customizable mouse and keyboard controls and advanced
diff --git a/pkgs/by-name/hy/hyprshot/package.nix b/pkgs/by-name/hy/hyprshot/package.nix
index 39a222d51ae6..351177b88505 100644
--- a/pkgs/by-name/hy/hyprshot/package.nix
+++ b/pkgs/by-name/hy/hyprshot/package.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://github.com/Gustash/hyprshot";
-    description = "Hyprshot is an utility to easily take screenshots in Hyprland using your mouse";
+    description = "Utility to easily take screenshots in Hyprland using your mouse";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [
       Cryolitia
diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix
index 598d6fb2b93c..a73faf7fad89 100644
--- a/pkgs/by-name/im/imaginer/package.nix
+++ b/pkgs/by-name/im/imaginer/package.nix
@@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://github.com/ImaginerApp/Imaginer";
-    description = "Imaginer with AI";
+    description = "AI image generator for GNOME";
     mainProgram = "imaginer";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ _0xMRTT ];
diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index 9a3ddc0a1a5b..f72e0341ee06 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {
-    description = "Imath is a C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics";
+    description = "C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics";
     homepage = "https://github.com/AcademySoftwareFoundation/Imath";
     license = licenses.bsd3;
     maintainers = with maintainers; [ paperdigits ];
diff --git a/pkgs/by-name/im/imposm/package.nix b/pkgs/by-name/im/imposm/package.nix
index c09ae89cadd5..8fd1627010cb 100644
--- a/pkgs/by-name/im/imposm/package.nix
+++ b/pkgs/by-name/im/imposm/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   doCheck = false;
 
   meta = {
-    description = "Imposm imports OpenStreetMap data into PostGIS";
+    description = "Imports OpenStreetMap data into PostGIS";
     homepage = "https://imposm.org/";
     changelog = "https://github.com/omniscale/imposm3/releases/tag/${src.rev}";
     license = lib.licenses.apsl20;
diff --git a/pkgs/by-name/in/infra/package.nix b/pkgs/by-name/in/infra/package.nix
index 3920a0bb2a9e..9929717b539c 100644
--- a/pkgs/by-name/in/infra/package.nix
+++ b/pkgs/by-name/in/infra/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   ];
 
   meta = {
-    description = "Infra manages access to infrastructure such as Kubernetes";
+    description = "Manages access to infrastructure such as Kubernetes";
     homepage = "https://github.com/infrahq/infra";
     changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md";
     license = lib.licenses.elastic20;
diff --git a/pkgs/by-name/in/inspec/package.nix b/pkgs/by-name/in/inspec/package.nix
index eb3f3c2530ad..c2332d4fa877 100644
--- a/pkgs/by-name/in/inspec/package.nix
+++ b/pkgs/by-name/in/inspec/package.nix
@@ -16,7 +16,7 @@ bundlerApp {
   passthru.updateScript = bundlerUpdateScript "inspec";
 
   meta = {
-    description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements";
+    description = "Open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements";
     homepage = "https://inspec.io/";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dylanmtaylor ];
diff --git a/pkgs/by-name/in/integresql/package.nix b/pkgs/by-name/in/integresql/package.nix
index da724b573cdd..89da6be134a8 100644
--- a/pkgs/by-name/in/integresql/package.nix
+++ b/pkgs/by-name/in/integresql/package.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "IntegreSQL manages isolated PostgreSQL databases for your integration tests";
+    description = "Manages isolated PostgreSQL databases for your integration tests";
     homepage = "https://github.com/allaboutapps/integresql";
     changelog = "https://github.com/allaboutapps/integresql/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix
index b47ed9f395fd..a661dbf4f47f 100644
--- a/pkgs/by-name/io/iotop-c/package.nix
+++ b/pkgs/by-name/io/iotop-c/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "iotop identifies processes that use high amount of input/output requests on your machine";
+    description = "Iotop identifies processes that use high amount of input/output requests on your machine";
     homepage = "https://github.com/Tomas-M/iotop";
     maintainers = [ maintainers.arezvov ];
     mainProgram = "iotop-c";
diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix
index c0f95bfed150..d807a43b9f09 100644
--- a/pkgs/by-name/io/iozone/package.nix
+++ b/pkgs/by-name/io/iozone/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "IOzone Filesystem Benchmark";
+    description = "Filesystem benchmark tool";
     homepage = "http://www.iozone.org/";
     license = lib.licenses.unfreeRedistributable;
     platforms = [
diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index cbb462430a43..77ba8fb620b3 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://www.mowglii.com/itsycal/versionhistory.html";
-    description = "Itsycal is a tiny menu bar calendar";
+    description = "Tiny menu bar calendar";
     homepage = "https://www.mowglii.com/itsycal/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ donteatoreo ];
diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix
index 0f0f7d220b4a..de9a4bcaecb7 100644
--- a/pkgs/by-name/ja/jackass/package.nix
+++ b/pkgs/by-name/ja/jackass/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   meta = {
-    description = "JackAss is a VST plugin that provides JACK-MIDI support for VST hosts";
+    description = "VST plugin that provides JACK-MIDI support for VST hosts";
     longDescription = ''
       Simply load the plugin in your favourite host to get a JACK-MIDI port.
       Optionally includes a special Wine build for running in Wine
diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index abe00cd50f38..59f65cd53053 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -24,7 +24,7 @@ appimageTools.wrapType2 {
 
   meta = {
     changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
-    description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
+    description = "Open source alternative to ChatGPT that runs 100% offline on your computer";
     homepage = "https://github.com/janhq/jan";
     license = lib.licenses.agpl3Plus;
     mainProgram = "jan";
diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix
index b0d8a1a731e0..6e41fdc30b02 100644
--- a/pkgs/by-name/ja/jankyborders/package.nix
+++ b/pkgs/by-name/ja/jankyborders/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "JankyBorders is a lightweight tool designed to add colored borders to user windows on macOS 14.0+";
+    description = "Lightweight tool designed to add colored borders to user windows on macOS 14.0+";
     longDescription = "It enhances the user experience by visually highlighting the currently focused window without relying on the accessibility API, thereby being faster than comparable tools.";
     homepage = "https://github.com/FelixKratz/JankyBorders";
     license = lib.licenses.gpl3;
diff --git a/pkgs/by-name/ji/jiq/package.nix b/pkgs/by-name/ji/jiq/package.nix
index 153396aad1bf..fc39e1b38023 100644
--- a/pkgs/by-name/ji/jiq/package.nix
+++ b/pkgs/by-name/ji/jiq/package.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://github.com/fiatjaf/jiq";
     license = licenses.mit;
-    description = "jid on jq - interactive JSON query tool using jq expressions";
+    description = "Interactive JSON query tool using jq expressions";
     mainProgram = "jiq";
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
index 909783746da2..d9e2823b2660 100644
--- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix
+++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''A random number generator, which injects entropy to the kernel'';
+    description = "Random number generator, which injects entropy to the kernel";
     homepage = "https://github.com/smuellerDD/jitterentropy-rngd";
     changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}";
     license = [
diff --git a/pkgs/by-name/jm/jmespath/package.nix b/pkgs/by-name/jm/jmespath/package.nix
index eb3c8fbe5901..3b2b70d09d52 100644
--- a/pkgs/by-name/jm/jmespath/package.nix
+++ b/pkgs/by-name/jm/jmespath/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   ];
 
   meta = with lib; {
-    description = "JMESPath implementation in Go";
+    description = "Golang implementation of JMESPath";
     homepage = "https://github.com/jmespath/go-jmespath";
     license = licenses.asl20;
     maintainers = with maintainers; [ cransom ];
diff --git a/pkgs/by-name/ka/kacst/package.nix b/pkgs/by-name/ka/kacst/package.nix
index 28f364021b60..8d8a0de7992c 100644
--- a/pkgs/by-name/ka/kacst/package.nix
+++ b/pkgs/by-name/ka/kacst/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "KACST Latin-Arabic TrueType fonts";
+    description = "Latin-Arabic TrueType fonts";
     license = licenses.gpl2Only;
     maintainers = with lib.maintainers; [ serge ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/ka/kamal/package.nix b/pkgs/by-name/ka/kamal/package.nix
index 628ec7bedbca..06fb650ba690 100644
--- a/pkgs/by-name/ka/kamal/package.nix
+++ b/pkgs/by-name/ka/kamal/package.nix
@@ -13,7 +13,7 @@ bundlerApp {
   exes = [ "kamal" ];
 
   meta = with lib; {
-    description = "Kamal: Deploy web apps anywhere";
+    description = "Deploy web apps anywhere";
     homepage = "https://kamal-deploy.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ nathanruiz ];
diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix
index 2343cafa98c9..9d38473ed99d 100644
--- a/pkgs/by-name/ka/karabiner-elements/package.nix
+++ b/pkgs/by-name/ka/karabiner-elements/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${finalAttrs.version}";
-    description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later";
+    description = "Powerful utility for keyboard customization on macOS Ventura (13) or later";
     homepage = "https://karabiner-elements.pqrs.org/";
     license = lib.licenses.unlicense;
     maintainers = [ ];
diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix
index eccab152e644..ae5adf9a38d5 100644
--- a/pkgs/by-name/kd/kdotool/package.nix
+++ b/pkgs/by-name/kd/kdotool/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ dbus ];
 
   meta = with lib; {
-    description = "xdotool-like for KDE Wayland";
+    description = "xdotool clone for KDE Wayland";
     homepage = "https://github.com/jinliu/kdotool";
     license = licenses.asl20;
     maintainers = with maintainers; [ kotatsuyaki ];
diff --git a/pkgs/by-name/ke/keepass-otpkeyprov/package.nix b/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
index bdcaa7cc405a..f6940de8dba6 100644
--- a/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
+++ b/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
@@ -19,7 +19,7 @@ let
     };
 
     meta = {
-      description = "OtpKeyProv is a key provider based on one-time passwords";
+      description = "Key provider based on one-time passwords";
       homepage = "https://keepass.info/plugins.html#otpkeyprov";
       platforms = with lib.platforms; linux;
       license = lib.licenses.gpl2;
diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index e6349b3f2b95..35047ef594fd 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Keychain management tool";
+    description = "Manage SSH and GPG keys in a convenient and secure manner";
     longDescription = ''
       Keychain helps you to manage SSH and GPG keys in a convenient and secure
       manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
diff --git a/pkgs/by-name/kh/khmeros/package.nix b/pkgs/by-name/kh/khmeros/package.nix
index c867281fd1dd..8fdb07423952 100644
--- a/pkgs/by-name/kh/khmeros/package.nix
+++ b/pkgs/by-name/kh/khmeros/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "KhmerOS Unicode fonts for the Khmer language";
+    description = "Unicode fonts for the Khmer language";
     homepage = "http://www.khmeros.info/";
     license = licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ serge ];
diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix
index e571bfd016a8..5aba2f449a3d 100644
--- a/pkgs/by-name/ki/kine/package.nix
+++ b/pkgs/by-name/ki/kine/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   };
 
   meta = {
-    description = "Kine is an etcdshim that translates etcd API to RDMS";
+    description = "etcdshim that translates etcd API to RDMS";
     homepage = "https://github.com/k3s-io/kine";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ techknowlogick ];
diff --git a/pkgs/by-name/km/kminion/package.nix b/pkgs/by-name/km/kminion/package.nix
index fa00cdfb8df4..2575ff228e1b 100644
--- a/pkgs/by-name/km/kminion/package.nix
+++ b/pkgs/by-name/km/kminion/package.nix
@@ -22,7 +22,7 @@ buildGoModule {
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {
-    description = "KMinion is a feature-rich Prometheus exporter for Apache Kafka written in Go";
+    description = "Feature-rich Prometheus exporter for Apache Kafka written in Go";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cafkafk ];
diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
index ac3e55bf5a66..8b62e1abd08c 100644
--- a/pkgs/by-name/ko/kontroll/package.nix
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ protobuf ];
 
   meta = {
-    description = "Kontroll demonstates how to control the Keymapp API, making it easy to control your ZSA keyboard from the command line and scripts";
+    description = "Demonstrates how to control the Keymapp API, making it easy to control your ZSA keyboard from the command line and scripts";
     homepage = "https://github.com/zsa/kontroll";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ davsanchez ];
diff --git a/pkgs/by-name/ku/kubectl-df-pv/package.nix b/pkgs/by-name/ku/kubectl-df-pv/package.nix
index 5160659ce06a..6a2c9facde0b 100644
--- a/pkgs/by-name/ku/kubectl-df-pv/package.nix
+++ b/pkgs/by-name/ku/kubectl-df-pv/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   vendorHash = "sha256-YkDPgN7jBvYveiyU8N+3Ia52SEmlzC0TGBQjUuIAaw0=";
 
   meta = {
-    description = "df (disk free)-like utility for persistent volumes on kubernetes";
+    description = "df-like utility for persistent volumes on Kubernetes";
     mainProgram = "df-pv";
     homepage = "https://github.com/yashbhutwala/kubectl-df-pv";
     changelog = "https://github.com/yashbhutwala/kubectl-df-pv/releases/tag/v${version}";
diff --git a/pkgs/by-name/ku/kubemqctl/package.nix b/pkgs/by-name/ku/kubemqctl/package.nix
index 69330987bbb3..7dc4b1eec0de 100644
--- a/pkgs/by-name/ku/kubemqctl/package.nix
+++ b/pkgs/by-name/ku/kubemqctl/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
 
   meta = {
     homepage = "https://github.com/kubemq-io/kubemqctl";
-    description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker";
+    description = "CLI for Kubemq Kubernetes Message Broker";
     mainProgram = "kubemqctl";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ brianmcgee ];
diff --git a/pkgs/by-name/la/lab/package.nix b/pkgs/by-name/la/lab/package.nix
index 6d3b4cc4b53d..425214809eab 100644
--- a/pkgs/by-name/la/lab/package.nix
+++ b/pkgs/by-name/la/lab/package.nix
@@ -53,7 +53,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
+    description = "Wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
     homepage = "https://zaquestion.github.io/lab";
     license = licenses.cc0;
     maintainers = [ ];
diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix
index c8d9571aab70..03595777c74b 100644
--- a/pkgs/by-name/le/leetcode-cli/package.nix
+++ b/pkgs/by-name/le/leetcode-cli/package.nix
@@ -48,8 +48,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "May the code be with you 👻";
-    longDescription = "Use leetcode.com in command line";
+    description = "Leetcode CLI utility";
     homepage = "https://github.com/clearloop/leetcode-cli";
     license = licenses.mit;
     maintainers = with maintainers; [ congee ];
diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix
index c01af1a84756..5f32b2f0bc2f 100644
--- a/pkgs/by-name/le/lenmus/package.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "LenMus Phonascus is a program for learning music";
+    description = "Program for learning music";
     longDescription = ''
       LenMus Phonascus is a free open source program (GPL v3) for learning music.
       It allows you to focus on specific skills and exercises, on both theory and aural training.
diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix
index e88ad0b9e96b..f15ce43431df 100644
--- a/pkgs/by-name/le/lexbor/package.nix
+++ b/pkgs/by-name/le/lexbor/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Lexbor is development of an open source HTML Renderer library";
+    description = "Open source HTML Renderer library";
     homepage = "https://github.com/lexbor/lexbor";
     changelog = "https://github.com/lexbor/lexbor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index b7c37443b294..b17a109e656f 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -54,7 +54,7 @@ beamPackages.mixRelease rec {
   };
 
   meta = {
-    description = "Lexical is a next-generation elixir language server";
+    description = "Next-generation elixir language server";
     homepage = "https://github.com/lexical-lsp/lexical";
     changelog = "https://github.com/lexical-lsp/lexical/releases/tag/v${version}";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/lh/lha/package.nix b/pkgs/by-name/lh/lha/package.nix
index ad3da2237676..9d8903980d91 100644
--- a/pkgs/by-name/lh/lha/package.nix
+++ b/pkgs/by-name/lh/lha/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
-    description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms";
+    description = "Archiver and compressor using the LZSS and Huffman encoding compression algorithms";
     homepage = "https://github.com/jca02266/lha";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/li/libfreefare/package.nix b/pkgs/by-name/li/libfreefare/package.nix
index 247fa1607940..c85e2c89c1e2 100644
--- a/pkgs/by-name/li/libfreefare/package.nix
+++ b/pkgs/by-name/li/libfreefare/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations";
+    description = "Convenient API for MIFARE card manipulations";
     license = lib.licenses.lgpl3;
     homepage = "https://github.com/nfc-tools/libfreefare";
     maintainers = with lib.maintainers; [ bobvanderlinden ];
diff --git a/pkgs/by-name/li/libipfix/package.nix b/pkgs/by-name/li/libipfix/package.nix
index 70f480e0570b..11bbcfde6b54 100644
--- a/pkgs/by-name/li/libipfix/package.nix
+++ b/pkgs/by-name/li/libipfix/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://libipfix.sourceforge.net/";
-    description = "Libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF";
+    description = "C library that implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF";
     mainProgram = "ipfix_collector";
     license = licenses.lgpl3;
     platforms = platforms.linux;
diff --git a/pkgs/by-name/li/libiscsi/package.nix b/pkgs/by-name/li/libiscsi/package.nix
index 6067083ef57a..5c36f7af4e10 100644
--- a/pkgs/by-name/li/libiscsi/package.nix
+++ b/pkgs/by-name/li/libiscsi/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "iscsi client library and utilities";
+    description = "iSCSI client library and utilities";
     homepage = "https://github.com/sahlberg/libiscsi";
     license = licenses.lgpl2;
     platforms = platforms.unix;
diff --git a/pkgs/by-name/li/libshout/package.nix b/pkgs/by-name/li/libshout/package.nix
index 3ba32d1f8e04..1698a77fc69d 100644
--- a/pkgs/by-name/li/libshout/package.nix
+++ b/pkgs/by-name/li/libshout/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "icecast 'c' language bindings";
+    description = "Icecast C language bindings";
 
     longDescription = ''
       Libshout is a library for communicating with and sending data to an icecast
diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index f65860d8bf9b..4d2327bd6fbc 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "Libtpms library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)";
+    description = "Library for software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)";
     homepage = "https://github.com/stefanberger/libtpms";
     license = licenses.bsd3;
     maintainers = [ maintainers.baloo ];
diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix
index 71a5283253b2..83222c9ae75d 100644
--- a/pkgs/by-name/lo/lora/package.nix
+++ b/pkgs/by-name/lo/lora/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Lora is a well-balanced contemporary serif with roots in calligraphy";
+    description = "Lora Font: well-balanced contemporary serif with roots in calligraphy";
     homepage = "https://github.com/cyrealtype/lora";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix
index e2aca674b63f..84e80560b8b6 100644
--- a/pkgs/by-name/lp/lprint/package.nix
+++ b/pkgs/by-name/lp/lprint/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    description = "LPrint implements printing for a variety of common label and receipt printers connected via network or USB";
+    description = "Implements printing for a variety of common label and receipt printers connected via network or USB";
     mainProgram = "lprint";
     homepage = "https://github.com/michaelrsweet/lprint";
     license = licenses.asl20;
diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 508ba914d62f..849ae8502a7c 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   meta = {
-    description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made";
+    description = "Provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made";
     homepage = "https://mactracker.ca";
     changelog = "https://mactracker.ca/releasenotes-mac.html";
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/ma/mapscii/package.nix b/pkgs/by-name/ma/mapscii/package.nix
index b8b83539218a..3657192d3571 100644
--- a/pkgs/by-name/ma/mapscii/package.nix
+++ b/pkgs/by-name/ma/mapscii/package.nix
@@ -24,7 +24,7 @@ buildNpmPackage rec {
   '';
 
   meta = with lib; {
-    description = "MapSCII is a Braille & ASCII world map renderer for your console";
+    description = "Braille & ASCII world map renderer for your console";
     homepage = "https://github.com/rastapasta/mapscii";
     license = licenses.mit;
     maintainers = with maintainers; [ kinzoku ];
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index bb850553b072..6da951b8ea72 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -249,7 +249,7 @@ buildMattermost rec {
   };
 
   meta = {
-    description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle";
+    description = "Open source platform for secure collaboration across the entire software development lifecycle";
     homepage = "https://www.mattermost.org";
     license = with lib.licenses; [
       agpl3Only
diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
index 844be4104ac2..d589f9f5722d 100644
--- a/pkgs/by-name/md/mdbook-emojicodes/package.nix
+++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0=";
 
   meta = {
-    description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱";
+    description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis";
     mainProgram = "mdbook-emojicodes";
     homepage = "https://github.com/blyxyas/mdbook-emojicodes";
     changelog = "https://github.com/blyxyas/mdbook-emojicodes/releases/tag/${version}";
diff --git a/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/pkgs/by-name/me/merge-ut-dictionaries/package.nix
index 0651f2468c41..571786f264fd 100644
--- a/pkgs/by-name/me/merge-ut-dictionaries/package.nix
+++ b/pkgs/by-name/me/merge-ut-dictionaries/package.nix
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation {
   };
 
   meta = {
-    description = "Merge multiple Mozc UT dictionaries into one and modify the costs";
+    description = "Mozc UT dictionaries are additional dictionaries for Mozc";
     homepage = "https://github.com/utuhiro78/merge-ut-dictionaries";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ pineapplehunter ];
diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix
index 3f12eeaa77bc..e47e417bcd3e 100644
--- a/pkgs/by-name/mi/mirakurun/package.nix
+++ b/pkgs/by-name/mi/mirakurun/package.nix
@@ -72,7 +72,7 @@ buildNpmPackage rec {
     '';
 
   meta = with lib; {
-    description = "Resource manager for TV tuners.";
+    description = "Resource manager for TV tuners";
     license = licenses.asl20;
     maintainers = with maintainers; [ midchildan ];
   };
diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix
index c2cfda64ce40..0a146317b339 100644
--- a/pkgs/by-name/mo/mockgen/package.nix
+++ b/pkgs/by-name/mo/mockgen/package.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   };
 
   meta = {
-    description = "GoMock is a mocking framework for the Go programming language";
+    description = "Mocking framework for the Go programming language";
     homepage = "https://github.com/uber-go/mock";
     changelog = "https://github.com/uber-go/mock/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/mo/mozlz4a/package.nix b/pkgs/by-name/mo/mozlz4a/package.nix
index 8ef0d3ea0c08..24432a59b342 100644
--- a/pkgs/by-name/mo/mozlz4a/package.nix
+++ b/pkgs/by-name/mo/mozlz4a/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "MozLz4a compression/decompression utility";
+    description = "Compression/decompression utility";
     license = licenses.bsd2;
     maintainers = with maintainers; [
       kira-bruneau
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index 9f8dcc8dfb65..ce1289e9a50c 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Multimon is a digital baseband audio protocol decoder";
+    description = "Digital baseband audio protocol decoder";
     mainProgram = "multimon-ng";
     longDescription = ''
       multimon-ng a fork of multimon, a digital baseband audio
diff --git a/pkgs/by-name/mu/multitail/package.nix b/pkgs/by-name/mu/multitail/package.nix
index 6338b0c7be54..5099f3917c09 100644
--- a/pkgs/by-name/mu/multitail/package.nix
+++ b/pkgs/by-name/mu/multitail/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/folkertvanheusden/multitail";
-    description = "tail on Steroids";
+    description = "tail on steroids";
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     platforms = lib.platforms.unix;
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
index acd55a8d8e4e..fbc83d2413ad 100644
--- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix
+++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
@@ -119,7 +119,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Unofficial desktop client for F1 TV®";
+    description = "Unofficial desktop client for F1 TV";
     homepage = "https://multiviewer.app";
     downloadPage = "https://multiviewer.app/download";
     license = licenses.unfree;
diff --git a/pkgs/by-name/my/myanon/package.nix b/pkgs/by-name/my/myanon/package.nix
index e5d107d8be0e..da604d1aadea 100644
--- a/pkgs/by-name/my/myanon/package.nix
+++ b/pkgs/by-name/my/myanon/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Myanon is a mysqldump anonymizer, reading a dump from stdin, and producing on the fly an anonymized version to stdout";
+    description = "mysqldump anonymizer, reading a dump from stdin, and producing on the fly an anonymized version to stdout";
     homepage = "https://ppomes.github.io/myanon/";
     license = lib.licenses.bsd3;
     mainProgram = "myanon";
diff --git a/pkgs/by-name/na/nap/package.nix b/pkgs/by-name/na/nap/package.nix
index 323be8e97cb1..264cb884af5f 100644
--- a/pkgs/by-name/na/nap/package.nix
+++ b/pkgs/by-name/na/nap/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   excludedPackages = ".nap";
 
   meta = {
-    description = "Code snippets in your terminal 🛌";
+    description = "Code snippets in your terminal";
     mainProgram = "nap";
     homepage = "https://github.com/maaslalani/nap";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 6bae6309068d..53520301680e 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -84,7 +84,7 @@ buildGo124Module rec {
   };
 
   meta = {
-    description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic";
+    description = "Music Server and Streamer compatible with Subsonic/Airsonic";
     mainProgram = "navidrome";
     homepage = "https://www.navidrome.org/";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 2d47f953ead8..a0397272cbaf 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   disallowedReferences = [ finalAttrs.SKIA_SOURCE_DIR ];
 
   meta = {
-    description = "Neovide is a simple, no-nonsense, cross-platform graphical user interface for Neovim";
+    description = "Simple, no-nonsense, cross-platform graphical user interface for Neovim";
     mainProgram = "neovide";
     homepage = "https://neovide.dev/";
     changelog = "https://github.com/neovide/neovide/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index afb442d35919..2ea8471f8813 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-8EchpubKnixlvAyM2iSf4fE5wowJHT6/mDHIvLPnEok=";
 
   meta = with lib; {
-    description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";
+    description = "Helps you to find/fix obsolete nerd font icons in your project";
     mainProgram = "nerdfix";
     homepage = "https://github.com/loichyan/nerdfix";
     changelog = "https://github.com/loichyan/nerdfix/blob/${src.rev}/CHANGELOG.md";
diff --git a/pkgs/by-name/ni/nix-pin/package.nix b/pkgs/by-name/ni/nix-pin/package.nix
index b249652e9819..30d5ebec5b74 100644
--- a/pkgs/by-name/ni/nix-pin/package.nix
+++ b/pkgs/by-name/ni/nix-pin/package.nix
@@ -65,7 +65,7 @@ let
       };
     meta = with lib; {
       homepage = "https://github.com/timbertson/nix-pin";
-      description = "nixpkgs development utility";
+      description = "Nixpkgs development utility";
       license = licenses.mit;
       maintainers = [ maintainers.timbertson ];
       platforms = platforms.all;
diff --git a/pkgs/by-name/no/notify/package.nix b/pkgs/by-name/no/notify/package.nix
index 8dbf247b00e2..4e04f257a0ef 100644
--- a/pkgs/by-name/no/notify/package.nix
+++ b/pkgs/by-name/no/notify/package.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "Notify allows sending the output from any tool to Slack, Discord and Telegram";
+    description = "Allows sending the output from any tool to Slack, Discord and Telegram";
     longDescription = ''
       Notify is a helper utility written in Go that allows you to post the output from any tool
       to Slack, Discord, and Telegram.
diff --git a/pkgs/by-name/ob/obs-cli/package.nix b/pkgs/by-name/ob/obs-cli/package.nix
index 53d52131ade8..85474ae05519 100644
--- a/pkgs/by-name/ob/obs-cli/package.nix
+++ b/pkgs/by-name/ob/obs-cli/package.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   ];
 
   meta = {
-    description = "OBS-cli is a command-line remote control for OBS";
+    description = "Command-line remote control for OBS";
     homepage = "https://github.com/muesli/obs-cli";
     changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/og/ograc/package.nix b/pkgs/by-name/og/ograc/package.nix
index efd803ca5d8a..71303ec9acb1 100644
--- a/pkgs/by-name/og/ograc/package.nix
+++ b/pkgs/by-name/og/ograc/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-rWU8rOGLUrSkXLkHib8qkkiOZvuGbSJ4knFrHuD+R44=";
 
   meta = with lib; {
-    description = "like cargo, but backwards";
+    description = "Like cargo, but backwards";
     mainProgram = "ograc";
     homepage = "https://crates.io/crates/ograc";
     license = licenses.agpl3Plus;
diff --git a/pkgs/by-name/ok/okapi/package.nix b/pkgs/by-name/ok/okapi/package.nix
index 427a95123084..b8898c4bc3b3 100644
--- a/pkgs/by-name/ok/okapi/package.nix
+++ b/pkgs/by-name/ok/okapi/package.nix
@@ -21,11 +21,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "Okapi Library";
-    longDescription = ''
-      Collection of tools that support workflows for working
-      with authentic data and identity management
-    '';
+    description = "Collection of tools that support workflows for working with authentic data and identity management";
     homepage = "https://github.com/trinsic-id/okapi";
     license = licenses.asl20;
     maintainers = with maintainers; [ tmarkovski ];
diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix
index d8c3f666c639..5653e74ed504 100644
--- a/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix
+++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   meta = {
-    description = "This is the OpenCloud Desktop shell integration for the great KDE Dolphin in KDE Frameworks 6";
+    description = "OpenCloud Desktop shell integration for the great KDE Dolphin in KDE Frameworks 6";
     homepage = "https://github.com/opencloud-eu/desktop-shell-integration-dolphin";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ k900 ];
diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix
index 3081619b8e10..76f713be4c9e 100644
--- a/pkgs/by-name/op/opensoldat/package.nix
+++ b/pkgs/by-name/op/opensoldat/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Opensoldat is a unique 2D (side-view) multiplayer action game";
+    description = "Unique 2D (side-view) multiplayer action game";
     license = [
       licenses.mit
       base.meta.license
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 188ff12895e8..f8225cec2b56 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     changelog = "https://github.com/openvinotoolkit/openvino/releases/tag/${src.tag}";
-    description = "OpenVINO™ Toolkit repository";
+    description = "Open-source toolkit for optimizing and deploying AI inference";
     longDescription = ''
       This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic.
 
diff --git a/pkgs/by-name/op/openwsman/package.nix b/pkgs/by-name/op/openwsman/package.nix
index ebb2cd200ea9..a4dc6377fd8d 100644
--- a/pkgs/by-name/op/openwsman/package.nix
+++ b/pkgs/by-name/op/openwsman/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-more-warnings" ];
 
   meta = {
-    description = "Openwsman server implementation and client API with bindings";
+    description = "Open source implementation of WS-Management";
     downloadPage = "https://github.com/Openwsman/openwsman/releases";
     homepage = "https://openwsman.github.io";
     license = lib.licenses.bsd3;
diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix
index b8ae0063f634..578227e6a6c4 100644
--- a/pkgs/by-name/or/oras/package.nix
+++ b/pkgs/by-name/or/oras/package.nix
@@ -47,7 +47,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://oras.land/";
     changelog = "https://github.com/oras-project/oras/releases/tag/v${finalAttrs.version}";
-    description = "ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries";
+    description = "Distribute artifacts across OCI registries with ease";
     mainProgram = "oras";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 6ec7af87decf..620f45361c8b 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research";
+    description = "Lightweight, RESTful DICOM server for healthcare and medical research";
     homepage = "https://www.orthanc-server.com/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "Orthanc";
diff --git a/pkgs/by-name/or/ory/package.nix b/pkgs/by-name/or/ory/package.nix
index e1546fe5e049..ff604a8f1ba9 100644
--- a/pkgs/by-name/or/ory/package.nix
+++ b/pkgs/by-name/or/ory/package.nix
@@ -39,8 +39,8 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
+    description = "CLI for Ory";
     mainProgram = "ory";
-    description = "Ory CLI";
     homepage = "https://www.ory.sh/cli";
     license = licenses.asl20;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
index 751077fb85b4..7532621379c0 100644
--- a/pkgs/by-name/os/osmo-hnodeb/package.nix
+++ b/pkgs/by-name/os/osmo-hnodeb/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "(upper layers of) HomeNodeB";
+    description = "Upper layers implementation of HomeNodeB for 3G/UMTS";
     mainProgram = "osmo-hnodeb";
     homepage = "https://osmocom.org/projects/osmo-hnodeb";
     license = lib.licenses.agpl3Plus;
diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix
index b271be6bcd94..4de00b879af4 100644
--- a/pkgs/by-name/pa/pacemaker/package.nix
+++ b/pkgs/by-name/pa/pacemaker/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://clusterlabs.org/pacemaker/";
-    description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters";
+    description = "Open source, high availability resource manager suitable for both small and large clusters";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/pa/pageedit/package.nix b/pkgs/by-name/pa/pageedit/package.nix
index 7ebc9c53ba6f..a8aa4dd1dc25 100644
--- a/pkgs/by-name/pa/pageedit/package.nix
+++ b/pkgs/by-name/pa/pageedit/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       null;
 
   meta = {
-    description = "ePub XHTML Visual Editor";
+    description = "EPUB XHTML Visual Editor";
     mainProgram = "pageedit";
     homepage = "https://sigil-ebook.com/pageedit/";
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix
index 2c7288e3defa..acc50d4b43ac 100644
--- a/pkgs/by-name/pa/pat/package.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "Pat is a cross platform Winlink client written in Go";
+    description = "Cross-platform Winlink client written in Go";
     homepage = "https://getpat.io/";
     license = licenses.mit;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 9251c1c55125..f10f21a4601b 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
+    description = "Point Data Abstraction Library. GDAL for point cloud data";
     homepage = "https://pdal.io";
     license = licenses.bsd3;
     teams = [ teams.geospatial ];
diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix
index 11bc62495fdd..359fed4846ef 100644
--- a/pkgs/by-name/pd/pdi/package.nix
+++ b/pkgs/by-name/pd/pdi/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "PDI supports loose coupling of simulation codes with data handling libraries";
+    description = "Library that aims todecouple high-performance simulation codes from I/O concerns";
     homepage = "https://pdi.dev/master/";
     changelog = "https://github.com/pdidev/pdi/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
diff --git a/pkgs/by-name/pg/pgscv/package.nix b/pkgs/by-name/pg/pgscv/package.nix
index 0199c328ede8..578cf9328e7e 100644
--- a/pkgs/by-name/pg/pgscv/package.nix
+++ b/pkgs/by-name/pg/pgscv/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   '';
 
   meta = {
-    description = "PgSCV is a PostgreSQL ecosystem metrics collector";
+    description = "PostgreSQL ecosystem metrics collector";
     homepage = "https://github.com/CHERTS/pgscv/";
     changelog = "https://github.com/CHERTS/pgscv/releases/${version}";
     license = lib.licenses.bsd3;
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index b0cac4c2e54f..6dc91e2276f4 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -24,7 +24,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}";
-    description = "Phel is a functional programming language that compiles to PHP. A Lisp dialect inspired by Clojure and Janet";
+    description = "Functional programming language that compiles to PHP. A Lisp dialect inspired by Clojure and Janet";
     homepage = "https://github.com/phel-lang/phel-lang";
     license = lib.licenses.mit;
     mainProgram = "phel";
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
index 929dfb83872d..5c7431275a7a 100644
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   vendorHash = null;
 
   meta = {
-    description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
+    description = "Matrix <-> Email bridge in the form of an SMTP server";
     homepage = "https://github.com/etkecc/postmoogle";
     changelog = "https://github.com/etkecc/postmoogle/releases/tag/v${version}";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix
index 31ae575004a0..c7576e57a726 100644
--- a/pkgs/by-name/pr/prefect/package.nix
+++ b/pkgs/by-name/pr/prefect/package.nix
@@ -192,7 +192,7 @@ python3Packages.buildPythonApplication rec {
   # );
 
   meta = {
-    description = "Prefect is a workflow orchestration framework for building resilient data pipelines in Python";
+    description = "Workflow orchestration framework for building resilient data pipelines in Python";
     homepage = "https://github.com/PrefectHQ/prefect";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
diff --git a/pkgs/by-name/pr/procyon/package.nix b/pkgs/by-name/pr/procyon/package.nix
index 4fe075bd8886..23cfab49b1e8 100644
--- a/pkgs/by-name/pr/procyon/package.nix
+++ b/pkgs/by-name/pr/procyon/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Procyon is a suite of Java metaprogramming tools including a Java decompiler";
+    description = "Suite of Java metaprogramming tools including a Java decompiler";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     homepage = "https://github.com/mstrobel/procyon/";
     license = licenses.asl20;
diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
index 5c87d0b63fbd..4091b8d99567 100644
--- a/pkgs/by-name/pu/pulumi/package.nix
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -177,7 +177,7 @@ buildGoModule rec {
 
   meta = {
     homepage = "https://www.pulumi.com";
-    description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
+    description = "Cloud development platform that makes creating cloud programs easy and productive";
     sourceProvenance = [ lib.sourceTypes.fromSource ];
     license = lib.licenses.asl20;
     mainProgram = "pulumi";
diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index 10656bfdcee3..66ac56b52271 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -54,7 +54,7 @@ buildDotnetModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/mattpannella/pupdate";
-    description = "Pupdate - A thing for updating your Analogue Pocket";
+    description = "Update utility for the openFPGA cores, firmware, and other stuff on your Analogue Pocket";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ p-rintz ];
diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index 13f123162263..5d44268b5c5f 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "Quarkus is a Kubernetes-native Java framework tailored for GraalVM and HotSpot, crafted from best-of-breed Java libraries and standards";
+    description = "Kubernetes-native Java framework tailored for GraalVM and HotSpot, crafted from best-of-breed Java libraries and standards";
     homepage = "https://quarkus.io";
     changelog = "https://github.com/quarkusio/quarkus/releases/tag/${finalAttrs.version}";
     license = licenses.asl20;
diff --git a/pkgs/by-name/qu/quickfix/package.nix b/pkgs/by-name/qu/quickfix/package.nix
index bd4612c8eec1..3dad4044a99c 100644
--- a/pkgs/by-name/qu/quickfix/package.nix
+++ b/pkgs/by-name/qu/quickfix/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "QuickFIX C++ Fix Engine Library";
+    description = "C++ Fix Engine Library";
     homepage = "http://www.quickfixengine.org";
     license = licenses.free; # similar to BSD 4-clause
     maintainers = with maintainers; [ bhipple ];
diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix
index ec31feb4b013..32c0e15ffbb1 100644
--- a/pkgs/by-name/qu/quill-qr/package.nix
+++ b/pkgs/by-name/qu/quill-qr/package.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Print QR codes for use with https://p5deo-6aaaa-aaaab-aaaxq-cai.raw.ic0.app/";
+    description = "Print QR codes for use with https://p5deo-6aaaa-aaaab-aaaxq-cai.raw.ic0.app";
     mainProgram = "quill-qr.sh";
     homepage = "https://github.com/IvanMalison/quill-qr";
     maintainers = with maintainers; [ imalison ];
diff --git a/pkgs/by-name/ra/ran/package.nix b/pkgs/by-name/ra/ran/package.nix
index c6216308ebea..4f1a747b733d 100644
--- a/pkgs/by-name/ra/ran/package.nix
+++ b/pkgs/by-name/ra/ran/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/m3ng9i/ran";
-    description = "Ran is a simple web server for serving static files";
+    description = "Simple web server for serving static files";
     mainProgram = "ran";
     license = licenses.mit;
     maintainers = with maintainers; [ tomberek ];
diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index 12dcd424d283..462e5f7e7efb 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "Rancher Command Line Interface (CLI) is a unified tool for interacting with your Rancher Server";
+    description = "CLI tool for interacting with your Rancher Server";
     mainProgram = "rancher";
     homepage = "https://github.com/rancher/cli";
     license = licenses.asl20;
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 2da4684d4ca8..f0fd2b3bf536 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules";
+    description = "Generate Buck build rules from Rust Cargo dependencies";
     mainProgram = "reindeer";
     homepage = "https://github.com/facebookincubator/reindeer";
     license = with licenses; [ mit ];
diff --git a/pkgs/by-name/re/retry/package.nix b/pkgs/by-name/re/retry/package.nix
index e366a297ba82..de747e78a4d3 100644
--- a/pkgs/by-name/re/retry/package.nix
+++ b/pkgs/by-name/re/retry/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/minfrin/retry";
-    description = "Retry a command until the command succeeds";
+    description = "Command wrapper that retries until the command succeeds";
     license = licenses.asl20;
     maintainers = with maintainers; [ gfrascadorio ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix
index 4589f9853884..6d18cef194b9 100644
--- a/pkgs/by-name/ro/rotonda/package.nix
+++ b/pkgs/by-name/ro/rotonda/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "Rotonda - composable, programmable BGP Engine";
+    description = "Composable, programmable BGP Engine";
     homepage = "https://github.com/NLnetLabs/rotonda";
     changelog = "https://github.com/NLnetLabs/rotonda/blob/refs/tags/${finalAttrs.src.tag}/Changelog.md";
     license = lib.licenses.mpl20;
diff --git a/pkgs/by-name/ro/round/package.nix b/pkgs/by-name/ro/round/package.nix
index c2681172e1a8..8e14274f264a 100644
--- a/pkgs/by-name/ro/round/package.nix
+++ b/pkgs/by-name/ro/round/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   subPackages = [ "." ];
 
   meta = with lib; {
-    description = "Round image corners from CLI";
+    description = "CLI tool for rounding images";
     homepage = "https://github.com/mingrammer/round";
     license = licenses.mit;
     maintainers = with maintainers; [ addict3d ];
diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix
index 195d932aaed0..c78bff131861 100644
--- a/pkgs/by-name/s5/s5/package.nix
+++ b/pkgs/by-name/s5/s5/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   doCheck = true;
 
   meta = with lib; {
-    description = "cipher/decipher text within a file";
+    description = "Cipher/decipher text within a file";
     mainProgram = "s5";
     homepage = "https://github.com/mvisonneau/s5";
     license = licenses.asl20;
diff --git a/pkgs/by-name/sc/scaleft/package.nix b/pkgs/by-name/sc/scaleft/package.nix
index 3b80b518a658..9922319516eb 100644
--- a/pkgs/by-name/sc/scaleft/package.nix
+++ b/pkgs/by-name/sc/scaleft/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services";
+    description = "Zero Trust software which you can use to secure your internal servers and services";
     homepage = "https://www.scaleft.com";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
diff --git a/pkgs/by-name/sc/scarlett2/package.nix b/pkgs/by-name/sc/scarlett2/package.nix
index 82d7be656f52..753e5f08c215 100644
--- a/pkgs/by-name/sc/scarlett2/package.nix
+++ b/pkgs/by-name/sc/scarlett2/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Scarlett2 Firmware Management Utility for Scarlett 2nd, 3rd, and 4th Gen, Clarett USB, and Clarett+ interfaces";
+    description = "Firmware Management Utility for Scarlett 2nd, 3rd, and 4th Gen, Clarett USB, and Clarett+ interfaces";
     homepage = "https://github.com/geoffreybennett/scarlett2";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ squalus ];
diff --git a/pkgs/by-name/sc/scd2html/package.nix b/pkgs/by-name/sc/scd2html/package.nix
index 0114287f74fc..546cc404dfba 100644
--- a/pkgs/by-name/sc/scd2html/package.nix
+++ b/pkgs/by-name/sc/scd2html/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    description = "scd2html generates HTML from scdoc source files";
+    description = "Generates HTML from scdoc source files";
     homepage = "https://git.sr.ht/~bitfehler/scd2html";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/by-name/si/simplesamlphp/package.nix b/pkgs/by-name/si/simplesamlphp/package.nix
index 835c007c7afe..4345d70ca6ff 100644
--- a/pkgs/by-name/si/simplesamlphp/package.nix
+++ b/pkgs/by-name/si/simplesamlphp/package.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
   vendorHash = "sha256-kFRvOxSfqlM+xzFFlEm9YrbQDOvC4AA0BtztFQ1xxDU=";
 
   meta = {
-    description = "SimpleSAMLphp is an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)";
+    description = "Application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)";
     homepage = "https://simplesamlphp.org";
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ nhnn ];
diff --git a/pkgs/by-name/si/sing-geosite/package.nix b/pkgs/by-name/si/sing-geosite/package.nix
index b98390b1d2bf..76ba9725644d 100644
--- a/pkgs/by-name/si/sing-geosite/package.nix
+++ b/pkgs/by-name/si/sing-geosite/package.nix
@@ -47,7 +47,7 @@ buildGoModule (finalAttrs: {
   '';
 
   meta = {
-    description = "community managed domain list";
+    description = "Community managed domain list";
     homepage = "https://github.com/SagerNet/sing-geosite";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix
index 84c79a8c547b..bcd40fd12376 100644
--- a/pkgs/by-name/sk/skimpdf/package.nix
+++ b/pkgs/by-name/sk/skimpdf/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Skim is a PDF reader and note-taker for OS X";
+    description = "PDF reader and note-taker for macOS";
     homepage = "https://skim-app.sourceforge.io/";
     license = licenses.bsd0;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/sm/smooth/package.nix b/pkgs/by-name/sm/smooth/package.nix
index 4fdeb5a47b24..7b0ebcf3cbec 100644
--- a/pkgs/by-name/sm/smooth/package.nix
+++ b/pkgs/by-name/sm/smooth/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "Smooth Class Library";
+    description = "Object-oriented class library for C++ application development";
     mainProgram = "smooth-translator";
     license = licenses.artistic2;
     homepage = "http://www.smooth-project.org/";
diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index 61aa2f4a9aa0..7a8944446143 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/ivaaaan/smug";
-    description = "Smug - tmux session manager";
+    description = "tmux session manager";
     license = licenses.mit;
     maintainers = with maintainers; [ juboba ];
     mainProgram = "smug";
diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix
index 7311f17fcfbe..87f085628d0b 100644
--- a/pkgs/by-name/sn/snore/package.nix
+++ b/pkgs/by-name/sn/snore/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = with lib; {
-    description = "sleep with feedback";
+    description = "'sleep' with feedback";
     homepage = "https://github.com/clamiax/snore";
     license = licenses.mit;
     maintainers = with maintainers; [ cafkafk ];
diff --git a/pkgs/by-name/sp/splat/package.nix b/pkgs/by-name/sp/splat/package.nix
index a151bc05c48e..1ef1ce014a51 100644
--- a/pkgs/by-name/sp/splat/package.nix
+++ b/pkgs/by-name/sp/splat/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
-    description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz";
+    description = "RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz";
     license = licenses.gpl2Only;
     homepage = "https://www.qsl.net/kd2bd/splat.html";
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix
index 27241ec8e3c6..adfb3aff654d 100644
--- a/pkgs/by-name/sr/srb2kart/package.nix
+++ b/pkgs/by-name/sr/srb2kart/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "SRB2Kart is a classic styled kart racer";
+    description = "Classic styled kart racer";
     homepage = "https://mb.srb2.org/threads/srb2kart.25868/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/sr/srt-live-server/package.nix b/pkgs/by-name/sr/srt-live-server/package.nix
index 47d1d58419e2..ddf5afeedcde 100644
--- a/pkgs/by-name/sr/srt-live-server/package.nix
+++ b/pkgs/by-name/sr/srt-live-server/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "srt live server for low latency";
+    description = "Open-source low latency livestreaming server, based on Secure Reliable Tranport (SRT)";
     license = licenses.mit;
     homepage = "https://github.com/Edward-Wu/srt-live-server";
     maintainers = with maintainers; [ shamilton ];
diff --git a/pkgs/by-name/ss/ssh-agents/package.nix b/pkgs/by-name/ss/ssh-agents/package.nix
index 7c15a763f42f..9dda59d4bb0c 100644
--- a/pkgs/by-name/ss/ssh-agents/package.nix
+++ b/pkgs/by-name/ss/ssh-agents/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
-    description = "ssh-agents capable of spawning and maintaining multiple ssh-agents across terminals";
+    description = "Spawn and maintain multiple ssh-agents across terminals";
     longDescription = ''
       The SSH agent is usually spawned by running eval $(ssh-agent), however this
       spawns a new SSH agent at every invocation. This project provides an
diff --git a/pkgs/by-name/st/stderred/package.nix b/pkgs/by-name/st/stderred/package.nix
index b23785361685..997a1cc1a623 100644
--- a/pkgs/by-name/st/stderred/package.nix
+++ b/pkgs/by-name/st/stderred/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src";
 
   meta = with lib; {
-    description = "stderr in red";
+    description = "Colorize all stderr output that goes to terminal, making it distinguishable from stdout";
     homepage = "https://github.com/sickill/stderred";
     license = licenses.mit;
     maintainers = with maintainers; [ vojta001 ];
diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index 74a0d403a440..297f488a677e 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
   ];
 
   meta = with lib; {
-    description = "step plugin to manage keys and certificates on cloud KMSs and HSMs";
+    description = "Step plugin to manage keys and certificates on cloud KMSs and HSMs";
     homepage = "https://smallstep.com/cli/";
     license = licenses.asl20;
     maintainers = with maintainers; [ qbit ];
diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix
index 90740339153b..541104c1c0ce 100644
--- a/pkgs/by-name/st/sticky/package.nix
+++ b/pkgs/by-name/st/sticky/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "Sticky notes app for the linux desktop";
+    description = "Sticky notes app for the Linux desktop";
     mainProgram = "sticky";
     homepage = "https://github.com/linuxmint/sticky";
     license = licenses.gpl2Only;
diff --git a/pkgs/by-name/st/strfry/package.nix b/pkgs/by-name/st/strfry/package.nix
index be99854c55f0..f9ed884fbcc7 100644
--- a/pkgs/by-name/st/strfry/package.nix
+++ b/pkgs/by-name/st/strfry/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Strfry: A nostr relay implementation in C++";
+    description = "Nostr relay implementation in C++";
     homepage = "https://github.com/hoytech/strfry";
     mainProgram = "strfry";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/st/stuntman/package.nix b/pkgs/by-name/st/stuntman/package.nix
index 580378ad350c..411d164cab60 100644
--- a/pkgs/by-name/st/stuntman/package.nix
+++ b/pkgs/by-name/st/stuntman/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "STUNTMAN - an open source STUN server and client";
+    description = "Open source STUN server and client";
     homepage = "https://www.stunprotocol.org/";
     license = licenses.asl20;
     maintainers = with maintainers; [ mattchrist ];
diff --git a/pkgs/by-name/su/subnetcalc/package.nix b/pkgs/by-name/su/subnetcalc/package.nix
index 38801ab0df7d..4b63fe30957c 100644
--- a/pkgs/by-name/su/subnetcalc/package.nix
+++ b/pkgs/by-name/su/subnetcalc/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "SubNetCalc is an IPv4/IPv6 subnet address calculator";
+    description = "IPv4/IPv6 subnet address calculator";
     homepage = "https://www.uni-due.de/~be0001/subnetcalc/";
     license = lib.licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 3ebb574901be..dda3283106dc 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "Surrealist is the ultimate way to visually manage your SurrealDB database";
+    description = "Visual management of your SurrealDB database";
     homepage = "https://surrealdb.com/surrealist";
     license = licenses.mit;
     mainProgram = "surrealist";
diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix
index 4d4a94e4a286..1d15c5cdc2a4 100644
--- a/pkgs/by-name/sw/sway-overfocus/package.nix
+++ b/pkgs/by-name/sw/sway-overfocus/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = ''"Better" focus navigation for sway and i3.'';
+    description = "Better focus navigation for sway and i3";
     homepage = "https://github.com/korreman/sway-overfocus";
     changelog = "https://github.com/korreman/sway-overfocus/releases/tag/${src.rev}";
     license = licenses.mit;
diff --git a/pkgs/by-name/sw/swaylock-fancy/package.nix b/pkgs/by-name/sw/swaylock-fancy/package.nix
index 23853af8e8ba..eae17cde4c1e 100644
--- a/pkgs/by-name/sw/swaylock-fancy/package.nix
+++ b/pkgs/by-name/sw/swaylock-fancy/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "This is an swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text";
+    description = "swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text";
     homepage = "https://github.com/Big-B/swaylock-fancy";
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/by-name/sy/symfpu/package.nix b/pkgs/by-name/sy/symfpu/package.nix
index 791431770d4b..7d7e2f7b9f73 100644
--- a/pkgs/by-name/sy/symfpu/package.nix
+++ b/pkgs/by-name/sy/symfpu/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "(concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point";
+    description = "Implementation of SMT-LIB / IEEE-754 operations in terms of bit-vector operations";
     homepage = "https://github.com/martin-cs/symfpu";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix
index dad1a903dcef..e7a840ba1e06 100644
--- a/pkgs/by-name/sy/symphony/package.nix
+++ b/pkgs/by-name/sy/symphony/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "SYMPHONY is an open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs) written in C with a number of unique features";
+    description = "Open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs)";
     homepage = "https://www.coin-or.org/SYMPHONY/index.htm";
     changelog = "https://github.com/coin-or/SYMPHONY/blob/${version}/CHANGELOG.md";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index ce36191d7c9b..94c5cf104869 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   ];
 
   meta = with lib; {
-    description = "curses based mediawiki browser";
+    description = "Curses-based mediawiki browser";
     homepage = "https://github.com/nerdypepper/taizen";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index bb072cb504c3..f3567a20f641 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Tana is an intelligent all-in-one workspace";
+    description = "Intelligent all-in-one workspace";
     longDescription = ''
       At its core, Tana is an outline editor which can be extended to
       cover multiple use-cases and different workflows.
diff --git a/pkgs/by-name/te/tectonic/package.nix b/pkgs/by-name/te/tectonic/package.nix
index 0546bdc07dfe..200c6f8b6368 100644
--- a/pkgs/by-name/te/tectonic/package.nix
+++ b/pkgs/by-name/te/tectonic/package.nix
@@ -53,7 +53,7 @@ symlinkJoin {
   '';
 
   meta = tectonic-unwrapped.meta // {
-    description = "Tectonic TeX/LaTeX engine, wrapped with a compatible biber";
+    description = "TeX/LaTeX engine, wrapped with a compatible biber";
     maintainers = with lib.maintainers; [
       doronbehar
       bryango
diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix
index f412c0d7b28b..5ea5956a9318 100644
--- a/pkgs/by-name/te/telescope/package.nix
+++ b/pkgs/by-name/te/telescope/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Telescope is a w3m-like browser for Gemini";
+    description = "w3m-like browser for Gemini";
     homepage = "https://telescope-browser.org/";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ heph2 ];
diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix
index 2f9bd7a583ec..e72fd85e5e55 100644
--- a/pkgs/by-name/th/therion/package.nix
+++ b/pkgs/by-name/th/therion/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Therion – cave surveying software";
+    description = "Cave surveying software";
     homepage = "https://therion.speleo.sk/";
     changelog = "https://github.com/therion/therion/blob/${src.rev}/CHANGES";
     license = lib.licenses.gpl2Only;
diff --git a/pkgs/by-name/th/thunderbolt/package.nix b/pkgs/by-name/th/thunderbolt/package.nix
index b1a3986b66e9..2d324ac60428 100644
--- a/pkgs/by-name/th/thunderbolt/package.nix
+++ b/pkgs/by-name/th/thunderbolt/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
 
   meta = {
-    description = "Thunderbolt(TM) user-space components";
+    description = "Thunderbolt user-space components";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.ryantrinkle ];
     homepage = "https://01.org/thunderbolt-sw";
diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index a46d81a4a2d4..f17e00fba28c 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data";
+    description = "Allows you to manage massive dense and sparse multi-dimensional array data";
     homepage = "https://github.com/TileDB-Inc/TileDB";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 696d4d4806e9..61a0404dd752 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "Tinymist is an integrated language service for Typst";
+    description = "Integrated language service for Typst";
     homepage = "https://github.com/Myriad-Dreamin/tinymist";
     changelog = "https://github.com/Myriad-Dreamin/tinymist/blob/v${finalAttrs.version}/editors/vscode/CHANGELOG.md";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 60d1458e3d39..233f578d6596 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -246,7 +246,7 @@ chosenStdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description =
-      "PKCS#11 interface for TPM2 hardware."
+      "PKCS#11 interface for TPM2 hardware"
       + lib.optionalString (extraDescription != null) " ${extraDescription}";
     homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
     license = lib.licenses.bsd2;
diff --git a/pkgs/by-name/tu/tun2socks/package.nix b/pkgs/by-name/tu/tun2socks/package.nix
index 4ae079992b30..a2d6f20fdf3c 100644
--- a/pkgs/by-name/tu/tun2socks/package.nix
+++ b/pkgs/by-name/tu/tun2socks/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
 
   meta = {
     homepage = "https://github.com/xjasonlyu/tun2socks";
-    description = "tun2socks - powered by gVisor TCP/IP stack";
+    description = "Routes network traffic from any application through a proxy";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ nickcao ];
     mainProgram = "tun2socks";
diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index c3a22f4f7dee..84f748967454 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "This is the command line interface (CLI) to Turso";
+    description = "CLI for Turso";
     homepage = "https://turso.tech";
     mainProgram = "turso";
     license = licenses.mit;
diff --git a/pkgs/by-name/ty/typesense/package.nix b/pkgs/by-name/ty/typesense/package.nix
index 5558ef38ad5e..0c8d8895e3b7 100644
--- a/pkgs/by-name/ty/typesense/package.nix
+++ b/pkgs/by-name/ty/typesense/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://typesense.org";
-    description = "Typesense is a fast, typo-tolerant search engine for building delightful search experiences";
+    description = "Fast, typo-tolerant search engine for building delightful search experiences";
     mainProgram = "typesense-server";
     license = licenses.gpl3;
     # There has been an attempt at building this from source, which were deemed
diff --git a/pkgs/by-name/uf/uftpd/package.nix b/pkgs/by-name/uf/uftpd/package.nix
index fd1aa0aad2a7..a4b6c318aae0 100644
--- a/pkgs/by-name/uf/uftpd/package.nix
+++ b/pkgs/by-name/uf/uftpd/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "FTP/TFTP server for Linux that just works™";
+    description = "FTP/TFTP server for Linux that just works";
     homepage = "https://troglobit.com/projects/uftpd/";
     license = licenses.isc;
     platforms = platforms.unix;
diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix
index 8feaea98ae70..f638a6b3691e 100644
--- a/pkgs/by-name/uh/uhk-agent/package.nix
+++ b/pkgs/by-name/uh/uhk-agent/package.nix
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Agent is the configuration application of the Ultimate Hacking Keyboard";
+    description = "Configuration application of the Ultimate Hacking Keyboard";
     homepage = "https://github.com/UltimateHackingKeyboard/agent";
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/um/umoci/package.nix b/pkgs/by-name/um/umoci/package.nix
index a5ff8b1139df..2cf236be2663 100644
--- a/pkgs/by-name/um/umoci/package.nix
+++ b/pkgs/by-name/um/umoci/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "umoci modifies Open Container images";
+    description = "Modifies Open Container images";
     homepage = "https://umo.ci";
     license = licenses.asl20;
     maintainers = with maintainers; [ zokrezyl ];
diff --git a/pkgs/by-name/un/unicode-idna/package.nix b/pkgs/by-name/un/unicode-idna/package.nix
index 07fe5ca5e945..a10c85849d5c 100644
--- a/pkgs/by-name/un/unicode-idna/package.nix
+++ b/pkgs/by-name/un/unicode-idna/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "unicode IDNA compatible processing data";
+    description = "Unicode IDNA compatible processing data";
     homepage = "http://www.unicode.org/reports/tr46/";
     license = lib.licenses.unicode-dfs-2016;
     maintainers = with lib.maintainers; [ jopejoe1 ];
diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix
index b1972404c58d..71b2060995a9 100644
--- a/pkgs/by-name/ut/ut/package.nix
+++ b/pkgs/by-name/ut/ut/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = with lib; {
-    description = "UT: C++20 μ(micro)/Unit Testing Framework";
+    description = "C++20 μ(micro)/Unit Testing Framework";
     homepage = "https://github.com/boost-ext/ut";
     license = licenses.boost;
     maintainers = with maintainers; [ matthewcroughan ];
diff --git a/pkgs/by-name/vc/vcs_query/package.nix b/pkgs/by-name/vc/vcs_query/package.nix
index 0449f3eac05e..f3dbc2b031fb 100644
--- a/pkgs/by-name/vc/vcs_query/package.nix
+++ b/pkgs/by-name/vc/vcs_query/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/mageta/vcs_query";
-    description = "eMail query-command to use vCards in mutt and Vim";
+    description = "Email query-command to use vCards in mutt and Vim";
     license = licenses.mit;
     maintainers = with maintainers; [ ma27 ];
     mainProgram = "vcs_query";
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 17839da6b504..950e292be954 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Vencord web extension";
+    description = "Cutest Discord client mod";
     homepage = "https://github.com/Vendicated/Vencord";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index c449d32cbaac..c9bb6621f160 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   meta = with lib; {
-    description = "Viceroy provides local testing for developers working with Compute@Edge";
+    description = "Provides local testing for developers working with Compute@Edge";
     mainProgram = "viceroy";
     homepage = "https://github.com/fastly/Viceroy";
     license = licenses.asl20;
diff --git a/pkgs/by-name/vu/vultr/package.nix b/pkgs/by-name/vu/vultr/package.nix
index 705382d7dea9..06a9dd2e5641 100644
--- a/pkgs/by-name/vu/vultr/package.nix
+++ b/pkgs/by-name/vu/vultr/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "Vultr CLI and API client library";
+    description = "CLI and API client library";
     mainProgram = "vultr";
     homepage = "https://jamesclonk.github.io/vultr";
     changelog = "https://github.com/JamesClonk/vultr/releases/tag/${src.rev}";
diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index cda146541457..3cf6e2fc91b0 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -23,7 +23,7 @@ buildGoModule {
   doCheck = false;
 
   meta = with lib; {
-    description = "Wait4X allows you to wait for a port or a service to enter the requested state";
+    description = "Allows you to wait for a port or a service to enter the requested state";
     homepage = "https://github.com/wait4x/wait4x";
     license = licenses.asl20;
     maintainers = with maintainers; [ jfvillablanca ];
diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 507d344b3fd4..78b12de61204 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Self hostable application for saving web pages";
+    description = "Self-hostable application for saving web pages";
     longDescription = ''
       wallabag is a self-hostable PHP application allowing you to not
       miss any content anymore. Click, save and read it when you can.
diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index ca065175f1e2..54f40ea3c6dd 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "Wastebin is a pastebin";
+    description = "Pastebin service";
     homepage = "https://github.com/matze/wastebin";
     changelog = "https://github.com/matze/wastebin/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix
index 12948799f117..7187e28bc715 100644
--- a/pkgs/by-name/we/weggli/package.nix
+++ b/pkgs/by-name/we/weggli/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "Weggli is a fast and robust semantic search tool for C and C++ codebases";
+    description = "Fast and robust semantic search tool for C and C++ codebases";
     homepage = "https://github.com/weggli-rs/weggli";
     changelog = "https://github.com/weggli-rs/weggli/releases/tag/v${version}";
     mainProgram = "weggli";
diff --git a/pkgs/by-name/wq/wqy_microhei/package.nix b/pkgs/by-name/wq/wqy_microhei/package.nix
index aa2569ec0e45..c48ea172229b 100644
--- a/pkgs/by-name/wq/wqy_microhei/package.nix
+++ b/pkgs/by-name/wq/wqy_microhei/package.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "(mainly) Chinese Unicode font";
+    description = "Chinese Unicode font optimized for screen display";
     homepage = "http://wenq.org";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.pkmx ];
diff --git a/pkgs/by-name/wq/wqy_zenhei/package.nix b/pkgs/by-name/wq/wqy_zenhei/package.nix
index e03ec3aa4d63..4003cc53d83d 100644
--- a/pkgs/by-name/wq/wqy_zenhei/package.nix
+++ b/pkgs/by-name/wq/wqy_zenhei/package.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "(mainly) Chinese Unicode font";
+    description = "Chinese Unicode font with full CJK coverage";
     homepage = "http://wenq.org";
     license = lib.licenses.gpl2; # with font embedding exceptions
     maintainers = [ lib.maintainers.pkmx ];
diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index 5e4cbc52a1cf..7d54c0a76891 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "XFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data";
+    description = "Open source QCD fit framework designed to extract PDFs and assess the impact of new data";
     license = licenses.gpl3;
     homepage = "https://www.xfitter.org/xFitter";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/xk/xkbd/package.nix b/pkgs/by-name/xk/xkbd/package.nix
index ef41440659a6..f28d2228637f 100644
--- a/pkgs/by-name/xk/xkbd/package.nix
+++ b/pkgs/by-name/xk/xkbd/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/mahatma-kaganovich/xkbd";
-    description = "onscreen soft keyboard for X11";
+    description = "On-screen soft keyboard for X11";
     license = licenses.gpl2Plus;
     maintainers = [ ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 197e212baf72..5600a859cdd0 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -14,7 +14,7 @@ appimageTools.wrapType2 rec {
   };
 
   meta = {
-    description = "xLights is a sequencer for Lights. xLights has usb and E1.31 drivers. You can create sequences in this object oriented program. You can create playlists, schedule them, test your hardware, convert between different sequencers";
+    description = "Sequencer for lights with USB and E1.31 drivers";
     homepage = "https://xlights.org";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ kashw2 ];
diff --git a/pkgs/by-name/xl/xlink/package.nix b/pkgs/by-name/xl/xlink/package.nix
index 111091c03f07..de021dd3fa94 100644
--- a/pkgs/by-name/xl/xlink/package.nix
+++ b/pkgs/by-name/xl/xlink/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "XLink library for communication with Myriad VPUs";
+    description = "Library for communication with Myriad VPUs";
     homepage = "https://github.com/luxonis/XLink";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/xm/xmloscopy/package.nix b/pkgs/by-name/xm/xmloscopy/package.nix
index b547ede58132..faab84dc3cef 100644
--- a/pkgs/by-name/xm/xmloscopy/package.nix
+++ b/pkgs/by-name/xm/xmloscopy/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "wtf is my docbook broken?";
+    description = "XML debugger";
     mainProgram = "xmloscopy";
     homepage = "https://github.com/grahamc/xmloscopy";
     license = licenses.mit;
diff --git a/pkgs/by-name/ya/yazi/plugins/nord/default.nix b/pkgs/by-name/ya/yazi/plugins/nord/default.nix
index 57d4b6e5d012..6f9eb157ebb6 100644
--- a/pkgs/by-name/ya/yazi/plugins/nord/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/nord/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "nordic yazi";
+    description = "Nordic yazi";
     homepage = "https://github.com/stepbrobd/nord.yazi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stepbrobd ];
diff --git a/pkgs/by-name/yu/yubihsm-connector/package.nix b/pkgs/by-name/yu/yubihsm-connector/package.nix
index 0b0299fdcc8f..990766665a71 100644
--- a/pkgs/by-name/yu/yubihsm-connector/package.nix
+++ b/pkgs/by-name/yu/yubihsm-connector/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "yubihsm-connector performs the communication between the YubiHSM 2 and applications that use it";
+    description = "Performs the communication between the YubiHSM 2 and applications that use it";
     homepage = "https://developers.yubico.com/yubihsm-connector/";
     maintainers = with maintainers; [ matthewcroughan ];
     license = licenses.asl20;
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
index 3a7bf5564bfc..4f9354ea4316 100644
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "fortify3" ];
 
   meta = with lib; {
-    description = "yubihsm-shell and libyubihsm";
+    description = "Thin wrapper around libyubihsm providing both an interactive and command-line interface to a YubiHSM";
     homepage = "https://github.com/Yubico/yubihsm-shell";
     maintainers = with maintainers; [ matthewcroughan ];
     license = licenses.asl20;
diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 062c8842d1e1..bd51f651c940 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -128,7 +128,7 @@ stdenvNoCC.mkDerivation {
   };
 
   meta = with lib; {
-    description = "Zammad, a web-based, open source user support/ticketing solution";
+    description = "Web-based, open source user support/ticketing solution";
     homepage = "https://zammad.org";
     license = licenses.agpl3Plus;
     platforms = [
diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix
index d1fbe8623e25..8278d2871aff 100644
--- a/pkgs/by-name/zi/zile/package.nix
+++ b/pkgs/by-name/zi/zile/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/zile/";
     changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}";
-    description = "Zile Implements Lua Editors";
+    description = "Implements Lua Editors";
     longDescription = ''
       GNU Zile is a text editor development kit, so that you can (relatively)
       quickly develop your own ideal text editor without reinventing the wheel
diff --git a/pkgs/by-name/zi/zipkin/package.nix b/pkgs/by-name/zi/zipkin/package.nix
index 3549578deb39..c05b420f2de7 100644
--- a/pkgs/by-name/zi/zipkin/package.nix
+++ b/pkgs/by-name/zi/zipkin/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --add-flags "-cp $out/share/java/zipkin-server-${version}-exec.jar org.springframework.boot.loader.JarLauncher"
   '';
   meta = with lib; {
-    description = "Zipkin distributed tracing system";
+    description = "Distributed tracing system";
     homepage = "https://zipkin.io/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.asl20;
diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix
index ced854e96993..6dce56c92190 100644
--- a/pkgs/by-name/zl/zluda/package.nix
+++ b/pkgs/by-name/zl/zluda/package.nix
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    description = "ZLUDA - CUDA on non-Nvidia GPUs";
+    description = "CUDA on non-Nvidia GPUs";
     homepage = "https://github.com/vosen/ZLUDA";
     changelog = "https://github.com/vosen/ZLUDA/releases/tag/${src.rev}";
     license = lib.licenses.mit;
diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index 3fa02d979775..01f91f7b9522 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -140,7 +140,7 @@ with self;
   ppx_hash = janePackage {
     pname = "ppx_hash";
     hash = "1dfsfvhiyp1mnf24mr93svpdn432kla0y7x631lssacxxp2sadbg";
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+    meta.description = "PPX rewriter that generates hash functions from type expressions and definitions";
     propagatedBuildInputs = [
       ppx_compare
       ppx_sexp_conv
@@ -178,7 +178,7 @@ with self;
   ppx_sexp_message = janePackage {
     pname = "ppx_sexp_message";
     hash = "0yskd6v48jc6wa0nhg685kylh1n9qb6b7d1wglr9wnhl9sw990mc";
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "PPX rewriter for easy construction of s-expressions";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -227,7 +227,7 @@ with self;
   bin_prot = janePackage {
     pname = "bin_prot";
     hash = "0hh6s7g9s004z35hsr8z6nw5phlcvcd6g2q3bj4f0s1s0anlsswm";
-    meta.description = "A binary protocol generator";
+    meta.description = "Binary protocol generator";
     propagatedBuildInputs = [
       ppx_compare
       ppx_custom_printf
@@ -309,14 +309,14 @@ with self;
   ppx_pipebang = janePackage {
     pname = "ppx_pipebang";
     hash = "1p4pdpl8h2bblbhpn5nk17ri4rxpz0aih0gffg3cl1186irkj0xj";
-    meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+    meta.description = "PPX rewriter that inlines reverse application operators `|>` and `|!`";
     propagatedBuildInputs = [ ppxlib ];
   };
 
   ppx_sexp_value = janePackage {
     pname = "ppx_sexp_value";
     hash = "1mg81834a6dx1x7x9zb9wc58438cabjjw08yhkx6i386hxfy891p";
-    meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+    meta.description = "PPX rewriter that simplifies building s-expressions from ocaml values";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix
index df1fdaaaf74f..d1cb388cd920 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -15,7 +15,7 @@ with self;
     version = "0.14.1";
     minimalOCamlVersion = "4.09";
     hash = "0wm2081kzd5zsqs516cn3f975bnnmnyynv8fa818gmfa65i6mxm8";
-    meta.description = "A library that makes it nicer to work with nested functional data structures";
+    meta.description = "Library that makes it nicer to work with nested functional data structures";
     propagatedBuildInputs = [ higher_kinded ];
   };
 
@@ -99,7 +99,7 @@ with self;
   async_js = janePackage {
     pname = "async_js";
     hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v";
-    meta.description = "A small library that provide Async support for JavaScript platforms";
+    meta.description = "Small library that provide Async support for JavaScript platforms";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_rpc_kernel
@@ -237,7 +237,7 @@ with self;
     pname = "bin_prot";
     hash = "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A binary protocol generator";
+    meta.description = "Binary protocol generator";
     propagatedBuildInputs = [
       ppx_compare
       ppx_custom_printf
@@ -250,7 +250,7 @@ with self;
   bonsai = janePackage {
     pname = "bonsai";
     hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ ppx_pattern_bind ];
     propagatedBuildInputs = [ incr_dom ];
   };
@@ -389,7 +389,7 @@ with self;
     version = "0.14.1";
     minimalOCamlVersion = "4.09";
     hash = "05jvxgqsx3j2v8rqpd91ah76dgc1q2dz38kjklmx0vms4r4gvlsx";
-    meta.description = "A library with an encoding of higher kinded types in OCaml";
+    meta.description = "Library with an encoding of higher kinded types in OCaml";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -399,7 +399,7 @@ with self;
   incr_dom = janePackage {
     pname = "incr_dom";
     hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_js
@@ -622,7 +622,7 @@ with self;
     pname = "ppx_hash";
     hash = "1zf03xdrg4jig7pdcrdpbabyjkdpifb31z2z1bf9wfdawybdhwkq";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+    meta.description = "PPX rewriter that generates hash functions from type expressions and definitions";
     propagatedBuildInputs = [
       ppx_compare
       ppx_sexp_conv
@@ -736,7 +736,7 @@ with self;
     pname = "ppx_pattern_bind";
     hash = "0yxkwnn30nxgrspi191zma95bgrh134aqh2bnpj3wg0245ki55zv";
     minimalOCamlVersion = "4.07";
-    meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
+    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
     propagatedBuildInputs = [ ppx_let ];
   };
 
@@ -744,14 +744,14 @@ with self;
     pname = "ppx_pipebang";
     hash = "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+    meta.description = "PPX rewriter that inlines reverse application operators `|>` and `|!`";
     propagatedBuildInputs = [ ppxlib ];
   };
 
   ppx_python = janePackage {
     pname = "ppx_python";
     hash = "0gk4nqz4i9v3hwjg5mvgpgwj0dfcgpyc7ikba93cafyhn6fy83zk";
-    meta.description = "A [@@deriving] plugin to generate Python conversion functions ";
+    meta.description = "[@@deriving] plugin to generate Python conversion functions";
     # Compatibility with ppxlib 0.23
     patches = fetchpatch {
       url = "https://github.com/janestreet/ppx_python/commit/b2fe0040cc39fa6164de868f8a20edb38d81170e.patch";
@@ -782,7 +782,7 @@ with self;
     version = "0.14.1";
     hash = "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "PPX rewriter for easy construction of s-expressions";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -793,7 +793,7 @@ with self;
     pname = "ppx_sexp_value";
     hash = "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+    meta.description = "PPX rewriter that simplifies building s-expressions from ocaml values";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -856,7 +856,7 @@ with self;
   pythonlib = janePackage {
     pname = "pythonlib";
     hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639";
-    meta.description = "A library to help writing wrappers around ocaml code for python";
+    meta.description = "Library to help writing wrappers around ocaml code for python";
     meta.broken = lib.versionAtLeast ocaml.version "4.13";
     propagatedBuildInputs = [
       ppx_expect
@@ -950,7 +950,7 @@ with self;
       base
       ppx_jane
     ];
-    meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+    meta.description = "Library to use CSS-style selectors to traverse sexp trees";
   };
 
   sexplib0 = janePackage {
@@ -1005,7 +1005,7 @@ with self;
   splay_tree = janePackage {
     pname = "splay_tree";
     hash = "1xbzzbqb054hl1v1zcgfwdgzqihni3a0dmvrric9xggmgn4ycmqq";
-    meta.description = "A splay tree implementation";
+    meta.description = "Splay tree implementation";
     propagatedBuildInputs = [ core_kernel ];
   };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix
index 89ca0e0c42ef..368f4c420304 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@@ -27,7 +27,7 @@ with self;
     pname = "abstract_algebra";
     minimalOCamlVersion = "4.08";
     hash = "12imf6ibm7qb8r1fpqnrl20x2z14zl3ri1vzg0z8qby9l8bv2fbd";
-    meta.description = "A small library describing abstract algebra concepts";
+    meta.description = "Small library describing abstract algebra concepts";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -38,7 +38,7 @@ with self;
     pname = "accessor";
     minimalOCamlVersion = "4.09";
     hash = "17rzf0jpc9s3yrxcnn630jhgsw5mrnrhwbfh62hqxqanascc5rxh";
-    meta.description = "A library that makes it nicer to work with nested functional data structures";
+    meta.description = "Library that makes it nicer to work with nested functional data structures";
     propagatedBuildInputs = [ higher_kinded ];
   };
 
@@ -118,7 +118,7 @@ with self;
   async_js = janePackage {
     pname = "async_js";
     hash = "184j077bz686k5lrqswircnrdqldb316ngpzq7xri1pcsl39sy3q";
-    meta.description = "A small library that provide Async support for JavaScript platforms";
+    meta.description = "Small library that provide Async support for JavaScript platforms";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_rpc_kernel
@@ -221,7 +221,7 @@ with self;
   async_websocket = janePackage {
     pname = "async_websocket";
     hash = "16ixqfnx9jp77bvx11dlzsq0pzfpyiif60hl2q06zncyswky9xgb";
-    meta.description = "A library that implements the websocket protocol on top of Async";
+    meta.description = "Library that implements the websocket protocol on top of Async";
     propagatedBuildInputs = [
       async
       cryptokit
@@ -279,7 +279,7 @@ with self;
     pname = "bin_prot";
     hash = "1qfqglscc25wwnjx7byqmjcnjww1msnr8940gyg8h93wdq43fjnh";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A binary protocol generator";
+    meta.description = "Binary protocol generator";
     propagatedBuildInputs = [
       ppx_compare
       ppx_custom_printf
@@ -292,7 +292,7 @@ with self;
   bonsai = janePackage {
     pname = "bonsai";
     hash = "150zx2g1dmhyrxwqq8j7f2m3hjpmk5bk182ihx2gdbarhw1ainpm";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ ppx_pattern_bind ];
     nativeBuildInputs = [
       js_of_ocaml-compiler
@@ -343,7 +343,7 @@ with self;
     pname = "cohttp_static_handler";
     version = "0.15.0";
     hash = "sha256-ENaH8ChvjeMc9WeNIhkeNBB7YK9vB4lw95o6FFZI1ys=";
-    meta.description = "A library for easily creating a cohttp handler for static files";
+    meta.description = "Library for easily creating a cohttp handler for static files";
     propagatedBuildInputs = [ cohttp-async ];
   };
 
@@ -491,7 +491,7 @@ with self;
     pname = "file_path";
     minimalOCamlVersion = "4.11";
     hash = "0vjvxviryywwwfdazcijwhpajp2d4mavlki7lj4qaafjrw62x14k";
-    meta.description = "A library for typed manipulation of UNIX-style file paths";
+    meta.description = "Library for typed manipulation of UNIX-style file paths";
     propagatedBuildInputs = [
       async
       core
@@ -506,7 +506,7 @@ with self;
   fuzzy_match = janePackage {
     pname = "fuzzy_match";
     hash = "0s5w81698b07l5m11nwx8xbjcpmp54dnf5fcrnlva22jrlsf14h4";
-    meta.description = "A library for fuzzy string matching";
+    meta.description = "Library for fuzzy string matching";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -517,7 +517,7 @@ with self;
     pname = "fzf";
     minimalOCamlVersion = "4.08";
     hash = "1ha0i6dx5bgwzbdi4rn98wjwi2imv5p2i7qs7hy0c6cmg88xbdry";
-    meta.description = "A library for running the fzf command line tool";
+    meta.description = "Library for running the fzf command line tool";
     propagatedBuildInputs = [
       async
       core_kernel
@@ -532,7 +532,7 @@ with self;
     pname = "higher_kinded";
     minimalOCamlVersion = "4.09";
     hash = "0rafxxajqswi070h8sinhjna0swh1hc6d7i3q7y099yj3wlr2y1l";
-    meta.description = "A library with an encoding of higher kinded types in OCaml";
+    meta.description = "Library with an encoding of higher kinded types in OCaml";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -542,7 +542,7 @@ with self;
   incr_dom = janePackage {
     pname = "incr_dom";
     hash = "1sija9w2im8vdp61h387w0mww9hh7jgkgsjcccps4lbv936ac7c1";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_js
@@ -598,7 +598,7 @@ with self;
   jsonaf = janePackage {
     pname = "jsonaf";
     hash = "1j9rn8vsvfpgmdpmdqb5qhvss5171j8n3ii1bcgnavqinchbvqa6";
-    meta.description = "A library for parsing, manipulating, and serializing data structured as JSON";
+    meta.description = "Library for parsing, manipulating, and serializing data structured as JSON";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -793,7 +793,7 @@ with self;
   ppx_css = janePackage {
     pname = "ppx_css";
     hash = "09dpmj3f3m3z1ji9hq775iqr3cfmv5gh7q9zlblizj4wx4y0ibyi";
-    meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within";
+    meta.description = "PPX that takes in css strings and produces a module for accessing the unique names defined within";
     propagatedBuildInputs = [
       core_kernel
       ppxlib
@@ -867,7 +867,7 @@ with self;
     pname = "ppx_hash";
     hash = "15agkwavadllzxdv4syjna02083nfnap8qs4yqf5s0adjw73fzyg";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+    meta.description = "PPX rewriter that generates hash functions from type expressions and definitions";
     propagatedBuildInputs = [
       ppx_compare
       ppx_sexp_conv
@@ -1006,7 +1006,7 @@ with self;
     pname = "ppx_pattern_bind";
     hash = "01nfdk9yvk92r7sjl4ngxfsx8fyqh2dsjxz0i299nszv9jc4rn4f";
     minimalOCamlVersion = "4.07";
-    meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
+    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
     propagatedBuildInputs = [ ppx_let ];
   };
 
@@ -1014,14 +1014,14 @@ with self;
     pname = "ppx_pipebang";
     hash = "0sm5dghyalhws3hy1cc2ih36az1k4q02hcgj6l26gwyma3y4irvq";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+    meta.description = "PPX rewriter that inlines reverse application operators `|>` and `|!`";
     propagatedBuildInputs = [ ppxlib ];
   };
 
   ppx_python = janePackage {
     pname = "ppx_python";
     hash = "1d2wf0rkvxg07q6xq2zmxh6hmvnwlsmny3mm92jsg1s7bdl39gap";
-    meta.description = "A [@@deriving] plugin to generate Python conversion functions ";
+    meta.description = "[@@deriving] plugin to generate Python conversion functions";
     propagatedBuildInputs = [
       ppx_base
       ppxlib
@@ -1046,7 +1046,7 @@ with self;
     pname = "ppx_sexp_message";
     hash = "0a7hx50bkkc5n5msc3zzc4ixnp7674x3mallknb9j31jnd8l90nj";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "PPX rewriter for easy construction of s-expressions";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1057,7 +1057,7 @@ with self;
     pname = "ppx_sexp_value";
     hash = "0kz83j9v6yz3v8c6vr9ilhkcci4hhjd6i6r6afnx72jh6i7d3hnv";
     minimalOCamlVersion = "4.04.2";
-    meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+    meta.description = "PPX rewriter that simplifies building s-expressions from ocaml values";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1120,7 +1120,7 @@ with self;
   profunctor = janePackage {
     pname = "profunctor";
     hash = "151vk0cagjwn0isnnwryn6gmvnpds4dyj1in9jvv5is8yij203gg";
-    meta.description = "A library providing a signature for simple profunctors and traversal of a record";
+    meta.description = "Library providing a signature for simple profunctors and traversal of a record";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1139,7 +1139,7 @@ with self;
     pname = "pythonlib";
     version = "0.15.1";
     hash = "sha256-j8WXVTEiBmHtoTjkbnIh31vC4IghfAMaEL19nDLx3mc=";
-    meta.description = "A library to help writing wrappers around ocaml code for python";
+    meta.description = "Library to help writing wrappers around ocaml code for python";
     buildInputs = [ ppx_optcomp ];
     propagatedBuildInputs = [
       ppx_expect
@@ -1175,7 +1175,7 @@ with self;
   record_builder = janePackage {
     pname = "record_builder";
     hash = "004nqcmwll0vy47mb3d3jlk21cc6adcjy62dkv2k966n9jkh472h";
-    meta.description = "A library which provides traversal of records with an applicative";
+    meta.description = "Library which provides traversal of records with an applicative";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1258,7 +1258,7 @@ with self;
       base
       ppx_jane
     ];
-    meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+    meta.description = "Library to use CSS-style selectors to traverse sexp trees";
   };
 
   sexplib0 = janePackage {
@@ -1313,7 +1313,7 @@ with self;
   splay_tree = janePackage {
     pname = "splay_tree";
     hash = "1jxfh7f2hjrms5pm2cy1cf6ivphgiqqvyyr9hdcz8d3vi612p4dm";
-    meta.description = "A splay tree implementation";
+    meta.description = "Splay tree implementation";
     propagatedBuildInputs = [ core_kernel ];
   };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix
index 75ddf6c2ba4b..6f2ec4554374 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix
@@ -26,7 +26,7 @@ with self;
   abstract_algebra = janePackage {
     pname = "abstract_algebra";
     hash = "sha256-hAZzc2ypbGE/8mxxk4GZqr17JlIYv71gZJMQ4plsK38=";
-    meta.description = "A small library describing abstract algebra concepts";
+    meta.description = "Small library describing abstract algebra concepts";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -36,7 +36,7 @@ with self;
   accessor = janePackage {
     pname = "accessor";
     hash = "sha256-yClfUXqwVoipF4WqbqC6VBVYc6t8MZYVoHGjchH7XQA=";
-    meta.description = "A library that makes it nicer to work with nested functional data structures";
+    meta.description = "Library that makes it nicer to work with nested functional data structures";
     propagatedBuildInputs = [ higher_kinded ];
   };
 
@@ -126,7 +126,7 @@ with self;
   async_js = janePackage {
     pname = "async_js";
     hash = "sha256-JyF1busOv9JWxp55oaxBozIQyCKlmAY3csBA4/98qy0=";
-    meta.description = "A small library that provide Async support for JavaScript platforms";
+    meta.description = "Small library that provide Async support for JavaScript platforms";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_rpc_kernel
@@ -228,7 +228,7 @@ with self;
   async_websocket = janePackage {
     pname = "async_websocket";
     hash = "sha256-Qy+A8ee6u5Vr05FNeaH/6Sdp9bcq3cnaDYO9OU06VW0=";
-    meta.description = "A library that implements the websocket protocol on top of Async";
+    meta.description = "Library that implements the websocket protocol on top of Async";
     propagatedBuildInputs = [
       async
       cryptokit
@@ -238,7 +238,7 @@ with self;
   babel = janePackage {
     pname = "babel";
     hash = "sha256-nnMliU0d6vtHTYEy9uMi8nMaHvAsEXKN6uNByqZ28+c=";
-    meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility";
+    meta.description = "Library for defining Rpcs that can evolve over time without breaking backward compatibility";
     propagatedBuildInputs = [
       async_rpc_kernel
       core
@@ -296,7 +296,7 @@ with self;
   bidirectional_map = janePackage {
     pname = "bidirectional_map";
     hash = "sha256-YEzOdzanBJaskI2/xN9E3ozWnBXDyxJvY3g/qEE73yI=";
-    meta.description = "A library for bidirectional maps and multimaps";
+    meta.description = "Library for bidirectional maps and multimaps";
   };
 
   bignum = janePackage {
@@ -313,7 +313,7 @@ with self;
   bin_prot = janePackage {
     pname = "bin_prot";
     hash = "sha256-qFkM6TrTLnnFKmzQHktBb68HpBTMYhiURvnRKEoAevk=";
-    meta.description = "A binary protocol generator";
+    meta.description = "Binary protocol generator";
     propagatedBuildInputs = [
       ppx_compare
       ppx_custom_printf
@@ -327,7 +327,7 @@ with self;
   bonsai = janePackage {
     pname = "bonsai";
     hash = "sha256-YJ+qkVG5PLBmioa1gP7y6jwn82smyyYDIwHwhDqNeWM=";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ ppx_pattern_bind ];
     nativeBuildInputs = [
       ppx_css
@@ -383,14 +383,14 @@ with self;
   cohttp_static_handler = janePackage {
     pname = "cohttp_static_handler";
     hash = "sha256-7NCnJVArudBEvWARQUGlJuEq3kSCjpn5YtsLsL04bf4=";
-    meta.description = "A library for easily creating a cohttp handler for static files";
+    meta.description = "Library for easily creating a cohttp handler for static files";
     propagatedBuildInputs = [ cohttp-async ];
   };
 
   content_security_policy = janePackage {
     pname = "content_security_policy";
     hash = "sha256-q/J+ZzeC6txyuRQzR8Hmu7cYJCQbxaMlVEmK8fj0hus=";
-    meta.description = "A library for building content-security policies";
+    meta.description = "Library for building content-security policies";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -480,7 +480,7 @@ with self;
       ppx_jane
       stdio
     ];
-    meta.description = "A library for improving redability of multi-line string constants in code";
+    meta.description = "Library for improving readability of multi-line string constants in code";
   };
 
   delimited_parsing = janePackage {
@@ -502,7 +502,7 @@ with self;
       stored_reversed
       streamable
     ];
-    meta.description = "An interface for diffs";
+    meta.description = "Interface for diffs";
   };
 
   ecaml = janePackage {
@@ -571,7 +571,7 @@ with self;
   file_path = janePackage {
     pname = "file_path";
     hash = "sha256-EEpDZNgUgyeqivRhZgQWWlerl+7OOcvAbjjQ3e1NYOQ=";
-    meta.description = "A library for typed manipulation of UNIX-style file paths";
+    meta.description = "Library for typed manipulation of UNIX-style file paths";
     propagatedBuildInputs = [
       async
       core
@@ -586,7 +586,7 @@ with self;
   fuzzy_match = janePackage {
     pname = "fuzzy_match";
     hash = "sha256-M3yOqP0/OZFbqZZpgDdhJ/FZU3MhKwIXbWjwuMlxe2Q=";
-    meta.description = "A library for fuzzy string matching";
+    meta.description = "Library for fuzzy string matching";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -596,7 +596,7 @@ with self;
   fzf = janePackage {
     pname = "fzf";
     hash = "sha256-IQ2wze34LlOutecDOrPhj3U7MFVJTSjQW+If3QyHoes=";
-    meta.description = "A library for running the fzf command line tool";
+    meta.description = "Library for running the fzf command line tool";
     propagatedBuildInputs = [
       async
       core_kernel
@@ -621,7 +621,7 @@ with self;
   higher_kinded = janePackage {
     pname = "higher_kinded";
     hash = "sha256-aCpYc7f4mrPsGp038YabEyw72cA6GbCKsok+5Hej5P0=";
-    meta.description = "A library with an encoding of higher kinded types in OCaml";
+    meta.description = "Library with an encoding of higher kinded types in OCaml";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -631,7 +631,7 @@ with self;
   incr_dom = janePackage {
     pname = "incr_dom";
     hash = "sha256-fnD/YnaGK6MIy/fL6bDwcoGDJhHo2+1l8dCXxwN28kg=";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_js
@@ -675,7 +675,7 @@ with self;
   indentation_buffer = janePackage {
     pname = "indentation_buffer";
     hash = "sha256-5ayWs7yUnuxh5S3Dp0GbYTkGXttDMomfZak4MHePFbk=";
-    meta.description = "A library for building strings with indentation";
+    meta.description = "Library for building strings with indentation";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -695,7 +695,7 @@ with self;
   janestreet_cpuid = janePackage {
     pname = "janestreet_cpuid";
     hash = "sha256-lN8+8uhcVn3AoApWzqeCe/It1G6f0VgZzFcwFEckejk=";
-    meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction";
+    meta.description = "Library for parsing CPU capabilities out of the `cpuid` instruction";
     propagatedBuildInputs = [
       core
       core_kernel
@@ -753,7 +753,7 @@ with self;
   jsonaf = janePackage {
     pname = "jsonaf";
     hash = "sha256-Gn54NUg4YOyrXY5kXCZhHFz24CfUT9c55cJ2sOsNVw8=";
-    meta.description = "A library for parsing, manipulating, and serializing data structured as JSON";
+    meta.description = "Library for parsing, manipulating, and serializing data structured as JSON";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -776,7 +776,7 @@ with self;
   krb = janePackage {
     pname = "krb";
     hash = "sha256-+XwYKwpl668fZ23YEbL1wW9PlaIIjbP/hHwNanf3dAY=";
-    meta.description = "A library for using Kerberos for both Rpc and Tcp communication";
+    meta.description = "Library for using Kerberos for both Rpc and Tcp communication";
     propagatedBuildInputs = [
       async
       base
@@ -794,7 +794,7 @@ with self;
   lru_cache = janePackage {
     pname = "lru_cache";
     hash = "sha256-FqOBC4kBL9IuFIL4JrVU7iF1AUu+1R/CchR52eyEsa8=";
-    meta.description = "An LRU Cache implementation";
+    meta.description = "LRU cache implementation";
     propagatedBuildInputs = [
       core_kernel
       ppx_jane
@@ -817,7 +817,7 @@ with self;
   n_ary = janePackage {
     pname = "n_ary";
     hash = "sha256-ofstQs5R25NTP4EtBIzDE/Mzg9ZzAJKfAF838uu0zuE=";
-    meta.description = "A library for N-ary datatypes and operations";
+    meta.description = "Library for N-ary datatypes and operations";
     propagatedBuildInputs = [
       base
       expect_test_helpers_core
@@ -833,7 +833,7 @@ with self;
   numeric_string = janePackage {
     pname = "numeric_string";
     hash = "sha256-MzRPXMR4Pi07mfJQgOV6R1Z22y2tvQTCq22+00aY1ik=";
-    meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value";
+    meta.description = "Comparison function for strings that sorts numeric fragments of strings according to their numeric value";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -881,7 +881,7 @@ with self;
   of_json = janePackage {
     pname = "of_json";
     hash = "sha256-qh9mX03Fk9Jb8yox7mZ/CGbWecszK15oaygKbJVDqa0=";
-    meta.description = "A friendly applicative interface for Jsonaf";
+    meta.description = "Friendly applicative interface for Jsonaf";
     buildInputs = [
       core
       core_extended
@@ -893,7 +893,7 @@ with self;
   ordinal_abbreviation = janePackage {
     pname = "ordinal_abbreviation";
     hash = "sha256-bGlzFcM6Yw8fcuovrv11WNtAB4mVYv4BjuMlkhsHomQ=";
-    meta.description = "A minimal library for generating ordinal names of integers";
+    meta.description = "Minimal library for generating ordinal names of integers";
     buildInputs = [
       base
       ppx_jane
@@ -937,7 +937,7 @@ with self;
   polling_state_rpc = janePackage {
     pname = "polling_state_rpc";
     hash = "sha256-l7SMFI+U2rde2OSUNOXPb9NBsvjPrBcxStNooxMgVB8=";
-    meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire";
+    meta.description = "RPC which tracks state on the client and server so it only needs to send diffs across the wire";
     propagatedBuildInputs = [
       async_kernel
       async_rpc_kernel
@@ -1045,7 +1045,7 @@ with self;
   ppx_css = janePackage {
     pname = "ppx_css";
     hash = "sha256-spT/dJW8YJtG4pOku9r6VVlBAMwGakTrr1euiABeqsU=";
-    meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within";
+    meta.description = "PPX that takes in css strings and produces a module for accessing the unique names defined within";
     propagatedBuildInputs = [
       async
       async_unix
@@ -1140,7 +1140,7 @@ with self;
   ppx_globalize = janePackage {
     pname = "ppx_globalize";
     hash = "sha256-SG7710YPwWmhRVl7wN3ZQz3ZMTw3cpoywVSeVQAI3Zc=";
-    meta.description = "A ppx rewriter that generates functions to copy local values to the global heap";
+    meta.description = "PPX rewriter that generates functions to copy local values to the global heap";
     propagatedBuildInputs = [
       base
       ppxlib
@@ -1150,7 +1150,7 @@ with self;
   ppx_hash = janePackage {
     pname = "ppx_hash";
     hash = "sha256-ZmdW+q7fak8iG42jRQgZ6chmjHHwrDSy9wg7pq/6zwk=";
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+    meta.description = "PPX rewriter that generates hash functions from type expressions and definitions";
     propagatedBuildInputs = [
       ppx_compare
       ppx_sexp_conv
@@ -1276,21 +1276,21 @@ with self;
   ppx_pattern_bind = janePackage {
     pname = "ppx_pattern_bind";
     hash = "sha256-ShR8N71a7sz5XaKDyybsy+K0Uu7sYMgvpMADVxmrI/g=";
-    meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
+    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
     propagatedBuildInputs = [ ppx_let ];
   };
 
   ppx_pipebang = janePackage {
     pname = "ppx_pipebang";
     hash = "sha256-gSS+vfsYw3FFOFZ8/iRnP3rxokKAU7EPa1wXq7SbJBk=";
-    meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+    meta.description = "PPX rewriter that inlines reverse application operators `|>` and `|!`";
     propagatedBuildInputs = [ ppxlib ];
   };
 
   ppx_python = janePackage {
     pname = "ppx_python";
     hash = "sha256-lpc6F+Scc5ECdOXPWowKSWRnFSzKbmE8oHs7zCjq3j8=";
-    meta.description = "A [@@deriving] plugin to generate Python conversion functions ";
+    meta.description = "[@@deriving] plugin to generate Python conversion functions";
     propagatedBuildInputs = [
       ppx_base
       ppxlib
@@ -1312,7 +1312,7 @@ with self;
   ppx_sexp_message = janePackage {
     pname = "ppx_sexp_message";
     hash = "sha256-4g3Fjrjqhw+XNkCyxrXkgZDEa3e+ytPsEtQA2xSv+jA=";
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "PPX rewriter for easy construction of s-expressions";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1322,7 +1322,7 @@ with self;
   ppx_sexp_value = janePackage {
     pname = "ppx_sexp_value";
     hash = "sha256-LsP+deeFYxB38xXw7LLB3gOMGZiUOFRYklGVY7DMmvE=";
-    meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+    meta.description = "PPX rewriter that simplifies building s-expressions from ocaml values";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1402,7 +1402,7 @@ with self;
     pname = "pythonlib";
     version = "0.16";
     hash = "sha256-HrsdtwPSDSaMB9CDIR9P5iaAmLihUrReuNAPIYa+s3Y=";
-    meta.description = "A library to help writing wrappers around ocaml code for python";
+    meta.description = "Library to help writing wrappers around ocaml code for python";
     propagatedBuildInputs = [
       base
       core
@@ -1423,7 +1423,7 @@ with self;
   profunctor = janePackage {
     pname = "profunctor";
     hash = "sha256-CFHMtCuBnrlr+B2cdJm2Tamt0A/e+f3SnjEavvE31xQ=";
-    meta.description = "A library providing a signature for simple profunctors and traversal of a record";
+    meta.description = "Library providing a signature for simple profunctors and traversal of a record";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1467,7 +1467,7 @@ with self;
   record_builder = janePackage {
     pname = "record_builder";
     hash = "sha256-46zGgN9RlDjoSbi8RimuQVrMhy65Gpic0YPZpHOeoo0=";
-    meta.description = "A library which provides traversal of records with an applicative";
+    meta.description = "Library which provides traversal of records with an applicative";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1581,7 +1581,7 @@ with self;
       base
       ppx_jane
     ];
-    meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+    meta.description = "Library to use CSS-style selectors to traverse sexp trees";
   };
 
   sexplib0 = janePackage {
@@ -1632,7 +1632,7 @@ with self;
   splay_tree = janePackage {
     pname = "splay_tree";
     hash = "sha256-Ag6yqTofEZ3v0qF+Z7xpXQOh7+HWtvRLlY+iAYqcReg=";
-    meta.description = "A splay tree implementation";
+    meta.description = "Splay tree implementation";
     propagatedBuildInputs = [ core_kernel ];
   };
 
@@ -1658,7 +1658,7 @@ with self;
   stored_reversed = janePackage {
     pname = "stored_reversed";
     hash = "sha256-ef11f0qifEvxKChM49Hnfk6J6hL+b0tMlm0iDLd5Y0Q=";
-    meta.description = "A library for representing a list temporarily stored in reverse order";
+    meta.description = "Library for representing a list temporarily stored in reverse order";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -1669,7 +1669,7 @@ with self;
     version = "0.16.1";
     pname = "streamable";
     hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY=";
-    meta.description = "A collection of types suitable for incremental serialization";
+    meta.description = "Collection of types suitable for incremental serialization";
     propagatedBuildInputs = [
       async_kernel
       async_rpc_kernel
@@ -1754,7 +1754,7 @@ with self;
   username_kernel = janePackage {
     pname = "username_kernel";
     hash = "sha256-UvFL/M9OsD+SOs9MYMKiKzZilLJHzriop6SPA4bOhZQ=";
-    meta.description = "An identifier for a user";
+    meta.description = "Identifier for a user";
     propagatedBuildInputs = [
       core
       ppx_jane
diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 411faf6e0ef6..8df7078ac225 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -25,7 +25,7 @@ with self;
   abstract_algebra = janePackage {
     pname = "abstract_algebra";
     hash = "sha256-W2rSSbppNkulCgGeTiovzP5zInPWIVfflDxWkGpEOFA=";
-    meta.description = "A small library describing abstract algebra concepts";
+    meta.description = "Small library describing abstract algebra concepts";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -35,7 +35,7 @@ with self;
   accessor = janePackage {
     pname = "accessor";
     hash = "sha256-1inoFwDDhnfhW+W3aAkcFNUkf5Umy8BDGDEbMty+Fts=";
-    meta.description = "A library that makes it nicer to work with nested functional data structures";
+    meta.description = "Library that makes it nicer to work with nested functional data structures";
     propagatedBuildInputs = [ higher_kinded ];
   };
 
@@ -126,7 +126,7 @@ with self;
   async_js = janePackage {
     pname = "async_js";
     hash = "sha256-4t7dJ04lTQ0b6clf8AvtyC8ip43vIcEBXgHJLiRbuGM=";
-    meta.description = "A small library that provide Async support for JavaScript platforms";
+    meta.description = "Small library that provide Async support for JavaScript platforms";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_rpc_kernel
@@ -242,7 +242,7 @@ with self;
   async_websocket = janePackage {
     pname = "async_websocket";
     hash = "sha256-22N+QO9hpkKHv3n9WkvtmJouxb/nuauv1UXdVV0zOGA=";
-    meta.description = "A library that implements the websocket protocol on top of Async";
+    meta.description = "Library that implements the websocket protocol on top of Async";
     propagatedBuildInputs = [
       async
       cryptokit
@@ -252,7 +252,7 @@ with self;
   babel = janePackage {
     pname = "babel";
     hash = "sha256-mRSlLXtaGj8DcdDZGUZbi16qQxtfb+fXkwxz6AXxN3o=";
-    meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility";
+    meta.description = "Library for defining Rpcs that can evolve over time without breaking backward compatibility";
     propagatedBuildInputs = [
       async_rpc_kernel
       core
@@ -313,7 +313,7 @@ with self;
   bidirectional_map = janePackage {
     pname = "bidirectional_map";
     hash = "sha256-LnslyNdgQpa9DOAkwb0qq9/NdRvKNocUTIP+Dni6oYc=";
-    meta.description = "A library for bidirectional maps and multimaps";
+    meta.description = "Library for bidirectional maps and multimaps";
   };
 
   bignum = janePackage {
@@ -330,7 +330,7 @@ with self;
   bin_prot = janePackage {
     pname = "bin_prot";
     hash = "sha256-5QeK8Cdu+YjNE/MLiQps6SSf5bRJ/eYZYsJH7oYSarg=";
-    meta.description = "A binary protocol generator";
+    meta.description = "Binary protocol generator";
     propagatedBuildInputs = [
       ppx_compare
       ppx_custom_printf
@@ -347,7 +347,7 @@ with self;
   bonsai = janePackage {
     pname = "bonsai";
     hash = "sha256-rr87o/w/a6NtCrDIIYmk2a5IZ1WJM/qJUeDqTLN1Gr4=";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ ppx_pattern_bind ];
     nativeBuildInputs = [
       ppx_css
@@ -428,14 +428,14 @@ with self;
   cohttp_static_handler = janePackage {
     pname = "cohttp_static_handler";
     hash = "sha256-RB/sUq1tL8A3m9YhHHx2LFqoExTX187VeZI9MRb1NeA=";
-    meta.description = "A library for easily creating a cohttp handler for static files";
+    meta.description = "Library for easily creating a cohttp handler for static files";
     propagatedBuildInputs = [ cohttp-async ];
   };
 
   content_security_policy = janePackage {
     pname = "content_security_policy";
     hash = "sha256-AQN2JJA+5B0PERNNOA9FXX6rIeej40bwJtQmHP6GKw4=";
-    meta.description = "A library for building content-security policies";
+    meta.description = "Library for building content-security policies";
     propagatedBuildInputs = [
       base64
       cryptokit
@@ -535,7 +535,7 @@ with self;
       ppx_jane
       stdio
     ];
-    meta.description = "A library for improving redability of multi-line string constants in code";
+    meta.description = "Library for improving readability of multi-line string constants in code";
   };
 
   delimited_parsing = janePackage {
@@ -557,7 +557,7 @@ with self;
       stored_reversed
       streamable
     ];
-    meta.description = "An interface for diffs";
+    meta.description = "Interface for diffs";
   };
 
   ecaml = janePackage {
@@ -626,7 +626,7 @@ with self;
   file_path = janePackage {
     pname = "file_path";
     hash = "sha256-XSLfYasn6qMZmDzAUGssOM9EX09n2W9/imTgNoSBEyk=";
-    meta.description = "A library for typed manipulation of UNIX-style file paths";
+    meta.description = "Library for typed manipulation of UNIX-style file paths";
     propagatedBuildInputs = [
       async
       core
@@ -641,7 +641,7 @@ with self;
   fuzzy_match = janePackage {
     pname = "fuzzy_match";
     hash = "sha256-XB1U4mY0LcdsKYRnmV0SR4ODTIZynZetBk5X5SdHs44=";
-    meta.description = "A library for fuzzy string matching";
+    meta.description = "Library for fuzzy string matching";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -651,7 +651,7 @@ with self;
   fzf = janePackage {
     pname = "fzf";
     hash = "sha256-yHdvC3cB5sVXsZQbtNzUZkaaqOe/7y8pDHgLwugAlQg=";
-    meta.description = "A library for running the fzf command line tool";
+    meta.description = "Library for running the fzf command line tool";
     propagatedBuildInputs = [
       async
       core_kernel
@@ -665,7 +665,7 @@ with self;
   gel = janePackage {
     pname = "gel";
     hash = "sha256-zGDlxbJINXD1qG7EifZGDfKbQpehdHyR/WLRJRYlwUg=";
-    meta.description = "A library to mark non-record fields global";
+    meta.description = "Library to mark non-record fields global";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -686,7 +686,7 @@ with self;
   higher_kinded = janePackage {
     pname = "higher_kinded";
     hash = "sha256-6aZxgGzltRs2aS4MYJh23Gpoqcko6xJxU11T6KixXno=";
-    meta.description = "A library with an encoding of higher kinded types in OCaml";
+    meta.description = "Library with an encoding of higher kinded types in OCaml";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -696,7 +696,7 @@ with self;
   incr_dom = janePackage {
     pname = "incr_dom";
     hash = "sha256-dkF7+aq5Idw1ltDgGEjGYspdmOXjXqv8AA27b4M7U8A=";
-    meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+    meta.description = "Library for building dynamic webapps, using Js_of_ocaml";
     buildInputs = [ js_of_ocaml-ppx ];
     propagatedBuildInputs = [
       async_js
@@ -740,7 +740,7 @@ with self;
   indentation_buffer = janePackage {
     pname = "indentation_buffer";
     hash = "sha256-/IUZyRkcxUsddzGGIoaLpXbpCxJ1satK79GkzPxSPSc=";
-    meta.description = "A library for building strings with indentation";
+    meta.description = "Library for building strings with indentation";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -764,7 +764,7 @@ with self;
       url = "https://github.com/janestreet/janestreet_cpuid/commit/55223d9708388fe990553669d881f78a811979b9.patch";
       hash = "sha256-aggT6GGMkQj4rRkSZK4hoPRzEfpC8z9qnIROptMDf9E=";
     };
-    meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction";
+    meta.description = "Library for parsing CPU capabilities out of the `cpuid` instruction";
     propagatedBuildInputs = [
       core
       core_kernel
@@ -823,7 +823,7 @@ with self;
   jsonaf = janePackage {
     pname = "jsonaf";
     hash = "sha256-MMIDHc40cmPpO0n8yREIGMyFndw3NfvGUhy6vHnn40w=";
-    meta.description = "A library for parsing, manipulating, and serializing data structured as JSON";
+    meta.description = "Library for parsing, manipulating, and serializing data structured as JSON";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -846,7 +846,7 @@ with self;
   lru_cache = janePackage {
     pname = "janestreet_lru_cache";
     hash = "sha256-/UMSccN9yGAXF7/g6ueSnsfPSnF1fm0zJIRFsThZvH8=";
-    meta.description = "An LRU Cache implementation";
+    meta.description = "LRU cache implementation";
     propagatedBuildInputs = [
       core_kernel
       ppx_jane
@@ -869,7 +869,7 @@ with self;
   n_ary = janePackage {
     pname = "n_ary";
     hash = "sha256-xg4xK3m7SoO1P+rBHvPqFMLx9JXnADEeyU58UmAqW6s=";
-    meta.description = "A library for N-ary datatypes and operations";
+    meta.description = "Library for N-ary datatypes and operations";
     propagatedBuildInputs = [
       base
       expect_test_helpers_core
@@ -885,7 +885,7 @@ with self;
   numeric_string = janePackage {
     pname = "numeric_string";
     hash = "sha256-cU5ETGfavkkiqZOjehCYg06YdDk8W+ZDqz17FGWHey8=";
-    meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value";
+    meta.description = "Comparison function for strings that sorts numeric fragments of strings according to their numeric value";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -925,14 +925,14 @@ with self;
   ocaml_intrinsics_kernel = janePackage {
     pname = "ocaml_intrinsics_kernel";
     hash = "sha256-utD9HE0P3vPgSXDW8Bz0FxgEy+lNkIAlN/+JkfDqb9A=";
-    meta.description = "A kernel library of intrinsics for OCaml";
+    meta.description = "Kernel library of intrinsics for OCaml";
     buildInputs = [ dune-configurator ];
   };
 
   ocaml_intrinsics = janePackage {
     pname = "ocaml_intrinsics";
     hash = "sha256-Ndt6ZPJamBYzr1YA941BLwvRgkkbD8AEQR/JjjR38xI=";
-    meta.description = "A library of intrinsics for OCaml";
+    meta.description = "Library of intrinsics for OCaml";
     buildInputs = [
       dune-configurator
     ];
@@ -970,7 +970,7 @@ with self;
   of_json = janePackage {
     pname = "of_json";
     hash = "sha256-pZCiwXRwZK6ohsGz/WLacgo48ekdT35uD4VESvGxH8A=";
-    meta.description = "A friendly applicative interface for Jsonaf";
+    meta.description = "Friendly applicative interface for Jsonaf";
     buildInputs = [
       core
       core_extended
@@ -982,7 +982,7 @@ with self;
   ordinal_abbreviation = janePackage {
     pname = "ordinal_abbreviation";
     hash = "sha256-kmTGnGbhdiUoXXw2DEAeZJL2sudEf8BRRt2RHCdL7HU=";
-    meta.description = "A minimal library for generating ordinal names of integers";
+    meta.description = "Minimal library for generating ordinal names of integers";
     buildInputs = [
       base
       ppx_jane
@@ -1030,7 +1030,7 @@ with self;
   polling_state_rpc = janePackage {
     pname = "polling_state_rpc";
     hash = "sha256-fZKGva11ztuM+q0Lc6rr9NEH/Qo+wFmE6Rr1/TJm7rA=";
-    meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire";
+    meta.description = "RPC which tracks state on the client and server so it only needs to send diffs across the wire";
     propagatedBuildInputs = [
       async_kernel
       async_rpc_kernel
@@ -1139,7 +1139,7 @@ with self;
   ppx_css = janePackage {
     pname = "ppx_css";
     hash = "sha256-mzLMVtNTy9NrVaNgsRa+oQynxXnh2qlHJCfr3FLFJ2I=";
-    meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within";
+    meta.description = "PPX that takes in css strings and produces a module for accessing the unique names defined within";
     propagatedBuildInputs = [
       async
       async_unix
@@ -1211,7 +1211,7 @@ with self;
   ppx_embed_file = janePackage {
     pname = "ppx_embed_file";
     hash = "sha256-Ew6/X7oAq81ldERU37QWXQdgReEtPD/lxbku8WZNJ6A=";
-    meta.description = "A PPX that allows embedding files directly into executables/libraries as strings or bytes";
+    meta.description = "PPX that allows embedding files directly into executables/libraries as strings or bytes";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -1263,7 +1263,7 @@ with self;
   ppx_globalize = janePackage {
     pname = "ppx_globalize";
     hash = "sha256-LKV5zfaf6AXn3NzOhN2ka8NtjItPTIsfmoJVBw5bYi8=";
-    meta.description = "A ppx rewriter that generates functions to copy local values to the global heap";
+    meta.description = "PPX rewriter that generates functions to copy local values to the global heap";
     propagatedBuildInputs = [
       base
       ppxlib
@@ -1274,7 +1274,7 @@ with self;
   ppx_hash = janePackage {
     pname = "ppx_hash";
     hash = "sha256-GADCLoF2GjZkvAiezn0xyReCs1avrUgjJGSS/pMNq38=";
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+    meta.description = "PPX rewriter that generates hash functions from type expressions and definitions";
     propagatedBuildInputs = [
       ppx_compare
       ppx_sexp_conv
@@ -1413,21 +1413,21 @@ with self;
   ppx_pattern_bind = janePackage {
     pname = "ppx_pattern_bind";
     hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA=";
-    meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
+    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
     propagatedBuildInputs = [ ppx_let ];
   };
 
   ppx_pipebang = janePackage {
     pname = "ppx_pipebang";
     hash = "sha256-GBa1zzNChZOQfVSHyUeDEMFxuNUT3lj/pIQi/l1J35M=";
-    meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+    meta.description = "PPX rewriter that inlines reverse application operators `|>` and `|!`";
     propagatedBuildInputs = [ ppxlib ];
   };
 
   ppx_python = janePackage {
     pname = "ppx_python";
     hash = "sha256-WqTYH5Zz/vRak/CL1ha8oUbQ8+XRuUu9610uj8II74o=";
-    meta.description = "A [@@deriving] plugin to generate Python conversion functions ";
+    meta.description = "[@@deriving] plugin to generate Python conversion functions";
     propagatedBuildInputs = [
       ppx_base
       ppxlib
@@ -1471,7 +1471,7 @@ with self;
   ppx_sexp_message = janePackage {
     pname = "ppx_sexp_message";
     hash = "sha256-SNgTvsTUgFzjqHpyIYk4YuA4c5MbA9e77YUEsDaKTeA=";
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "PPX rewriter for easy construction of s-expressions";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1481,7 +1481,7 @@ with self;
   ppx_sexp_value = janePackage {
     pname = "ppx_sexp_value";
     hash = "sha256-f96DLNFI+s3TKsOj01i6xUoM9L+qRgAXbbepNis397I=";
-    meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+    meta.description = "PPX rewriter that simplifies building s-expressions from ocaml values";
     propagatedBuildInputs = [
       ppx_here
       ppx_sexp_conv
@@ -1571,7 +1571,7 @@ with self;
   ppxlib_jane = janePackage (
     {
       pname = "ppxlib_jane";
-      meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree";
+      meta.description = "Library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree";
       propagatedBuildInputs = [ ppxlib ];
     }
     // (
@@ -1591,7 +1591,7 @@ with self;
   profunctor = janePackage {
     pname = "profunctor";
     hash = "sha256-WYPJLt3kYvIzh88XcPpw2xvSNjNX63/LvWwIDK+Xr0Q=";
-    meta.description = "A library providing a signature for simple profunctors and traversal of a record";
+    meta.description = "Library providing a signature for simple profunctors and traversal of a record";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1635,7 +1635,7 @@ with self;
   record_builder = janePackage {
     pname = "record_builder";
     hash = "sha256-NQ0Wizxi/wD8BCwt8hxZWnEpLBTn3XkaG+96ooOKIFE=";
-    meta.description = "A library which provides traversal of records with an applicative";
+    meta.description = "Library which provides traversal of records with an applicative";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1750,7 +1750,7 @@ with self;
       core_kernel
       ppx_jane
     ];
-    meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+    meta.description = "Library to use CSS-style selectors to traverse sexp trees";
   };
 
   sexplib0 = janePackage {
@@ -1801,7 +1801,7 @@ with self;
   splay_tree = janePackage {
     pname = "splay_tree";
     hash = "sha256-gRHRqUKjFEgkL1h8zSbqJkf+gHxhh61AtAT+mkPcz+k=";
-    meta.description = "A splay tree implementation";
+    meta.description = "Splay tree implementation";
     propagatedBuildInputs = [ core_kernel ];
   };
 
@@ -1827,7 +1827,7 @@ with self;
   stored_reversed = janePackage {
     pname = "stored_reversed";
     hash = "sha256-FPyQxXaGAzFWW6GiiqKQgU+6/lAZhEQwhNnXsmqKkzg=";
-    meta.description = "A library for representing a list temporarily stored in reverse order";
+    meta.description = "Library for representing a list temporarily stored in reverse order";
     propagatedBuildInputs = [
       core
       ppx_jane
@@ -1837,7 +1837,7 @@ with self;
   streamable = janePackage {
     pname = "streamable";
     hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg=";
-    meta.description = "A collection of types suitable for incremental serialization";
+    meta.description = "Collection of types suitable for incremental serialization";
     propagatedBuildInputs = [
       async_kernel
       async_rpc_kernel
@@ -1923,7 +1923,7 @@ with self;
   uopt = janePackage {
     pname = "uopt";
     hash = "sha256-t0SFJVF0ScyFFwziBZOYCOsmhRd6J5H3s0Kk9NKorcM=";
-    meta.description = "An [option]-like type that incurs no allocation";
+    meta.description = "[option]-like type that incurs no allocation";
     propagatedBuildInputs = [
       base
       ppx_jane
@@ -1933,7 +1933,7 @@ with self;
   username_kernel = janePackage {
     pname = "username_kernel";
     hash = "sha256-1lxWSv7CbmucurNw8ws18N9DYqo4ik2KZBc5GtNmmeU=";
-    meta.description = "An identifier for a user";
+    meta.description = "Identifier for a user";
     propagatedBuildInputs = [
       core
       ppx_jane
diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index cc475db3a165..4f10df8c8159 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -73,7 +73,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "CleverCSV is a Python package for handling messy CSV files";
+    description = "Python package for handling messy CSV files";
     mainProgram = "clevercsv";
     longDescription = ''
       CleverCSV is a Python package for handling messy CSV files. It provides
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index b3afe56d9daf..48bc3a3a8679 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   meta = {
     changelog = "https://github.com/pooya-rostami/gawd/releases/tag/${version}";
-    description = "Gawd is a Python library and command-line tool for computing syntactic differences between two GitHub Actions workflow files";
+    description = "Python library and command-line tool for computing syntactic differences between two GitHub Actions workflow files";
     mainProgram = "gawd";
     homepage = "https://github.com/pooya-rostami/gawd";
     license = lib.licenses.lgpl3Only;
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index 023c697abaf8..705fc7b6013d 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -28,8 +28,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "
-Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML";
+    description = "Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML";
     homepage = "https://github.com/tmbdev/hocr-tools";
     license = licenses.asl20;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix
index 198587c03951..d8de9bfa92b9 100644
--- a/pkgs/development/python-modules/magika/default.nix
+++ b/pkgs/development/python-modules/magika/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   passthru.tests.version = testers.testVersion { package = magika; };
 
   meta = with lib; {
-    description = "Magika: Detect file content types with deep learning";
+    description = "Detect file content types with deep learning";
     homepage = "https://github.com/google/magika";
     changelog = "https://github.com/google/magika/blob/python-v${version}/python/CHANGELOG.md";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index bb6b16307f91..bc6a61ab5040 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
       });
 
   meta = with lib; {
-    description = "Molecule aids in the development and testing of Ansible roles";
+    description = "Aids in the development and testing of Ansible roles";
     homepage = "https://github.com/ansible-community/molecule";
     changelog = "https://github.com/ansible/molecule/releases/tag/v${version}";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix
index ce39c5090344..aaac0e457a36 100644
--- a/pkgs/development/python-modules/svgdigitizer/default.nix
+++ b/pkgs/development/python-modules/svgdigitizer/default.nix
@@ -75,7 +75,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "(x,y) Data Points from SVG files";
+    description = "Extract numerical data points from SVG files";
     homepage = "https://github.com/echemdb/svgdigitizer";
     changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.tag}/ChangeLog";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix
index 4c2dd406e4ec..753dfddeb2b0 100644
--- a/pkgs/development/tools/java/jprofiler/default.nix
+++ b/pkgs/development/tools/java/jprofiler/default.nix
@@ -15,10 +15,12 @@ let
   nameApp = "JProfiler";
 
   meta = {
-    description = "JProfiler's intuitive UI helps you resolve performance bottlenecks";
+    description = "Java profiler for deep JVM analysis";
     longDescription = ''
-      JProfiler's intuitive UI helps you resolve performance bottlenecks,
-      pin down memory leaks and understand threading issues.
+      JProfiler bridges high-level analytics and low-level JVM data,
+      delivering unmatched insights to solve your toughest performance
+      problems, memory leaks, threading issues, and higher-level problems in
+      technologies like JDBC, JPA, and more.
     '';
     homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html";
     license = lib.licenses.unfree;
diff --git a/pkgs/development/tools/lerna/generic.nix b/pkgs/development/tools/lerna/generic.nix
index dc918b08fc00..dd845f887979 100644
--- a/pkgs/development/tools/lerna/generic.nix
+++ b/pkgs/development/tools/lerna/generic.nix
@@ -25,7 +25,7 @@ buildNpmPackage rec {
   dontNpmBuild = true;
 
   meta = {
-    description = "Lerna is a fast, modern build system for managing and publishing multiple JavaScript/TypeScript packages from the same repository";
+    description = "Fast, modern build system for managing and publishing multiple JavaScript/TypeScript packages from the same repository";
     homepage = "https://lerna.js.org/";
     changelog = "https://github.com/lerna/lerna/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 230497a50546..49a961d0c10a 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -85,7 +85,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''
+    description = "First-person role-playing game / dungeon crawler";
+    longDescription = ''
       A cross-platform, open source port of Arx Fatalis, a 2002
       first-person role-playing game / dungeon crawler
       developed by Arkane Studios.
diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix
index adf358522abe..ed17fac29cdf 100644
--- a/pkgs/games/scummvm/games.nix
+++ b/pkgs/games/scummvm/games.nix
@@ -118,7 +118,7 @@ in
     plong = "Broken Sword 2.5";
     pshort = "sword25";
     pcode = "sword25";
-    description = "A fan game of the Broken Sword series";
+    description = "Fan game of the Broken Sword series";
     version = "1.0";
     src = fetchurl {
       url = "mirror://sourceforge/scummvm/${pshort}-v${version}.zip";
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
index 55acef0b9cf0..6fea405ecea0 100644
--- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
@@ -19,6 +19,6 @@ callPackage ../generic.nix rec {
   meta = {
     homepage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone";
     downloadPage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone/releases";
-    description = "A fork of the Shattered Pixel Dungeon roguelike without limits on experience and items";
+    description = "Fork of the Shattered Pixel Dungeon roguelike without limits on experience and items";
   };
 }
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
index 9c6f74bd0a0e..9507d3b60707 100644
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
@@ -19,6 +19,6 @@ callPackage ../generic.nix rec {
   meta = {
     homepage = "https://github.com/TrashboxBobylev/Rat-King-Adventure";
     downloadPage = "https://github.com/TrashboxBobylev/Rat-King-Adventure/releases";
-    description = "An expansive fork of RKPD2, itself a fork of the Shattered Pixel Dungeon roguelike";
+    description = "Expansive fork of RKPD2, itself a fork of the Shattered Pixel Dungeon roguelike";
   };
 }
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
index 7dde5e15b747..d1d5f357051f 100644
--- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
@@ -19,6 +19,6 @@ callPackage ../generic.nix rec {
   meta = {
     homepage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon";
     downloadPage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon/releases";
-    description = "A shorter fork of the Shattered Pixel Dungeon roguelike";
+    description = "Shorter fork of the Shattered Pixel Dungeon roguelike";
   };
 }
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
index d0b3e50fa5e6..c6d551f18608 100644
--- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
@@ -47,6 +47,6 @@ callPackage ../generic.nix rec {
   meta = {
     homepage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon";
     downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases";
-    description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics";
+    description = "Fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics";
   };
 }
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 3318a9bc60b2..d95688c9766c 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontPatchELF = true;
 
   meta = with lib; {
-    description = "DisplayLink DL-7xxx, DL-6xxx, DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
+    description = "DL-7xxx, DL-6xxx, DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
     homepage = "https://www.displaylink.com/";
     hydraPlatforms = [ ];
     license = licenses.unfree;
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index a6ee2a03a238..306fc5d776a0 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -445,7 +445,7 @@ let
       platforms = platforms.linux;
       maintainers = with maintainers; [ talyz ];
       license = licenses.gpl2Plus;
-      description = "Discourse is an open source discussion platform";
+      description = "Open source discussion platform";
     };
   };
 in
diff --git a/pkgs/servers/web-apps/wordpress/generic.nix b/pkgs/servers/web-apps/wordpress/generic.nix
index 640fb34f1b91..577a4bc45741 100644
--- a/pkgs/servers/web-apps/wordpress/generic.nix
+++ b/pkgs/servers/web-apps/wordpress/generic.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://wordpress.org";
-    description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
+    description = "Open source software you can use to create a beautiful website, blog, or app";
     license = [ licenses.gpl2Plus ];
     maintainers = [ maintainers.basvandijk ];
     platforms = platforms.all;
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 94ac9d77b37d..49f144d390ba 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
       gpl2Plus
       lgpl21Plus
     ];
-    description = "RPM Package Manager";
+    description = "RPM package manager";
     maintainers = [ ];
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 04c0e3e89543..bbbc5ee0c783 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
-    description = "B2sum utility is similar to the md5sum or shasum utilities but for BLAKE2";
+    description = "BLAKE2 cryptographic hash function";
     mainProgram = "b2sum";
     homepage = "https://blake2.net";
     license = with licenses; [
diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix
index eb4403d6f4ee..67dd09d8b6c6 100644
--- a/pkgs/tools/security/schleuder/default.nix
+++ b/pkgs/tools/security/schleuder/default.nix
@@ -26,7 +26,7 @@ bundlerApp {
 
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
-    description = "Schleuder is an encrypting mailing list manager with remailing-capabilities";
+    description = "Encrypting mailing list manager with remailing-capabilities";
     longDescription = ''
       Schleuder is a group's email-gateway: subscribers can exchange
       encrypted emails among themselves, receive emails from
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 4a2b609ed7f1..79721da656b4 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "(h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs";
+    description = "htop-like task monitor for AMD, Adreno, Intel and NVIDIA GPUs";
     longDescription = ''
       Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs.
       It can handle multiple GPUs and print information about them in a htop familiar way.
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index f0993d4d0766..0a50f31a6be4 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -85,14 +85,14 @@ in
     libname = "format";
     version = "3.5.0";
     sha256 = "sha256-5vZ7b+P74uGx0Gb7X/+jbsx5048dO/jv5nqCDtw5y/A=";
-    meta.description = "A Haxe Library for supporting different file formats";
+    meta.description = "Haxe library for supporting different file formats";
   };
 
   heaps = buildHaxeLib {
     libname = "heaps";
     version = "1.9.1";
     sha256 = "sha256-i5EIKnph80eEEHvGXDXhIL4t4+RW7OcUV5zb2f3ItlI=";
-    meta.description = "The GPU Game Framework";
+    meta.description = "GPU game framework";
   };
 
   hlopenal = buildHaxeLib {

From 0a168b77342ff0db224872204a856824fa4c13be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 07:49:46 +0000
Subject: [PATCH 53/67] libretro.stella: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-07

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 89334982a8e4..763063b464da 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2025-07-28";
+  version = "0-unstable-2025-08-07";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "211b4902d5b4440b0aa567dade4eebf77cd868aa";
-    hash = "sha256-l2b2Lu9l5CwmfDsJazOdQ9mowxfAqJY4SEgtDxCnYxY=";
+    rev = "92313128c3e2afdb9b3decf6642d342af18a1ab5";
+    hash = "sha256-b1GaRB9Iv3qqyb3I9XKmEbkiplV+Wi3TflJdnQboLbw=";
   };
 
   makefile = "Makefile";

From a4727cf3fd63808c3f0f225b1213220339429677 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 07:13:56 +0000
Subject: [PATCH 54/67] vscode: 1.102.3 -> 1.103.0

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index b229e30310e3..fb1a781e3bad 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,20 +36,20 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-EbgP2CjUBiC+2G7TkGyuxaqr35sTArls4lbDNTH1Pmc=";
-      x86_64-darwin = "sha256-OrDuzSaPxuedhS21Hx1PNTbp6eQpfFfUbO05gIu5Ou8=";
-      aarch64-linux = "sha256-V0aEGqBRf3qVKvPYNypQ9hYWovqQIC3kQq2goq/hVjA=";
-      aarch64-darwin = "sha256-29i/+mz0NCU0ZCO+tzlbSl1iKx5/H89bGQTvRR5/PuA=";
-      armv7l-linux = "sha256-VSsn4d9ztFgGXVZeCeTSHDD5n3aTBbHF/xx2JvTGOeQ=";
+      x86_64-linux = "sha256-Fji3/9T8X2VQH6gUhReSuniuX2BX+4S7uPJWEZn56vc=";
+      x86_64-darwin = "sha256-LgYdgiZbMdpe/KjAYuAVYEFFc1gcFSo5+/6lf15zUvk=";
+      aarch64-linux = "sha256-WxJEjTvXK1N1FjEFv0nUX7oLgPrcKlPHYSiLkTcdhj4=";
+      aarch64-darwin = "sha256-2H44MkP7Vv+j78DxGWROHCPdMQv2WzTrG1I7LANMYqg=";
+      armv7l-linux = "sha256-Pw9krAFjrllNOsXipaZy7X7wnB7C8V45WU7HuKa59JQ=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.102.3";
+  version = "1.103.0";
 
   # This is used for VS Code - Remote SSH test
-  rev = "488a1f239235055e34e673291fb8d8c810886f81";
+  rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";
 in
 callPackage ./generic.nix {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-xVYG/EJRPRJBj3BSarTwpX9F1UM/OI+7ci6vQa64iWI=";
+      hash = "sha256-GEN8WMPaYhwQsgml3tXWJP7F4RXH5vy6Ht0RUGauxnw=";
     };
     stdenv = stdenvNoCC;
   };

From 7875ce5bd5aa7bddf173066560959b894570002a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 08:37:13 +0000
Subject: [PATCH 55/67] openstack-rs: 0.12.4 -> 0.13.0

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

diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix
index 24a6055d47ca..9c6cd797e517 100644
--- a/pkgs/by-name/op/openstack-rs/package.nix
+++ b/pkgs/by-name/op/openstack-rs/package.nix
@@ -9,15 +9,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openstack-rs";
-  version = "0.12.4";
+  version = "0.13.0";
   src = fetchFromGitHub {
     owner = "gtema";
     repo = "openstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UEnvKqnAY7QHeeEayTk5aBBxHcOrAr7LisvaOiRhRMQ=";
+    hash = "sha256-ywj0K9MdckVuKxjt1za+IyK4SoeyTXoXbDRXLqEkic0=";
   };
 
-  cargoHash = "sha256-YytlhN1UtNnB5ZgCEVyBfiPTnhABjCaA87ejkHJsIOk=";
+  cargoHash = "sha256-e2wt5BS+RQOpo3T5HOutvKGv4lHiIoTk9tEqMs4f5Dw=";
 
   nativeBuildInputs = [
     installShellFiles

From a1d47a4ca33675e48868a6eb6dff57b0c448a22d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 10:32:11 +0200
Subject: [PATCH 56/67] nixos/pam: fix lastlog2 import service

---
 nixos/modules/security/pam.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index a02bf460a9eb..abc632c1c07d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2316,7 +2316,21 @@ in
         (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services))
         {
           tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
-          services.lastlog2-import.enable = true;
+          services.lastlog2-import = {
+            enable = true;
+            wantedBy = [ "default.target" ];
+            after = [
+              "local-fs.target"
+              "systemd-tmpfiles-setup.service"
+            ];
+            # TODO: ${pkgs.util-linux.lastlog}/lib/systemd/system/lastlog2-import.service
+            # uses unpatched /usr/bin/mv, needs to be fixed on staging
+            # in the meantime, use a service drop-in here
+            serviceConfig.ExecStartPost = [
+              ""
+              "${lib.getExe' pkgs.coreutils "mv"} /var/log/lastlog /var/log/lastlog.migrated"
+            ];
+          };
           packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
         };
 

From 122c5aa7d98f912aadc2c6d1e7dd2db1dc5f5323 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 19:30:28 +0200
Subject: [PATCH 57/67] nixos/tests/pam-lastlog: test legacy lastlog importer

---
 nixos/tests/pam/pam-lastlog.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/pam/pam-lastlog.nix b/nixos/tests/pam/pam-lastlog.nix
index 837c84e1e601..cefc8a3d4e45 100644
--- a/nixos/tests/pam/pam-lastlog.nix
+++ b/nixos/tests/pam/pam-lastlog.nix
@@ -13,9 +13,18 @@
     };
 
   testScript = ''
-    machine.wait_for_unit("multi-user.target")
-    machine.succeed("run0 --pty true") # perform full login
-    print(machine.succeed("lastlog2 --active --user root"))
-    machine.succeed("stat /var/lib/lastlog/lastlog2.db")
+    with subtest("Test legacy lastlog import"):
+      # create old lastlog file to test import
+      # empty = nothing will actually be imported, but the service will run
+      machine.succeed("touch /var/log/lastlog")
+      machine.wait_for_unit("lastlog2-import.service")
+      machine.succeed("journalctl -b --grep 'Starting Import lastlog data into lastlog2 database'")
+      machine.succeed("stat /var/log/lastlog.migrated")
+
+    with subtest("Test lastlog entries are created by logins"):
+      machine.wait_for_unit("multi-user.target")
+      machine.succeed("run0 --pty true") # perform full login
+      print(machine.succeed("lastlog2 --active --user root"))
+      machine.succeed("stat /var/lib/lastlog/lastlog2.db")
   '';
 }

From 2ef184693764febf1809ef469c2e901abdd9d1b6 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Sun, 27 Jul 2025 19:02:47 +0200
Subject: [PATCH 58/67] puddletag: 2.3.0 -> 2.5.0

---
 .../pu/puddletag/package.nix}                 | 37 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 15 insertions(+), 24 deletions(-)
 rename pkgs/{applications/audio/puddletag/default.nix => by-name/pu/puddletag/package.nix} (62%)

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/by-name/pu/puddletag/package.nix
similarity index 62%
rename from pkgs/applications/audio/puddletag/default.nix
rename to pkgs/by-name/pu/puddletag/package.nix
index 4daeee6d4cb3..5c3ce77a2cca 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/by-name/pu/puddletag/package.nix
@@ -1,33 +1,26 @@
 {
   lib,
   fetchFromGitHub,
-  fetchurl,
   python3,
-  qtbase,
-  qtwayland,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
+let
+  qt = libsForQt5;
+
+in
 python3.pkgs.buildPythonApplication rec {
   pname = "puddletag";
-  version = "2.3.0";
+  version = "2.5.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "puddletag";
     repo = "puddletag";
     tag = version;
-    hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8=";
+    hash = "sha256-Per+olIi2yd2cNRO22Fi6cC7/90AqRP1NpRK1XU1i0A=";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://github.com/puddletag/puddletag/commit/54074824adb05da42c03d7adfbba94d8e24982f0.patch";
-      hash = "sha256-DkgaFWgp2m2bRuhdXhHW+nxV/2GaCgeRNdwLMYAkcYQ=";
-      name = "fix_for_pyparsing_3_1_2.patch";
-    })
-  ];
-
   pythonRelaxDeps = true;
 
   pythonRemoveDeps = [
@@ -37,19 +30,19 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace share/pixmaps share/icons
+      --replace-fail share/pixmaps share/icons
   '';
 
-  buildInputs = [
+  buildInputs = with qt; [
     qtbase
     qtwayland
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with qt; [
     wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     configobj
     levenshtein
     lxml
@@ -73,15 +66,15 @@ python3.pkgs.buildPythonApplication rec {
 
   dontStrip = true; # we are not generating any binaries
 
-  meta = with lib; {
+  meta = {
     description = "Audio tag editor similar to the Windows program, Mp3tag";
     mainProgram = "puddletag";
     homepage = "https://docs.puddletag.net";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       peterhoeg
       dschrempf
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81e3e9bedb33..91d9ea61329f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11962,8 +11962,6 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  puddletag = libsForQt5.callPackage ../applications/audio/puddletag { };
-
   welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
 
   wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {

From ad06f16748a178f3fa7182a9efa921895e768587 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Mon, 14 Jul 2025 09:54:14 +0800
Subject: [PATCH 59/67] amarok: 3.2.2 -> 3.3.0

---
 .../am/amarok/package.nix}                    | 112 +++++++++---------
 pkgs/top-level/all-packages.nix               |   3 -
 2 files changed, 54 insertions(+), 61 deletions(-)
 rename pkgs/{applications/audio/amarok/default.nix => by-name/am/amarok/package.nix} (51%)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/by-name/am/amarok/package.nix
similarity index 51%
rename from pkgs/applications/audio/amarok/default.nix
rename to pkgs/by-name/am/amarok/package.nix
index 75f2d9e807de..0e51fcfc8fc8 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/by-name/am/amarok/package.nix
@@ -2,36 +2,19 @@
   stdenv,
   fetchurl,
   lib,
+  cmake,
   extra-cmake-modules,
-  kdoctools,
-  qca-qt5,
-  qjson,
-  qtquickcontrols2,
-  qtscript,
-  qtwebengine,
-  karchive,
-  kcmutils,
-  kconfig,
-  kdnssd,
-  kguiaddons,
-  kinit,
-  kirigami2,
-  knewstuff,
-  knotifyconfig,
-  ktexteditor,
-  kwindowsystem,
+  pkg-config,
+  kdePackages,
   fftw,
-  phonon,
-  plasma-framework,
-  threadweaver,
-  breeze-icons,
-  wrapQtAppsHook,
   curl,
   ffmpeg,
   gdk-pixbuf,
+  gst_all_1,
   libaio,
-  liblastfm,
   libmtp,
+  libsysprof-capture,
+  libunwind,
   loudmouth,
   lzo,
   lz4,
@@ -43,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amarok";
-  version = "3.2.2";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-/N48N9H4FezIiTD+bR6k1LCx7Tsz/NMt9VQq+HTdKrA=";
+    hash = "sha256-Lc5YezwUv5IOpNiQdpZOuXT8Q0VwFHKA/NHkPPFP8aw=";
   };
 
   outputs = [
@@ -55,39 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wrapQtAppsHook
-  ];
-
-  propagatedBuildInputs = [
-    qca-qt5
-    qjson
-    qtquickcontrols2
-    qtscript
-    qtwebengine
-    karchive
-    kcmutils
-    kconfig
-    kdnssd
-    kguiaddons
-    kinit
-    kirigami2
-    knewstuff
-    knotifyconfig
-    ktexteditor
-    kwindowsystem
-    phonon
-    plasma-framework
-    threadweaver
+  buildInputs = [
     curl
     fftw
     ffmpeg
     gdk-pixbuf
     libaio
-    liblastfm
     libmtp
+    libsysprof-capture
+    libunwind
     loudmouth
     lz4
     lzo
@@ -95,15 +54,52 @@ stdenv.mkDerivation (finalAttrs: {
     snappy
     taglib
     taglib_extras
-    breeze-icons
-  ];
+  ]
+  ++ (with kdePackages; [
+    qca
+    qt5compat
+    qtbase
+    qtdeclarative
+    qtwebengine
+    kcmutils
+    kcoreaddons
+    kdnssd
+    kio
+    kpackage
+    kstatusnotifieritem
+    ktexteditor
+    threadweaver
+  ])
+  ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ]);
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ (with kdePackages; [
+    extra-cmake-modules
+    kdoctools
+    qttools
+    wrapQtAppsHook
+  ]);
 
-  meta = with lib; {
+  env.LANG = "C.UTF-8";
+
+  postInstall = ''
+    qtWrapperArgs+=(
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+    )
+  '';
+
+  meta = {
     homepage = "https://amarok.kde.org";
     description = "Powerful music player with an intuitive interface";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ peterhoeg ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ];
+    mainProgram = "amarok";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d9ea61329f..e6f43468a353 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11579,9 +11579,6 @@ with pkgs;
 
   airwave = libsForQt5.callPackage ../applications/audio/airwave { };
 
-  amarok = libsForQt5.callPackage ../applications/audio/amarok { };
-  amarok-kf5 = amarok; # for compatibility
-
   androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { });
   android-studio = androidStudioPackages.stable;
   android-studio-full = android-studio.full;

From b3d220e95de765a006f5d0e441841511297750be Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Sun, 10 Aug 2025 16:09:45 +0200
Subject: [PATCH 60/67] amarok: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/by-name/am/amarok/package.nix b/pkgs/by-name/am/amarok/package.nix
index 0e51fcfc8fc8..cc6b535b0119 100644
--- a/pkgs/by-name/am/amarok/package.nix
+++ b/pkgs/by-name/am/amarok/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amarok";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Lc5YezwUv5IOpNiQdpZOuXT8Q0VwFHKA/NHkPPFP8aw=";
+    hash = "sha256-OW8uqToH25XI+762gNeAai5ZVKUgxSwFZIXBHeYznAE=";
   };
 
   outputs = [

From f26c52e8cf788df7b97ba29d775931cfd26ff2e4 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <github@jackr.eu>
Date: Sat, 9 Aug 2025 10:51:12 +0200
Subject: [PATCH 61/67] nixos/traefik: add WorkingDirectory

---
 nixos/modules/services/web-servers/traefik.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 93b9b71ba967..86534f291ee7 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -152,6 +152,7 @@ in
         ProtectSystem = "full";
         ReadWritePaths = [ cfg.dataDir ];
         RuntimeDirectory = "traefik";
+        WorkingDirectory = cfg.dataDir;
       };
     };
 

From 784852621a62a165a11752c09611505969a758bb Mon Sep 17 00:00:00 2001
From: Jade Lovelace <software@lfcode.ca>
Date: Sat, 9 Aug 2025 18:19:12 +0000
Subject: [PATCH 62/67] capnproto: fix fibers on static builds

This was broken (https://git.lix.systems/lix-project/lix/issues/955) and
it's just us not using libucontext (and the libucontext package being
broken).

Fibers should basically be supported on all platforms that matter and
it's mostly just some packaging mishaps that stop them from working, so
we want to turn on the requirement by default so that it works.
---
 .../ca/capnproto/fix-libucontext.patch        | 74 +++++++++++++++++++
 pkgs/by-name/ca/capnproto/package.nix         | 23 +++++-
 2 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ca/capnproto/fix-libucontext.patch

diff --git a/pkgs/by-name/ca/capnproto/fix-libucontext.patch b/pkgs/by-name/ca/capnproto/fix-libucontext.patch
new file mode 100644
index 000000000000..93c2b99d91a0
--- /dev/null
+++ b/pkgs/by-name/ca/capnproto/fix-libucontext.patch
@@ -0,0 +1,74 @@
+From f26dd335c8650a2f8ab7d6e4fb5dfc40ee6af618 Mon Sep 17 00:00:00 2001
+From: Jade Lovelace <software@lfcode.ca>
+Date: Sun, 10 Aug 2025 10:54:14 +0000
+Subject: [PATCH] fix: include libucontext in Requires.private in cmake builds
+
+This is required so that static musl actually links to libucontext
+correctly to get setcontext/etc for fibers.
+---
+ c++/CMakeLists.txt           | 4 ++++
+ c++/configure.ac             | 4 ++++
+ c++/pkgconfig/kj-async.pc.in | 1 +
+ 3 files changed, 9 insertions(+)
+
+diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
+index f335f12f7c..b2a24e40e0 100644
+--- a/c++/CMakeLists.txt
++++ b/c++/CMakeLists.txt
+@@ -96,6 +96,9 @@ set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF)
+ # CapnProtoConfig.cmake.in needs this variable.
+ set(_WITH_LIBUCONTEXT OFF)
+ 
++# Used by pkg-config files
++set(ASYNC_REQUIRES_PRIVATE "")
++
+ if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
+   set(_capnp_fibers_found OFF)
+   if (WIN32 OR CYGWIN)
+@@ -116,6 +119,7 @@ if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
+         if (libucontext_FOUND)
+           set(_WITH_LIBUCONTEXT ON)
+           set(_capnp_fibers_found ON)
++          set(ASYNC_REQUIRES_PRIVATE "${ASYNC_REQUIRES_PRIVATE} libucontext")
+         endif()
+       else()
+         set(_capnp_fibers_found OFF)
+diff --git a/c++/configure.ac b/c++/configure.ac
+index a2de7aac80..ce3c632e8c 100644
+--- a/c++/configure.ac
++++ b/c++/configure.ac
+@@ -216,6 +216,8 @@ AS_IF([test "$with_fibers" != no], [
+   ])
+ ])
+ 
++ASYNC_REQUIRES_PRIVATE=""
++
+ # Check for library support necessary for fibers.
+ AS_IF([test "$with_fibers" != no], [
+   case "${host_os}" in
+@@ -241,6 +243,7 @@ AS_IF([test "$with_fibers" != no], [
+         ])
+         AS_IF([test "$ucontext_supports_fibers" = yes], [
+           ASYNC_LIBS="$ASYNC_LIBS -lucontext"
++          ASYNC_REQUIRES_PRIVATE="$ASYNC_REQUIRES_PRIVATE libucontext"
+           with_fibers=yes
+         ], [
+           AS_IF([test "$with_fibers" = yes], [
+@@ -259,6 +262,7 @@ AS_IF([test "$with_fibers" = yes], [
+ ], [
+   CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0"
+ ])
++AC_SUBST(ASYNC_REQUIRES_PRIVATE, $ASYNC_REQUIRES_PRIVATE)
+ 
+ # CapnProtoConfig.cmake.in needs these variables,
+ # we force them to NO because we don't need the CMake dependency for them,
+diff --git a/c++/pkgconfig/kj-async.pc.in b/c++/pkgconfig/kj-async.pc.in
+index 49d5ff6996..41aae28555 100644
+--- a/c++/pkgconfig/kj-async.pc.in
++++ b/c++/pkgconfig/kj-async.pc.in
+@@ -8,4 +8,5 @@ Description: Basic utility library called KJ (async part)
+ Version: @VERSION@
+ Libs: -L${libdir} -lkj-async @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
+ Requires: kj = @VERSION@
++Requires.private: @ASYNC_REQUIRES_PRIVATE@
+ Cflags: -I${includedir} @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index cf43e3d27bea..10e758fcfa39 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -1,11 +1,14 @@
 {
   binutils,
   lib,
+  libucontext,
+  pkg-config,
   clangStdenv,
   fetchFromGitHub,
   cmake,
   openssl,
   zlib,
+  nix-update-script,
 }:
 
 let
@@ -40,12 +43,22 @@ clangStdenv.mkDerivation rec {
     hash = "sha256-aDcn4bLZGq8915/NPPQsN5Jv8FRWd8cAspkG3078psc=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  patches = [
+    # https://github.com/capnproto/capnproto/pull/2377
+    ./fix-libucontext.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   propagatedBuildInputs = [
     openssl
     zlib
   ]
-  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh;
+  ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh
+  # musl doesn't ship getcontext/setcontext unlike basically every other libc
+  ++ lib.optional clangStdenv.hostPlatform.isMusl libucontext;
 
   # FIXME: separate the binaries from the stuff that user systems actually use
   # This runs into a terrible UX issue in Lix and I just don't want to debug it
@@ -55,6 +68,10 @@ clangStdenv.mkDerivation rec {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    # merely requires setcontext/getcontext (libc), lix expects fibers to
+    # be available, and we want to make sure that the build will fail if
+    # it breaks
+    (lib.cmakeBool "WITH_FIBERS" true)
     # Take optimization flags from CXXFLAGS rather than cmake injecting them
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
   ];
@@ -66,6 +83,8 @@ clangStdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://capnproto.org/";
     description = "Cap'n Proto cerealization protocol";

From a55e447f6c19e420c6de592dcc6c57af814c4a22 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:29:53 +0300
Subject: [PATCH 63/67] spandsp3: add missing libjpeg dependency

---
 pkgs/development/libraries/spandsp/3.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index eedc5c38b527..b41a9085e618 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -1,6 +1,7 @@
 {
   fetchFromGitHub,
   callPackage,
+  libjpeg,
 }:
 
 (callPackage ./common.nix { }).overrideAttrs (previousAttrs: {
@@ -11,4 +12,8 @@
     rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
     sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
+
+  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [] ++ [
+    libjpeg
+  ];
 })

From 2433ed3a944932fb64b02081eaf0c352ec107557 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:31:36 +0300
Subject: [PATCH 64/67] libplacebo_5: fix build with latest Python

Same change as libplacebo[_7].
---
 pkgs/by-name/li/libplacebo_5/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index 9691db7ca0ef..57ea29690d5b 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "python-compat.patch";
+      url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch";
+      hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

From 837a8169099d17c78f5da40061336634c45532be Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:33:36 +0300
Subject: [PATCH 65/67] python313Packages.ruff: fix build

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

diff --git a/pkgs/development/python-modules/ruff/default.nix b/pkgs/development/python-modules/ruff/default.nix
index edd44682d7f7..d32d951c4aec 100644
--- a/pkgs/development/python-modules/ruff/default.nix
+++ b/pkgs/development/python-modules/ruff/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage {
     # to avoid rebuilding the ruff binary for every active python package set.
     + ''
       substituteInPlace pyproject.toml \
-        --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \
+        --replace-fail 'requires = ["maturin>=1.9,<2.0"]' 'requires = ["hatchling"]' \
         --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"'
 
       cat >> pyproject.toml <<EOF

From 44ba17565f8e56f8742adcc560ac612d9da3ef7d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 14:32:43 +0300
Subject: [PATCH 66/67] spandsp3: nixfmt

Oops.
---
 pkgs/development/libraries/spandsp/3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index b41a9085e618..77126a7c4cee 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -13,7 +13,7 @@
     sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
 
-  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [] ++ [
+  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
     libjpeg
   ];
 })

From 618142c161b74dc626540b30eb888640ff5227ac Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 14:35:47 +0300
Subject: [PATCH 67/67] sane-backends: cherry-pick fix for scanimage locking up
 on exit

This takes installCheckPhase from hanging on probably 90% of attempts
to not hanging a single time over an hour or so of looped builds.
---
 pkgs/applications/graphics/sane/backends/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index c586ed806c73..5daa76bf0aa3 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   runtimeShell,
   buildPackages,
   gettext,
@@ -52,6 +53,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";
   };
 
+  # Fix hangs in tests, hopefully
+  # FIXME: remove in next release
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.com/sane-project/backends/-/commit/8acc267d5f4049d8438456821137ae56e91baea9.patch";
+      hash = "sha256-IyupDeH1MPvEBnGaUzBbCu106Gp7zXxlPGFAaiiINQI=";
+    })
+  ];
+
   postPatch = ''
     # Do not create lock dir in install phase
     sed -i '/^install-lockpath:/!b;n;c\       # pass' backend/Makefile.am