From 8715fb4f5818869624cb7dac9980a937891a5a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 22 Mar 2025 14:16:16 +0100
Subject: [PATCH 001/104] elvis: unbreak

Disable check for the NEED_WAIT_H macro to always include <sys/wait.h>
as it fails otherwise with gcc14 and newer compilers.
---
 pkgs/by-name/el/elvis/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix
index b3740b94bfe2..fe32e110c66b 100644
--- a/pkgs/by-name/el/elvis/package.nix
+++ b/pkgs/by-name/el/elvis/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace configure \
-      --replace-fail '-lcurses' '-lncurses'
+      --replace-fail '-lcurses' '-lncurses' \
+      --replace-fail 'if [ -f /usr/include/sys/wait.h ]' 'if true'
   '';
 
   installPhase = ''

From 86f4249a7af4b62c2c9334a678888513aef160aa Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sat, 22 Mar 2025 15:57:01 +0000
Subject: [PATCH 002/104] gotestsum: 1.12.0-unstable-2024-09-17 -> 1.12.1

---
 pkgs/by-name/go/gotestsum/package.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/go/gotestsum/package.nix b/pkgs/by-name/go/gotestsum/package.nix
index 810fe5438fe8..11a808c00534 100644
--- a/pkgs/by-name/go/gotestsum/package.nix
+++ b/pkgs/by-name/go/gotestsum/package.nix
@@ -3,41 +3,36 @@
   fetchFromGitHub,
   buildGoModule,
 }:
-let
-  version = "1.12.0";
-in
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "gotestsum";
-
-  # move back to stable releases when build is successful
-  version = "${version}-unstable-2024-09-17";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "gotestyourself";
     repo = "gotestsum";
-    rev = "2f61a73f997821b2e5a1823496e8362630e213f9";
-    hash = "sha256-5zgchATcpoM4g5Mxex9wYanzrR0Pie9GYqx48toORkM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nIdGon14bAaSxUmJNlpLztQVbA8SJ76+Ve46gbM0awk=";
   };
 
-  vendorHash = "sha256-DR4AyEhgD71hFFEAnPfSxaWYFFV7FlPugZBHUjDynEE=";
+  vendorHash = "sha256-x48jjd6cIX/M8U+5QwrKalt1iLgeQKeJItLJsxXrPgY=";
 
   doCheck = false;
 
   ldflags = [
     "-s"
     "-w"
-    "-X gotest.tools/gotestsum/cmd.version=${version}"
+    "-X gotest.tools/gotestsum/cmd.version=${finalAttrs.version}"
   ];
 
   subPackages = [ "." ];
 
   meta = {
     homepage = "https://github.com/gotestyourself/gotestsum";
-    changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}";
+    changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${finalAttrs.version}";
     description = "Human friendly `go test` runner";
     mainProgram = "gotestsum";
     platforms = with lib.platforms; linux ++ darwin;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ isabelroses ];
   };
-}
+})

From 203fdbd94a7c06ffaea10ed387d5e036b0c6ac95 Mon Sep 17 00:00:00 2001
From: Vladimir Rubin <vavakado@proton.me>
Date: Fri, 28 Mar 2025 18:38:41 +0300
Subject: [PATCH 003/104] blender: move openUsdSupport from let-in to attrs

the reason for this change is having openUsdSupport in the let-in block
doesn't let users change it with overrides, but some users might want to
disable openusd support as it increases the build time by a lot
---
 pkgs/by-name/bl/blender/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 6d4516c07a6e..87dbe51ba6b5 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -53,6 +53,7 @@
   llvmPackages,
   makeWrapper,
   mesa,
+  openUsdSupport ? !stdenv.hostPlatform.isDarwin,
   openal,
   opencollada-blender,
   opencolorio,
@@ -92,7 +93,6 @@ let
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
   openImageDenoiseSupport =
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
-  openUsdSupport = !stdenv.hostPlatform.isDarwin;
   vulkanSupport = !stdenv.hostPlatform.isDarwin;
 
   python3 = python3Packages.python;

From 8f1cad433a1fdaa3b928806fed41c1251412ba29 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 3 Apr 2025 10:55:35 +0900
Subject: [PATCH 004/104] node-gyp: 11.1.0 -> 11.2.0

https://github.com/nodejs/node-gyp/blob/v11.2.0/CHANGELOG.md

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/no/node-gyp/package-lock.json | 404 ++++++++++++---------
 pkgs/by-name/no/node-gyp/package.nix       |   6 +-
 2 files changed, 226 insertions(+), 184 deletions(-)

diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json
index 914eb940dbed..18c4c6678063 100644
--- a/pkgs/by-name/no/node-gyp/package-lock.json
+++ b/pkgs/by-name/no/node-gyp/package-lock.json
@@ -1,23 +1,23 @@
 {
   "name": "node-gyp",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "node-gyp",
-      "version": "11.1.0",
+      "version": "11.2.0",
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
-        "glob": "^10.3.10",
         "graceful-fs": "^4.2.6",
         "make-fetch-happen": "^14.0.3",
         "nopt": "^8.0.0",
         "proc-log": "^5.0.0",
         "semver": "^7.3.5",
         "tar": "^7.4.3",
+        "tinyglobby": "^0.2.12",
         "which": "^5.0.0"
       },
       "bin": {
@@ -37,9 +37,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
+      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -93,10 +93,20 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
+      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
-      "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -107,9 +117,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
-      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -131,9 +141,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
-      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
+      "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -151,13 +161,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
-      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+      "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.13.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -165,9 +175,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
-      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -241,9 +251,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
-      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -393,9 +403,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "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"
     },
@@ -407,17 +417,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.0.tgz",
-      "integrity": "sha512-aFcXEJJCI4gUdXgoo/j9udUYIHgF23MFkg09LFz2dzEmU0+1Plk4rQWv/IYKvPHAtlkkGoB3m5e6oUp+JPsNaQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz",
+      "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.24.0",
-        "@typescript-eslint/type-utils": "8.24.0",
-        "@typescript-eslint/utils": "8.24.0",
-        "@typescript-eslint/visitor-keys": "8.24.0",
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/type-utils": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -433,20 +443,20 @@
       "peerDependencies": {
         "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.0.tgz",
-      "integrity": "sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
+      "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.24.0",
-        "@typescript-eslint/types": "8.24.0",
-        "@typescript-eslint/typescript-estree": "8.24.0",
-        "@typescript-eslint/visitor-keys": "8.24.0",
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/typescript-estree": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -458,18 +468,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.0.tgz",
-      "integrity": "sha512-HZIX0UByphEtdVBKaQBgTDdn9z16l4aTUz8e8zPQnyxwHBtf5vtl1L+OhH+m1FGV9DrRmoDuYKqzVrvWDcDozw==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
+      "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.24.0",
-        "@typescript-eslint/visitor-keys": "8.24.0"
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -480,14 +490,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.0.tgz",
-      "integrity": "sha512-8fitJudrnY8aq0F1wMiPM1UUgiXQRJ5i8tFjq9kGfRajU+dbPyOuHbl0qRopLEidy0MwqgTHDt6CnSeXanNIwA==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz",
+      "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.24.0",
-        "@typescript-eslint/utils": "8.24.0",
+        "@typescript-eslint/typescript-estree": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.0.1"
       },
@@ -500,13 +510,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.0.tgz",
-      "integrity": "sha512-VacJCBTyje7HGAw7xp11q439A+zeGG0p0/p2zsZwpnMzjPB5WteaWqt4g2iysgGFafrqvyLWqq6ZPZAOCoefCw==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
+      "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -518,14 +528,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.0.tgz",
-      "integrity": "sha512-ITjYcP0+8kbsvT9bysygfIfb+hBj6koDsu37JZG7xrCiy3fPJyNmfVtaGsgTUSEuTzcvME5YI5uyL5LD1EV5ZQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
+      "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.24.0",
-        "@typescript-eslint/visitor-keys": "8.24.0",
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -541,7 +551,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -571,16 +581,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.0.tgz",
-      "integrity": "sha512-07rLuUBElvvEb1ICnafYWr4hk8/U7X9RDCOqd9JcAMtjh/9oRmcfN4yGzbPVirgMR0+HLVHehmu19CWeh7fsmQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz",
+      "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.24.0",
-        "@typescript-eslint/types": "8.24.0",
-        "@typescript-eslint/typescript-estree": "8.24.0"
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/typescript-estree": "8.29.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -591,17 +601,17 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.0.tgz",
-      "integrity": "sha512-kArLq83QxGLbuHrTMoOEWO+l2MwsNS2TGISEdx8xgqpkbytB07XmlQyQdNDrCc1ecSqx0cnmhGvpX+VBwqqSkg==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
+      "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.24.0",
+        "@typescript-eslint/types": "8.29.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -622,9 +632,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -993,9 +1003,9 @@
       }
     },
     "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
-      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1007,14 +1017,14 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
-      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "get-intrinsic": "^1.2.6"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1634,13 +1644,16 @@
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
@@ -1685,22 +1698,23 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.20.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.0.tgz",
-      "integrity": "sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==",
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
+      "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.11.0",
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.20.0",
-        "@eslint/plugin-kit": "^0.2.5",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.2.0",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.23.0",
+        "@eslint/plugin-kit": "^0.2.7",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.1",
+        "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -1708,7 +1722,7 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
+        "eslint-scope": "^8.3.0",
         "eslint-visitor-keys": "^4.2.0",
         "espree": "^10.3.0",
         "esquery": "^1.5.0",
@@ -1783,13 +1797,13 @@
       }
     },
     "node_modules/eslint-plugin-n": {
-      "version": "17.15.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz",
-      "integrity": "sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==",
+      "version": "17.17.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.17.0.tgz",
+      "integrity": "sha512-2VvPK7Mo73z1rDFb6pTvkH6kFibAmnTubFq5l83vePxu0WiY1s0LOtj2WHb6Sa40R3w4mnh8GFYbHBQyMlotKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.1",
+        "@eslint-community/eslint-utils": "^4.5.0",
         "enhanced-resolve": "^5.17.1",
         "eslint-plugin-es-x": "^7.8.0",
         "get-tsconfig": "^4.8.1",
@@ -1819,9 +1833,9 @@
       }
     },
     "node_modules/eslint-plugin-n/node_modules/globals": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
-      "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
+      "version": "15.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1910,9 +1924,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -2061,9 +2075,9 @@
       "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -2145,9 +2159,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true,
       "license": "ISC"
     },
@@ -2168,12 +2182,12 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -2262,18 +2276,18 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
-      "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
+        "call-bind-apply-helpers": "^1.0.2",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "get-proto": "^1.0.0",
+        "get-proto": "^1.0.1",
         "gopd": "^1.2.0",
         "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
@@ -3366,9 +3380,9 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.0.tgz",
-      "integrity": "sha512-2v6aXUXwLP1Epd/gc32HAMIWoczx+fZwEPRHm/VwtrJzRGwR1qGZXEYV3Zp8ZjjbwaZhMrM6uHV4KVkk+XCc2w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
@@ -3473,13 +3487,12 @@
       "license": "ISC"
     },
     "node_modules/minizlib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
-      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
       "license": "MIT",
       "dependencies": {
-        "minipass": "^7.0.4",
-        "rimraf": "^5.0.5"
+        "minipass": "^7.1.2"
       },
       "engines": {
         "node": ">= 18"
@@ -3582,9 +3595,9 @@
       "license": "MIT"
     },
     "node_modules/nan": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
-      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -3632,9 +3645,9 @@
       }
     },
     "node_modules/neostandard/node_modules/globals": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
-      "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
+      "version": "15.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3724,15 +3737,16 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
+      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "es-object-atoms": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4167,9 +4181,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4177,21 +4191,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^10.3.7"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -4795,6 +4794,48 @@
         "node": ">=18"
       }
     },
+    "node_modules/tinyglobby": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
+      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.4.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4809,9 +4850,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
-      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4913,9 +4954,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -4928,15 +4969,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.24.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.0.tgz",
-      "integrity": "sha512-/lmv4366en/qbB32Vz5+kCNZEMf6xYHwh1z48suBwZvAtnXKbP+YhGe8OLE2BqC67LMqKkCNLtjejdwsdW6uOQ==",
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz",
+      "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.24.0",
-        "@typescript-eslint/parser": "8.24.0",
-        "@typescript-eslint/utils": "8.24.0"
+        "@typescript-eslint/eslint-plugin": "8.29.0",
+        "@typescript-eslint/parser": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4947,7 +4988,7 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/unbox-primitive": {
@@ -5086,16 +5127,17 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
-      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "for-each": "^0.3.3",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
         "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix
index bfcfb8876757..f7f279ecb719 100644
--- a/pkgs/by-name/no/node-gyp/package.nix
+++ b/pkgs/by-name/no/node-gyp/package.nix
@@ -7,16 +7,16 @@
 
 (buildNpmPackage.override { inherit nodejs; }) rec {
   pname = "node-gyp";
-  version = "11.1.0";
+  version = "11.2.0";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
     tag = "v${version}";
-    hash = "sha256-KbV0lhBICx9oRWA8Gq/ex2cfeHbZSQq8JCjwCCIcrYk=";
+    hash = "sha256-NOVswjTByrQ+2z4H9wYd4YIWKhWIdgxpz2pE0dOK6qc=";
   };
 
-  npmDepsHash = "sha256-TQKSR0h/RH4/P+HENT+mwb0AFWkBo7SUh51yfCq/jVk=";
+  npmDepsHash = "sha256-emCYKqe6Bn1hmUq9jPDo5Nu9n43s4kb0E8lQndVtmlQ=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From ca829335db54862311f218c79f849fbda5680e80 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 8 Apr 2025 12:14:55 +0900
Subject: [PATCH 005/104] fishnet: prefer versionCheckHook rather than
 testers.testVersion

https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84
---
 pkgs/by-name/fi/fishnet/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index 8fd0f00138a2..d7742b7ca89a 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -3,8 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   fetchurl,
-  testers,
-  fishnet,
+  versionCheckHook,
 }:
 
 let
@@ -42,9 +41,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA=";
 
-  passthru.tests.version = testers.testVersion {
-    package = fishnet;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgramArg = "--version";
 
   meta = with lib; {
     description = "Distributed Stockfish analysis for lichess.org";

From 85116561bcd61a931d98ee883df6d129486a66f1 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 8 Apr 2025 12:30:43 +0900
Subject: [PATCH 006/104] fishnet: prefer finalAttrs rather than rec

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

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index d7742b7ca89a..bbf8b3930bbf 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -19,14 +19,14 @@ let
     sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
   };
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fishnet";
   version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8=";
     fetchSubmodules = true;
   };
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
   versionCheckProgramArg = "--version";
 
   meta = with lib; {
@@ -62,4 +62,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "fishnet";
   };
-}
+})

From 2f8642eab588152705dfe012a0b5d707605acdbe Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 8 Apr 2025 12:33:55 +0900
Subject: [PATCH 007/104] fishnet: prefer hash rather than sha256 in fetchurl

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

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index bbf8b3930bbf..8dc4a9eb9734 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -11,12 +11,12 @@ let
   nnueBigFile = "nn-1111cefa1111.nnue";
   nnueBig = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
-    sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
+    hash = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
   };
   nnueSmallFile = "nn-37f18f62d772.nnue";
   nnueSmall = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
-    sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
+    hash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
   };
 in
 rustPlatform.buildRustPackage (finalAttrs: {

From bdce1c44a26a09891c680d9dfdcbc38b3954628c Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 10 Apr 2025 17:02:16 +0900
Subject: [PATCH 008/104] fishnet: prefer tag rather than rev for
 fetchFromGitHub

This commit introduces reverted 65a333600d5c88a98d674f637d092807cfc12253
again only for this package.
---
 pkgs/by-name/fi/fishnet/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index 8dc4a9eb9734..e45a41c8b2e1 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8=";
     fetchSubmodules = true;
   };

From a00e9a3ac0cb59a91af811dfc5292fa05f840a85 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 10 Apr 2025 14:39:45 +0000
Subject: [PATCH 009/104] gnome-solanum: 5.0.0 -> 6.0.0

Diff: https://gitlab.gnome.org/World/Solanum/-/compare/5.0.0..6.0.0
---
 pkgs/by-name/gn/gnome-solanum/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix
index b23b4c3dda2d..dbc767e5166f 100644
--- a/pkgs/by-name/gn/gnome-solanum/package.nix
+++ b/pkgs/by-name/gn/gnome-solanum/package.nix
@@ -23,20 +23,20 @@
 
 stdenv.mkDerivation rec {
   pname = "solanum";
-  version = "5.0.0";
+  version = "6.0.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Solanum";
     rev = version;
-    hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y=";
+    hash = "sha256-Wh9/88Vc4mtjL0U1Vrw+GEEBPjEv+5NrWd/Kw1glp+w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc=";
+    hash = "sha256-krjbeutochFk5md+THlYBW4iEwfFDbK89DYHZyd3IKo=";
   };
 
   postPatch = ''

From da9f701b1825e03a53ca9af61bcdaa107468b3b8 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 10 Apr 2025 12:27:34 -0400
Subject: [PATCH 010/104] gnome-solanum: modernize

---
 pkgs/by-name/gn/gnome-solanum/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix
index dbc767e5166f..8225396d41fb 100644
--- a/pkgs/by-name/gn/gnome-solanum/package.nix
+++ b/pkgs/by-name/gn/gnome-solanum/package.nix
@@ -21,7 +21,7 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "solanum";
   version = "6.0.0";
 
@@ -29,13 +29,12 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Solanum";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-Wh9/88Vc4mtjL0U1Vrw+GEEBPjEv+5NrWd/Kw1glp+w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-krjbeutochFk5md+THlYBW4iEwfFDbK89DYHZyd3IKo=";
   };
 
@@ -71,12 +70,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/World/Solanum";
     description = "Pomodoro timer for the GNOME desktop";
-    maintainers = with maintainers; [ linsui ] ++ lib.teams.gnome-circle.members;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ linsui ] ++ lib.teams.gnome-circle.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     mainProgram = "solanum";
   };
-}
+})

From 0a2144000ed2af68d59ef7d735a68cfd5c7a0501 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 10 Apr 2025 21:21:19 +0900
Subject: [PATCH 011/104] fishnet: add update script

---
 pkgs/by-name/fi/fishnet/package.nix | 36 ++++++++++++++++++++++--
 pkgs/by-name/fi/fishnet/update.bash | 43 +++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/fi/fishnet/update.bash

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index e45a41c8b2e1..d2fe80135f5c 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -4,19 +4,26 @@
   fetchFromGitHub,
   fetchurl,
   versionCheckHook,
+  writeShellApplication,
+  curl,
+  jq,
+  nix-update,
+  common-updater-scripts,
 }:
 
 let
   # These files can be found in Stockfish/src/evaluate.h
   nnueBigFile = "nn-1111cefa1111.nnue";
+  nnueBigHash = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
   nnueBig = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
-    hash = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
+    hash = nnueBigHash;
   };
   nnueSmallFile = "nn-37f18f62d772.nnue";
+  nnueSmallHash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
   nnueSmall = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
-    hash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
+    hash = nnueSmallHash;
   };
 in
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -48,6 +55,31 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
   versionCheckProgramArg = "--version";
 
+  passthru = {
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-${finalAttrs.pname}";
+
+      runtimeInputs = [
+        curl
+        jq
+        nix-update
+        common-updater-scripts
+      ];
+
+      runtimeEnv = {
+        PNAME = finalAttrs.pname;
+        PKG_FILE = builtins.toString ./package.nix;
+        GITHUB_REPOSITORY = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
+        NNUE_BIG_FILE = nnueBigFile;
+        NNUE_BIG_HASH = nnueBigHash;
+        NNUE_SMALL_FILE = nnueSmallFile;
+        NNUE_SMALL_HASH = nnueSmallHash;
+      };
+
+      text = builtins.readFile ./update.bash;
+    });
+  };
+
   meta = with lib; {
     description = "Distributed Stockfish analysis for lichess.org";
     homepage = "https://github.com/lichess-org/fishnet";
diff --git a/pkgs/by-name/fi/fishnet/update.bash b/pkgs/by-name/fi/fishnet/update.bash
new file mode 100644
index 000000000000..8bf6997f3936
--- /dev/null
+++ b/pkgs/by-name/fi/fishnet/update.bash
@@ -0,0 +1,43 @@
+new_version="$(
+    curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest" |
+        jq '.tag_name | ltrimstr("v")' --raw-output
+)"
+stockfish_revision="$(
+    curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/contents/Stockfish?ref=v$new_version" |
+        jq .sha --raw-output
+)"
+stockfish_header="$(
+    curl --fail --silent "https://raw.githubusercontent.com/official-stockfish/Stockfish/$stockfish_revision/src/evaluate.h"
+)"
+new_nnue_big_file="$(
+    echo "$stockfish_header" |
+        grep --perl-regexp --only-matching 'EvalFileDefaultNameBig "\Knn-(\w+).nnue'
+)"
+new_nnue_big_hash="$(
+    nix hash to-sri --type sha256 "$(
+        nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_big_file}"
+    )"
+)"
+new_nnue_small_file="$(
+    echo "$stockfish_header" |
+        grep --perl-regexp --only-matching 'EvalFileDefaultNameSmall "\Knn-(\w+).nnue'
+)"
+new_nnue_small_hash="$(
+    nix hash to-sri --type sha256 "$(
+        nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_small_file}"
+    )"
+)"
+
+# Update NNUE
+pkg_body="$(<"$PKG_FILE")"
+pkg_body="${pkg_body//"$NNUE_BIG_FILE"/"$new_nnue_big_file"}"
+pkg_body="${pkg_body//"$NNUE_BIG_HASH"/"$new_nnue_big_hash"}"
+pkg_body="${pkg_body//"$NNUE_SMALL_FILE"/"$new_nnue_small_file"}"
+pkg_body="${pkg_body//"$NNUE_SMALL_HASH"/"$new_nnue_small_hash"}"
+echo "$pkg_body" >"$PKG_FILE"
+
+# Update version, src
+update-source-version "$PNAME" "$new_version" --ignore-same-version --print-changes
+
+# Update cargoHash
+nix-update --version=skip "$PNAME"

From b32d0267c035f95a7d6fec9b180feaa71521f397 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 11 Apr 2025 00:20:37 +0900
Subject: [PATCH 012/104] fishnet: 2.9.4 -> 2.9.5

Diff: https://github.com/lichess-org/fishnet/compare/v2.9.4...v2.9.5

This patch has been generated with following command

```
nix-shell ./maintainers/scripts/update.nix --argstr package fishnet
```
---
 pkgs/by-name/fi/fishnet/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index d2fe80135f5c..d77f785d09e7 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -13,8 +13,8 @@
 
 let
   # These files can be found in Stockfish/src/evaluate.h
-  nnueBigFile = "nn-1111cefa1111.nnue";
-  nnueBigHash = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
+  nnueBigFile = "nn-1c0000000000.nnue";
+  nnueBigHash = "sha256-HAAAAAAApn1imZnZMtDDc/dFDOQ80S0FYoaPTq+a4q0=";
   nnueBig = fetchurl {
     url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
     hash = nnueBigHash;
@@ -28,13 +28,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fishnet";
-  version = "2.9.4";
+  version = "2.9.5";
 
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8=";
+    hash = "sha256-+JkqxO7wwYZHwWRMboKGe8uo/F223efR+9pIsAIoFpU=";
     fetchSubmodules = true;
   };
 
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA=";
+  cargoHash = "sha256-WjBrv4GApT7LTnexLDhY7Zni5kLtvUzaGs2YuA3UiHE=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From da76ddc1bc1c272f54b77526ef7c76c094fce135 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 11 Apr 2025 19:39:37 +0800
Subject: [PATCH 013/104] kitex: 0.13.0 -> 0.13.1

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

diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index cc60333b66b2..4eeb2099de2a 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -6,15 +6,15 @@
   kitex,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kitex";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
-    rev = "v${version}";
-    hash = "sha256-1dgQgc9XljawyH+MIDPNqcwHMH0yW2BMY8TZnc+P13I=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ivuAqHOerGkaEX/zfzViY1xhNrymMOBv8RPGAPNYp/4=";
   };
 
   vendorHash = "sha256-31OgNcAL2NJq5b96UmQnVecdusY4AtUP/O2MVCmPk+8=";
@@ -33,7 +33,7 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion {
     package = kitex;
-    version = "v${version}";
+    version = "v${finalAttrs.version}";
   };
 
   meta = {
@@ -43,4 +43,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "kitex";
   };
-}
+})

From 4d3929d0b1d65d5114c1c54f2fc797d254931d12 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Fri, 11 Apr 2025 15:07:03 +0200
Subject: [PATCH 014/104] nixos/television: init module

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 nixos/modules/module-list.nix         |  1 +
 nixos/modules/programs/television.nix | 42 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 nixos/modules/programs/television.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 51d1690ff9a1..77e5dff5f1c1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -313,6 +313,7 @@
   ./programs/system-config-printer.nix
   ./programs/systemtap.nix
   ./programs/tcpdump.nix
+  ./programs/television.nix
   ./programs/thefuck.nix
   ./programs/thunar.nix
   ./programs/thunderbird.nix
diff --git a/nixos/modules/programs/television.nix b/nixos/modules/programs/television.nix
new file mode 100644
index 000000000000..1989df2b925b
--- /dev/null
+++ b/nixos/modules/programs/television.nix
@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib.options) mkEnableOption mkPackageOption;
+  inherit (lib.modules) mkIf;
+  inherit (lib.meta) getExe;
+
+  cfg = config.programs.television;
+in
+{
+  options.programs.television = {
+    enable = mkEnableOption "Blazingly fast general purpose fuzzy finder TUI";
+    package = mkPackageOption pkgs "television" { };
+
+    enableBashIntegration = mkEnableOption "Bash integration";
+    enableZshIntegration = mkEnableOption "Zsh integration";
+    enableFishIntegration = mkEnableOption "Fish integration";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    programs = {
+      zsh.interactiveShellInit = mkIf cfg.enableZshIntegration ''
+        eval "$(${getExe cfg.package} init zsh)"
+      '';
+      bash.interactiveShellInit = mkIf cfg.enableBashIntegration ''
+        eval "$(${getExe cfg.package} init bash)"
+      '';
+      fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+        ${getExe cfg.package} init fish | source
+      '';
+    };
+
+  };
+
+  meta.maintainers = with lib.maintainers; [ pbek ];
+}

From be535c2b929c29d531b9a9d112e24f48112f3080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Apr 2025 21:42:37 +0000
Subject: [PATCH 015/104] python312Packages.djangosaml2: 1.9.3 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix
index e8807ddd78d0..0db0264877bf 100644
--- a/pkgs/development/python-modules/djangosaml2/default.nix
+++ b/pkgs/development/python-modules/djangosaml2/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "djangosaml2";
-  version = "1.9.3";
+  version = "1.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "IdentityPython";
     repo = "djangosaml2";
     tag = "v${version}";
-    hash = "sha256-rbmEJuG2mgozpCFOXZUJFxv8v52IRQeaeAKfeUDACeU=";
+    hash = "sha256-5o89tqGlklVS6WwxPUG+3rXBFVSqv8QXmoGVonBucK4=";
   };
 
   build-system = [ setuptools ];
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = {
     description = "Django SAML2 Service Provider based on pySAML2";
     homepage = "https://github.com/IdentityPython/djangosaml2";
-    changelog = "https://github.com/IdentityPython/djangosaml2/blob/v${version}/CHANGES";
+    changelog = "https://github.com/IdentityPython/djangosaml2/blob/${src.tag}/CHANGES";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ melvyn2 ];
   };

From 4533e57d0dfefa7998221694f325f877656f0f24 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 25 Mar 2025 17:11:26 +0800
Subject: [PATCH 016/104] moarvm: 2025.01 -> 2025.03

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 9000fab8bb72..73ee14bd505c 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2025.01";
+  version = "2025.03";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
     rev = version;
-    hash = "sha256-Xvkn1edzOeXBiBn2QSwk0eKfSG1JvfSkVrCAmyYtlmI=";
+    hash = "sha256-8uvO4GcediL0ysYWApEo6C583nw5QcrjN+0EmO2NKWo=";
     fetchSubmodules = true;
   };
 

From 2de38412b48d1bb9e96a4e46aae810adc0af9793 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 25 Mar 2025 17:16:02 +0800
Subject: [PATCH 017/104] nqp: 2025.01 -> 2025.03

---
 pkgs/development/interpreters/rakudo/nqp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index b1d06179fc23..e0ef64022138 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2025.01";
+  version = "2025.03";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
     rev = version;
-    hash = "sha256-45L3fEL8jIk9bkKpuhrsLM014zNW1P7Kf6qVXxJjWws=";
+    hash = "sha256-/+MfjR7J2fwwMu8oRaBqjKi1dI0+6WZENzpymXEYN/Q=";
     fetchSubmodules = true;
   };
 

From 05a889a9250f1250bd4b54217669e323ea31bdec Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 25 Mar 2025 17:21:40 +0800
Subject: [PATCH 018/104] rakudo: 2025.01 -> 2025.03

---
 pkgs/development/interpreters/rakudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 145f515a3c1d..ce69c2b8488d 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2025.01";
+  version = "2025.03";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
     rev = version;
-    hash = "sha256-NrbeB6/VnxlUt6glIvetK1o9huWaeVD6WLdpi4bb2FU=";
+    hash = "sha256-7gqBjhPtD4gm3D3uNlzOFftETvgbdQn7TKlKaEke/hg=";
     fetchSubmodules = true;
   };
 

From 7304599c02f5ba6637e3f7e988d2f5a302d0d17c Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Sat, 12 Apr 2025 19:17:34 +0800
Subject: [PATCH 019/104] maintainers: add dabao1955

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ea268847edf1..3cdb222389d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5240,6 +5240,12 @@
     github = "d4rkstar";
     githubId = 4957015;
   };
+  dabao1955 = {
+    email = "dabao1955@163.com";
+    github = "dabao1955";
+    githubId = 79307765;
+    name = "Hang Li";
+  };
   dadada = {
     name = "dadada";
     email = "dadada@dadada.li";

From f594460198f4b0aa764b10e99b3e7ba91ee9d559 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Sat, 12 Apr 2025 21:20:21 +0200
Subject: [PATCH 020/104] borgmatic: 1.9.14 -> 2.0.2

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

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 6456f44e3e6e..752fe1dfe4cd 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "1.9.14";
+  version = "2.0.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-w503lwXlKWlTsguzECUGmsbhvdJzTF4XK+Ib2KuD2DE=";
+    hash = "sha256-Zem1Zn+S01/rpPOOPhTaRaAgIqq2UixEdjEOodbkk5w=";
   };
 
   passthru.updateScript = nix-update-script { };

From 8d568e70ed6e475cf79dad470d9d2ee8e63a88a8 Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Sat, 12 Apr 2025 15:41:16 +0800
Subject: [PATCH 021/104] ruri: init at 3.8

---
 pkgs/by-name/ru/ruri/package.nix | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ru/ruri/package.nix

diff --git a/pkgs/by-name/ru/ruri/package.nix b/pkgs/by-name/ru/ruri/package.nix
new file mode 100644
index 000000000000..ed39092e3688
--- /dev/null
+++ b/pkgs/by-name/ru/ruri/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libcap,
+  libseccomp,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ruri";
+  version = "3.8";
+
+  src = fetchFromGitHub {
+    owner = "Moe-hacker";
+    repo = "ruri";
+    rev = "v${finalAttrs.version}";
+    fetchSubmodules = false;
+    sha256 = "sha256-gf+WJPGeLbMntBk8ryTSsV9L4J3N4Goh9eWBIBj5FA4=";
+  };
+
+  buildInputs = [
+    libcap
+    libseccomp
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 ruri $out/bin/ruri
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Self-contained Linux container implementation";
+    homepage = "https://wiki.crack.moe/ruri";
+    downloadPage = "https://github.com/Moe-hacker/ruri";
+    changelog = "https://github.com/Moe-hacker/ruri/releases/tag/v${finalAttrs.version}";
+    mainProgram = "ruri";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.dabao1955 ];
+  };
+})

From 86ceaa46f4666f6b84712e78d1a58b2894f237fe Mon Sep 17 00:00:00 2001
From: Isaac Kabel <me@igk.nz>
Date: Sun, 13 Apr 2025 15:17:31 +1200
Subject: [PATCH 022/104] prisma,prisma-engines: 6.3.0 -> 6.5.0

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

diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index d7156eaa6ba9..cdd7de693da2 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -13,17 +13,17 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "6.3.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    hash = "sha256-gQLDskabTaNk19BJi9Kv4TiEfVck2QZ7xdhopt5KH6M=";
+    hash = "sha256-m3LBIMIVMI5GlY0+QNw/nTlNWt2rGOZ28z+CfdP51cY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GLOGivOH8psE5/M5kYakh9Cab4Xe5Q8isY1c6YDyAB8=";
+  cargoHash = "sha256-yG+omKAS1eWq3sFgKXMoZWhTP4M34dVRes7OhhTUyTQ=";
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index 5240f890a1a7..aa029b42879f 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma";
-  version = "6.3.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     rev = finalAttrs.version;
-    hash = "sha256-Buu+E0xxjcrPOyEHkQTp7IVS9kymmR1PTegeOXxb2PA=";
+    hash = "sha256-j/2XUrkxoplvXB8XNOqceZgVxG7F2J7N8wiLY4nHhKo=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-rAEUkk3uWVuUDrSRz6d2Ewr3vi4rzYmO0yLTCl21qZ4=";
+    hash = "sha256-EED14kiAKEIiEinYHRpWhTuZA6zLVZvtULZvkZviNbE=";
   };
 
   patchPhase = ''

From 5a413d21be11a2833430644aafd9672d3a000dc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Apr 2025 20:33:28 +0000
Subject: [PATCH 023/104] ebusd: 24.1 -> 25.1

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

diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix
index d0549942bcc9..cc2a2e9d7f02 100644
--- a/pkgs/by-name/eb/ebusd/package.nix
+++ b/pkgs/by-name/eb/ebusd/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ebusd";
-  version = "24.1";
+  version = "25.1";
 
   src = fetchFromGitHub {
     owner = "john30";
     repo = "ebusd";
     rev = version;
-    sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4=";
+    sha256 = "sha256-rj0Wkfk3Tpm58fbCUkgCdHt5MvW+tGgDyUd5COXfBc0=";
   };
 
   nativeBuildInputs = [

From e0191a1b090d0b03a4a2be78825faffd3d241326 Mon Sep 17 00:00:00 2001
From: Isaac Kabel <me@igk.nz>
Date: Tue, 15 Apr 2025 10:48:09 +1200
Subject: [PATCH 024/104] Update prisma,prima-engines version in release notes

---
 doc/release-notes/rl-2505.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 213b0c0b346a..847c254fcff3 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -298,7 +298,7 @@
   add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the
   vim plugin.
 
-- `prisma` and `prisma-engines` have been updated to version 6.3.0, which
+- `prisma` and `prisma-engines` have been updated to version 6.5.0, which
   introduces several breaking changes. See the
   [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6)
   for more information.

From fd75ab0135c7ce8d7b7c7af412c9f63637f8b129 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 15 Apr 2025 07:41:34 +0800
Subject: [PATCH 025/104] adminer: 5.1.1 -> 5.2.1

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

diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix
index fbda3c4b7897..cc532ae1f6c5 100644
--- a/pkgs/by-name/ad/adminer/package.nix
+++ b/pkgs/by-name/ad/adminer/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.1.1";
   pname = "adminer";
+  version = "5.2.1";
 
   # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
   src = fetchurl {
     url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip";
-    hash = "sha256-L1akLFljp4UW/YEVLi317ijY62WN9L4g+OQ127vUP/4=";
+    hash = "sha256-EQmCZRkH27rqLeNCDysjUGwm8wxMvxbO7cHgV8Vq8yo=";
   };
 
   nativeBuildInputs = [
@@ -44,17 +44,17 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Database management in a single PHP file";
     homepage = "https://www.adminer.org";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       gpl2Only
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jtojnar
       sstef
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 })

From 3eafda9b5e557941448d0e754059d1b1fe6c25fc Mon Sep 17 00:00:00 2001
From: Supa <36031171+0Supa@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:17:53 +0300
Subject: [PATCH 026/104] chatterino2: enable gitUpdater script

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

diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix
index cd22b02ec183..e7c7d84c5dcb 100644
--- a/pkgs/by-name/ch/chatterino2/package.nix
+++ b/pkgs/by-name/ch/chatterino2/package.nix
@@ -2,7 +2,7 @@
   lib,
   callPackage,
   fetchFromGitHub,
-  nix-update-script,
+  gitUpdater,
   boost186,
 }:
 
@@ -24,7 +24,10 @@
 
       passthru = {
         buildChatterino = args: callPackage ./common.nix args;
-        updateScript = nix-update-script { };
+        updateScript = gitUpdater {
+          rev-prefix = "v";
+          ignoredVersions = "beta";
+        };
       };
 
       meta = {

From 1bdd049560f19d7a6edcf902957d1d1adeeb1dbe Mon Sep 17 00:00:00 2001
From: Supa <36031171+0Supa@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:18:06 +0300
Subject: [PATCH 027/104] chatterino7: enable gitUpdater script

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

diff --git a/pkgs/by-name/ch/chatterino7/package.nix b/pkgs/by-name/ch/chatterino7/package.nix
index 3bff23f94c4c..3673d8022322 100644
--- a/pkgs/by-name/ch/chatterino7/package.nix
+++ b/pkgs/by-name/ch/chatterino7/package.nix
@@ -2,7 +2,7 @@
   lib,
   chatterino2,
   fetchFromGitHub,
-  nix-update-script,
+  gitUpdater,
   boost186,
 }:
 
@@ -23,7 +23,10 @@
         fetchSubmodules = true;
       };
 
-      passthru.updateScript = nix-update-script { };
+      passthru.updateScript = gitUpdater {
+        rev-prefix = "v";
+        ignoredVersions = "beta";
+      };
 
       meta = {
         description = "Chat client for Twitch chat";

From 187d9c641e7eda152d1e2cf5d967325e30a4e0d6 Mon Sep 17 00:00:00 2001
From: Supa <36031171+0Supa@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:18:44 +0300
Subject: [PATCH 028/104] chatterino7: add supa as a maintainer

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

diff --git a/pkgs/by-name/ch/chatterino7/package.nix b/pkgs/by-name/ch/chatterino7/package.nix
index 3673d8022322..f17e42132621 100644
--- a/pkgs/by-name/ch/chatterino7/package.nix
+++ b/pkgs/by-name/ch/chatterino7/package.nix
@@ -41,7 +41,10 @@
         changelog = "https://github.com/SevenTV/chatterino7/blob/${finalAttrs.src.rev}/CHANGELOG.c7.md";
         license = lib.licenses.mit;
         platforms = lib.platforms.unix;
-        maintainers = with lib.maintainers; [ marie ];
+        maintainers = with lib.maintainers; [
+          marie
+          supa
+        ];
       };
     }
   )

From 4e4b6efd4d93b68b67b8248f4a68aba09b86e3f7 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Tue, 15 Apr 2025 14:46:55 +0200
Subject: [PATCH 029/104] frida-tools: 13.6.1 -> 13.7.1

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

diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix
index 9cd64d846448..ab5fe8501a2b 100644
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@@ -6,11 +6,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
-  version = "13.6.1";
+  version = "13.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA=";
+    hash = "sha256-c0Gq1ep75WAvTGIj4c7xSy0NjCGK5wrRPYzeYyFHDgU=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From d50d6b1324b916a9178795c51cfb90eb0d60997f Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Tue, 15 Apr 2025 14:47:10 +0200
Subject: [PATCH 030/104] python3Packages.frida-python: 16.5.7 -> 16.7.11

---
 .../python-modules/frida-python/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix
index 7decc1885e6f..ec2e459dff13 100644
--- a/pkgs/development/python-modules/frida-python/default.nix
+++ b/pkgs/development/python-modules/frida-python/default.nix
@@ -5,7 +5,7 @@
   buildPythonPackage,
 }:
 let
-  version = "16.5.7";
+  version = "16.7.11";
   format = "wheel";
   inherit (stdenvNoCC.hostPlatform) system;
 
@@ -13,19 +13,19 @@ let
   pypiMeta =
     {
       x86_64-linux = {
-        hash = "sha256-+2P+Be7xDWBHesqcGupt6gGdUmda0zIp8HkyJqzGgio=";
+        hash = "sha256-aAPVZPz1mn73JuQPGJ/PAOUAtaufeHehSKHzaBmVFF8=";
         platform = "manylinux1_x86_64";
       };
       aarch64-linux = {
-        hash = "sha256-CH7+4ehbrQ4JcRO7CxCVeMLPO57qzAWQPOhywbpmRE8=";
+        hash = "sha256-mQgfMJ6esH41MXnGZQUwF4j8gDgzfyBDUQo5Kw8TGa4=";
         platform = "manylinux2014_aarch64";
       };
       x86_64-darwin = {
-        hash = "sha256-nG/ZDZ8jbClbzn3/raMC2JdqS2QQMEyGN/jnJLZGfWs=";
+        hash = "sha256-TuWvQ4oDkK5Fn/bp0G3eAhvDLlv0tzIQ8dKtysX36w0=";
         platform = "macosx_10_13_x86_64";
       };
       aarch64-darwin = {
-        hash = "sha256-6hbIKv3R4deqrZyCGXwpXk84ej8elpPGYvfUi5DCmtM=";
+        hash = "sha256-QWfWbGnKeuKiGoD0srnnMsbWPYFcYsbO/Oy68uJIRjI=";
         platform = "macosx_11_0_arm64";
       };
     }

From 1b7cedf3be01f35819790c486d5bf0e75e004825 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 16 Apr 2025 04:27:20 +0800
Subject: [PATCH 031/104] arti: 1.3.2 -> 1.4.2

---
 pkgs/by-name/ar/arti/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index b35cc724d2bd..58d2bd27db10 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -10,21 +10,21 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "arti";
-  version = "1.3.2";
+  version = "1.4.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
     group = "tpo";
     owner = "core";
     repo = "arti";
-    tag = "arti-v${version}";
-    hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A=";
+    tag = "arti-v${finalAttrs.version}";
+    hash = "sha256-dryW7znckIsa7O2H0U7p1urBXtANU6B9Pv11A+pBiho=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-brC8ZTB/+LAtNiG9/MGhPzzFcnaEBV/zU9lexZ56N/I=";
+  cargoHash = "sha256-o4he+WVsXf5GymTOvbBIsdhnGrvDtD8AMWmRMQMNiOw=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
@@ -52,18 +52,18 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; };
   };
 
   meta = {
     description = "Implementation of Tor in Rust";
     mainProgram = "arti";
     homepage = "https://arti.torproject.org/";
-    changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${version}/CHANGELOG.md";
+    changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit
     ];
     maintainers = with lib.maintainers; [ rapiteanu ];
   };
-}
+})

From b4a1c350fa7dae5858905ff4539bb37065caa81f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 16 Apr 2025 16:11:05 +0800
Subject: [PATCH 032/104] c2patool: 0.9.12 -> 0.16.4

---
 pkgs/by-name/c2/c2patool/package.nix | 35 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 6122da0739a9..746a8a971242 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -8,19 +8,19 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.9.12";
+  version = "0.16.4";
 
   src = fetchFromGitHub {
     owner = "contentauth";
-    repo = "c2patool";
-    rev = "v${version}";
-    hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY=";
+    repo = "c2pa-rs";
+    tag = "c2patool-v${finalAttrs.version}";
+    hash = "sha256-mJ9839jW8+HuzyFJuT+PwERGXO765ST5iMmHz4DdbGQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jod9wKuyhbY+/3NIEMZGoKIA1rT6Y4XoLKqYvzM5fAQ=";
+  cargoHash = "sha256-cRMeaQUkm5YenLruM+l3BWkWQqYhtRpb4s9HyzRn71k=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;
@@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
+
+  # could not compile `c2pa` (lib test) due to 102 previous errors
+  doCheck = false;
 
   checkFlags = [
     # These tests rely on additional executables to be compiled to "target/debug/".
@@ -51,18 +52,16 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
-  meta = with lib; {
-    description = "Command line tool for displaying and adding C2PA manifests";
-    homepage = "https://github.com/contentauth/c2patool";
-    license = with licenses; [
+  meta = {
+    description = "Command line tool for working with C2PA manifests and media assets";
+    homepage = "https://github.com/contentauth/c2pa-rs/tree/main/cli";
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ok-nick ];
+    maintainers = with lib.maintainers; [ ok-nick ];
     mainProgram = "c2patool";
   };
-}
+})

From f0529548e8ad6d4bb1d2944e9be1ac4a4f93f59d Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:20:27 +0800
Subject: [PATCH 033/104] python313Packages.blacken-docs: 1.15.0 -> 1.19.1

Diff: https://github.com/adamchainz/blacken-docs/compare/1.15.0...1.19.1

Changelog: https://github.com/adamchainz/blacken-docs/blob/1.19.1/CHANGELOG.rst
---
 .../python-modules/blacken-docs/default.nix   | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix
index 7370471c2604..638d8e5f2260 100644
--- a/pkgs/development/python-modules/blacken-docs/default.nix
+++ b/pkgs/development/python-modules/blacken-docs/default.nix
@@ -9,34 +9,28 @@
 
 buildPythonPackage rec {
   pname = "blacken-docs";
-  version = "1.15.0";
+  version = "1.19.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "blacken-docs";
-    rev = version;
-    hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8=";
+    tag = version;
+    hash = "sha256-cMnwOrkOma+su4CDheHRd484pG4GMSm+i/Xcus3E+m8=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [
-    black
-  ];
+  dependencies = [ black ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/adamchainz/blacken-docs";
     changelog = "https://github.com/adamchainz/blacken-docs/blob/${src.rev}/CHANGELOG.rst";
     description = "Run Black on Python code blocks in documentation files";
-    license = licenses.mit;
-    maintainers = with maintainers; [ l0b0 ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.l0b0 ];
     mainProgram = "blacken-docs";
   };
 }

From 3d6298f1db7948a292932ab363fea0d65ccbe16a Mon Sep 17 00:00:00 2001
From: ilys <185637611+ilyist@users.noreply.github.com>
Date: Fri, 14 Mar 2025 22:19:26 +0100
Subject: [PATCH 034/104] moonlight: 1.3.9 -> 1.3.12; moonlight: improved stuff
 and fixed updating

---
 .../mo/moonlight/disable_updates.patch        | 78 +++++++++++++++++++
 pkgs/by-name/mo/moonlight/package.nix         | 31 +++++---
 2 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/mo/moonlight/disable_updates.patch

diff --git a/pkgs/by-name/mo/moonlight/disable_updates.patch b/pkgs/by-name/mo/moonlight/disable_updates.patch
new file mode 100644
index 000000000000..10a76daad274
--- /dev/null
+++ b/pkgs/by-name/mo/moonlight/disable_updates.patch
@@ -0,0 +1,78 @@
+diff --git a/packages/core-extensions/src/moonbase/host.ts b/packages/core-extensions/src/moonbase/host.ts
+index 8903f41..e5c8709 100644
+--- a/packages/core-extensions/src/moonbase/host.ts
++++ b/packages/core-extensions/src/moonbase/host.ts
+@@ -79,22 +79,9 @@ electron.app.whenReady().then(() => {
+ 
+     if (!entries.find((e) => e.label === "moonlight")) {
+       const options: Electron.MenuItemConstructorOptions[] = [
+-        { label: "Update and restart", click: updateAndRestart },
+         { label: "Reset config", click: resetConfig }
+       ];
+ 
+-      if (moonlightHost.branch !== MoonlightBranch.DEV) {
+-        options.push({
+-          label: "Switch branch",
+-          submenu: [MoonlightBranch.STABLE, MoonlightBranch.NIGHTLY].map((branch) => ({
+-            label: branch,
+-            type: "radio",
+-            checked: moonlightHost.branch === branch,
+-            click: () => changeBranch(branch)
+-          }))
+-        });
+-      }
+-
+       options.push({ label: "About", click: showAbout });
+ 
+       entries.splice(i + 1, 0, {
+diff --git a/packages/core-extensions/src/moonbase/native.ts b/packages/core-extensions/src/moonbase/native.ts
+index c6e068f..0adc765 100644
+--- a/packages/core-extensions/src/moonbase/native.ts
++++ b/packages/core-extensions/src/moonbase/native.ts
+@@ -39,24 +39,7 @@ export default function getNatives(): MoonbaseNatives {
+ 
+   return {
+     async checkForMoonlightUpdate() {
+-      try {
+-        if (moonlightGlobal.branch === MoonlightBranch.STABLE) {
+-          const json = await getStableRelease();
+-          return json.name !== moonlightGlobal.version ? json.name : null;
+-        } else if (moonlightGlobal.branch === MoonlightBranch.NIGHTLY) {
+-          const req = await fetch(nightlyRefUrl, {
+-            cache: "no-store",
+-            headers: sharedHeaders
+-          });
+-          const ref = (await req.text()).split("\n")[0];
+-          return ref !== moonlightGlobal.version ? ref : null;
+-        }
+-
+-        return null;
+-      } catch (e) {
+-        logger.error("Error checking for moonlight update", e);
+-        return null;
+-      }
++      return null;
+     },
+ 
+     async updateMoonlight(overrideBranch?: MoonlightBranch) {
+diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
+index 302c610..2db7ecd 100644
+--- a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
++++ b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
+@@ -108,16 +108,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" }
+ export default function ConfigPage() {
+   return (
+     <>
+-      <FormSwitch
+-        className={Margins.marginTop20}
+-        value={MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "updateChecking", true) ?? true}
+-        onChange={(value: boolean) => {
+-          MoonbaseSettingsStore.setExtensionConfig("moonbase", "updateChecking", value);
+-        }}
+-        note="Checks for updates to moonlight"
+-      >
+-        Automatic update checking
+-      </FormSwitch>
+       <FormItem title="Repositories">
+         <FormText className={Margins.marginBottom4}>A list of remote repositories to display extensions from</FormText>
+         <ArrayFormItem config="repositories" />
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 1a08a488d80d..290b5baba453 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -1,34 +1,46 @@
 {
   lib,
   stdenv,
-  nodejs,
-  pnpm_9,
+  pnpm_10,
+  nodejs_22,
   fetchFromGitHub,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.9";
+  version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WhPQ7JYfE8RBhDknBunKdW1VBxrklb3UGnMgk5LFVFA=";
+    hash = "sha256-FmQS8DqjgOyfEth8tpUlJoduo6rAv28PwLGv90J3rcM=";
   };
 
   nativeBuildInputs = [
-    nodejs
-    pnpm_9.configHook
+    nodejs_22
+    pnpm_10.configHook
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
 
-    hash = "sha256-KZFHcW/OVjTDXZltxPYGuO+NWjuD5o6HE/E9JQZmrG8=";
+    buildInputs = [ nodejs_22 ];
+
+    hash = "sha256-I+zRCUqJabpGJRFBGW0NrM9xzyzeCjioF54zlCpynBU=";
   };
 
+  env = {
+    NODE_ENV = "production";
+    MOONLIGHT_BRANCH = "stable";
+    MOONLIGHT_VERSION = "v${finalAttrs.version}";
+  };
+
+  patches = [
+    ./disable_updates.patch
+  ];
+
   buildPhase = ''
     runHook preBuild
 
@@ -55,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
       All core code is original or used with permission from their respective authors where not copyleft.
     '';
     homepage = "https://moonlight-mod.github.io";
-    changelog = "https://github.com/moonlight-mod/moonlight/blob/main/CHANGELOG.md";
+    downloadPage = "https://moonlight-mod.github.io/using/install/#nix";
+    changelog = "https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v${finalAttrs.version}/CHANGELOG.md";
 
     license = licenses.lgpl3;
     maintainers = with maintainers; [

From 8e407aaa5f9716b0899b781d30f0c02e0f5a346b Mon Sep 17 00:00:00 2001
From: Justin Conner <jstncnnr@outlook.com>
Date: Wed, 16 Apr 2025 12:40:58 -0700
Subject: [PATCH 035/104] bolt-launcher: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index fa8533ecc983..cf6aceb59d46 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -87,14 +87,14 @@ in
 let
   bolt = stdenv.mkDerivation (finalAttrs: {
     pname = "bolt-launcher";
-    version = "0.14.0";
+    version = "0.15.0";
 
     src = fetchFromGitHub {
       owner = "AdamCake";
       repo = "bolt";
       tag = finalAttrs.version;
       fetchSubmodules = true;
-      hash = "sha256-fNCi2Wu+oOL6p8IBm6bHZ/rcaFmqoKs2DnXQ+ZA9McE=";
+      hash = "sha256-zEExwQRzDmV0xd3lcxFE2ZVfkyTFYZQe3/c0IWJ9C/c=";
     };
 
     nativeBuildInputs = [

From d6c19d6f5ef0b387b260e16f2fa0ff1c1cfa5bca Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 17 Apr 2025 06:25:53 +0100
Subject: [PATCH 036/104] nginxMainline: 1.27.4 -> 1.27.5

Changes: https://github.com/nginx/nginx/releases/tag/release-1.27.5
---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 0060f6de1791..e4ece30ec374 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.27.4";
-  hash = "sha256-KUgW+HmzAOYh+k7dU1PdHsALrbBWOZ7Osw3n22S3U7I=";
+  version = "1.27.5";
+  hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4=";
 }

From 86d6f144bb676c21537582ccc3891cead900293d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Thu, 17 Apr 2025 02:29:48 +0700
Subject: [PATCH 037/104] =?UTF-8?q?ejabberd:=2025.03=20=E2=86=92=2025.04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 6e6e0668064b..dee0cad6572c 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -141,7 +141,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "25.03";
+  version = "25.04";
 
   nativeBuildInputs = [
     makeWrapper
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-VEH1V8v2wQ9qf6Xcj00xHw30tWo0s9AhPyoB7d5B8k8=";
+    hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo=";
   };
 
   passthru.tests = {

From 6c98eb583a81130be44e976f929e583a0ce74678 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Wed, 16 Apr 2025 08:40:55 +0200
Subject: [PATCH 038/104] linalg: init at 2.2

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

diff --git a/pkgs/by-name/li/linalg/package.nix b/pkgs/by-name/li/linalg/package.nix
new file mode 100644
index 000000000000..7daf050b5fe0
--- /dev/null
+++ b/pkgs/by-name/li/linalg/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lialg";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "sgorsten";
+    repo = "linalg";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2I+sJca0tf/CcuoqaldfwPVRrzNriTXO60oHxsFQSnE=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 linalg.h -t $out/include
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Single-header, public domain, short vector math library for C++";
+    homepage = "https://github.com/sgorsten/linalg";
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.eymeric ];
+    platforms = lib.platforms.all;
+  };
+})

From 924de2ce0d8b18cc9fa5b93301226964890ccfe4 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 17 Apr 2025 21:44:45 +0800
Subject: [PATCH 039/104] jamesdsp: fix build on qt 6.9

---
 pkgs/applications/audio/jamesdsp/default.nix  |  1 +
 .../audio/jamesdsp/fix-build-on-qt6_9.diff    | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff

diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
index f98bdae72975..1849a8c428a2 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co=";
       name = "fix-build-with-new-pipewire.patch";
     })
+    ./fix-build-on-qt6_9.diff
   ];
 
   buildInputs =
diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff
new file mode 100644
index 000000000000..9706aa8eb614
--- /dev/null
+++ b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff
@@ -0,0 +1,22 @@
+diff --git a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp
+index 01940a1..2ec9c5b 100644
+--- a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp
++++ b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp
+@@ -133,7 +133,7 @@ QtPromise::QPromise<AeqVersion> AeqPackageManager::getLocalVersion()
+     return QtPromise::QPromise<AeqVersion>{[&](
+         const QtPromise::QPromiseResolve<AeqVersion>& resolve,
+                 const QtPromise::QPromiseReject<AeqVersion>& reject) {
+-            QFile versionJson = (databaseDirectory() + "/version.json");
++            QFile versionJson(databaseDirectory() + "/version.json");
+             if(!versionJson.exists())
+             {
+                 reject();
+@@ -159,7 +159,7 @@ QtPromise::QPromise<QVector<AeqMeasurement>> AeqPackageManager::getLocalIndex()
+     return QtPromise::QPromise<QVector<AeqMeasurement>>{[&](
+         const QtPromise::QPromiseResolve<QVector<AeqMeasurement>>& resolve,
+                 const QtPromise::QPromiseReject<QVector<AeqMeasurement>>& reject) {
+-            QFile indexJson = (databaseDirectory() + "/index.json");
++            QFile indexJson(databaseDirectory() + "/index.json");
+             if(!indexJson.exists())
+             {
+                 reject();

From 1aa67c9db1d01fc35a262342d742652e5439024d Mon Sep 17 00:00:00 2001
From: 0x5a4 <1444@wienstroer.net>
Date: Wed, 16 Apr 2025 14:49:56 +0200
Subject: [PATCH 040/104] gh-classroom: init at 0.1.14

---
 pkgs/by-name/gh/gh-classroom/package.nix | 52 ++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/gh/gh-classroom/package.nix

diff --git a/pkgs/by-name/gh/gh-classroom/package.nix b/pkgs/by-name/gh/gh-classroom/package.nix
new file mode 100644
index 000000000000..910e31d7f12f
--- /dev/null
+++ b/pkgs/by-name/gh/gh-classroom/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+  installShellFiles,
+}:
+buildGoModule (finalAttrs: {
+  pname = "gh-classroom";
+  version = "0.1.14";
+
+  src = fetchFromGitHub {
+    owner = "github";
+    repo = "gh-classroom";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-h9j8B/MGZ4JJOJRj41IIQ9trQJZ4oqvT6ee9lc0P4oo=";
+  };
+
+  vendorHash = "sha256-UFV3KiRnefrdOwRsHQeo8mx8Z+sI1Rk5yu3jdZxUHxo=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd gh-classroom \
+        --bash <(${emulator} $out/bin/gh-classroom --bash-completion) \
+        --fish <(${emulator} $out/bin/gh-classroom --fish-completion) \
+        --zsh <(${emulator} $out/bin/gh-classroom --zsh-completion)
+    ''
+  );
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/github/gh-classroom";
+    description = "Extension for the GitHub CLI, that enhances it for educators using GitHub classroom";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ _0x5a4 ];
+    mainProgram = "gh-classroom";
+  };
+})

From 6655ee4f8a2b5af569cfbe6202016ce584e86ea2 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 6 Apr 2025 09:02:58 +0000
Subject: [PATCH 041/104] mslicer: init at 0.2.1

Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com>

Co-authored-by: Nurali Aslanbekov <ilarvne@proton.me>
---
 pkgs/by-name/ms/mslicer/package.nix | 55 +++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/ms/mslicer/package.nix

diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix
new file mode 100644
index 000000000000..9f288a65925f
--- /dev/null
+++ b/pkgs/by-name/ms/mslicer/package.nix
@@ -0,0 +1,55 @@
+{
+  fetchFromGitHub,
+  lib,
+  libglvnd,
+  libxkbcommon,
+  nix-update-script,
+  rustPlatform,
+  vulkan-loader,
+  wayland,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mslicer";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "connorslade";
+    repo = "mslicer";
+    rev = finalAttrs.version;
+    hash = "sha256-VgbHFUQpxlQcYh3TNyw1IX7vyaWrHRxl4Oe5jake9Qg=";
+  };
+
+  cargoHash = "sha256-Bs/mQTMEQxRvKK9ibIAf4KLv9jzGv3hnduXFYEdjljc=";
+
+  buildInputs = [
+    libglvnd
+    libxkbcommon
+    vulkan-loader
+    wayland
+  ];
+
+  # Force linking to libEGL, which is always dlopen()ed, and to
+  # libwayland-client & libxkbcommon, which is dlopen()ed based on the
+  # winit backend.
+  NIX_LDFLAGS = [
+    "--no-as-needed"
+    "-lEGL"
+    "-lvulkan"
+    "-lwayland-client"
+    "-lxkbcommon"
+  ];
+
+  strictDeps = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Experimental open source slicer for masked stereolithography (resin) printers";
+    homepage = "https://connorcode.com/projects/mslicer";
+    changelog = "https://github.com/connorslade/mslicer/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ colinsane ];
+    platforms = lib.platforms.linux;
+  };
+})

From f3603e626ff30d73fa4615f4cc1cd0aa8795cc79 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 17 Apr 2025 22:43:08 +0200
Subject: [PATCH 042/104] mysql80: 8.0.41 -> 8.0.42

Fixes:
* CVE-2025-21577
* CVE-2025-30682
* CVE-2025-30687
* CVE-2025-30688
* CVE-2025-21574
* CVE-2025-21575
* CVE-2025-30722
* CVE-2025-30693
* CVE-2025-30695
* CVE-2025-30715
* CVE-2025-21583
* CVE-2025-21584
* CVE-2025-21580
* CVE-2025-21581
* CVE-2025-21585
* CVE-2025-30689
* CVE-2025-21579
* CVE-2025-30696
* CVE-2025-30705
* CVE-2025-30683
* CVE-2025-30684
* CVE-2025-30685
* CVE-2025-30699
* CVE-2025-30704
* CVE-2025-30703
* CVE-2025-30681

https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-42.html
---
 pkgs/servers/sql/mysql/8.0.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 3465db715b9f..735cbdbf4e90 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.41";
+  version = "8.0.42";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-AV0gj3OOKfRjQr9i4Hq1Oxg/MEQq/YE1SnkxrSP+jPc=";
+    hash = "sha256-XrIsIMILdlxYlMkBBIW9B9iptuv7YovP0wYHAXFVJv4=";
   };
 
   nativeBuildInputs = [

From f9dc6b2042ce61fbec8f39b584cd39e497128e13 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 17 Apr 2025 23:01:07 +0200
Subject: [PATCH 043/104] mysql84: 8.4.4 -> 8.4.5

Fixes:
* CVE-2025-21577
* CVE-2025-30682
* CVE-2025-30687
* CVE-2025-30688
* CVE-2025-21574
* CVE-2025-21575
* CVE-2025-30722
* CVE-2025-30693
* CVE-2025-30695
* CVE-2025-30715
* CVE-2025-21583
* CVE-2025-21584
* CVE-2025-21580
* CVE-2025-21581
* CVE-2025-21585
* CVE-2025-30689
* CVE-2025-21579
* CVE-2025-30696
* CVE-2025-30705
* CVE-2025-30683
* CVE-2025-30684
* CVE-2025-30685
* CVE-2025-30699
* CVE-2025-30704
* CVE-2025-30703
* CVE-2025-30681
* CVE-2025-21588

https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-5.html
---
 pkgs/by-name/my/mysql84/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index bdddda7e3124..d601857dded1 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.4";
+  version = "8.4.5";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+ykO90iJRDQIUknDG8pSrHGFMSREarIYuzvFAr8AgqU=";
+    hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo=";
   };
 
   nativeBuildInputs = [

From 68d386e5700ac1be79d7ac6407ebcf6c0df9c045 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 17 Apr 2025 17:29:46 -0400
Subject: [PATCH 044/104] libAppleWM: fix build failure due to missing
 xorg-macros

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/servers/x11/xorg/overrides.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8c72f10418ed..327f8b3296cd 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -277,8 +277,10 @@ self: super:
   });
 
   libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [
+      autoreconfHook
+      xorg.utilmacros
+    ];
     meta = attrs.meta // {
       platforms = lib.platforms.darwin;
     };

From 68f90f4481c480681e7a0858893c3bf8cb39d2db Mon Sep 17 00:00:00 2001
From: kpcyrd <git@rxv.cc>
Date: Wed, 2 Apr 2025 11:29:26 +0200
Subject: [PATCH 045/104] sh4d0wup: init at 0.11.0

---
 pkgs/by-name/sh/sh4d0wup/package.nix | 77 ++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 pkgs/by-name/sh/sh4d0wup/package.nix

diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix
new file mode 100644
index 000000000000..93ef3f73bd6e
--- /dev/null
+++ b/pkgs/by-name/sh/sh4d0wup/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  fetchFromGitHub,
+  gcc,
+  go,
+  makeWrapper,
+  nix-update-script,
+  openssl,
+  pcsclite,
+  pkg-config,
+  podman,
+  rustPlatform,
+  rustc,
+  sequoia-sq,
+  shared-mime-info,
+  versionCheckHook,
+  xz, # for liblzma
+  zstd,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sh4d0wup";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "kpcyrd";
+    repo = "sh4d0wup";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gzkh+JYwuYvdNljB6agEVd7WxqJ5lI3sseY3BlkLmXs=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-FjRlKlOX78QClzhhFhkZuaOLA6XpFziSghJltlRPt20=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
+  buildInputs = [
+    openssl
+    pcsclite
+    xz
+    zstd
+  ];
+  postInstall = ''
+    wrapProgram $out/bin/sh4d0wup \
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+  '';
+
+  checkInputs = [ sequoia-sq ];
+  preCheck = ''
+    export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  passthru.updateScript = nix-update-script { };
+
+  env = {
+    OPENSSL_NO_VENDOR = 1;
+    SH4D0WUP_GCC_BINARY = lib.getExe gcc;
+    SH4D0WUP_GO_BINARY = lib.getExe go;
+    SH4D0WUP_PODMAN_BINARY = lib.getExe podman;
+    SH4D0WUP_RUSTC_BINARY = lib.getExe' rustc "rustc";
+    SH4D0WUP_SQ_BINARY = lib.getExe sequoia-sq;
+  };
+
+  meta = {
+    description = "Signing-key abuse and update exploitation framework";
+    homepage = "https://github.com/kpcyrd/sh4d0wup";
+    changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}";
+    mainProgram = "sh4d0wup";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ kpcyrd ];
+    platforms = lib.platforms.all;
+  };
+})

From a8c3a293c7430eb9991e93174ec2213ec8342961 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 17 Apr 2025 21:13:43 -0700
Subject: [PATCH 046/104] cliscord: modernize

---
 pkgs/misc/cliscord/default.nix  | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix |  4 +---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix
index 5531b8c9805e..41f2f38e74ee 100644
--- a/pkgs/misc/cliscord/default.nix
+++ b/pkgs/misc/cliscord/default.nix
@@ -1,36 +1,33 @@
 {
   lib,
-  stdenv,
   rustPlatform,
+  fetchFromGitHub,
   openssl,
   pkg-config,
-  fetchFromGitHub,
-  Security,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "cliscord";
-  version = "unstable-2022-10-07";
+  version = "0-unstable-2022-10-07";
 
   src = fetchFromGitHub {
     owner = "somebody1234";
-    repo = pname;
+    repo = "cliscord";
     rev = "d62317d55c07ece8c9d042dcd74b62e58c9bfaeb";
     hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4=";
   };
 
-  buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = [ openssl ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U=";
 
-  meta = with lib; {
+  meta = {
     description = "Simple command-line tool to send text and files to discord";
     homepage = "https://github.com/somebody1234/cliscord";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lom ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lom ];
     mainProgram = "cliscord";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9041c61f98..385cd3a03903 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7292,9 +7292,7 @@ with pkgs;
     jdk = graalvmPackages.graalvm-ce;
   };
 
-  cliscord = callPackage ../misc/cliscord {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cliscord = callPackage ../misc/cliscord { };
 
   clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter {
     jre = jre8;

From 1c89974d74b0b499630625383a44767552484ead Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 17 Apr 2025 21:14:46 -0700
Subject: [PATCH 047/104] cliscord: migrate to by-name

---
 .../cliscord/default.nix => by-name/cl/cliscord/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/cliscord/default.nix => by-name/cl/cliscord/package.nix} (100%)

diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/by-name/cl/cliscord/package.nix
similarity index 100%
rename from pkgs/misc/cliscord/default.nix
rename to pkgs/by-name/cl/cliscord/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 385cd3a03903..2f5ebe9966ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7292,8 +7292,6 @@ with pkgs;
     jdk = graalvmPackages.graalvm-ce;
   };
 
-  cliscord = callPackage ../misc/cliscord { };
-
   clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter {
     jre = jre8;
   };

From f553f295e37751ef24450cf1c5801912a3d235b4 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 17 Apr 2025 21:27:40 -0700
Subject: [PATCH 048/104] t-rec: moderinize

---
 pkgs/misc/t-rec/default.nix     | 43 ++++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |  4 +--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix
index 5e8ff5be7ed1..b9b13483c7f5 100644
--- a/pkgs/misc/t-rec/default.nix
+++ b/pkgs/misc/t-rec/default.nix
@@ -1,55 +1,58 @@
 {
   lib,
   stdenv,
-  imagemagick,
-  ffmpeg,
   rustPlatform,
   fetchFromGitHub,
   makeWrapper,
+  imagemagick,
   libiconv,
-  Foundation,
+  ffmpeg,
+  versionCheckHook,
+  nix-update-script,
 }:
-
-let
-  binPath = lib.makeBinPath [
-    imagemagick
-    ffmpeg
-  ];
-in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "t-rec";
   version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "sassman";
     repo = "t-rec-rs";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g=";
   };
 
+  cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY=";
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs =
     [ imagemagick ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libiconv
-      Foundation
     ];
 
   postInstall = ''
-    wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}"
+    wrapProgram "$out/bin/t-rec" --prefix PATH : "${
+      lib.makeBinPath [
+        imagemagick
+        ffmpeg
+      ]
+    }"
   '';
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY=";
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust";
     homepage = "https://github.com/sassman/t-rec-rs";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [
+    changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [
       hoverbear
       matthiasbeyer
     ];
     mainProgram = "t-rec";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9041c61f98..74462d6bb175 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16411,9 +16411,7 @@ with pkgs;
 
   tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
 
-  t-rec = callPackage ../misc/t-rec {
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
+  t-rec = callPackage ../misc/t-rec { };
 
   twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
 

From 91515e02ae291e317187cdc1f7346b672680114b Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 17 Apr 2025 21:29:34 -0700
Subject: [PATCH 049/104] t-rec: move to by-name

---
 pkgs/{misc/t-rec/default.nix => by-name/t-/t-rec/package.nix} | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/t-rec/default.nix => by-name/t-/t-rec/package.nix} (100%)

diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/by-name/t-/t-rec/package.nix
similarity index 100%
rename from pkgs/misc/t-rec/default.nix
rename to pkgs/by-name/t-/t-rec/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74462d6bb175..cfab10ea016b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16411,8 +16411,6 @@ with pkgs;
 
   tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
 
-  t-rec = callPackage ../misc/t-rec { };
-
   twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
 
   terminal-typeracer = callPackage ../applications/misc/terminal-typeracer {

From 0e033980bdc438b54d7ba587aa3f1bd5ec69c348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Fri, 18 Apr 2025 11:16:09 +0200
Subject: [PATCH 050/104] archi: install icon and desktop file, resolves
 #383612

---
 pkgs/by-name/ar/archi/package.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index 8bf9c5806541..02238be0e7a7 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -11,6 +11,8 @@
   wrapGAppsHook3,
   _7zz,
   nixosTests,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
 
 stdenv.mkDerivation rec {
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
+      copyDesktopItems
     ];
 
   sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null;
@@ -55,6 +58,8 @@ stdenv.mkDerivation rec {
   installPhase =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       ''
+        runHook preInstall
+
         mkdir -p $out/bin $out/libexec
         for f in configuration features p2 plugins Archi.ini; do
           cp -r $f $out/libexec
@@ -70,13 +75,35 @@ stdenv.mkDerivation rec {
           } \
           --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
           --prefix PATH : ${jdk}/bin
+
+        install -Dm444 icon.xpm $out/share/icons/hicolor/256x256/apps/archi.xpm
+
+        runHook postInstall
       ''
     else
       ''
+        runHook preInstall
+
         mkdir -p "$out/Applications"
         mv Archi.app "$out/Applications/"
+
+        runHook postInstall
       '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "archi";
+      desktopName = "Archi";
+      exec = "Archi";
+      type = "Application";
+      comment = meta.description;
+      icon = "archi";
+      categories = [
+        "Development"
+      ];
+    })
+  ];
+
   passthru.updateScript = ./update.sh;
 
   passthru.tests = { inherit (nixosTests) archi; };

From 66aaee5d7dc0368cbc6cf0c93a6b96464bb2a87d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 12:42:45 +0000
Subject: [PATCH 051/104] mir: 2.20.1 -> 2.20.2

---
 pkgs/servers/mir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index a23e0e669559..36064f9aa178 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.20.1";
-    hash = "sha256-c+0xMW6GspTpRsPX7D/9mdqHRBRsrcChl6TkFkHT6hg=";
+    version = "2.20.2";
+    hash = "sha256-kxXPRIvgvpWqos8l/fJyHvfJBNi0jOZfV5inY3SBavM=";
   };
 
   mir_2_15 = common {

From e3b97888888b1185b7b1bc2134293fbf6b9a7650 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 17 Apr 2025 02:07:58 +0400
Subject: [PATCH 052/104] hobbits: enable on darwin

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

diff --git a/pkgs/by-name/ho/hobbits/package.nix b/pkgs/by-name/ho/hobbits/package.nix
index 40afc2fbbadc..2e5f1dbbd55d 100644
--- a/pkgs/by-name/ho/hobbits/package.nix
+++ b/pkgs/by-name/ho/hobbits/package.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-warn "pythonHome = \"/usr\"" "pythonHome = \"${python3}\""
     substituteInPlace cmake/gitversion.cmake \
       --replace-warn "[Mystery Build]" "${finalAttrs.version}"
+    substituteInPlace CMakeLists.txt \
+      --replace-warn "SELF_CONTAINED_APP OR APPLE" "SELF_CONTAINED_APP"
   '';
 
   buildInputs = [
@@ -46,11 +48,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
 
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/hobbits.app $out/Applications
+    wrapProgram $out/Applications/hobbits.app/Contents/MacOS/hobbits \
+      --prefix DYLD_LIBRARY_PATH : $out/Applications/hobbits.app/Contents/Frameworks
+    ln -s $out/Applications/hobbits.app/Contents/MacOS/hobbits $out/bin/hobbits
+    # Prevent wrapping
+    find $out/Applications -type f -name "*.dylib" -exec chmod -x {} \;
+  '';
+
   meta = {
     description = "Multi-platform GUI for bit-based analysis, processing, and visualization";
     homepage = "https://github.com/Mahlet-Inc/hobbits";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
-    platforms = lib.platforms.linux;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })

From 56b1526f9838dac311c73777c20efd93b7e702fa Mon Sep 17 00:00:00 2001
From: JeanCASPAR <55629512+JeanCASPAR@users.noreply.github.com>
Date: Fri, 18 Apr 2025 21:00:28 +0200
Subject: [PATCH 053/104] maintainers: add jeancaspar

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 80fdde839a7c..33bc93aa83e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11152,6 +11152,11 @@
     github = "jdupak";
     githubId = 22683640;
   };
+  jeancaspar = {
+    name = "Jean Caspar";
+    github = "JeanCASPAR";
+    githubId = 55629512;
+  };
   jecaro = {
     email = "jeancharles.quillet@gmail.com";
     github = "jecaro";

From 7c4f892159065be5f06a7468f217650ecfaa7c7d Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Mon, 23 Dec 2024 03:51:45 +0100
Subject: [PATCH 054/104] msbuild-structured-log-viewer: migrate lockfile to
 JSON

---
 .../msbuild-structured-log-viewer/deps.json   | 327 +++++++++++++++++
 .../ms/msbuild-structured-log-viewer/deps.nix | 332 ------------------
 .../msbuild-structured-log-viewer/package.nix |   2 +-
 3 files changed, 328 insertions(+), 333 deletions(-)
 create mode 100644 pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json
 delete mode 100644 pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json
new file mode 100644
index 000000000000..b15409a33258
--- /dev/null
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json
@@ -0,0 +1,327 @@
+[
+  {
+    "pname": "AutomaticGraphLayout",
+    "version": "1.1.12",
+    "hash": "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo="
+  },
+  {
+    "pname": "AutomaticGraphLayout.Drawing",
+    "version": "1.1.12",
+    "hash": "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.0.0",
+    "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.1.3",
+    "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.1.0",
+    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.28",
+    "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.1.3",
+    "hash": "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.1.3",
+    "hash": "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.1.3",
+    "hash": "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.1.3",
+    "hash": "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.1.3",
+    "hash": "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.1.3",
+    "hash": "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.0.0",
+    "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.1.3",
+    "hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.1.3",
+    "hash": "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.1.3",
+    "hash": "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.1.3",
+    "hash": "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.1.3",
+    "hash": "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.1.3",
+    "hash": "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="
+  },
+  {
+    "pname": "DotUtils.StreamUtils.Sources",
+    "version": "0.0.8",
+    "hash": "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw="
+  },
+  {
+    "pname": "GuiLabs.Language.Xml",
+    "version": "1.2.93",
+    "hash": "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.2",
+    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.2",
+    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.2",
+    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.2",
+    "hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.2",
+    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.5.0",
+    "hash": "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="
+  },
+  {
+    "pname": "Microsoft.Build.Tasks.Git",
+    "version": "8.0.0",
+    "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="
+  },
+  {
+    "pname": "Microsoft.Build.Utilities.Core",
+    "version": "17.5.0",
+    "hash": "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="
+  },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.5.0",
+    "hash": "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.SourceLink.Common",
+    "version": "8.0.0",
+    "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
+  },
+  {
+    "pname": "Microsoft.SourceLink.GitHub",
+    "version": "8.0.0",
+    "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "5.0.0",
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
+  {
+    "pname": "Nerdbank.GitVersioning",
+    "version": "3.6.141",
+    "hash": "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
+  {
+    "pname": "Nullable",
+    "version": "1.3.1",
+    "hash": "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.8",
+    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.8",
+    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "4.5.0",
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "6.0.0",
+    "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "6.0.0",
+    "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.6.0",
+    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.6.0",
+    "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.1.0",
+    "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "5.0.0",
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "6.0.0",
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "6.0.0",
+    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
+  },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "6.0.0",
+    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "5.0.0",
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "6.0.0",
+    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "6.0.0",
+    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.16.0",
+    "hash": "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="
+  }
+]
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix
deleted file mode 100644
index 34286768531c..000000000000
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix
+++ /dev/null
@@ -1,332 +0,0 @@
-# This file was automatically generated by passthru.fetch-deps.
-# Please dont edit it manually, your changes might get overwritten!
-# TODO: This format file is obsolete, consider migrating to JSON.
-
-{ fetchNuGet }:
-[
-  (fetchNuGet {
-    pname = "AutomaticGraphLayout";
-    version = "1.1.12";
-    hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo=";
-  })
-  (fetchNuGet {
-    pname = "AutomaticGraphLayout.Drawing";
-    version = "1.1.12";
-    hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia";
-    version = "11.0.0";
-    hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia";
-    version = "11.1.3";
-    hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Angle.Windows.Natives";
-    version = "2.1.22045.20230930";
-    hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.AvaloniaEdit";
-    version = "11.1.0";
-    hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.BuildServices";
-    version = "0.0.28";
-    hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.BuildServices";
-    version = "0.0.29";
-    hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Controls.ColorPicker";
-    version = "11.1.3";
-    hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Controls.DataGrid";
-    version = "11.1.3";
-    hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Desktop";
-    version = "11.1.3";
-    hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Diagnostics";
-    version = "11.1.3";
-    hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.FreeDesktop";
-    version = "11.1.3";
-    hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Native";
-    version = "11.1.3";
-    hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Remote.Protocol";
-    version = "11.0.0";
-    hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Remote.Protocol";
-    version = "11.1.3";
-    hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Skia";
-    version = "11.1.3";
-    hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Themes.Fluent";
-    version = "11.1.3";
-    hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Themes.Simple";
-    version = "11.1.3";
-    hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.Win32";
-    version = "11.1.3";
-    hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=";
-  })
-  (fetchNuGet {
-    pname = "Avalonia.X11";
-    version = "11.1.3";
-    hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=";
-  })
-  (fetchNuGet {
-    pname = "DotUtils.StreamUtils.Sources";
-    version = "0.0.8";
-    hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw=";
-  })
-  (fetchNuGet {
-    pname = "GuiLabs.Language.Xml";
-    version = "1.2.93";
-    hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk=";
-  })
-  (fetchNuGet {
-    pname = "HarfBuzzSharp";
-    version = "7.3.0.2";
-    hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=";
-  })
-  (fetchNuGet {
-    pname = "HarfBuzzSharp.NativeAssets.Linux";
-    version = "7.3.0.2";
-    hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=";
-  })
-  (fetchNuGet {
-    pname = "HarfBuzzSharp.NativeAssets.macOS";
-    version = "7.3.0.2";
-    hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=";
-  })
-  (fetchNuGet {
-    pname = "HarfBuzzSharp.NativeAssets.WebAssembly";
-    version = "7.3.0.2";
-    hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=";
-  })
-  (fetchNuGet {
-    pname = "HarfBuzzSharp.NativeAssets.Win32";
-    version = "7.3.0.2";
-    hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=";
-  })
-  (fetchNuGet {
-    pname = "MicroCom.Runtime";
-    version = "0.11.0";
-    hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Build.Framework";
-    version = "17.5.0";
-    hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Build.Tasks.Git";
-    version = "8.0.0";
-    hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Build.Utilities.Core";
-    version = "17.5.0";
-    hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NET.StringTools";
-    version = "17.5.0";
-    hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.NETCore.Platforms";
-    version = "1.1.0";
-    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.SourceLink.Common";
-    version = "8.0.0";
-    hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.SourceLink.GitHub";
-    version = "8.0.0";
-    hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Win32.Registry";
-    version = "5.0.0";
-    hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=";
-  })
-  (fetchNuGet {
-    pname = "Microsoft.Win32.SystemEvents";
-    version = "6.0.0";
-    hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=";
-  })
-  (fetchNuGet {
-    pname = "Nerdbank.GitVersioning";
-    version = "3.6.141";
-    hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=";
-  })
-  (fetchNuGet {
-    pname = "NETStandard.Library";
-    version = "2.0.3";
-    hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
-  })
-  (fetchNuGet {
-    pname = "Nullable";
-    version = "1.3.1";
-    hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=";
-  })
-  (fetchNuGet {
-    pname = "SkiaSharp";
-    version = "2.88.8";
-    hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=";
-  })
-  (fetchNuGet {
-    pname = "SkiaSharp.NativeAssets.Linux";
-    version = "2.88.8";
-    hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=";
-  })
-  (fetchNuGet {
-    pname = "SkiaSharp.NativeAssets.macOS";
-    version = "2.88.8";
-    hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=";
-  })
-  (fetchNuGet {
-    pname = "SkiaSharp.NativeAssets.WebAssembly";
-    version = "2.88.8";
-    hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=";
-  })
-  (fetchNuGet {
-    pname = "SkiaSharp.NativeAssets.Win32";
-    version = "2.88.8";
-    hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=";
-  })
-  (fetchNuGet {
-    pname = "System.Buffers";
-    version = "4.5.1";
-    hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=";
-  })
-  (fetchNuGet {
-    pname = "System.Buffers";
-    version = "4.6.0";
-    hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=";
-  })
-  (fetchNuGet {
-    pname = "System.Collections.Immutable";
-    version = "8.0.0";
-    hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=";
-  })
-  (fetchNuGet {
-    pname = "System.ComponentModel.Annotations";
-    version = "4.5.0";
-    hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=";
-  })
-  (fetchNuGet {
-    pname = "System.Configuration.ConfigurationManager";
-    version = "6.0.0";
-    hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=";
-  })
-  (fetchNuGet {
-    pname = "System.Drawing.Common";
-    version = "6.0.0";
-    hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=";
-  })
-  (fetchNuGet {
-    pname = "System.IO.Pipelines";
-    version = "6.0.0";
-    hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=";
-  })
-  (fetchNuGet {
-    pname = "System.Memory";
-    version = "4.6.0";
-    hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=";
-  })
-  (fetchNuGet {
-    pname = "System.Numerics.Vectors";
-    version = "4.5.0";
-    hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=";
-  })
-  (fetchNuGet {
-    pname = "System.Numerics.Vectors";
-    version = "4.6.0";
-    hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=";
-  })
-  (fetchNuGet {
-    pname = "System.Runtime.CompilerServices.Unsafe";
-    version = "6.1.0";
-    hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=";
-  })
-  (fetchNuGet {
-    pname = "System.Security.AccessControl";
-    version = "5.0.0";
-    hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=";
-  })
-  (fetchNuGet {
-    pname = "System.Security.AccessControl";
-    version = "6.0.0";
-    hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Cryptography.ProtectedData";
-    version = "6.0.0";
-    hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Permissions";
-    version = "6.0.0";
-    hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=";
-  })
-  (fetchNuGet {
-    pname = "System.Security.Principal.Windows";
-    version = "5.0.0";
-    hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding.CodePages";
-    version = "6.0.0";
-    hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=";
-  })
-  (fetchNuGet {
-    pname = "System.Windows.Extensions";
-    version = "6.0.0";
-    hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=";
-  })
-  (fetchNuGet {
-    pname = "Tmds.DBus.Protocol";
-    version = "0.16.0";
-    hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=";
-  })
-]
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index a73e70468cd7..8f81ae770063 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -27,7 +27,7 @@ buildDotnetModule (finalAttrs: rec {
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
   projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ];
-  nugetDeps = ./deps.nix;
+  nugetDeps = ./deps.json;
 
   # HACK: Clear out RuntimeIdentifiers that's set in StructuredLogViewer.Avalonia.csproj, otherwise our --runtime has no effect
   dotnetFlags = [ "-p:RuntimeIdentifiers=" ];

From a7c25e2d69cdf8f98a48b4e9c9879a65e0430e5d Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 18 Apr 2025 15:06:18 -0300
Subject: [PATCH 055/104] azahar: 2120.2 -> 2120.3

---
 pkgs/by-name/az/azahar/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 1e1070f1759d..46daa2984f37 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -43,7 +43,6 @@
   cubeb,
   useDiscordRichPresence ? true,
   rapidjson,
-  azahar,
 }:
 let
   inherit (lib)
@@ -54,13 +53,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "azahar";
-  version = "2120.2";
+  version = "2120.3";
 
   src = fetchzip {
     # TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved
     # url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
-    url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250329-32bb14f.tar.xz";
-    hash = "sha256-OyAc4nePQDuuwb+/ABnNe5ihPqMEoAqNeCYvME7SIio=";
+    url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250414-00e3bbb.tar.xz";
+    hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk=";
   };
 
   nativeBuildInputs = [

From 2358d006aaefc40afb75a3f08cbb56de93477f75 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 18 Apr 2025 23:32:21 +0200
Subject: [PATCH 056/104] glitchtip: don't rely on releases in update script

---
 pkgs/by-name/gl/glitchtip/update.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/update.sh b/pkgs/by-name/gl/glitchtip/update.sh
index 7076d162d211..e0a5cf370e59 100755
--- a/pkgs/by-name/gl/glitchtip/update.sh
+++ b/pkgs/by-name/gl/glitchtip/update.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nix-update
+#!nix-shell -i bash -p curl jq nix-update
 
-nix-update glitchtip
-nix-update glitchtip.frontend
+set -eou pipefail
+
+version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/15450933/repository/tags | jq -r '.[0].name')
+
+nix-update --version="$version" glitchtip
+nix-update --version="$version" glitchtip.frontend

From 5d094c2338d5fcf9c5e4b7071b8e66a8d7e0677a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 18 Apr 2025 23:35:51 +0200
Subject: [PATCH 057/104] nixos/alloy: set After=network.target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents the network from being torn down before alloy itself it
stopped.

Alloy tries to flush its WAL on SIGTERM, and if the network stack is
already down, it tries to flush logs up to 90s during shutdown/reboot.

From https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/:

> network.target has very little meaning during start-up. It only
> indicates that the network management stack is up after it has been
> reached. Whether any network interfaces are already configured when
> it is reached is undefined. Its primary purpose is for ordering
> things properly at shutdown: since the shutdown ordering of units in
> systemd is the reverse of the startup ordering, any unit that is order
> After=network.target can be sure that it is stopped before the network
> is shut down if the system is powered off. This allows services to
> cleanly terminate connections before going down, instead of abruptly
> losing connectivity for ongoing connections, leaving them in an
> undefined state. […]
---
 nixos/modules/services/monitoring/alloy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/alloy.nix b/nixos/modules/services/monitoring/alloy.nix
index 73f967addc91..fe0ed2cab8b3 100644
--- a/nixos/modules/services/monitoring/alloy.nix
+++ b/nixos/modules/services/monitoring/alloy.nix
@@ -65,6 +65,7 @@ in
 
   config = lib.mkIf cfg.enable {
     systemd.services.alloy = {
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       reloadTriggers = lib.mapAttrsToList (_: v: v.source or null) (
         lib.filterAttrs (n: _: lib.hasPrefix "alloy/" n && lib.hasSuffix ".alloy" n) config.environment.etc

From 3481e1937ea63dc890f727dde793f1a2fed8749d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 14 Apr 2025 18:25:18 +0200
Subject: [PATCH 058/104] python3Packages.symbolic_10: init at 10.2.1

required by glitchtip
---
 pkgs/by-name/gl/glitchtip/package.nix         |    2 +-
 .../python-modules/symbolic/10.nix            |   76 +
 .../python-modules/symbolic/Cargo.lock        | 2737 +++++++++++++++++
 .../python-modules/symbolic/default.nix       |   13 +-
 pkgs/top-level/python-packages.nix            |    2 +
 5 files changed, 2819 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/symbolic/10.nix
 create mode 100644 pkgs/development/python-modules/symbolic/Cargo.lock

diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index bdb275631e8e..296869a42b70 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -47,7 +47,7 @@ let
       psycopg
       pydantic
       sentry-sdk
-      symbolic
+      symbolic_10
       user-agents
       uvicorn
       uwsgi-chunked
diff --git a/pkgs/development/python-modules/symbolic/10.nix b/pkgs/development/python-modules/symbolic/10.nix
new file mode 100644
index 000000000000..13a43365c9b5
--- /dev/null
+++ b/pkgs/development/python-modules/symbolic/10.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools-rust,
+  rustPlatform,
+  rustc,
+  cargo,
+  milksnake,
+  cffi,
+  pytestCheckHook,
+  nixosTests,
+}:
+
+buildPythonPackage rec {
+  pname = "symbolic";
+  version = "10.2.1"; # glitchtip currently only works with symbolic 10.x
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "symbolic";
+    tag = version;
+    hash = "sha256-3u4MTzaMwryGpFowrAM/MJOmnU8M+Q1/0UtALJib+9A=";
+    # the `py` directory is not included in the tarball, so we fetch the source via git instead
+    forceFetchGit = true;
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit
+      pname
+      version
+      src
+      postPatch
+      ;
+    hash = "sha256-cpIVzgcxKfEA5oov6/OaXqknYsYZUoduLTn2qIXGL5U=";
+  };
+
+  nativeBuildInputs = [
+    setuptools-rust
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    milksnake
+  ];
+
+  dependencies = [ cffi ];
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  preBuild = ''
+    cd py
+  '';
+
+  preCheck = ''
+    cd ..
+  '';
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "py" ];
+
+  pythonImportsCheck = [ "symbolic" ];
+
+  passthru.tests = { inherit (nixosTests) glitchtip; };
+
+  meta = {
+    description = "Python library for dealing with symbol files and more";
+    homepage = "https://github.com/getsentry/symbolic";
+    changelog = "https://github.com/getsentry/symbolic/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ defelo ];
+  };
+}
diff --git a/pkgs/development/python-modules/symbolic/Cargo.lock b/pkgs/development/python-modules/symbolic/Cargo.lock
new file mode 100644
index 000000000000..5ac24d4be5ed
--- /dev/null
+++ b/pkgs/development/python-modules/symbolic/Cargo.lock
@@ -0,0 +1,2737 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli 0.28.1",
+]
+
+[[package]]
+name = "addr2line"
+version = "10.2.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anyhow"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+
+[[package]]
+name = "anylog"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e2e9a7b2d67ca2b6e886b610ae20ac845cf37980df84892e38f6046e8fc225f"
+dependencies = [
+ "chrono",
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "ast_node"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line 0.21.0",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "better_scoped_tls"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
+dependencies = [
+ "scoped-tls",
+]
+
+[[package]]
+name = "binary-merge"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "breakpad-symbols"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "962e48eab21c8cc026fb28919961ea4f45bb0d424eb58f215b0f245e2699b6c8"
+dependencies = [
+ "async-trait",
+ "circular",
+ "debugid",
+ "minidump-common",
+ "nom",
+ "range-map",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "brownstone"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5839ee4f953e811bfdcf223f509cb2c6a3e1447959b0bff459405575bc17f22"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "bstr"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits 0.2.18",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "circular"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea"
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "atty",
+ "bitflags 1.3.2",
+ "clap_lex",
+ "indexmap",
+ "strsim",
+ "termcolor",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpp_demangle"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "criterion"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+dependencies = [
+ "anes",
+ "atty",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "itertools",
+ "lazy_static",
+ "num-traits 0.2.18",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "data-encoding"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
+[[package]]
+name = "debugid"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+dependencies = [
+ "serde",
+ "uuid",
+]
+
+[[package]]
+name = "debuginfo_debug"
+version = "10.2.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "dmsort"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0bc8fbe9441c17c9f46f75dfe27fa1ddb6c68a461ccaed0481419219d4f10d3"
+
+[[package]]
+name = "dump_cfi"
+version = "10.2.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "dump_sources"
+version = "10.2.1"
+dependencies = [
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "either"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+
+[[package]]
+name = "elementtree"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3efd4742acf458718a6456e0adf0b4d734d6b783e452bbf1ac36bf31f4085cb3"
+dependencies = [
+ "string_cache",
+]
+
+[[package]]
+name = "elsa"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+dependencies = [
+ "encoding-index-japanese",
+ "encoding-index-korean",
+ "encoding-index-simpchinese",
+ "encoding-index-singlebyte",
+ "encoding-index-tradchinese",
+]
+
+[[package]]
+name = "encoding-index-japanese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
+dependencies = [
+ "encoding_index_tests",
+]
+
+[[package]]
+name = "encoding-index-korean"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
+dependencies = [
+ "encoding_index_tests",
+]
+
+[[package]]
+name = "encoding-index-simpchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
+dependencies = [
+ "encoding_index_tests",
+]
+
+[[package]]
+name = "encoding-index-singlebyte"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
+dependencies = [
+ "encoding_index_tests",
+]
+
+[[package]]
+name = "encoding-index-tradchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
+dependencies = [
+ "encoding_index_tests",
+]
+
+[[package]]
+name = "encoding_index_tests"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+
+[[package]]
+name = "enum-primitive-derive"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e"
+dependencies = [
+ "num-traits 0.2.18",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "from_variant"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db"
+dependencies = [
+ "proc-macro2",
+ "swc_macros_common",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+dependencies = [
+ "fallible-iterator",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "goblin"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "if_chain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+
+[[package]]
+name = "indent_write"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "inplace-vec-builder"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "insta"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"
+dependencies = [
+ "console",
+ "lazy_static",
+ "linked-hash-map",
+ "serde",
+ "similar",
+]
+
+[[package]]
+name = "is-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "joinery"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
+
+[[package]]
+name = "js-source-scopes"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8da074711c234172331e301df3f78c7a3988e6e8fab0a128a1fb9ff235f384d"
+dependencies = [
+ "indexmap",
+ "sourcemap",
+ "swc_common",
+ "swc_ecma_parser",
+ "swc_ecma_visit",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
+[[package]]
+name = "lexical"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+dependencies = [
+ "lexical-core",
+]
+
+[[package]]
+name = "lexical-core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "maybe-owned"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "minidump"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8cb3a9530388df2ec8118130d17f57939c1d17e900a20f88a9f68169ab20c3c"
+dependencies = [
+ "debugid",
+ "encoding",
+ "memmap2",
+ "minidump-common",
+ "num-traits 0.2.18",
+ "range-map",
+ "scroll",
+ "thiserror",
+ "time",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "minidump-common"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97dbaf56dfe28d07e1fecffce410976774dcac1f0d7f6d797b437468e989e687"
+dependencies = [
+ "bitflags 1.3.2",
+ "debugid",
+ "enum-primitive-derive",
+ "num-traits 0.2.18",
+ "range-map",
+ "scroll",
+ "smart-default",
+ "tracing",
+]
+
+[[package]]
+name = "minidump-processor"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18166049057bbbd113418bbf6dc2d68b932bef8bda5103e717492569522e7476"
+dependencies = [
+ "async-trait",
+ "breakpad-symbols",
+ "debugid",
+ "futures-util",
+ "memmap2",
+ "minidump",
+ "minidump-common",
+ "scroll",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "minidump_stackwalk"
+version = "10.2.1"
+dependencies = [
+ "async-trait",
+ "clap",
+ "minidump",
+ "minidump-processor",
+ "symbolic",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "walkdir",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "msvc-demangler"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb67c6dd0fa9b00619c41c5700b6f92d5f418be49b45ddb9970fbd4569df3c8"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nom-supreme"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bd3ae6c901f1959588759ff51c95d24b491ecb9ff91aa9c2ef4acc5b1dcab27"
+dependencies = [
+ "brownstone",
+ "indent_write",
+ "joinery",
+ "memchr",
+ "nom",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits 0.2.18",
+ "serde",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits 0.2.18",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+dependencies = [
+ "num-traits 0.2.18",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "object_debug"
+version = "10.2.1"
+dependencies = [
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "pdb"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863"
+dependencies = [
+ "fallible-iterator",
+ "scroll",
+ "uuid",
+]
+
+[[package]]
+name = "pdb-addr2line"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4e89a9f2f40b2389ba6da0814c8044bf942bece03dffa1514f84e3b525f4f9a"
+dependencies = [
+ "bitflags 1.3.2",
+ "elsa",
+ "maybe-owned",
+ "pdb",
+ "range-collections",
+ "thiserror",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "plotters"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+dependencies = [
+ "num-traits 0.2.18",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proguard"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b88dddb086b00f5539a95d2c7a2373358fd8bfadb7b1297cc29e0196403a1b98"
+dependencies = [
+ "lazy_static",
+ "uuid",
+]
+
+[[package]]
+name = "psm"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "range-collections"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61fdfd79629e2b44a1d34b4d227957174cb858e6b86ee45fad114edbcfc903ab"
+dependencies = [
+ "binary-merge",
+ "inplace-vec-builder",
+ "smallvec",
+]
+
+[[package]]
+name = "range-map"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dc8ff3b0f3e32dbba6e49c592c0191a3a2cabbf6f7e5a78e1010050b9a42e1"
+dependencies = [
+ "num-traits 0.1.43",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scroll"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.200"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.200"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "similar"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
+dependencies = [
+ "bstr",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "similar-asserts"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f"
+dependencies = [
+ "console",
+ "similar",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "smart-default"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "smartstring"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
+dependencies = [
+ "autocfg",
+ "static_assertions",
+ "version_check",
+]
+
+[[package]]
+name = "sourcemap"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90"
+dependencies = [
+ "data-encoding",
+ "debugid",
+ "if_chain",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "unicode-id",
+ "url",
+]
+
+[[package]]
+name = "sourcemapcache_debug"
+version = "10.2.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "symbolic",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stacker"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "psm",
+ "winapi",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "string_enum"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "swc_atoms"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f54563d7dcba626d4acfe14ed12def7ecc28e004debe3ecd2c3ee07cc47e449"
+dependencies = [
+ "once_cell",
+ "rustc-hash",
+ "serde",
+ "string_cache",
+ "string_cache_codegen",
+ "triomphe",
+]
+
+[[package]]
+name = "swc_common"
+version = "0.31.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d00f960c667c59c133f30492f4d07f26242fcf988a066d3871e6d3d838d528"
+dependencies = [
+ "ast_node",
+ "better_scoped_tls",
+ "cfg-if",
+ "either",
+ "from_variant",
+ "new_debug_unreachable",
+ "num-bigint",
+ "once_cell",
+ "rustc-hash",
+ "serde",
+ "siphasher",
+ "string_cache",
+ "swc_atoms",
+ "swc_eq_ignore_macros",
+ "swc_visit",
+ "tracing",
+ "unicode-width",
+ "url",
+]
+
+[[package]]
+name = "swc_ecma_ast"
+version = "0.106.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebf4d6804b1da4146c4c0359d129e3dd43568d321f69d7953d9abbca4ded76ba"
+dependencies = [
+ "bitflags 2.5.0",
+ "is-macro",
+ "num-bigint",
+ "scoped-tls",
+ "string_enum",
+ "swc_atoms",
+ "swc_common",
+ "unicode-id",
+]
+
+[[package]]
+name = "swc_ecma_parser"
+version = "0.136.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45d40421c607d7a48334f78a9b24a5cbde1f36250f9986746ec082208d68b39f"
+dependencies = [
+ "either",
+ "lexical",
+ "num-bigint",
+ "serde",
+ "smallvec",
+ "smartstring",
+ "stacker",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "tracing",
+ "typed-arena",
+]
+
+[[package]]
+name = "swc_ecma_visit"
+version = "0.92.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f61da6cac0ec3b7e62d367cfbd9e38e078a4601271891ad94f0dac5ff69f839"
+dependencies = [
+ "num-bigint",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_visit",
+ "tracing",
+]
+
+[[package]]
+name = "swc_eq_ignore_macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "swc_macros_common"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "swc_visit"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9"
+dependencies = [
+ "either",
+ "swc_visit_macros",
+]
+
+[[package]]
+name = "swc_visit_macros"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "symbolic"
+version = "10.2.1"
+dependencies = [
+ "symbolic-cfi",
+ "symbolic-common",
+ "symbolic-debuginfo",
+ "symbolic-demangle",
+ "symbolic-il2cpp",
+ "symbolic-ppdb",
+ "symbolic-sourcemapcache",
+ "symbolic-symcache",
+ "symbolic-unreal",
+]
+
+[[package]]
+name = "symbolic-cabi"
+version = "10.2.1"
+dependencies = [
+ "proguard",
+ "sourcemap",
+ "symbolic",
+ "tempfile",
+]
+
+[[package]]
+name = "symbolic-cfi"
+version = "10.2.1"
+dependencies = [
+ "insta",
+ "similar-asserts",
+ "symbolic-common",
+ "symbolic-debuginfo",
+ "symbolic-testutils",
+ "thiserror",
+]
+
+[[package]]
+name = "symbolic-common"
+version = "10.2.1"
+dependencies = [
+ "debugid",
+ "memmap2",
+ "serde",
+ "similar-asserts",
+ "stable_deref_trait",
+ "symbolic-testutils",
+ "tempfile",
+ "uuid",
+]
+
+[[package]]
+name = "symbolic-debuginfo"
+version = "10.2.1"
+dependencies = [
+ "bitvec",
+ "criterion",
+ "dmsort",
+ "elementtree",
+ "elsa",
+ "fallible-iterator",
+ "flate2",
+ "gimli 0.27.3",
+ "goblin",
+ "insta",
+ "lazy_static",
+ "lazycell",
+ "nom",
+ "nom-supreme",
+ "parking_lot",
+ "pdb-addr2line",
+ "regex",
+ "scroll",
+ "serde",
+ "serde_json",
+ "similar-asserts",
+ "smallvec",
+ "symbolic-common",
+ "symbolic-ppdb",
+ "symbolic-testutils",
+ "tempfile",
+ "thiserror",
+ "wasmparser",
+ "zip",
+]
+
+[[package]]
+name = "symbolic-demangle"
+version = "10.2.1"
+dependencies = [
+ "cc",
+ "cpp_demangle",
+ "msvc-demangler",
+ "rustc-demangle",
+ "similar-asserts",
+ "symbolic-common",
+]
+
+[[package]]
+name = "symbolic-il2cpp"
+version = "10.2.1"
+dependencies = [
+ "indexmap",
+ "serde_json",
+ "symbolic-common",
+ "symbolic-debuginfo",
+]
+
+[[package]]
+name = "symbolic-ppdb"
+version = "10.2.1"
+dependencies = [
+ "indexmap",
+ "symbolic-common",
+ "symbolic-testutils",
+ "thiserror",
+ "uuid",
+ "watto",
+]
+
+[[package]]
+name = "symbolic-sourcemapcache"
+version = "10.2.1"
+dependencies = [
+ "itertools",
+ "js-source-scopes",
+ "sourcemap",
+ "symbolic-testutils",
+ "thiserror",
+ "tracing",
+ "watto",
+]
+
+[[package]]
+name = "symbolic-symcache"
+version = "10.2.1"
+dependencies = [
+ "criterion",
+ "indexmap",
+ "insta",
+ "similar-asserts",
+ "symbolic-common",
+ "symbolic-debuginfo",
+ "symbolic-il2cpp",
+ "symbolic-testutils",
+ "thiserror",
+ "tracing",
+ "watto",
+]
+
+[[package]]
+name = "symbolic-testutils"
+version = "10.2.1"
+
+[[package]]
+name = "symbolic-unreal"
+version = "10.2.1"
+dependencies = [
+ "anylog",
+ "bytes",
+ "chrono",
+ "elementtree",
+ "flate2",
+ "insta",
+ "lazy_static",
+ "regex",
+ "scroll",
+ "serde",
+ "similar-asserts",
+ "symbolic-testutils",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "symcache_debug"
+version = "10.2.1"
+dependencies = [
+ "anyhow",
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+
+[[package]]
+name = "thiserror"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+dependencies = [
+ "backtrace",
+ "pin-project-lite",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "triomphe"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-id"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unreal_engine_crash"
+version = "10.2.1"
+dependencies = [
+ "clap",
+ "symbolic",
+]
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "wasmparser"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a"
+dependencies = [
+ "indexmap",
+ "url",
+]
+
+[[package]]
+name = "watto"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6746b5315e417144282a047ebb82260d45c92d09bf653fa9ec975e3809be942b"
+dependencies = [
+ "leb128",
+ "thiserror",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "byteorder",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+]
diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix
index 48f5aaa2d537..47995f2ac3c4 100644
--- a/pkgs/development/python-modules/symbolic/default.nix
+++ b/pkgs/development/python-modules/symbolic/default.nix
@@ -9,12 +9,11 @@
   milksnake,
   cffi,
   pytestCheckHook,
-  nixosTests,
 }:
 
 buildPythonPackage rec {
   pname = "symbolic";
-  version = "12.14.1"; # glitchtip currently only works with symbolic 10.x
+  version = "12.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -22,16 +21,12 @@ buildPythonPackage rec {
     repo = "symbolic";
     tag = version;
     hash = "sha256-u3nEYvnt2P+W/0zYctikMgdkalej86eCYhfWj9LW4pU=";
-    # for some reason the `py` directory in the tarball is empty, so we fetch the source via git instead
+    # the `py` directory is not included in the tarball, so we fetch the source via git instead
     forceFetchGit = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit
-      pname
-      version
-      src
-      ;
+    inherit pname version src;
     hash = "sha256-X8IjmSQD32bougiUFyuk8OOGIzIQgk/TjVM5bgUey5M=";
   };
 
@@ -59,8 +54,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "symbolic" ];
 
-  passthru.tests = { inherit (nixosTests) glitchtip; };
-
   meta = {
     description = "Python library for dealing with symbol files and more";
     homepage = "https://github.com/getsentry/symbolic";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 307bc9bcce88..ea4a877c6270 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16788,6 +16788,8 @@ self: super: with self; {
 
   symbolic = callPackage ../development/python-modules/symbolic { };
 
+  symbolic_10 = callPackage ../development/python-modules/symbolic/10.nix { };
+
   symengine = callPackage ../development/python-modules/symengine { inherit (pkgs) symengine; };
 
   symfc = callPackage ../development/python-modules/symfc { };

From f5d70069578527f3b1450a42cbc9388825e417f8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 14 Apr 2025 15:49:58 +0000
Subject: [PATCH 059/104] glitchtip: 4.2.5 -> 4.2.10

---
 pkgs/by-name/gl/glitchtip/frontend.nix | 6 +++---
 pkgs/by-name/gl/glitchtip/package.nix  | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index f17f728f62f8..ce0762096f43 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "4.2.5";
+  version = "4.2.10";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yLpDjHnt8ZwpT+KlmEtXMYgrpnbYlVzJ/MZMELVO/j8=";
+    hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8=";
   };
 
-  npmDepsHash = "sha256-sR/p/JRVuaemN1euZ/VrJ0j1q7fkS/Zi6R1m6lPvygs=";
+  npmDepsHash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ=";
 
   postPatch = ''
     ${lib.getExe jq} '. + {
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 296869a42b70..c046a85f59b1 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -25,7 +25,6 @@ let
       brotli
       celery
       celery-batches
-      dj-stripe
       django
       django-allauth
       django-anymail
@@ -39,7 +38,6 @@ let
       django-organizations
       django-prometheus
       django-redis
-      django-sql-utils
       django-storages
       google-cloud-logging
       gunicorn
@@ -69,14 +67,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "4.2.5";
+  version = "4.2.10";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OTf2rvx+ONnB7pLB7rinztXL7l2eZfIuI7PosCXaOH8=";
+    hash = "sha256-EGk/mhDlqGrJm/j5rTKeKRkJ/fRTspwtPJ+5OHwplfM=";
   };
 
   propagatedBuildInputs = pythonPackages;

From d70098beb1e308a738430d147b250315ef1a05d2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 14 Apr 2025 17:57:15 +0200
Subject: [PATCH 060/104] glitchtip: refactor

---
 pkgs/by-name/gl/glitchtip/frontend.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index ce0762096f43..34a157cec600 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitLab,
   buildNpmPackage,
+  fetchNpmDeps,
   jq,
   moreutils,
 }:
@@ -17,14 +18,20 @@ buildNpmPackage (finalAttrs: {
     hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8=";
   };
 
-  npmDepsHash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ=";
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ=";
+  };
 
   postPatch = ''
-    ${lib.getExe jq} '. + {
-      "devDependencies": .devDependencies | del(.cypress, ."cypress-localstorage-commands")
-    }' package.json | ${lib.getExe' moreutils "sponge"} package.json
+    jq '.devDependencies |= del(.cypress, ."cypress-localstorage-commands")' package.json | sponge package.json
   '';
 
+  nativeBuildInputs = [
+    moreutils
+    jq
+  ];
+
   buildPhase = ''
     runHook preBuild
 

From 975318de1810843cdbdd0812cc700d2f52e9440c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 19 Apr 2025 00:26:21 +0200
Subject: [PATCH 061/104] python312Packages.djangosaml2: drop support for
 python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/djangosaml2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix
index 0db0264877bf..37db74d9c29b 100644
--- a/pkgs/development/python-modules/djangosaml2/default.nix
+++ b/pkgs/development/python-modules/djangosaml2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   version = "1.10.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "IdentityPython";

From c6c6c722e02967080843001a6e1112604e96f739 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Apr 2025 22:55:38 +0000
Subject: [PATCH 062/104] codesnap: 0.10.7 -> 0.10.8

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

diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix
index 8cfa02716dc4..ae7e891e928b 100644
--- a/pkgs/by-name/co/codesnap/package.nix
+++ b/pkgs/by-name/co/codesnap/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "codesnap";
-  version = "0.10.7";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "mistricky";
     repo = "CodeSnap";
     tag = "v${version}";
-    hash = "sha256-gDV66eLHcg7OuVR0Wo5x3anqKjnS/BsCCVaR6VOnM+s=";
+    hash = "sha256-7miAizBKhUM1KGV+WKuOE3ENTsgSvwNtprvcs1R6ivU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-bQT+tpoSZ54yppyNJxbOEqQoIKqYZAnRo0j42Ti+EJo=";
+  cargoHash = "sha256-UDP4nlGF5GnNQdFo4aIYlgCn0HU+bNtJjEjcaO2f/U4=";
 
   cargoBuildFlags = [
     "-p"

From 43011ef0089081e1acbb5397182acd02e0bb5191 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 00:57:45 +0000
Subject: [PATCH 063/104] java-service-wrapper: 3.5.60 -> 3.6.0

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

diff --git a/pkgs/by-name/ja/java-service-wrapper/package.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix
index c85a95861fc6..786495577c77 100644
--- a/pkgs/by-name/ja/java-service-wrapper/package.nix
+++ b/pkgs/by-name/ja/java-service-wrapper/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "java-service-wrapper";
-  version = "3.5.60";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    hash = "sha256-h3iW4U83XAyIHDpQ+O6RC8ZQSziPu/5lEo5512PQhxc=";
+    hash = "sha256-b9H7teM3zIXvuek1UNlxlzjxPNPy82ElATAGT/Fvjgw=";
   };
 
   strictDeps = true;

From bc62af41fae304bb365e1db201f898730712363c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 21 Mar 2025 17:47:46 +0100
Subject: [PATCH 064/104] muon: 0.2.0 -> 0.4.0

After some initial issues with bootstrapping, things seem to work now.
---
 pkgs/by-name/mu/muon/package.nix | 42 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix
index 1e5957775ee7..afbdceac9b46 100644
--- a/pkgs/by-name/mu/muon/package.nix
+++ b/pkgs/by-name/mu/muon/package.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai";
-  version = "0.2.0";
+  version = "0.4.0";
 
   src = fetchFromSourcehut {
     name = "muon-src";
     owner = "~lattis";
     repo = "muon";
     rev = finalAttrs.version;
-    hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I=";
+    hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw=";
   };
 
   outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     [
       pkgconf
-      samurai
     ]
+    ++ lib.optionals (!embedSamurai) [ samurai ]
     ++ lib.optionals buildDocs [
       (python3.withPackages (ps: [ ps.pyyaml ]))
       scdoc
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libarchive
     libpkgconf
-    samurai
     zlib
   ];
 
@@ -54,20 +53,25 @@ stdenv.mkDerivation (finalAttrs: {
       # URLs manually extracted from subprojects directory
       meson-docs-wrap = fetchurl {
         name = "meson-docs-wrap";
-        url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz";
-        hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI=";
+        url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz";
+        hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM=";
       };
 
-      samurai-wrap = fetchurl {
-        name = "samurai-wrap";
-        url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz";
-        hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc=";
+      meson-tests-wrap = fetchurl {
+        name = "meson-tests-wrap";
+        url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz";
+        hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w=";
       };
     in
     ''
-      pushd $sourceRoot/subprojects
-      ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"}
-      ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"}
+      mkdir -p $sourceRoot/subprojects/meson-docs
+      pushd $sourceRoot/subprojects/meson-docs
+      ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"}
+      popd
+
+      mkdir -p $sourceRoot/subprojects/meson-tests
+      pushd $sourceRoot/subprojects/meson-tests
+      tar xvf ${meson-tests-wrap} --strip-components=1
       popd
     '';
 
@@ -99,13 +103,15 @@ stdenv.mkDerivation (finalAttrs: {
     ''
       runHook preBuild
 
-      ./bootstrap.sh stage-1
+      ${
+        lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\""
+      } ./bootstrap.sh stage-1
 
-      ./stage-1/muon setup ${cmdlineForMuon} stage-2
-      samu ${cmdlineForSamu} -C stage-2
+      ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2
+      ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2
 
-      stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3
-      samu ${cmdlineForSamu} -C stage-3
+      ./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3
+      ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3
 
       runHook postBuild
     '';

From 94542df81d1fde555953e02e30f42ad04cae1208 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 01:18:07 +0000
Subject: [PATCH 065/104] lavat: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix
index 12beae650e52..8cd735a692c5 100644
--- a/pkgs/by-name/la/lavat/package.nix
+++ b/pkgs/by-name/la/lavat/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.1.0";
+  version = "2.2.0";
 in
 stdenv.mkDerivation {
   pname = "lavat";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     owner = "AngelJumbo";
     repo = "lavat";
     rev = "v${version}";
-    hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk=";
+    hash = "sha256-SNRhel2RmaAPqoYpcq7F9e/FcbCJ0E3VJN/G9Ya4TeY=";
   };
 
   installPhase = ''

From 90cee57c0ca8e0d4c257234a8de5c722a62ef4ca Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:04:05 -0700
Subject: [PATCH 066/104] swaytools: cleanup

---
 pkgs/tools/wayland/swaytools/default.nix | 20 ++++++++++----------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix
index 3f994ef03eb2..45884093a7a2 100644
--- a/pkgs/tools/wayland/swaytools/default.nix
+++ b/pkgs/tools/wayland/swaytools/default.nix
@@ -1,15 +1,13 @@
 {
   lib,
-  setuptools,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   slurp,
+  nix-update-script,
 }:
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "swaytools";
   version = "0.1.2";
-
   format = "pyproject";
 
   src = fetchFromGitHub {
@@ -19,15 +17,17 @@ buildPythonApplication rec {
     sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = with python3Packages; [ setuptools ];
 
   propagatedBuildInputs = [ slurp ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     homepage = "https://github.com/tmccombs/swaytools";
     description = "Collection of simple tools for sway (and i3)";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ atila ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ atila ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b83ccb7c4..07347ec2de57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2266,7 +2266,7 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };
+  swaytools = callPackage ../tools/wayland/swaytools { };
 
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 

From ea7f74c6c94c1039819309a601add2e01d6c2041 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:05:04 -0700
Subject: [PATCH 067/104] swaytools: move to by-name

---
 .../swaytools/default.nix => by-name/sw/swaytools/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/wayland/swaytools/default.nix => by-name/sw/swaytools/package.nix} (100%)

diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/by-name/sw/swaytools/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swaytools/default.nix
rename to pkgs/by-name/sw/swaytools/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07347ec2de57..41f291e59e91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2266,8 +2266,6 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  swaytools = callPackage ../tools/wayland/swaytools { };
-
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 
   cplex = callPackage ../applications/science/math/cplex (config.cplex or { });

From 9f8fe82da663a6fa344137f44a0c4ec9e4c8e71e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 03:47:55 +0000
Subject: [PATCH 068/104] woodpecker-server: 3.5.1 -> 3.5.2

---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 27ef50bb6c6c..c9b4b501b7b5 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.5.1";
-  srcHash = "sha256-Ts5CIyyaXpEVRWqRPGsH+NAkA0FextLVKzO6SYwbXPk=";
+  version = "3.5.2";
+  srcHash = "sha256-aHzaBYQ+IHen15FwmSIHaRLe8oWm3BpADrmqW4UWwj0=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From 47f42b8841f753683dcedd6dea08aaa3834d601e Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:35:31 -0700
Subject: [PATCH 069/104] libfakeXinerama: cleanup

---
 pkgs/tools/X11/xpra/libfakeXinerama.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix
index 2b533c1aacca..51f16727c4ec 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix
@@ -6,12 +6,12 @@
   libXinerama,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfakeXinerama";
   version = "0.1.0";
 
   src = fetchurl {
-    url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2";
+    url = "https://www.xpra.org/src/libfakeXinerama-${finalAttrs.version}.tar.bz2";
     sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx";
   };
 
@@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.nickcao ];
     license = lib.licenses.mit;
   };
-}
+})

From e80a4c4b15a483565e82fb8790702eb635c507d3 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:39:12 -0700
Subject: [PATCH 070/104] libfakeXinerama: move to by-name

---
 .../li/libfakeXinerama/package.nix}                             | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/X11/xpra/libfakeXinerama.nix => by-name/li/libfakeXinerama/package.nix} (100%)

diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/by-name/li/libfakeXinerama/package.nix
similarity index 100%
rename from pkgs/tools/X11/xpra/libfakeXinerama.nix
rename to pkgs/by-name/li/libfakeXinerama/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b83ccb7c4..57ff98525525 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16818,12 +16818,10 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra { };
   xpraWithNvenc = callPackage ../tools/X11/xpra {
     withNvenc = true;
     nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
   };
-  libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
 
   xmp = callPackage ../applications/audio/xmp {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;

From 23e0d283d945f52942bf9bef87bf83921ba4ffde Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:40:01 -0700
Subject: [PATCH 071/104] xpra: move to by-name

---
 pkgs/{tools/X11 => by-name/xp}/xpra/0002-Constant-DPI.patch       | 0
 pkgs/{tools/X11 => by-name/xp}/xpra/0003-fix-pointer-limits.patch | 0
 pkgs/{tools/X11 => by-name/xp}/xpra/fix-122159.patch              | 0
 pkgs/{tools/X11 => by-name/xp}/xpra/fix-41106.patch               | 0
 pkgs/{tools/X11 => by-name/xp}/xpra/nvenc.pc                      | 0
 pkgs/{tools/X11/xpra/default.nix => by-name/xp/xpra/package.nix}  | 0
 pkgs/{tools/X11 => by-name/xp}/xpra/update.sh                     | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/0002-Constant-DPI.patch (100%)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/0003-fix-pointer-limits.patch (100%)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/fix-122159.patch (100%)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/fix-41106.patch (100%)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/nvenc.pc (100%)
 rename pkgs/{tools/X11/xpra/default.nix => by-name/xp/xpra/package.nix} (100%)
 rename pkgs/{tools/X11 => by-name/xp}/xpra/update.sh (100%)

diff --git a/pkgs/tools/X11/xpra/0002-Constant-DPI.patch b/pkgs/by-name/xp/xpra/0002-Constant-DPI.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/0002-Constant-DPI.patch
rename to pkgs/by-name/xp/xpra/0002-Constant-DPI.patch
diff --git a/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch b/pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch
rename to pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch
diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/fix-122159.patch
rename to pkgs/by-name/xp/xpra/fix-122159.patch
diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/fix-41106.patch
rename to pkgs/by-name/xp/xpra/fix-41106.patch
diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/by-name/xp/xpra/nvenc.pc
similarity index 100%
rename from pkgs/tools/X11/xpra/nvenc.pc
rename to pkgs/by-name/xp/xpra/nvenc.pc
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/by-name/xp/xpra/package.nix
similarity index 100%
rename from pkgs/tools/X11/xpra/default.nix
rename to pkgs/by-name/xp/xpra/package.nix
diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/by-name/xp/xpra/update.sh
similarity index 100%
rename from pkgs/tools/X11/xpra/update.sh
rename to pkgs/by-name/xp/xpra/update.sh

From 5b5c0ecf868304664b0cc5898a386cf6149a11dd Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:34:20 -0700
Subject: [PATCH 072/104] xpraWithNvenc: move to by-name

---
 pkgs/by-name/xp/xpraWithNvenc/package.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix           | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/xp/xpraWithNvenc/package.nix

diff --git a/pkgs/by-name/xp/xpraWithNvenc/package.nix b/pkgs/by-name/xp/xpraWithNvenc/package.nix
new file mode 100644
index 000000000000..169c3a657a19
--- /dev/null
+++ b/pkgs/by-name/xp/xpraWithNvenc/package.nix
@@ -0,0 +1,8 @@
+{
+  xpra,
+  linuxPackages,
+}:
+xpra.override {
+  withNvenc = true;
+  nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57ff98525525..42c4df87aaeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16818,11 +16818,6 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpraWithNvenc = callPackage ../tools/X11/xpra {
-    withNvenc = true;
-    nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
-  };
-
   xmp = callPackage ../applications/audio/xmp {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
   };

From 76ee0c99384229ea23258468356ed1a51de2450e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 05:13:46 +0000
Subject: [PATCH 073/104] jx: 3.11.76 -> 3.11.78

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

diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index bc8ec3d0f597..8dd6a6f14518 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.11.76";
+  version = "3.11.78";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-XoLJ1YabI3UZpfqIudH8a1rhSr/RI0oYKYHPx2FHAJQ=";
+    sha256 = "sha256-ZGOCjNxj2tcIW82HN6MQBedIJEuguqeTP1GdkXeMJew=";
   };
 
   vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc=";

From 961d9ed4091e2d97c39fde8fce0d025735522b38 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:30:35 -0700
Subject: [PATCH 074/104] bumblebee: move to by-name

---
 .../{tools/X11 => by-name/bu}/bumblebee/nixos.patch |  0
 .../bu/bumblebee/package.nix}                       | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                     | 11 -----------
 3 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{tools/X11 => by-name/bu}/bumblebee/nixos.patch (100%)
 rename pkgs/{tools/X11/bumblebee/default.nix => by-name/bu/bumblebee/package.nix} (93%)

diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/by-name/bu/bumblebee/nixos.patch
similarity index 100%
rename from pkgs/tools/X11/bumblebee/nixos.patch
rename to pkgs/by-name/bu/bumblebee/nixos.patch
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/by-name/bu/bumblebee/package.nix
similarity index 93%
rename from pkgs/tools/X11/bumblebee/default.nix
rename to pkgs/by-name/bu/bumblebee/package.nix
index 50c9209288e1..cfffcec882f6 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -30,7 +30,9 @@
   xorgserver,
   kmod,
   xf86videonouveau,
-  nvidia_x11,
+  nvidia_x11 ? linuxPackages.nvidia_x11,
+  linuxPackages,
+  pkgsi686Linux,
   virtualgl,
   libglvnd,
   automake111x,
@@ -38,8 +40,13 @@
   # The below should only be non-null in a x86_64 system. On a i686
   # system the above nvidia_x11 and virtualgl will be the i686 packages.
   # TODO: Confusing. Perhaps use "SubArch" instead of i686?
-  nvidia_x11_i686 ? null,
-  libglvnd_i686 ? null,
+  nvidia_x11_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then
+      pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
+    else
+      null,
+  libglvnd_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null,
   useDisplayDevice ? false,
   extraNvidiaDeviceOptions ? "",
   extraNouveauDeviceOptions ? "",
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b83ccb7c4..ac0a6dd942da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16565,17 +16565,6 @@ with pkgs;
       if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null;
   };
 
-  bumblebee = callPackage ../tools/X11/bumblebee {
-    nvidia_x11 = linuxPackages.nvidia_x11;
-    nvidia_x11_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then
-        pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
-      else
-        null;
-    libglvnd_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null;
-  };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {

From 4ed0e3adc1c958e6b5ced9682a28b24a30fef862 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 06:21:31 +0000
Subject: [PATCH 075/104] python312Packages.pysmhi: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
index 40eff6b35908..067c290f0d3f 100644
--- a/pkgs/development/python-modules/pysmhi/default.nix
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pysmhi";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pysmhi";
     tag = "v${version}";
-    hash = "sha256-VSFbPh4tnXs48jTlk9pUXY8uribRxIg+6xStbLGBlL8=";
+    hash = "sha256-9jsSvitxcjH2oFCdSm1203UwG5xjOwQDTaU4Z9Cqs+A=";
   };
 
   build-system = [ poetry-core ];

From 012b53cbd0c4d39e0b2122dac7eac2c070dd34f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 06:43:55 +0000
Subject: [PATCH 076/104] aerospike: 8.0.0.5 -> 8.0.0.6

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

diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix
index 5a7de5fc4b53..2bef97c2384d 100644
--- a/pkgs/by-name/ae/aerospike/package.nix
+++ b/pkgs/by-name/ae/aerospike/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "8.0.0.5";
+  version = "8.0.0.6";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-Ou7lSQHkudE0cuhXUtx9EI3z+udfnHI+CXdgoef2TIw=";
+    hash = "sha256-pfB/K5CXwuAgLcJtp4fsllFiCRzjZY0Kv83O/1Uohfw=";
     fetchSubmodules = true;
   };
 

From af53253aa9f3cd5d5da05d2b6f750303f1be9b27 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 13 Apr 2025 17:41:24 +0100
Subject: [PATCH 077/104] codebook: init at 0.2.9

---
 pkgs/by-name/co/codebook/package.nix | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/co/codebook/package.nix

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
new file mode 100644
index 000000000000..7b97353d1d18
--- /dev/null
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "codebook";
+  version = "0.2.9";
+
+  src = fetchFromGitHub {
+    owner = "blopker";
+    repo = "codebook";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iJ9S9DDoZVZxZ1o9dkor8PGM6Z+FljWZfetWFFMOIIo=";
+  };
+
+  buildAndTestSubdir = "crates/codebook-lsp";
+  cargoHash = "sha256-PmhfEftgto0FHOIfryN9JME9S+/CarAEZ6hV/vj37Eg=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  env.OPENSSL_NO_VENDOR = 1;
+
+  # Integration tests require internet access for dictionaries
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Unholy spellchecker for code";
+    homepage = "https://github.com/blopker/codebook";
+    changelog = "https://github.com/blopker/codebook/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      jpds
+    ];
+    mainProgram = "codebook-lsp";
+    platforms = with lib.platforms; unix ++ windows;
+  };
+})

From 45efda8e8300627b8aabadd251326b6857f1c289 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 09:42:17 +0000
Subject: [PATCH 078/104] anakron: 0.3.1 -> 0.3.3

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

diff --git a/pkgs/by-name/an/anakron/package.nix b/pkgs/by-name/an/anakron/package.nix
index cf4babb295e6..5cd737856512 100644
--- a/pkgs/by-name/an/anakron/package.nix
+++ b/pkgs/by-name/an/anakron/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "anakron";
-  version = "0.3.1";
+  version = "0.3.3";
 
   src = fetchzip {
     url = "https://github.com/molarmanful/ANAKRON/releases/download/v${version}/ANAKRON-release_v${version}.zip";
-    hash = "sha256-YggeGSFc+NoDUZjV/cEhQGUR278f97X+WpcDLY66iqg";
+    hash = "sha256-l4MA3OsMnqPIBWKx3ZO5XnxjE0gnIGyAtsZe2z/9zrw=";
   };
 
   nativeBuildInputs = [ xorg.mkfontscale ];

From 4007b7e3dbbec49928866ad13c261dc868848645 Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Sat, 19 Apr 2025 11:48:00 +0200
Subject: [PATCH 079/104] cargo-msrv: 0.17.1 -> 0.18.4

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

diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
index a8c8dd80bb53..72528f1ab810 100644
--- a/pkgs/by-name/ca/cargo-msrv/package.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-msrv";
-  version = "0.17.1";
+  version = "0.18.4";
 
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = "cargo-msrv";
     tag = "v${version}";
-    sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU=";
+    sha256 = "sha256-dvCKi40c9PmM05MK+0VGWxny0ZA+9YO/M3zmv5Qv6b0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D35koQEqHsmXIBgXRCyI8Wyo2OVSuTFCjgm/JjO4VDo=";
+  cargoHash = "sha256-cIyoGFIxtX4/Dn4RbtMB75WQj+UO44V182u6C5smgSw=";
 
   passthru = {
     updateScript = gitUpdater {

From 940d8891b724b4a04ff4b2ac2ec2915035214c3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 09:49:46 +0000
Subject: [PATCH 080/104] ghostfolio: 2.150.0 -> 2.153.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 07ff98dce31e..6473cb5be1f8 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.150.0";
+  version = "2.153.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-6XoOv1ynZomcWS156DybhfDlrThi3tepqNTtw/1M/zU=";
+    hash = "sha256-0TRhG0fRO9Hm4OX2GLcL7r3PyvsZbZl+5f9qCpF7hwQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-bLy+5hHyZDnSJ+IH3DPECScaRsXgPNr5ttuHfCpn5kU=";
+  npmDepsHash = "sha256-1I5IKenVF5xPaqz3m6RBdah6S0lBRZBIuMqnPnepYsU=";
 
   nativeBuildInputs = [
     prisma

From 657d7c500ebac912a3f68735217f5305220e7c80 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Sat, 19 Apr 2025 12:15:16 +0200
Subject: [PATCH 081/104] errbot: add hlad as maintainer

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

diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix
index 8ff4c4cf431a..0707e72359ed 100644
--- a/pkgs/by-name/er/errbot/package.nix
+++ b/pkgs/by-name/er/errbot/package.nix
@@ -58,13 +58,13 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "errbot" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst";
     description = "Chatbot designed to be simple to extend with plugins written in Python";
     homepage = "http://errbot.io/";
-    maintainers = [ ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ hlad ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     # flaky on darwin, "RuntimeError: can't start new thread"
     mainProgram = "errbot";
   };

From 6ec96df49189b3ac8ab2743c248c15b2ffea269b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 19 Apr 2025 11:33:42 +0100
Subject: [PATCH 082/104] python3Packages.pylddwrap: set `pyproject = true`

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

diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix
index cb68291f27e6..f4b4ea8ff7a5 100644
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@@ -7,18 +7,19 @@
   pytestCheckHook,
   pythonOlder,
   replaceVars,
+  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pylddwrap";
   version = "1.2.2";
-  format = "setuptools";
+  pyproject = true;
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "Parquery";
-    repo = pname;
+    repo = "pylddwrap";
     rev = "v${version}";
     hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
   };
@@ -35,6 +36,8 @@ buildPythonPackage rec {
     rm -f $out/{LICENSE,README.rst,requirements.txt}
   '';
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [
     icontract
     typing-extensions

From 40c3141d97b05f81eeb4af02e93b34eedc09f41f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Apr 2025 12:41:43 +0200
Subject: [PATCH 083/104] python313Packages.caio: 0.9.21 -> 0.9.22

Diff: https://github.com/mosquito/caio/compare/refs/tags/0.9.21...refs/tags/0.9.22

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

diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix
index afe44020b9ce..ae4a10952868 100644
--- a/pkgs/development/python-modules/caio/default.nix
+++ b/pkgs/development/python-modules/caio/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "caio";
-  version = "0.9.21";
+  version = "0.9.22";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mosquito";
     repo = "caio";
     tag = version;
-    hash = "sha256-WP4LfC0VCpR5HiMmxPSeZbcCbTbSpmwEjEGdDptuOQY=";
+    hash = "sha256-O86SLZ+8bzPYtvLnmY5gLPYLWvNaktQwIEQckJR15LI=";
   };
 
   build-system = [ setuptools ];

From 9ea2c46d73ae6c27718f3d6d51bb0d057ec8a993 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Apr 2025 12:48:09 +0200
Subject: [PATCH 084/104] python313Packages.tlslite-ng:
 0.8.0b1-unstable-2024-06-24 -> 0.8.2

Changelog: https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v0.8.2
---
 .../python-modules/tlslite-ng/default.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix
index 1d715c6758f7..de05af7f786c 100644
--- a/pkgs/development/python-modules/tlslite-ng/default.nix
+++ b/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -1,24 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
   ecdsa,
+  fetchFromGitHub,
   hypothesis,
-  pythonAtLeast,
   pytestCheckHook,
+  pythonAtLeast,
+  setuptools,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "tlslite-ng";
-  version = "0.8.0b1-unstable-2024-06-24";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tlsfuzzer";
     repo = "tlslite-ng";
-    rev = "4d2c6b8fc8d14bb5c90c8360bdb6f617e8e38591";
-    hash = "sha256-VCQjxZIs4rzlFrIakXI7YeLz7Ws9WRf8zGPcSryO9Ko=";
+    tag = "v${version}";
+    hash = "sha256-lKSFPJ4Dm8o1zUgvXjUUpStV5M+xf7s6wOg2ceYbpbw=";
   };
 
   build-system = [ setuptools ];
@@ -36,9 +36,9 @@ buildPythonPackage {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v${version}";
-    description = "Pure python implementation of SSL and TLS";
+    description = "Implementation of SSL and TLS";
     homepage = "https://github.com/tlsfuzzer/tlslite-ng";
+    changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/${src.tag}";
     license = licenses.lgpl21Only;
     maintainers = [ ];
   };

From fccbe21d3d90934be6709b9a85d61c7390b25f67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 11:32:18 +0000
Subject: [PATCH 085/104] certinfo-go: 0.1.42 -> 0.1.43

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

diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix
index 23b3e6b9762b..f3f8fc02b470 100644
--- a/pkgs/by-name/ce/certinfo-go/package.nix
+++ b/pkgs/by-name/ce/certinfo-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "certinfo-go";
-  version = "0.1.42";
+  version = "0.1.43";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "certinfo";
     tag = "v${version}";
-    hash = "sha256-XnHQTMohpuMnV2trSqZ9PlKWmuOyHGDj+6ljKfUD40A=";
+    hash = "sha256-vXNk4DrElWmV7yxWEiLZexJQzVBUY08fF0in6hpBwjA=";
   };
 
-  vendorHash = "sha256-Bbj+8TAJJWhkOxib9cz/Znj5bHAXcgrDONRpGDK+los=";
+  vendorHash = "sha256-rAXnnd9E3HFvmbI+dIJj0F81NwXXD53QATNNmlOpBRM=";
 
   ldflags = [
     "-s"

From b0ad9fab605a0c8a965c745a2ec3e02a9a4957ee Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 19 Apr 2025 12:18:32 +0100
Subject: [PATCH 086/104] python3Packages.deal-solver: disable flaky test

---
 pkgs/development/python-modules/deal-solver/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix
index 2946db32d5af..9aff8a2c598c 100644
--- a/pkgs/development/python-modules/deal-solver/default.nix
+++ b/pkgs/development/python-modules/deal-solver/default.nix
@@ -45,6 +45,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "deal_solver" ];
 
+  disabledTests = [
+    # Flaky tests, sometimes it works sometimes it doesn't
+    "test_expr_asserts_ok"
+    "test_fuzz_math_floats"
+  ];
+
   meta = with lib; {
     description = "Z3-powered solver (theorem prover) for deal";
     homepage = "https://github.com/life4/deal-solver";

From 824afa7ff24c7cb1529fb871e75841d219b0a29b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Apr 2025 13:49:20 +0200
Subject: [PATCH 087/104] modelscan: relax rich

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

diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix
index eb746ead7b83..1a7b96927377 100644
--- a/pkgs/by-name/mo/modelscan/package.nix
+++ b/pkgs/by-name/mo/modelscan/package.nix
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-8VupkPiHebVtOqMdtkBflAI1zPRdDSvHCEq3ghjASaE=";
   };
 
+  pythonRelaxDeps = [ "rich" ];
+
   build-system = with python3.pkgs; [
     poetry-core
     poetry-dynamic-versioning

From 7b40a5c050822f835b8641548543f370fea3a554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 11:51:02 +0000
Subject: [PATCH 088/104] pmtiles: 1.27.1 -> 1.27.2

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index f04a8d97598f..d060c3fe5a12 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.27.1";
+  version = "1.27.2";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${version}";
-    hash = "sha256-SQzCNgRDu5elkCH0fTDL3w23Z6G2P1IuxSWwZYxQwVo=";
+    hash = "sha256-yOQrwJZUUdknEB+/I/BeQjtQvQ9HoKOJOYL4TM4vpc8=";
   };
 
   vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk=";

From b90cd8e52125b3ba20240dd3553642877813a3e4 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 19 Apr 2025 14:01:53 +0800
Subject: [PATCH 089/104] rust: add loongarch64-linux platforms

---
 pkgs/development/compilers/rust/1_86.nix        | 2 ++
 pkgs/development/compilers/rust/print-hashes.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_86.nix b/pkgs/development/compilers/rust/1_86.nix
index be65cf619e9d..d049de2224b8 100644
--- a/pkgs/development/compilers/rust/1_86.nix
+++ b/pkgs/development/compilers/rust/1_86.nix
@@ -130,6 +130,8 @@ import ./default.nix
       powerpc64le-unknown-linux-gnu = "9b104428e2b0377dbdb9dc094eb4d9f4893ada0b80d2b315f0c4ea2135ed9007";
       riscv64gc-unknown-linux-gnu = "b74cd0bf5ddeb759cd75fb4d7f3f90972dbab6e77569484491ab7ecf073558a8";
       s390x-unknown-linux-gnu = "721121bcb8f96b98942289f627f9054ded92215c391d48f459527d4b0c63114f";
+      loongarch64-unknown-linux-gnu = "0e7827b14c77ce3ede5ba414de9806b52c655940f95fddd3e07873b8fe46c8bf";
+      loongarch64-unknown-linux-musl = "d769fb639a9116c77d5b35cb0abe4fd3bc85b6d578fe7e4440c218530e32e1cf";
       x86_64-unknown-freebsd = "fc424d582cd45df010f3b3ff76768f6c87942002421f8896daf7e3989a8f72b4";
     };
 
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index e2ff6a815227..342b5c110704 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -20,6 +20,8 @@ PLATFORMS=(
   powerpc64le-unknown-linux-gnu
   riscv64gc-unknown-linux-gnu
   s390x-unknown-linux-gnu
+  loongarch64-unknown-linux-gnu
+  loongarch64-unknown-linux-musl
   x86_64-unknown-freebsd
 )
 BASEURL=https://static.rust-lang.org/dist

From ae344aafa476d2fee36560d0725b4aa4ac39e186 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 19 Apr 2025 12:36:28 +0000
Subject: [PATCH 090/104] uiua-unstable: 0.15.1 -> 0.16.0-dev.1

---
 pkgs/by-name/ui/uiua/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 99978a95e8bc..c5f37b346124 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.15.1";
+  version = "0.16.0-dev.1";
   tag = version;
-  hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8=";
-  cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno=";
+  hash = "sha256-fW8ntGSK6MX6shXqnKxLD52vDovFol+/tZtr0Hw5Btc=";
+  cargoHash = "sha256-1pcDM7VUVqigBeJ+loEUEOOPlggOsYir/Dge663UtSQ=";
   updateScript = ./update-unstable.sh;
 }

From 27b5a8e6606519040a453f60aa96f18990e316d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 12:44:44 +0000
Subject: [PATCH 091/104] tlsinfo: 0.1.45 -> 0.1.47

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

diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix
index 6c5a56257a89..f977279e9451 100644
--- a/pkgs/by-name/tl/tlsinfo/package.nix
+++ b/pkgs/by-name/tl/tlsinfo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "tlsinfo";
-  version = "0.1.45";
+  version = "0.1.47";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "tlsinfo";
     tag = "v${version}";
-    hash = "sha256-gVKB03Tv00c+vO9IgwESWCU1Vqh3iwkVuQLk3BEHlUk=";
+    hash = "sha256-9YOFsUDNxZi1C59ZSQ31QXE9comFa6DGEzvRah0bruY=";
   };
 
-  vendorHash = "sha256-FFefmnXPCyTEOUkM8A0UCz0nZ0Ors8scxZIwVPnSiac=";
+  vendorHash = "sha256-f7Rkpz6qGiJNhxlYPJo2G3ykItj+55PvGnNPNOU1ftI=";
 
   ldflags = [
     "-s"

From c4e27aa61705ba634ca902cb6b734aa82a9413c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 12:59:59 +0000
Subject: [PATCH 092/104] jwx: 2.1.4 -> 2.1.5

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

diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index 2350f9673073..a6bb653c9b65 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "jwx";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-UXiF3X1jLk4dCGKmZlx9V08hzNJV+s/K2Wei9i+A6dg=";
+    hash = "sha256-JDv1lqfhE16v3hJhf9OD2P2IS1KeLyewHxNlS7Ci2bk=";
   };
 
   vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y=";

From 2f8e275422da875d1f623a0e087d8a9b9717aa13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 13:30:50 +0000
Subject: [PATCH 093/104] plasma-panel-colorizer: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index c656b6c5f7fd..8cc8d19d4234 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SQ2jf0YWmDN0Yce2lmTpD11zLdUz2otm98TO/agaY28=";
+    hash = "sha256-5pPmXuP/7weG2EtBLnhSKHkycJw3VdAi05lRgut8Agg=";
   };
 
   nativeBuildInputs = [

From 3cd61cfc04fff72fc1246adc5f39b4a23b8d7b2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Apr 2025 18:03:28 +0000
Subject: [PATCH 094/104] crudini: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/by-name/cr/crudini/package.nix b/pkgs/by-name/cr/crudini/package.nix
index ae8387c374b3..d42b2ce0ec8e 100644
--- a/pkgs/by-name/cr/crudini/package.nix
+++ b/pkgs/by-name/cr/crudini/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "crudini";
-  version = "0.9.5";
+  version = "0.9.6";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = "crudini";
-    rev = version;
-    hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U=";
+    tag = version;
+    hash = "sha256-XW9pdP+aie6v9h35gLYM0wVrcsh+dcEB7EueATOV4w4=";
   };
 
   postPatch = ''

From 4f5f74421fb6853f879200f5d6437efbac8dcdb0 Mon Sep 17 00:00:00 2001
From: JeanCASPAR <55629512+JeanCASPAR@users.noreply.github.com>
Date: Fri, 18 Apr 2025 19:26:33 +0200
Subject: [PATCH 095/104] vscode-extensions.tecosaur.latex-utilities: init at
 0.4.14

Release: https://github.com/tecosaur/LaTeX-Utilities/releases/tag/v0.4.14
---
 .../editors/vscode/extensions/default.nix     |  2 +
 .../tecosaur.latex-utilities/default.nix      | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b616f280edfd..bc105bc15090 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4870,6 +4870,8 @@ let
         };
       };
 
+      tecosaur.latex-utilities = callPackage ./tecosaur.latex-utilities { };
+
       tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { };
 
       theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension {
diff --git a/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix
new file mode 100644
index 000000000000..61a582529ba2
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  vscode-utils,
+  jq,
+  moreutils,
+  texlivePackages,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
+  mktplcRef = {
+    name = "latex-utilities";
+    publisher = "tecosaur";
+    version = "0.4.14";
+    hash = "sha256-GsbHzFcN56UbcaqFN9s+6u/KjUBn8tmks2ihK0pg3Ds=";
+  };
+
+  nativeBuildInputs = [
+    jq
+    moreutils
+  ];
+
+  buildInputs = [ texlivePackages.texcount ];
+
+  postInstall = ''
+    cd "$out/$installPrefix"
+    echo -n ${finalAttrs.version} > VERSION
+    jq '.contributes.configuration.properties."latex-utilities.countWord.path".default = "${texlivePackages.texcount}/bin/texcount"' package.json | sponge package.json
+  '';
+
+  meta = {
+    description = "Add-on to the Visual Studio Code extension LaTeX Workshop";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=tecosaur.latex-utilities";
+    homepage = "https://github.com/tecosaur/LaTeX-Utilities";
+    changelog = "https://marketplace.visualstudio.com/items/tecosaur.latex-utilities/changelog";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jeancaspar ];
+  };
+})

From 196fcebfb614959869d6f73c72214af10598e042 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 14:05:18 +0000
Subject: [PATCH 096/104] klog-rs: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index 9c0e15bce9d4..cf85787623fa 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "klog-rs";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
     rev = version;
-    hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM=";
+    hash = "sha256-X7VUbn2DQx4Wo526COGAp0IFPPhh1vObxP/b6oYFWG4=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HmKMxI94j0cLLAjmUJQhymop9qiH71Rm8dnVVs2VDF8=";
+  cargoHash = "sha256-veE992wYv8SwAbvaqe3nVymxTbaMYEDWtLnisnyNOn4=";
   checkFlags = [
     # this integration test depends on a running kubernetes cluster
     "--skip=k8s::tests::test_get_pod_list"

From 951c787a496fceaa6af201c65f47aa7553ed153c Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Thu, 17 Apr 2025 19:18:42 +0200
Subject: [PATCH 097/104] unsure: init at 0.4.0

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
---
 pkgs/by-name/un/unsure/package.nix       |  48 +++
 pkgs/by-name/un/unsure/pubspec.lock.json | 527 +++++++++++++++++++++++
 pkgs/by-name/un/unsure/update.sh         |  24 ++
 3 files changed, 599 insertions(+)
 create mode 100644 pkgs/by-name/un/unsure/package.nix
 create mode 100644 pkgs/by-name/un/unsure/pubspec.lock.json
 create mode 100755 pkgs/by-name/un/unsure/update.sh

diff --git a/pkgs/by-name/un/unsure/package.nix b/pkgs/by-name/un/unsure/package.nix
new file mode 100644
index 000000000000..9dfac7acd784
--- /dev/null
+++ b/pkgs/by-name/un/unsure/package.nix
@@ -0,0 +1,48 @@
+{
+  buildDartApplication,
+  dart,
+  fetchFromGitHub,
+  lib,
+  runCommand,
+  testers,
+  unsure,
+  writeText,
+}:
+
+buildDartApplication rec {
+  pname = "unsure";
+  version = "0.4.0-unstable-2025-04-15";
+
+  src = fetchFromGitHub {
+    owner = "filiph";
+    repo = "unsure";
+    rev = "123712482b7053974cbef9ffa7ba46c1cdfb765f";
+    hash = "sha256-rn10vy6l12ToiqO4vGVT4N7WNlj6PY/r+xVzjmYqILw=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    [[ "$("$out/bin/unsure" "4~6 * 1~2" | head --lines=2)" == "$(printf '\n\t%s' '5~11')" ]]
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    changelog = "https://github.com/filiph/unsure/blob/${src.rev}/CHANGELOG.md";
+    description = "Calculate with numbers you’re not sure about";
+    downloadPage = "https://github.com/filiph/unsure";
+    homepage = "https://filiph.github.io/unsure";
+    license = lib.licenses.mit;
+    mainProgram = "unsure";
+    maintainers = [
+      lib.maintainers.l0b0
+      lib.maintainers.rksm
+    ];
+  };
+}
diff --git a/pkgs/by-name/un/unsure/pubspec.lock.json b/pkgs/by-name/un/unsure/pubspec.lock.json
new file mode 100644
index 000000000000..b47dc596e018
--- /dev/null
+++ b/pkgs/by-name/un/unsure/pubspec.lock.json
@@ -0,0 +1,527 @@
+{
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "82.0.0"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "f4c21c94eb4623b183c1014a470196b3910701bea9b926e6c91270d756e6fc60",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.4.1"
+    },
+    "args": {
+      "dependency": "direct main",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.0"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.0"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.6"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "js": {
+      "dependency": "transitive",
+      "description": {
+        "name": "js",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.2"
+    },
+    "lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "lints",
+        "sha256": "a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.17"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.16.0"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "petitparser": {
+      "dependency": "direct main",
+      "description": {
+        "name": "petitparser",
+        "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.4.0"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.1"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "quiver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "quiver",
+        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.1"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "t_stats": {
+      "dependency": "direct main",
+      "description": {
+        "name": "t_stats",
+        "sha256": "ebe4babf8fba8140d4a66465707a5f3db43cf31c9159df225fee823973d467c6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.25.15"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.4"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.8"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "15.0.0"
+    },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.6"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.7.0-0 <4.0.0"
+  }
+}
diff --git a/pkgs/by-name/un/unsure/update.sh b/pkgs/by-name/un/unsure/update.sh
new file mode 100755
index 000000000000..e0620d22e354
--- /dev/null
+++ b/pkgs/by-name/un/unsure/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p yq jq common-updater-scripts dart
+
+set -o errexit -o nounset -o pipefail
+
+# TODO: Expand to get new version automatically once implemented upstream
+
+package_dir="$(dirname "${BASH_SOURCE[0]}")"
+
+# Create new pubspec.lock.json
+cleanup() {
+    rm --force --recursive "${tmpdir}"
+}
+trap cleanup EXIT
+tmpdir="$(mktemp -d)"
+
+src="$(nix-build --no-link --attr unsure.src)"
+cp "${src}"/pubspec.* "${tmpdir}"
+
+if ! [[ -f pubspec.lock ]]; then
+    dart pub --directory="${tmpdir}" update
+fi
+
+yq . "${tmpdir}/pubspec.lock" >"${package_dir}/pubspec.lock.json"

From 28b8f26febb8ed8887a2080b6994edb30a3740e7 Mon Sep 17 00:00:00 2001
From: LazyStability <LazilyStable@proton.me>
Date: Thu, 17 Apr 2025 20:19:15 +0200
Subject: [PATCH 098/104] reddit-tui: init at 0.3.4

---
 pkgs/by-name/re/reddit-tui/package.nix | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/re/reddit-tui/package.nix

diff --git a/pkgs/by-name/re/reddit-tui/package.nix b/pkgs/by-name/re/reddit-tui/package.nix
new file mode 100644
index 000000000000..810f998267af
--- /dev/null
+++ b/pkgs/by-name/re/reddit-tui/package.nix
@@ -0,0 +1,34 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  callPackage,
+}:
+buildGoModule (finalAttrs: {
+  pname = "reddit-tui";
+  version = "0.3.4";
+  src = fetchFromGitHub {
+    owner = "tonymajestro";
+    repo = "reddit-tui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FlGprSbt1/jTRe2p/aXt5f5aZAxnQlb6M70wvUdE9qk=";
+  };
+  vendorHash = "sha256-H2ukIIi30b8kGOjESXJGv/VW5pPgfxG2c3H6S4jRAA4=";
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/tonymajestro/reddit-tui/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/tonymajestro/reddit-tui";
+    description = "Terminal UI for reddit";
+    longDescription = ''
+      Due to suspected throttling by reddit, it might be necessary to use a [redlib backend](https://github.com/redlib-org/redlib) to enable this package to work.
+      See [the Docs](https://github.com/tonymajestro/reddit-tui#configuration-files) on how to do that.
+    '';
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.LazilyStableProton ];
+    mainProgram = "reddittui";
+  };
+})

From 1d11c31b9c5acff739d2859ac322a904861356f8 Mon Sep 17 00:00:00 2001
From: LazyStability <LazilyStable@proton.me>
Date: Thu, 17 Apr 2025 20:19:15 +0200
Subject: [PATCH 099/104] maintainers: add LazilyStableProton

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 74fec3f9b32a..4fa9b33b6dcf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13374,6 +13374,12 @@
     githubId = 632767;
     name = "Guillaume Maudoux";
   };
+  LazilyStableProton = {
+    email = "LazilyStable@proton.me";
+    github = "LazyStability";
+    githubId = 120277625;
+    name = "LazilyStableProton";
+  };
   lblasc = {
     email = "lblasc@znode.net";
     github = "lblasc";

From e0d1b49a4678d9a4f2ff9c362122756b56c41f13 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Wed, 19 Feb 2025 21:00:29 +0100
Subject: [PATCH 100/104] chore: move meta option to top level in many modules

---
 nixos/modules/image/repart.nix                     | 11 +++++------
 nixos/modules/security/isolate.nix                 |  4 ++--
 nixos/modules/security/please.nix                  |  2 --
 nixos/modules/services/misc/devpi-server.nix       |  4 ++--
 nixos/modules/services/networking/ntp/chrony.nix   | 10 +++++-----
 nixos/modules/services/networking/ntp/ntpd.nix     |  4 ++--
 nixos/modules/services/networking/ntp/openntpd.nix |  3 ++-
 nixos/modules/services/networking/stunnel.nix      | 14 +++++++-------
 .../modules/services/networking/whoogle-search.nix |  4 ++--
 nixos/modules/services/networking/xandikos.nix     |  3 ++-
 .../services/web-apps/immich-public-proxy.nix      |  3 +--
 nixos/modules/services/web-apps/immich.nix         |  3 +--
 nixos/modules/services/web-apps/trilium.nix        |  4 ++--
 nixos/modules/system/boot/uki.nix                  |  5 ++---
 14 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index 3f8188ff44e8..db026870d4fc 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -369,11 +369,10 @@ in
           ;
         inherit fileSystems definitionsDirectory mkfsEnv;
       };
-
-    meta.maintainers = with lib.maintainers; [
-      nikstur
-      willibutz
-    ];
-
   };
+
+  meta.maintainers = with lib.maintainers; [
+    nikstur
+    willibutz
+  ];
 }
diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix
index c2df90e426a6..9f0060e305ac 100644
--- a/nixos/modules/security/isolate.nix
+++ b/nixos/modules/security/isolate.nix
@@ -140,7 +140,7 @@ in
     systemd.slices.isolate = {
       description = "Isolate Sandbox Slice";
     };
-
-    meta.maintainers = with maintainers; [ virchau13 ];
   };
+
+  meta.maintainers = with maintainers; [ virchau13 ];
 }
diff --git a/nixos/modules/security/please.nix b/nixos/modules/security/please.nix
index dcc3a63384b8..b67f0945521a 100644
--- a/nixos/modules/security/please.nix
+++ b/nixos/modules/security/please.nix
@@ -121,7 +121,5 @@ in
       sshAgentAuth = true;
       usshAuth = true;
     };
-
-    meta.maintainers = [ ];
   };
 }
diff --git a/nixos/modules/services/misc/devpi-server.nix b/nixos/modules/services/misc/devpi-server.nix
index 309ef8325f9f..16c5fd34ff17 100644
--- a/nixos/modules/services/misc/devpi-server.nix
+++ b/nixos/modules/services/misc/devpi-server.nix
@@ -125,7 +125,7 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
     };
-
-    meta.maintainers = [ lib.maintainers.cafkafk ];
   };
+
+  meta.maintainers = [ lib.maintainers.cafkafk ];
 }
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index a8c4c3885a71..3a9d911b8048 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -180,12 +180,12 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    meta.maintainers = with lib.maintainers; [
-      thoughtpolice
-      vifino
-    ];
+  meta.maintainers = with lib.maintainers; [
+    thoughtpolice
+    vifino
+  ];
 
+  config = mkIf cfg.enable {
     environment.systemPackages = [ chronyPkg ];
 
     users.groups.chrony.gid = config.ids.gids.chrony;
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index 84f79df52b0e..6debe11753f9 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -126,9 +126,9 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.ntp.enable {
-    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 
+  config = mkIf config.services.ntp.enable {
     # Make tools such as ntpq available in the system path.
     environment.systemPackages = [ pkgs.ntp ];
     services.timesyncd.enable = mkForce false;
diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix
index c4ad630826b5..8d7eebde8cdc 100644
--- a/nixos/modules/services/networking/ntp/openntpd.nix
+++ b/nixos/modules/services/networking/ntp/openntpd.nix
@@ -58,8 +58,9 @@ in
 
   ###### implementation
 
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+
   config = mkIf cfg.enable {
-    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
     services.timesyncd.enable = mkForce false;
 
     # Add ntpctl to the environment for status checking
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 0e02cc74184c..c986fc604a64 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -222,13 +222,13 @@ in
         Type = "forking";
       };
     };
-
-    meta.maintainers = with lib.maintainers; [
-      # Server side
-      lschuermann
-      # Client side
-      das_j
-    ];
   };
 
+  meta.maintainers = with lib.maintainers; [
+    # Server side
+    lschuermann
+    # Client side
+    das_j
+  ];
+
 }
diff --git a/nixos/modules/services/networking/whoogle-search.nix b/nixos/modules/services/networking/whoogle-search.nix
index 4665cfc5793d..c0067edce7f0 100644
--- a/nixos/modules/services/networking/whoogle-search.nix
+++ b/nixos/modules/services/networking/whoogle-search.nix
@@ -64,7 +64,7 @@ in
         RestartSec = "5s";
       };
     };
-
-    meta.maintainers = with lib.maintainers; [ malte-v ];
   };
+
+  meta.maintainers = with lib.maintainers; [ malte-v ];
 }
diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix
index 1b72cd03ba9c..908107a259a9 100644
--- a/nixos/modules/services/networking/xandikos.nix
+++ b/nixos/modules/services/networking/xandikos.nix
@@ -87,9 +87,10 @@ in
 
   };
 
+  meta.maintainers = with lib.maintainers; [ _0x4A6F ];
+
   config = mkIf cfg.enable (mkMerge [
     {
-      meta.maintainers = with lib.maintainers; [ _0x4A6F ];
 
       systemd.services.xandikos = {
         description = "A Simple Calendar and Contact Server";
diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix
index 85238e1cbacf..817c79bd534c 100644
--- a/nixos/modules/services/web-apps/immich-public-proxy.nix
+++ b/nixos/modules/services/web-apps/immich-public-proxy.nix
@@ -92,7 +92,6 @@ in
     };
 
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
-
-    meta.maintainers = with lib.maintainers; [ jaculabilis ];
   };
+  meta.maintainers = with lib.maintainers; [ jaculabilis ];
 }
diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index cc7d5ff6f39e..a647b552678f 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -389,7 +389,6 @@ in
       };
     };
     users.groups = mkIf (cfg.group == "immich") { immich = { }; };
-
-    meta.maintainers = with lib.maintainers; [ jvanbruegge ];
   };
+  meta.maintainers = with lib.maintainers; [ jvanbruegge ];
 }
diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix
index 2b0af61aa043..83f79589a947 100644
--- a/nixos/modules/services/web-apps/trilium.nix
+++ b/nixos/modules/services/web-apps/trilium.nix
@@ -108,11 +108,11 @@ in
     };
   };
 
+  meta.maintainers = with lib.maintainers; [ fliegendewurst ];
+
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        meta.maintainers = with lib.maintainers; [ fliegendewurst ];
-
         users.groups.trilium = { };
         users.users.trilium = {
           description = "Trilium User";
diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix
index fd9f1cadd340..d9f4713b307c 100644
--- a/nixos/modules/system/boot/uki.nix
+++ b/nixos/modules/system/boot/uki.nix
@@ -111,8 +111,7 @@ in
         --config=${cfg.configFile} \
         --output="$out/${config.system.boot.loader.ukiFile}"
     '';
-
-    meta.maintainers = with lib.maintainers; [ nikstur ];
-
   };
+
+  meta.maintainers = with lib.maintainers; [ nikstur ];
 }

From c9903c70db42e33d7769f56b6638c16d34aec9a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 16:41:19 +0000
Subject: [PATCH 101/104] filen-cli: 0.0.32 -> 0.0.33

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

diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix
index c841cfa9fd64..55a66bb2449d 100644
--- a/pkgs/by-name/fi/filen-cli/package.nix
+++ b/pkgs/by-name/fi/filen-cli/package.nix
@@ -15,16 +15,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "filen-cli";
-  version = "0.0.32";
+  version = "0.0.33";
 
   src = fetchFromGitHub {
     owner = "FilenCloudDienste";
     repo = "filen-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sSwRgtjBfmvZ8jEzMoiqGNSaxE+bRvx1udGf9g8EwfM=";
+    hash = "sha256-piGXcPUwJDOg8EAYML0BiSPRM+1LogU8s2BXtBud5ww=";
   };
 
-  npmDepsHash = "sha256-RXA/kVvLrmrsxj6T6H2soTMYmC6VRWNjuQfefgVB/qY=";
+  npmDepsHash = "sha256-4GdipHnaqv3LrejMXF73duNyZKgD/0ApzUjiI/QQ30g=";
 
   inherit nodejs;
 

From d7e7243d4ce0c32f04ff9f407a7afda5c56fd3fb Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 19 Apr 2025 18:17:50 +0200
Subject: [PATCH 102/104] nixosTests.signal-desktop: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix      |   2 +-
 nixos/tests/signal-desktop.nix | 143 ++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3d59d6bdc307..2ccd689b16c8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1205,7 +1205,7 @@ in
   shadowsocks = handleTest ./shadowsocks { };
   shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };
   shiori = handleTest ./shiori.nix { };
-  signal-desktop = handleTest ./signal-desktop.nix { };
+  signal-desktop = runTest ./signal-desktop.nix;
   silverbullet = handleTest ./silverbullet.nix { };
   simple = handleTest ./simple.nix { };
   sing-box = handleTest ./sing-box.nix { };
diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index 22b21f4bcecf..eb9f7b4f5b58 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -1,82 +1,79 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
+{ pkgs, ... }:
+let
+  sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''
+    set -eu
 
-  let
-    sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''
-      set -eu
+    readonly CFG=~/.config/Signal/config.json
+    readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"
+    readonly DB="$1"
+    readonly SQL="SELECT * FROM sqlite_master where type='table'"
+    ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"
+  '';
+in
+{
+  name = "signal-desktop";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      flokli
+      primeos
+    ];
+  };
 
-      readonly CFG=~/.config/Signal/config.json
-      readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"
-      readonly DB="$1"
-      readonly SQL="SELECT * FROM sqlite_master where type='table'"
-      ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"
-    '';
-  in
-  {
-    name = "signal-desktop";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        flokli
-        primeos
+  nodes.machine =
+    { ... }:
+
+    {
+      imports = [
+        ./common/user-account.nix
+        ./common/x11.nix
+      ];
+
+      services.xserver.enable = true;
+      test-support.displayManager.auto.user = "alice";
+      environment.systemPackages = with pkgs; [
+        signal-desktop
+        file
+        sqlite
+        sqlcipher-signal
       ];
     };
 
-    nodes.machine =
-      { ... }:
+  enableOCR = true;
 
-      {
-        imports = [
-          ./common/user-account.nix
-          ./common/x11.nix
-        ];
+  testScript =
+    { nodes, ... }:
+    let
+      user = nodes.machine.config.users.users.alice;
+    in
+    ''
+      start_all()
+      machine.wait_for_x()
 
-        services.xserver.enable = true;
-        test-support.displayManager.auto.user = "alice";
-        environment.systemPackages = with pkgs; [
-          signal-desktop
-          file
-          sqlite
-          sqlcipher-signal
-        ];
-      };
+      # start signal desktop
+      machine.execute("su - alice -c signal-desktop >&2 &")
 
-    enableOCR = true;
+      # Wait for the Signal window to appear. Since usually the tests
+      # are run sandboxed and therefore with no internet, we can not wait
+      # for the message "Link your phone ...". Nor should we wait for
+      # the "Failed to connect to server" message, because when manually
+      # running this test it will be not sandboxed.
+      machine.wait_for_text("Signal")
+      machine.wait_for_text("File Edit View Window Help")
+      machine.screenshot("signal_desktop")
 
-    testScript =
-      { nodes, ... }:
-      let
-        user = nodes.machine.config.users.users.alice;
-      in
-      ''
-        start_all()
-        machine.wait_for_x()
-
-        # start signal desktop
-        machine.execute("su - alice -c signal-desktop >&2 &")
-
-        # Wait for the Signal window to appear. Since usually the tests
-        # are run sandboxed and therefore with no internet, we can not wait
-        # for the message "Link your phone ...". Nor should we wait for
-        # the "Failed to connect to server" message, because when manually
-        # running this test it will be not sandboxed.
-        machine.wait_for_text("Signal")
-        machine.wait_for_text("File Edit View Window Help")
-        machine.screenshot("signal_desktop")
-
-        # Test if the database is encrypted to prevent these issues:
-        # - https://github.com/NixOS/nixpkgs/issues/108772
-        # - https://github.com/NixOS/nixpkgs/pull/117555
-        print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
-        machine.fail(
-            "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
-        )
-        # Only SQLCipher should be able to read the encrypted DB:
-        machine.fail(
-            "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
-        )
-        print(machine.succeed(
-            "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
-        ))
-      '';
-  }
-)
+      # Test if the database is encrypted to prevent these issues:
+      # - https://github.com/NixOS/nixpkgs/issues/108772
+      # - https://github.com/NixOS/nixpkgs/pull/117555
+      print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
+      machine.fail(
+          "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
+      )
+      # Only SQLCipher should be able to read the encrypted DB:
+      machine.fail(
+          "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
+      )
+      print(machine.succeed(
+          "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
+      ))
+    '';
+}

From 3f2710502ee915ba66a95ae87cc7ca0386132f66 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 17 Apr 2025 03:08:09 +0800
Subject: [PATCH 103/104] python312Packages.mpi4py: convert dependency mpi to
 python module

---
 pkgs/development/python-modules/mpi4py/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 5e1eecd4421a..eb2e0aafd749 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -5,6 +5,7 @@
   cython,
   setuptools,
   mpi,
+  toPythonModule,
   pytestCheckHook,
   mpiCheckPhaseHook,
 }:
@@ -31,7 +32,9 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    mpi
+    # Use toPythonModule so that also the mpi executables will be propagated to
+    # generated Python environment.
+    (toPythonModule mpi)
   ];
 
   pythonImportsCheck = [ "mpi4py" ];

From 641094ae908fbd522597da303c6c111206739eef Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller@posteo.de>
Date: Sat, 19 Apr 2025 19:48:42 +0200
Subject: [PATCH 104/104] taskflow: fix cross build (#399081)

* taskflow: fix cross build

This package's CMake setup conflates building and running tests,
so we must disable test building explicitly for cross builds.

* taskflow: convert to finalAttrs pattern
---
 pkgs/by-name/ta/taskflow/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix
index b445c0f03bc0..8cc90436fbd3 100644
--- a/pkgs/by-name/ta/taskflow/package.nix
+++ b/pkgs/by-name/ta/taskflow/package.nix
@@ -7,14 +7,14 @@
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "taskflow";
   version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "taskflow";
     repo = "taskflow";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-omon02xgf4vV7JzpLFtHgf2MXxR6JowI+pDyAswXMUY=";
   };
 
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
+  cmakeFlags = [
+    # building the tests implies running them in the buildPhase
+    (lib.cmakeBool "TF_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
   doCheck = true;
 
   meta = {
@@ -42,11 +47,11 @@ stdenv.mkDerivation rec {
     homepage = "https://taskflow.github.io/";
     changelog =
       let
-        release = lib.replaceStrings [ "." ] [ "-" ] version;
+        release = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version;
       in
       "https://taskflow.github.io/taskflow/release-${release}.html";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})