From 620dbdbdc51d60029e7fe36f0926f4adfd63ce00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jan 2026 00:13:14 +0000
Subject: [PATCH 01/59] why3find: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/by-name/wh/why3find/package.nix b/pkgs/by-name/wh/why3find/package.nix
index 8382d6c93395..e9761f556ee8 100644
--- a/pkgs/by-name/wh/why3find/package.nix
+++ b/pkgs/by-name/wh/why3find/package.nix
@@ -10,14 +10,14 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "why3find";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     domain = "git.frama-c.com";
     owner = "pub";
     repo = "why3find";
     tag = finalAttrs.version;
-    hash = "sha256-fqB6VrJ79E6KSAnq8TZGNFlvWbDaBNh+gbuRf0CFFy8=";
+    hash = "sha256-G1Cmmo83Le1WRBTeit2NvyXvWpw0yJtd2kRiGMKSPrs=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From ecc62370c85863dc615b084661f2cf1bbb78ff4c Mon Sep 17 00:00:00 2001
From: Jaakko Paju <36770267+JPaju@users.noreply.github.com>
Date: Wed, 8 Apr 2026 17:58:21 +0300
Subject: [PATCH 02/59] metals: 1.6.6 -> 1.6.7

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

diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix
index 1811fa6cea05..f33fd0036989 100644
--- a/pkgs/by-name/me/metals/package.nix
+++ b/pkgs/by-name/me/metals/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "metals";
-  version = "1.6.6";
+  version = "1.6.7";
 
   deps = stdenv.mkDerivation {
     name = "metals-deps-${finalAttrs.version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-Gc5fQCXLWvDLzxfj+NfOcelVV51UoydNfGdDx1T4cbk=";
+    outputHash = "sha256-2ly1vO+06EalQjEekRwm/g2wfdbq26IcEQscfM14Gvc=";
   };
 
   nativeBuildInputs = [

From 97d58413e93d0aa38c34154db30b2673a6dbe65e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 12:06:42 +0000
Subject: [PATCH 03/59] camilladsp: 4.0.1 -> 4.1.3

---
 pkgs/by-name/ca/camilladsp/Cargo.lock  | 414 ++++++++-----------------
 pkgs/by-name/ca/camilladsp/package.nix |   4 +-
 2 files changed, 139 insertions(+), 279 deletions(-)

diff --git a/pkgs/by-name/ca/camilladsp/Cargo.lock b/pkgs/by-name/ca/camilladsp/Cargo.lock
index e506a654a8d1..85fe0ee27d23 100644
--- a/pkgs/by-name/ca/camilladsp/Cargo.lock
+++ b/pkgs/by-name/ca/camilladsp/Cargo.lock
@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "CamillaDSP"
-version = "4.0.1"
+version = "4.1.3"
 dependencies = [
  "alsa",
  "alsa-sys",
@@ -23,13 +23,12 @@ dependencies = [
  "flexi_logger",
  "git-version",
  "json-patch",
- "lazy_static",
  "libc",
  "libpulse-binding",
  "libpulse-simple-binding",
  "log",
  "native-tls",
- "nix 0.30.1",
+ "nix",
  "num-complex",
  "num-traits",
  "objc2-audio-toolbox",
@@ -103,12 +102,12 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "annotate-snippets"
-version = "0.9.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 dependencies = [
+ "anstyle",
  "unicode-width",
- "yansi-term",
 ]
 
 [[package]]
@@ -173,7 +172,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826194e1612938c9be09b78b58323fbb2e326de3d491b4230186cf6e832d8ded"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "cc",
  "num-derive",
  "num-traits",
@@ -279,9 +278,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
 dependencies = [
  "async-io",
  "async-lock",
@@ -381,33 +380,13 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "annotate-snippets",
- "bitflags 2.11.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
+ "annotate-snippets",
  "bitflags 2.11.0",
  "cexpr",
  "clang-sys",
@@ -417,7 +396,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.2",
+ "rustc-hash",
  "shlex",
  "syn",
 ]
@@ -485,9 +464,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.59"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -505,14 +484,14 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "3c6b04e07d8080154ed4ac03546d9a2b303cc2fe1901ba0b35b301516e289368"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -636,9 +615,9 @@ dependencies = [
 
 [[package]]
 name = "convert_case"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -648,9 +627,6 @@ name = "cookie-factory"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
-dependencies = [
- "futures",
-]
 
 [[package]]
 name = "core-foundation"
@@ -812,9 +788,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -822,11 +798,10 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
@@ -836,9 +811,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
  "quote",
@@ -971,9 +946,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a043dc74da1e37d6afe657061213aa6f425f855399a11d3463c6ecccc4dfda1f"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
@@ -996,12 +971,6 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -1023,48 +992,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "futures"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -1084,23 +1017,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "futures-macro"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
-
 [[package]]
 name = "futures-task"
 version = "0.3.32"
@@ -1113,13 +1029,8 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
- "futures-channel",
  "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "slab",
 ]
@@ -1213,9 +1124,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 
 [[package]]
 name = "heck"
@@ -1300,12 +1211,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
@@ -1325,15 +1236,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1422,9 +1324,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1460,12 +1362,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -1474,9 +1370,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libloading"
@@ -1554,9 +1450,9 @@ dependencies = [
 
 [[package]]
 name = "libspa"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
+checksum = "b6b8cfa2a7656627b4c92c6b9ef929433acd673d5ab3708cda1b18478ac00df4"
 dependencies = [
  "bitflags 2.11.0",
  "cc",
@@ -1564,18 +1460,18 @@ dependencies = [
  "cookie-factory",
  "libc",
  "libspa-sys",
- "nix 0.27.1",
- "nom",
+ "nix",
+ "nom 8.0.0",
  "system-deps",
 ]
 
 [[package]]
 name = "libspa-sys"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
+checksum = "901049455d2eb6decf9058235d745237952f4804bc584c5fcb41412e6adcc6e0"
 dependencies = [
- "bindgen 0.69.5",
+ "bindgen",
  "cc",
  "system-deps",
 ]
@@ -1692,17 +1588,6 @@ dependencies = [
  "jni-sys 0.3.1",
 ]
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.11.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -1725,6 +1610,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -1745,9 +1639,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
 
 [[package]]
 name = "num-derive"
@@ -1901,9 +1795,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.76"
+version = "0.10.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
+checksum = "bfe4646e360ec77dff7dde40ed3d6c5fee52d156ef4a62f53973d38294dad87f"
 dependencies = [
  "bitflags 2.11.0",
  "cfg-if",
@@ -1933,9 +1827,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.112"
+version = "0.9.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
+checksum = "ad2f2c0eba47118757e4c6d2bff2838f3e0523380021356e7875e858372ce644"
 dependencies = [
  "cc",
  "libc",
@@ -1988,7 +1882,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "905787a434a2c721408e7c9a252e85f3d93ca0f118a5283022636c0e05a7ea49"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -2010,37 +1904,37 @@ dependencies = [
 
 [[package]]
 name = "pipewire"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
+checksum = "9688b89abf11d756499f7c6190711d6dbe5a3acdb30c8fbf001d6596d06a8d44"
 dependencies = [
  "anyhow",
  "bitflags 2.11.0",
  "libc",
  "libspa",
  "libspa-sys",
- "nix 0.27.1",
+ "nix",
  "once_cell",
  "pipewire-sys",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "pipewire-sys"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
+checksum = "cb028afee0d6ca17020b090e3b8fa2d7de23305aef975c7e5192a5050246ea36"
 dependencies = [
- "bindgen 0.69.5",
+ "bindgen",
  "libspa-sys",
  "system-deps",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plotters"
@@ -2139,7 +2033,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.10+spec-1.1.0",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2174,9 +2068,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "7ec095654a25171c2124e9e3393a930bddbffdc939556c914957a4c3e0a87166"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -2325,12 +2219,6 @@ dependencies = [
  "windowfunctions",
 ]
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -2509,24 +2397,24 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381b283ce7bc6b476d903296fb59d0d36633652b633b27f64db4fb46dcbfc3b9"
+checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
  "schemars 1.2.1",
  "serde_core",
@@ -2537,9 +2425,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d4e30573c8cb306ed6ab1dca8423eec9a463ea0e155f45399455e0368b27e0"
+checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2621,9 +2509,9 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.2.2"
+version = "7.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
 dependencies = [
  "cfg-expr",
  "heck",
@@ -2634,9 +2522,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tempfile"
@@ -2693,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.45"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
@@ -2708,15 +2596,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2734,23 +2622,17 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
- "serde",
+ "indexmap 2.14.0",
+ "serde_core",
  "serde_spanned",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.1",
 ]
 
 [[package]]
@@ -2764,25 +2646,12 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.25.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
 dependencies = [
- "indexmap 2.13.1",
- "serde",
- "serde_spanned",
- "toml_datetime 0.6.11",
- "winnow 0.7.15",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.25.10+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b"
-dependencies = [
- "indexmap 2.13.1",
- "toml_datetime 1.1.1+spec-1.1.0",
+ "indexmap 2.14.0",
+ "toml_datetime",
  "toml_parser",
  "winnow 1.0.1",
 ]
@@ -2796,6 +2665,12 @@ dependencies = [
  "winnow 1.0.1",
 ]
 
+[[package]]
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+
 [[package]]
 name = "tracing"
 version = "0.1.44"
@@ -2886,9 +2761,9 @@ checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -2973,11 +2848,11 @@ dependencies = [
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
- "wit-bindgen 0.46.0",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -2986,14 +2861,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3004,9 +2879,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3014,9 +2889,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3024,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -3037,9 +2912,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
@@ -3061,7 +2936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "wasm-encoder",
  "wasmparser",
 ]
@@ -3074,15 +2949,15 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
  "bitflags 2.11.0",
  "hashbrown 0.15.5",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "semver",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3433,12 +3308,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "wit-bindgen"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -3467,7 +3336,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn",
  "wasm-metadata",
@@ -3498,7 +3367,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
  "bitflags 2.11.0",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -3517,7 +3386,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -3533,27 +3402,18 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08c7c1b1a6a7c8a6b2741a6c21a4f8918e51899b111cfa08d1288202656e3975"
 dependencies = [
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "itoa",
  "libyaml-rs",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "zbus"
-version = "5.13.2"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
+checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -3586,9 +3446,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.13.2"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
+checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3638,9 +3498,9 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zvariant"
-version = "5.9.2"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
+checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
 dependencies = [
  "endi",
  "enumflags2",
@@ -3652,9 +3512,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.9.2"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
+checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix
index e9c0ec4bdedd..ad7fda83b157 100644
--- a/pkgs/by-name/ca/camilladsp/package.nix
+++ b/pkgs/by-name/ca/camilladsp/package.nix
@@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "camilladsp";
-  version = "4.0.1";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "HEnquist";
     repo = "camilladsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PedaOmrvvE9Kxux0XwwDJfKq0fncsV/sUzZhnAp++DM=";
+    hash = "sha256-/OnD607xSPXM4AjVOZjaZQJpo7Q847Z8mq6elHmEwAU=";
   };
 
   cargoLock = {

From 7d0a31b1bff5433c4fd361390fb3a991eb4cfc44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 15:04:38 +0000
Subject: [PATCH 04/59] python3Packages.coiled: 1.133.1 -> 1.134.0

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

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index cdd427f4d875..c3e7a7319b87 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coiled";
-  version = "1.133.1";
+  version = "1.134.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-BAlj+ExOQtwogKC5JaJGCoEs1lSkIrVRBABElqXSc1c=";
+    hash = "sha256-frU9QzSYhEDrruxwSGuhX/VVCuQdI2cFg+G0QQmOHaU=";
   };
 
   build-system = [

From c73689e490de8b9dd7b67cac133a26d2a319d1e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 06:22:51 +0000
Subject: [PATCH 05/59] drawterm: 0-unstable-2026-01-11 ->
 0-unstable-2026-04-14

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

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index 3b40b2d4f0d6..7680b4b60d04 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2026-01-11";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "8a88fb5b8c75450d2e20ae1c7839d823bb1f6fad";
-    hash = "sha256-hejdFLYJvANKOC4Jgr9XvYl/5kU9PiKSH5cWE6d6e/o=";
+    rev = "aeb3be64bfc4c8d8c0b5fce70b26d12f7a59156a";
+    hash = "sha256-YHcdAjM5+NEuyjz2sYFZEFhr0nQzstfdJtZ/HvksNHQ=";
   };
 
   enableParallelBuilding = true;

From 9a675b8d8599ce4f2984e0cd6bec2c2a4ffd3d18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 05:35:59 +0000
Subject: [PATCH 06/59] python3Packages.netbox-contextmenus: 1.4.13 -> 1.4.14

---
 .../python-modules/netbox-contextmenus/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/development/python-modules/netbox-contextmenus/default.nix
index 83ac474527ce..080824cd5fc5 100644
--- a/pkgs/development/python-modules/netbox-contextmenus/default.nix
+++ b/pkgs/development/python-modules/netbox-contextmenus/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-contextmenus";
-  version = "1.4.13";
+  version = "1.4.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PieterL75";
     repo = "netbox_contextmenus";
     tag = "v${version}";
-    hash = "sha256-xgJ9EzdLc2xK9Kam8fS3f9bEgWq2O7NFx3D8Ci3Hc8o=";
+    hash = "sha256-YqyxZaHKXhMLDdBTAAKQsCBBSXikxBgcOvXEfa6f+0Y=";
   };
 
   build-system = [ setuptools ];

From 25279a16c6738e3a51253fdc604ea536fea3c302 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:22:26 -0700
Subject: [PATCH 07/59] klog: migrate to by-name

---
 .../kl/klog/package.nix}                      | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 17 deletions(-)
 rename pkgs/{applications/radio/klog/default.nix => by-name/kl/klog/package.nix} (71%)

diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/by-name/kl/klog/package.nix
similarity index 71%
rename from pkgs/applications/radio/klog/default.nix
rename to pkgs/by-name/kl/klog/package.nix
index 48e70b24d7b5..f6d13a2b05ad 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/by-name/kl/klog/package.nix
@@ -4,34 +4,29 @@
   fetchurl,
   hamlib,
   pkg-config,
-  qtbase,
-  qttools,
-  qtserialport,
-  qtcharts,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "klog";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
   };
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
-    qmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
   ];
   buildInputs = [
     hamlib
-    qtbase
-    qtserialport
-    qtcharts
+    libsForQt5.qtbase
+    libsForQt5.qtserialport
+    libsForQt5.qtcharts
   ];
 
   qmakeFlags = [ "KLog.pro" ];
@@ -48,4 +43,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pulsation ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a09c77b2e54..019be4c8520e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1814,8 +1814,6 @@ with pkgs;
 
   klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { };
 
-  klog = qt5.callPackage ../applications/radio/klog { };
-
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
   lgogdownloader-gui = callPackage ../by-name/lg/lgogdownloader/package.nix { enableGui = true; };

From cec5030c0ba696d97effca8c37680c015b39be1e Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:26:26 -0700
Subject: [PATCH 08/59] fldigi: migrate to by-name

---
 .../default.nix => by-name/fl/fldigi/package.nix}      | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{applications/radio/fldigi/default.nix => by-name/fl/fldigi/package.nix} (86%)

diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/by-name/fl/fldigi/package.nix
similarity index 86%
rename from pkgs/applications/radio/fldigi/default.nix
rename to pkgs/by-name/fl/fldigi/package.nix
index 99a47f15b7f2..ce45fc6315ab 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/by-name/fl/fldigi/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  hamlib,
+  hamlib_4,
   fltk_1_3,
   libjpeg,
   libpng,
@@ -17,12 +17,12 @@
   udev,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fldigi";
   version = "4.2.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     hash = "sha256-dis3D/6crnc6KgO1EtC3JC5+kEB8EdWrvS0xrmUBZk8=";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxinerama
     gettext
-    hamlib
+    hamlib_4
     fltk_1_3
     libjpeg
     libpng
@@ -66,4 +66,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 019be4c8520e..190019dcc06a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9343,10 +9343,6 @@ with pkgs;
 
   firewalld-gui = firewalld.override { withGui = true; };
 
-  fldigi = callPackage ../applications/radio/fldigi {
-    hamlib = hamlib_4;
-  };
-
   fossil = callPackage ../applications/version-management/fossil {
     sqlite = sqlite.override { enableDeserialize = true; };
   };

From 46cc2270ce702a5a70c699b1ed87e2951f6b68c9 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:31:55 -0700
Subject: [PATCH 09/59] qsstv: migrate to by-name

---
 .../qsstv/default.nix => by-name/qs/qsstv/package.nix} | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/radio/qsstv/default.nix => by-name/qs/qsstv/package.nix} (92%)

diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/by-name/qs/qsstv/package.nix
similarity index 92%
rename from pkgs/applications/radio/qsstv/default.nix
rename to pkgs/by-name/qs/qsstv/package.nix
index 4cee9ac0820f..0b93a79a08c8 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/by-name/qs/qsstv/package.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qmake,
   openjpeg,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   fftw,
   libpulseaudio,
   alsa-lib,
@@ -26,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     imagemagick
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     openjpeg
     fftw
     libpulseaudio
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 190019dcc06a..53e190609774 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10223,8 +10223,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qsstv = qt5.callPackage ../applications/radio/qsstv { };
-
   qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
 
   qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };

From e6ddf4db3456eafdbb0e20a57180510f9b3f5a95 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:37:14 -0700
Subject: [PATCH 10/59] pothos: migrate to by-name

---
 .../radio => by-name/po}/pothos/cstring.patch |  0
 .../po/pothos/package.nix}                    | 19 ++++++++-----------
 .../radio => by-name/po}/pothos/spuce.patch   |  0
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/radio => by-name/po}/pothos/cstring.patch (100%)
 rename pkgs/{applications/radio/pothos/default.nix => by-name/po/pothos/package.nix} (94%)
 rename pkgs/{applications/radio => by-name/po}/pothos/spuce.patch (100%)

diff --git a/pkgs/applications/radio/pothos/cstring.patch b/pkgs/by-name/po/pothos/cstring.patch
similarity index 100%
rename from pkgs/applications/radio/pothos/cstring.patch
rename to pkgs/by-name/po/pothos/cstring.patch
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/by-name/po/pothos/package.nix
similarity index 94%
rename from pkgs/applications/radio/pothos/default.nix
rename to pkgs/by-name/po/pothos/package.nix
index 005f44c14a6a..f4a275e28d32 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/by-name/po/pothos/package.nix
@@ -6,12 +6,9 @@
   cmake,
   pkg-config,
   doxygen,
-  wrapQtAppsHook,
   pcre,
   poco,
-  qtbase,
-  qtsvg,
-  qwt6_1,
+  libsForQt5,
   nlohmann_json,
   soapysdr-with-plugins,
   portaudio,
@@ -20,14 +17,14 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pothos";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "PothosCore";
-    rev = "pothos-${version}";
+    rev = "pothos-${finalAttrs.version}";
     sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg";
     fetchSubmodules = true;
   };
@@ -67,15 +64,15 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     doxygen
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     pcre
     poco
-    qtbase
-    qtsvg
-    qwt6_1
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qwt6_1
     nlohmann_json
     soapysdr-with-plugins
     portaudio
@@ -113,4 +110,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/by-name/po/pothos/spuce.patch
similarity index 100%
rename from pkgs/applications/radio/pothos/spuce.patch
rename to pkgs/by-name/po/pothos/spuce.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53e190609774..54c71beb8172 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10169,8 +10169,6 @@ with pkgs;
 
   plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
 
-  pothos = libsForQt5.callPackage ../applications/radio/pothos { };
-
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
   profanity = callPackage ../applications/networking/instant-messengers/profanity (

From e5af81da7a30152278cb56147f5d6932121592a9 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:41:13 -0700
Subject: [PATCH 11/59] sigdigger: migrate to by-name

---
 .../si/sigdigger/package.nix}                    | 16 +++++++---------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/{applications/radio/sigdigger/default.nix => by-name/si/sigdigger/package.nix} (85%)

diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/by-name/si/sigdigger/package.nix
similarity index 85%
rename from pkgs/applications/radio/sigdigger/default.nix
rename to pkgs/by-name/si/sigdigger/package.nix
index 36c8c2f82a75..17f8c2f2bfa3 100644
--- a/pkgs/applications/radio/sigdigger/default.nix
+++ b/pkgs/by-name/si/sigdigger/package.nix
@@ -2,13 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  libsForQt5,
   pkg-config,
   sigutils,
   fftwSinglePrec,
   suwidgets,
-  wrapQtAppsHook,
   suscan,
   libsndfile,
   soapysdr-with-plugins,
@@ -16,25 +14,25 @@
   volk,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sigdigger";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SigDigger";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sigutils
     fftwSinglePrec
     suwidgets
@@ -61,4 +59,4 @@ stdenv.mkDerivation rec {
       oxapentane
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c71beb8172..dd0648ea447b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7348,8 +7348,6 @@ with pkgs;
   SDL = SDL_compat;
   SDL2 = sdl2-compat;
 
-  sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { };
-
   sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
 
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix { };

From 4585fcbefaa15795c87bb1057c0f83ba53c7a116 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:43:59 -0700
Subject: [PATCH 12/59] suwidgets: migrate to by-name

---
 .../default.nix => by-name/su/suwidgets/package.nix}       | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/radio/suwidgets/default.nix => by-name/su/suwidgets/package.nix} (94%)

diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/by-name/su/suwidgets/package.nix
similarity index 94%
rename from pkgs/applications/radio/suwidgets/default.nix
rename to pkgs/by-name/su/suwidgets/package.nix
index f32e5d7cef25..9bf543090671 100644
--- a/pkgs/applications/radio/suwidgets/default.nix
+++ b/pkgs/by-name/su/suwidgets/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  libsForQt5,
   pkg-config,
   sigutils,
   fftwSinglePrec,
@@ -28,12 +27,12 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sigutils
     fftwSinglePrec
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd0648ea447b..dbd14bed93e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7440,8 +7440,6 @@ with pkgs;
 
   inherit (python3Packages) sphinxHook;
 
-  suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { };
-
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
   unqlite = lowPrio (callPackage ../development/libraries/unqlite { });

From dd55d55dc1e34be371852353ea50f87c206fd8fc Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 16 Apr 2026 23:51:30 -0700
Subject: [PATCH 13/59] ciao: fix dangling symlinks

---
 pkgs/by-name/ci/ciao/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix
index f65f9c758114..bcce66ef8d3b 100644
--- a/pkgs/by-name/ci/ciao/package.nix
+++ b/pkgs/by-name/ci/ciao/package.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-jsHz50+R/bs19ees3kKYalYk72ET9eSAAUY7QogI0go=";
   };
 
+  postPatch = ''
+    # hotfix https://github.com/ciao-lang/ciao/issues/122
+    substituteInPlace builder/sh_src/build_car.sh \
+      --replace-fail 'ln -s "$i" "$b"' 'ln -sr "$i" "$b"'
+  '';
+
   configurePhase = ''
     ./ciao-boot.sh configure --instype=global --prefix=$prefix
   '';

From 42e23ca8c8fcf693fd274eef386f1c208d809d41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 21:47:12 +0000
Subject: [PATCH 14/59] phpPackages.php-cs-fixer: 3.94.2 -> 3.95.1

---
 .../php-packages/php-cs-fixer/composer.lock   | 346 +++++++++++-------
 .../php-packages/php-cs-fixer/default.nix     |   6 +-
 2 files changed, 211 insertions(+), 141 deletions(-)

diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock
index d3ad13c34cf8..b15358eaa3e3 100644
--- a/pkgs/development/php-packages/php-cs-fixer/composer.lock
+++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "62fd328a73b4ad8e2c1474d419ffe3af",
+    "content-hash": "ece7450e5eb672c027b998cfd2c9a771",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -292,6 +292,75 @@
             ],
             "time": "2024-05-06T16:37:16+00:00"
         },
+        {
+            "name": "ergebnis/agent-detector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ergebnis/agent-detector.git",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.50.0",
+                "ergebnis/license": "^2.7.0",
+                "ergebnis/php-cs-fixer-config": "^6.60.2",
+                "ergebnis/phpstan-rules": "^2.13.1",
+                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
+                "ergebnis/rector-rules": "^1.16.0",
+                "fakerphp/faker": "^1.24.1",
+                "infection/infection": "^0.26.6",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.46",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
+                "phpstan/phpstan-phpunit": "^2.0.16",
+                "phpstan/phpstan-strict-rules": "^2.0.10",
+                "phpunit/phpunit": "^9.6.34",
+                "rector/rector": "^2.4.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.0-dev"
+                },
+                "composer-normalize": {
+                    "indent-size": 2,
+                    "indent-style": "space"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ergebnis\\AgentDetector\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Möller",
+                    "email": "am@localheinz.com",
+                    "homepage": "https://localheinz.com"
+                }
+            ],
+            "description": "Provides a detector for detecting the presence of an agent.",
+            "homepage": "https://github.com/ergebnis/agent-detector",
+            "support": {
+                "issues": "https://github.com/ergebnis/agent-detector/issues",
+                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
+                "source": "https://github.com/ergebnis/agent-detector"
+            },
+            "time": "2026-04-10T13:45:13+00:00"
+        },
         {
             "name": "evenement/evenement",
             "version": "v3.0.2",
@@ -1148,16 +1217,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6d643a93b47398599124022eb24d97c153c12f27"
+                "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6d643a93b47398599124022eb24d97c153c12f27",
-                "reference": "6d643a93b47398599124022eb24d97c153c12f27",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
+                "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
                 "shasum": ""
             },
             "require": {
@@ -1222,7 +1291,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.6"
+                "source": "https://github.com/symfony/console/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1242,7 +1311,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T17:02:47+00:00"
+            "time": "2026-03-30T13:54:39+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1313,16 +1382,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.4.4",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "dc2c0eba1af673e736bb851d747d266108aea746"
+                "reference": "f57b899fa736fd71121168ef268f23c206083f0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dc2c0eba1af673e736bb851d747d266108aea746",
-                "reference": "dc2c0eba1af673e736bb851d747d266108aea746",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f57b899fa736fd71121168ef268f23c206083f0a",
+                "reference": "f57b899fa736fd71121168ef268f23c206083f0a",
                 "shasum": ""
             },
             "require": {
@@ -1374,7 +1443,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.4"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1394,7 +1463,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-05T11:45:34+00:00"
+            "time": "2026-03-30T13:54:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1474,16 +1543,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e"
+                "reference": "58b9790d12f9670b7f53a1c1738febd3108970a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3ebc794fa5315e59fd122561623c2e2e4280538e",
-                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/58b9790d12f9670b7f53a1c1738febd3108970a5",
+                "reference": "58b9790d12f9670b7f53a1c1738febd3108970a5",
                 "shasum": ""
             },
             "require": {
@@ -1520,7 +1589,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.4.6"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1540,20 +1609,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf"
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
-                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e0be088d22278583a82da281886e8c3592fbf149",
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149",
                 "shasum": ""
             },
             "require": {
@@ -1588,7 +1657,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.4.6"
+                "source": "https://github.com/symfony/finder/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1608,20 +1677,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-29T09:40:50+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b38026df55197f9e39a44f3215788edf83187b80"
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b38026df55197f9e39a44f3215788edf83187b80",
-                "reference": "b38026df55197f9e39a44f3215788edf83187b80",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
                 "shasum": ""
             },
             "require": {
@@ -1659,7 +1728,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.4.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1679,20 +1748,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-12T15:39:26+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
@@ -1742,7 +1811,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1762,20 +1831,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+                "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
+                "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
                 "shasum": ""
             },
             "require": {
@@ -1824,7 +1893,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1844,11 +1913,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T09:58:17+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1909,7 +1978,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1933,16 +2002,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
                 "shasum": ""
             },
             "require": {
@@ -1994,7 +2063,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2014,20 +2083,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-23T08:48:59+00:00"
+            "time": "2026-04-10T17:25:58+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
                 "shasum": ""
             },
             "require": {
@@ -2078,7 +2147,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2098,11 +2167,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-02T08:10:11+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -2158,7 +2227,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2182,16 +2251,16 @@
         },
         {
             "name": "symfony/polyfill-php84",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php84.git",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
                 "shasum": ""
             },
             "require": {
@@ -2238,7 +2307,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2258,20 +2327,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-24T13:30:11+00:00"
+            "time": "2026-04-10T18:47:49+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v7.4.5",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97"
+                "reference": "60f19cd3badc8de688421e21e4305eba50f8089a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97",
+                "url": "https://api.github.com/repos/symfony/process/zipball/60f19cd3badc8de688421e21e4305eba50f8089a",
+                "reference": "60f19cd3badc8de688421e21e4305eba50f8089a",
                 "shasum": ""
             },
             "require": {
@@ -2303,7 +2372,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.5"
+                "source": "https://github.com/symfony/process/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2323,7 +2392,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-26T15:07:59+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2414,16 +2483,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "8a24af0a2e8a872fb745047180649b8418303084"
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8a24af0a2e8a872fb745047180649b8418303084",
-                "reference": "8a24af0a2e8a872fb745047180649b8418303084",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
                 "shasum": ""
             },
             "require": {
@@ -2456,7 +2525,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2476,20 +2545,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-04T07:05:15+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b"
+                "reference": "114ac57257d75df748eda23dd003878080b8e688"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/9f209231affa85aa930a5e46e6eb03381424b30b",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/114ac57257d75df748eda23dd003878080b8e688",
+                "reference": "114ac57257d75df748eda23dd003878080b8e688",
                 "shasum": ""
             },
             "require": {
@@ -2547,7 +2616,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.4.6"
+                "source": "https://github.com/symfony/string/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2567,7 +2636,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-09T09:33:46+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         }
     ],
     "packages-dev": [
@@ -2963,16 +3032,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.8.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "21dc724a0583619cd1652f673303492272778051"
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
-                "reference": "21dc724a0583619cd1652f673303492272778051",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
                 "shasum": ""
             },
             "require": {
@@ -2988,6 +3057,7 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "http-interop/http-factory-tests": "0.9.0",
+                "jshttp/mime-db": "1.54.0.1",
                 "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
@@ -3059,7 +3129,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.9.0"
             },
             "funding": [
                 {
@@ -3075,7 +3145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-23T21:21:41+00:00"
+            "time": "2026-03-10T16:41:02+00:00"
         },
         {
             "name": "infection/abstract-testframework-adapter",
@@ -3505,16 +3575,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "v6.7.2",
+            "version": "6.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0"
+                "reference": "89ac92bcfe5d0a8a4433c7b89d394553ae7250cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/6fea66c7204683af437864e7c4e7abf383d14bc0",
-                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/89ac92bcfe5d0a8a4433c7b89d394553ae7250cc",
+                "reference": "89ac92bcfe5d0a8a4433c7b89d394553ae7250cc",
                 "shasum": ""
             },
             "require": {
@@ -3574,9 +3644,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/v6.7.2"
+                "source": "https://github.com/jsonrainbow/json-schema/tree/6.8.0"
             },
-            "time": "2026-02-15T15:06:22+00:00"
+            "time": "2026-04-02T12:43:11+00:00"
         },
         {
             "name": "keradus/cli-executor",
@@ -6195,16 +6265,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "9400e2f9226b3b64ebb0a8ae967ae84e54e39640"
+                "reference": "2d19dde43fa2ff720b9a40763ace7226594f503b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/9400e2f9226b3b64ebb0a8ae967ae84e54e39640",
-                "reference": "9400e2f9226b3b64ebb0a8ae967ae84e54e39640",
+                "url": "https://api.github.com/repos/symfony/config/zipball/2d19dde43fa2ff720b9a40763ace7226594f503b",
+                "reference": "2d19dde43fa2ff720b9a40763ace7226594f503b",
                 "shasum": ""
             },
             "require": {
@@ -6250,7 +6320,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v7.4.6"
+                "source": "https://github.com/symfony/config/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6270,20 +6340,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a3f7d594ca53a34a7d39ae683fbca09408b0c598"
+                "reference": "f7025fd7b687c240426562f86ada06a93b1e771d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a3f7d594ca53a34a7d39ae683fbca09408b0c598",
-                "reference": "a3f7d594ca53a34a7d39ae683fbca09408b0c598",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f7025fd7b687c240426562f86ada06a93b1e771d",
+                "reference": "f7025fd7b687c240426562f86ada06a93b1e771d",
                 "shasum": ""
             },
             "require": {
@@ -6334,7 +6404,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.4.6"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6354,20 +6424,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-31T06:50:29+00:00"
         },
         {
             "name": "symfony/polyfill-php85",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php85.git",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91"
+                "reference": "2c408a6bb0313e6001a83628dc5506100474254e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/2c408a6bb0313e6001a83628dc5506100474254e",
+                "reference": "2c408a6bb0313e6001a83628dc5506100474254e",
                 "shasum": ""
             },
             "require": {
@@ -6414,7 +6484,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -6434,20 +6504,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-23T16:12:55+00:00"
+            "time": "2026-04-10T16:50:15+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291"
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/045321c440ac18347b136c63d2e9bf28a2dc0291",
-                "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
                 "shasum": ""
             },
             "require": {
@@ -6501,7 +6571,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.4.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6521,20 +6591,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-15T10:53:20+00:00"
+            "time": "2026-03-30T13:44:50+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "03a60f169c79a28513a78c967316fbc8bf17816f"
+                "reference": "398907e89a2a56fe426f7955c6fa943ec0c77225"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/03a60f169c79a28513a78c967316fbc8bf17816f",
-                "reference": "03a60f169c79a28513a78c967316fbc8bf17816f",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/398907e89a2a56fe426f7955c6fa943ec0c77225",
+                "reference": "398907e89a2a56fe426f7955c6fa943ec0c77225",
                 "shasum": ""
             },
             "require": {
@@ -6582,7 +6652,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.4.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6602,20 +6672,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:15:23+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "58751048de17bae71c5aa0d13cb19d79bca26391"
+                "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/58751048de17bae71c5aa0d13cb19d79bca26391",
-                "reference": "58751048de17bae71c5aa0d13cb19d79bca26391",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/c58fdf7b3d6c2995368264c49e4e8b05bcff2883",
+                "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883",
                 "shasum": ""
             },
             "require": {
@@ -6658,7 +6728,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.4.6"
+                "source": "https://github.com/symfony/yaml/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6678,7 +6748,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-09T09:33:46+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -6875,16 +6945,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "2.1.6",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8"
+                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
+                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
                 "shasum": ""
             },
             "require": {
@@ -6931,9 +7001,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.1.6"
+                "source": "https://github.com/webmozarts/assert/tree/2.3.0"
             },
-            "time": "2026-02-27T10:28:38+00:00"
+            "time": "2026-04-11T10:33:05+00:00"
         }
     ],
     "aliases": [],
@@ -6949,5 +7019,5 @@
         "ext-tokenizer": "*"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index cf9fe25e48b0..a395a5ec3ba7 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -7,17 +7,17 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "php-cs-fixer";
-  version = "3.94.2";
+  version = "3.95.1";
 
   src = fetchFromGitHub {
     owner = "PHP-CS-Fixer";
     repo = "PHP-CS-Fixer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eX9awtJeOJSX0Q+687egTTRZFpj5qTjjAamGpJUMKzA=";
+    hash = "sha256-nQSVAEb57kcboaqTa344eIsDC7qRiCAA6M9x77hsTio=";
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-b3K7Ed/gtqyyEDrivMX8SFXe0X2XeJJ+zM6Pp1jY+Ow=";
+  vendorHash = "sha256-VIwZQutV2qlz0kZDQCncEM8Wa2zT9o+oM9O+FmhiTas=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 705ed0cbd7e7849a9cedef9745102e204fe6dbff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 10:30:34 +0000
Subject: [PATCH 15/59] voxtype: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix
index 130f8e5bb89c..62084d779d78 100644
--- a/pkgs/by-name/vo/voxtype/package.nix
+++ b/pkgs/by-name/vo/voxtype/package.nix
@@ -51,16 +51,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "voxtype";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "peteonrails";
     repo = "voxtype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gY5gP+F3SbCZsG/jaOHnEu291q6akg1M5c4BebRSpvI=";
+    hash = "sha256-D0CgT0Avb7il6/GU8CtxWUGlMHhYZIPbHX952L4orDM=";
   };
 
-  cargoHash = "sha256-X6TYlmHjLvsUYlxz4WbzHptKyQZHIBt8u1lLqrS/nz0=";
+  cargoHash = "sha256-h0b3H+79v8G28XNBDdCOZ+Vo+6wpfzckPCsDbRzp1m4=";
 
   buildFeatures =
     [ ]

From e06055cb31835b64b296384f971b1a431c154dcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 11:20:44 +0000
Subject: [PATCH 16/59] grafanaPlugins.grafana-opensearch-datasource: 2.33.0 ->
 2.33.1

---
 .../plugins/grafana-opensearch-datasource/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
index ce5a4fda5677..bd1224ef6828 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin {
   pname = "grafana-opensearch-datasource";
-  version = "2.33.0";
+  version = "2.33.1";
   zipHash = {
-    x86_64-linux = "sha256-oxPw/cQ/AYTHB4Z/hdt3Jqn3XXnx+bo3uAq6qS7hd6g=";
-    aarch64-linux = "sha256-0bF2ebVF26iPIKs+oICeaBwm6K8TZGqTP6ONR+yDFvY=";
-    x86_64-darwin = "sha256-yGJLaNCAmdIN1uuzh/v+adda6IRmcCH+mpbxno8qK9k=";
-    aarch64-darwin = "sha256-Kxgq9HYXPW3+uEzJPy0kKDFCXrSFpCgZQ+whqx4XtJ8=";
+    x86_64-linux = "sha256-IH1y3tbY++piN+Zlw9Jw2Z7c7pFcPQ7z/X3C0t3iAo8=";
+    aarch64-linux = "sha256-3Zm3omgkdYwHe0/39QCR+iwqe0bURKLB1k1cDkUYiAc=";
+    x86_64-darwin = "sha256-UJB56s/JEacST6sWTLv8lKt0ecpO4IHqelV8Awf6Wq0=";
+    aarch64-darwin = "sha256-QU+0jig8y/+7cshDTJ0J0LGGRVd1uJ5jtSyZcfDjx2k=";
   };
   meta = {
     description = "Empowers you to seamlessly integrate JSON data into Grafana";

From f65aba8f5cbcfbad8ec65910416b75572a220bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 19:29:56 +0000
Subject: [PATCH 17/59] miller: 6.17.0 -> 6.18.1

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

diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index 256ed560c8e2..9a4633b889f9 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "miller";
-  version = "6.17.0";
+  version = "6.18.1";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-a147/0w+e+y4zCDs9/NGmtVK8rp//5I+QAsDBzj/sRg=";
+    sha256 = "sha256-pXxXUw956M5EUhL1TFtQp1JTXQwQK9qxp2vjBkozi/0=";
   };
 
   outputs = [
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
     "man"
   ];
 
-  vendorHash = "sha256-6BStDF95QXk55m2QujCqxoE0nciP7blyN/fFCHaTy6I=";
+  vendorHash = "sha256-ZnNEOVChF3kizfjti6Cgexvt/5UPIRQsyfUz8c03EKc=";
 
   postInstall = ''
     mkdir -p $man/share/man/man1

From c62881b3141eb87b410d4b069436e500ead7a482 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 04:55:41 +0000
Subject: [PATCH 18/59] meshoptimizer: 1.1 -> 1.1.1

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

diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index 3a9e85d1ebe5..15f6638d90ca 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "meshoptimizer";
-  version = "1.1";
+  version = "1.1.1";
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "meshoptimizer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tvVMg3RO1T1/Ub/uue1UQwYeSwqq9OQ1F3PKlF3YOrk=";
+    hash = "sha256-h5lO3HHPtGYuzAZlRwXugvCsjtSMj9j2Z7xCRHQU8xY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 2453817442e3e4ce7a2046e5d9cbc3bdfa2a3db4 Mon Sep 17 00:00:00 2001
From: kilyanni <github@nkilian.org>
Date: Sun, 19 Apr 2026 22:50:06 +0200
Subject: [PATCH 19/59] kopia: enable __structuredAttrs

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

diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix
index 1c544f7127d2..24c9e6bec650 100644
--- a/pkgs/by-name/ko/kopia/package.nix
+++ b/pkgs/by-name/ko/kopia/package.nix
@@ -20,6 +20,8 @@ buildGoModule (finalAttrs: {
     hash = "sha256-5oNam99Mij78snSO6jiGPYzeD68sXEBKM2dGQtTUrww=";
   };
 
+  __structuredAttrs = true;
+
   vendorHash = "sha256-szlCiZOLU0KVWb2YX3Wmicrumn+fNm2AWdPxaJZZT90=";
 
   subPackages = [ "." ];

From 8d7b97f53502c8770360bb375badd7f85cda70dd Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 20 Apr 2026 12:16:16 +0200
Subject: [PATCH 20/59] portfolio: 0.83.1 -> 0.83.2

https://github.com/portfolio-performance/portfolio/releases/tag/0.83.2
---
 pkgs/by-name/po/portfolio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index cb81c9804723..e02b20928998 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -35,11 +35,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.83.1";
+  version = "0.83.2";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-MQ3GA5MV8eWDnu7SWZm9hXbRxWTMO04uNKOQV2x6Yvc=";
+    hash = "sha256-WJqkas9zSnSVvJmuOqdRuNYOu9RLTkvJBLITNrKz7Pk=";
   };
 
   nativeBuildInputs = [

From 09deae6f892a83c035b38456af3e9286cfba6ec7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 10:36:43 +0000
Subject: [PATCH 21/59] python3Packages.soundcard: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/development/python-modules/soundcard/default.nix b/pkgs/development/python-modules/soundcard/default.nix
index c402616ee1d1..cf67afd2acf8 100644
--- a/pkgs/development/python-modules/soundcard/default.nix
+++ b/pkgs/development/python-modules/soundcard/default.nix
@@ -10,7 +10,7 @@
 }:
 let
   pname = "soundcard";
-  version = "0.4.5";
+  version = "0.4.6";
 in
 buildPythonPackage {
   inherit pname version;
@@ -18,7 +18,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BycrqSfjLK/fY05KHKU7mjIYMhpgx9Lgj1S4MqVpRqo=";
+    hash = "sha256-m0bWSib5fNfYi8/Dhcl8Bp+Xxew0BOTnwjdxWYqM9Hs=";
   };
 
   patchPhase = ''

From baeb7ad1d931c0b59fff57934f847bd6475775df Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 20 Apr 2026 15:48:07 +0200
Subject: [PATCH 22/59] gruvbox-plus-icons: 6.3.0 -> 6.4.0

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

diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
index 8dcf786dc094..af7be4f64ec6 100644
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gruvbox-plus-icons";
-  version = "6.3.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "SylEleuth";
     repo = "gruvbox-plus-icon-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4UJOiDdw5BxtOjLQjCpkQnUwQRs49GZTShpcElWjAU8=";
+    hash = "sha256-t4bQeK9jwaE3nRZEhks9QARKkxKdH9ZTSgPIby323Jc=";
   };
 
   patches = [ ./folder-color.patch ];

From 2999de09fc5b403bf253c6974b02bd240f17efc1 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 20 Apr 2026 15:49:18 +0200
Subject: [PATCH 23/59] gruvbox-plus-icons: fix icons inherit

Use breeze-icons from KDE 6 and drop Gnome icons since they are no
longer used as a fallback.
---
 pkgs/by-name/gr/gruvbox-plus-icons/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
index af7be4f64ec6..ef97dde99380 100644
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -3,8 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  plasma5Packages,
-  gnome-icon-theme,
+  kdePackages,
   hicolor-icon-theme,
   nix-update-script,
   folder-color ? "plasma", # Supported colors: black blue caramel citron firebrick gold green grey highland jade lavender lime olive orange pistachio plasma pumpkin purple red rust sapphire tomato violet white yellow
@@ -26,8 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ gtk3 ];
 
   propagatedBuildInputs = [
-    plasma5Packages.breeze-icons
-    gnome-icon-theme
+    kdePackages.breeze-icons
     hicolor-icon-theme
   ];
 
@@ -48,6 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontDropIconThemeCache = true;
   dontBuild = true;
   dontConfigure = true;
+  dontWrapQtApps = true;
 
   passthru.updateScript = nix-update-script { };
 

From 4fb75547d9b14847a8c504b1ee460980cfcacba8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 16:47:41 +0000
Subject: [PATCH 24/59] xpipe: 22.9 -> 22.10

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

diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 2018098377d3..94acc0b44e16 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-dKYGepfjgqcYflVABXGp2heI8XY1rIyMJi04aTld4ss=";
+      x86_64-linux = "sha256-/f4+xVLsgwT4H25ZWX4Mxl+IE0vWKGrxPXMOfR5c4fU=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "22.9";
+  version = "22.10";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From a9f568da9eee472339a27168399af4f5529de85f Mon Sep 17 00:00:00 2001
From: Vinicius Deolindo <git@vini.cat>
Date: Mon, 20 Apr 2026 10:07:37 -0300
Subject: [PATCH 25/59] orbstack: 2.0.5-19905 -> 2.1.1-20026

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

diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index eb888578f63a..eb4049caceec 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -6,15 +6,15 @@
 }:
 let
   inherit (stdenvNoCC.hostPlatform) system;
-  version = "2.0.5-19905";
+  version = "2.1.1-20026";
   sourceData = {
     aarch64-darwin = {
       arch = "arm64";
-      hash = "sha256-YBiJVRzf3H/u4Ui3/bBID6C6XA2wvo8cBH/IQIhqdXE=";
+      hash = "sha256-GKQfdZlY4foJUWlrggtUeNPtc1P4ykhv6dAmoafZcgc=";
     };
     x86_64-darwin = {
       arch = "amd64";
-      hash = "sha256-qFj6Lc0m9/dc1/mcJO0aafRZs5vyCQyCb5l+zJwdF+s=";
+      hash = "sha256-x+748PKaqsnQqeqWIgihNipjztCSZkWluomDXlJgUTw=";
     };
   };
   sources = lib.mapAttrs (

From 5d04de68603db90b8c154fc7fa504cde5cf833c1 Mon Sep 17 00:00:00 2001
From: svistoi <svistoi@zohomailcloud.ca>
Date: Tue, 21 Apr 2026 19:44:36 -0400
Subject: [PATCH 26/59] scrutiny,scrutiny-collector: 0.8.6 -> 0.9.0

---
 pkgs/by-name/sc/scrutiny-collector/package.nix | 6 +++---
 pkgs/by-name/sc/scrutiny/package.nix           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix
index ea38815a0d3d..6a518d2e8d57 100644
--- a/pkgs/by-name/sc/scrutiny-collector/package.nix
+++ b/pkgs/by-name/sc/scrutiny-collector/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.8.6";
+  version = "0.9.0";
 in
 buildGoModule rec {
   inherit version;
@@ -18,12 +18,12 @@ buildGoModule rec {
     owner = "AnalogJ";
     repo = "scrutiny";
     tag = "v${version}";
-    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
+    hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
   };
 
   subPackages = "collector/cmd/collector-metrics";
 
-  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
+  vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix
index 559dcc0284d1..7860b2544af6 100644
--- a/pkgs/by-name/sc/scrutiny/package.nix
+++ b/pkgs/by-name/sc/scrutiny/package.nix
@@ -8,13 +8,13 @@
 }:
 let
   pname = "scrutiny";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
     tag = "v${version}";
-    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
+    hash = "sha256-N6CYVhdA0BWewGUxyHtkW1ZFDGBYI7QfUo5er7xRcFw=";
   };
 
   frontend = buildNpmPackage {
@@ -22,7 +22,7 @@ let
     pname = "${pname}-webapp";
     src = "${src}/webapp/frontend";
 
-    npmDepsHash = "sha256-EgIM3iu/dGQhzanWjjBFmLHU3EOy2riScXCDSwAvAZc=";
+    npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
 
     buildPhase = ''
       runHook preBuild
@@ -46,7 +46,7 @@ buildGoModule rec {
 
   subPackages = "webapp/backend/cmd/scrutiny";
 
-  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
+  vendorHash = "sha256-fyHWy1TwwzFMIFzwilu4osfl/iI+2KqI6Bjr1UYUS68=";
 
   env.CGO_ENABLED = 0;
 

From d6990f73e89d7e751c75fa63cd1537e9f9d2d3e8 Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Wed, 22 Apr 2026 11:30:53 +0800
Subject: [PATCH 27/59] dwproton-bin: fix steamDisplayName

---
 pkgs/by-name/dw/dwproton-bin/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index a3bf7a998f43..c8a28c6da020 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -18,6 +18,11 @@ proton-ge-bin.overrideAttrs (
       hash = "sha256-3mfJGi2pUwPgWNZCvGD1SNHghS2HThX5Y7TrnJaEYvw=";
     };
 
+    preFixup = ''
+      substituteInPlace "$steamcompattool/compatibilitytool.vdf" \
+        --replace-fail "${finalAttrs.version}" "${steamDisplayName}"
+    '';
+
     passthru.updateScript = writeScript "update-dwproton" ''
       #!/usr/bin/env nix-shell
       #!nix-shell -i bash -p curl jq common-updater-scripts

From 57084a1d6fcff288821a667320bc599e529f099f Mon Sep 17 00:00:00 2001
From: Erik Skytthe <ers@dbc.dk>
Date: Wed, 22 Apr 2026 12:44:30 +0200
Subject: [PATCH 28/59] apacheKafka_4_1:  4.1.1 -> 4.1.2 Critical bug fixes:
 https://downloads.apache.org/kafka/4.1.2/RELEASE_NOTES.html

---
 pkgs/servers/apache-kafka/4_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/4_1.nix b/pkgs/servers/apache-kafka/4_1.nix
index 933054416127..cf78bf39e3e6 100644
--- a/pkgs/servers/apache-kafka/4_1.nix
+++ b/pkgs/servers/apache-kafka/4_1.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  kafkaVersion = "4.1.1";
+  kafkaVersion = "4.1.2";
   scalaVersion = "2.13";
-  hash = "sha256-eR6O5plpgtgFWCk2eoA5H5TBvKcymy+7ZYv8IRp3Ry4=";
+  hash = "sha256-GHleC5qJ3g7YRDrYM2Xib2QHgTr+xP4TnBrLDDNk5tw=";
 }

From 9eb368d01e5e9a25728fc0e8a9db48984f14b0b3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 22 Apr 2026 18:17:52 +0700
Subject: [PATCH 29/59] openshell: 0.0.22 -> 0.0.34

---
 pkgs/by-name/op/openshell/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openshell/package.nix b/pkgs/by-name/op/openshell/package.nix
index 5d9c6d2aee2a..e0f73669d7f1 100644
--- a/pkgs/by-name/op/openshell/package.nix
+++ b/pkgs/by-name/op/openshell/package.nix
@@ -6,20 +6,29 @@
   versionCheckHook,
   cacert,
   gitMinimal,
+  pkg-config,
+  z3,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openshell";
-  version = "0.0.22";
+  version = "0.0.34";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "OpenShell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-98wmBhj1Bqkod9DWh4qhkT3287c56ZKRDf/Z3QCYf4Q=";
+    hash = "sha256-wchygUeSYbHXVgq5mR3nObPiEygREgvIk579gnPVMvM=";
   };
 
-  cargoHash = "sha256-lzS8V8e+wMX8KUfgrftNLdbyivoj0wtRWOThBRS1IdM=";
+  cargoHash = "sha256-ovg7IZL022wsj5EUjySCWsf0KrUCZLwQrjvvWld8Owo=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [ z3 ];
 
   nativeCheckInputs = [
     cacert

From c3e216bd2786782fa611979a33bb131661002500 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 22 Apr 2026 14:01:53 +0200
Subject: [PATCH 30/59] mattermost-desktop: disable update checking

---
 pkgs/by-name/ma/mattermost-desktop/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix
index 7dc24b53521e..14911d6e4cb6 100644
--- a/pkgs/by-name/ma/mattermost-desktop/package.nix
+++ b/pkgs/by-name/ma/mattermost-desktop/package.nix
@@ -37,6 +37,8 @@ buildNpmPackage rec {
       --replace-fail \
         "const VERSION = childProcess.execSync('git rev-parse --short HEAD', {cwd: __dirname}).toString();" \
         "const VERSION = process.env.version;"
+    substituteInPlace src/common/config/buildConfig.ts \
+      --replace-fail 'enableUpdateNotifications: true,' 'enableUpdateNotifications: false,'
   '';
 
   postBuild = ''

From 982443c789d9bbd0b07b7485203bfc52dee1b492 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Wed, 22 Apr 2026 19:33:39 +0300
Subject: [PATCH 31/59] searchix: 0.4.6 -> 0.4.7

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

diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix
index adeeebcf2281..65189c897c82 100644
--- a/pkgs/by-name/se/searchix/package.nix
+++ b/pkgs/by-name/se/searchix/package.nix
@@ -18,14 +18,14 @@ in
 
 buildGoModule (finalAttrs: {
   pname = "searchix";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "alinnow";
     repo = "searchix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-anmPuZ2En0KNhbnf4MiwiR/YP8QabOrjHHcQoZJ5Dho=";
+    hash = "sha256-+mvE68j+rozEePbAqIuit+zFZ/nQkiR6VlesD4/ilo8=";
   };
 
   vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";

From ccc8224c30f9eb8956925b2ff2325e38d35efd1c Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Wed, 22 Apr 2026 11:00:10 -0700
Subject: [PATCH 32/59] xyce: fix build

---
 pkgs/by-name/xy/xyce/package.nix | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/xy/xyce/package.nix b/pkgs/by-name/xy/xyce/package.nix
index 811089e03034..b3008b48cdca 100644
--- a/pkgs/by-name/xy/xyce/package.nix
+++ b/pkgs/by-name/xy/xyce/package.nix
@@ -2,6 +2,8 @@
   stdenv,
   fetchFromGitHub,
   fetchgit,
+  fetchpatch,
+  applyPatches,
   lib,
   bison,
   blas,
@@ -41,12 +43,21 @@ let
     hash = "sha256-8cvglBCykZVQk3BD7VE3riXfJ0PAEBwsoloqUsrMlBc=";
   };
 
-  regression_src = fetchFromGitHub {
-    name = "Xyce_Regression";
-    owner = "Xyce";
-    repo = "Xyce_Regression";
-    rev = "Release-${version}";
-    hash = "sha256-aA/4UpzSb+EeJ1RVkVwSKiNh7BDcLHxNDnKXZmnCBmI=";
+  regression_src = applyPatches {
+    src = fetchFromGitHub {
+      name = "Xyce_Regression";
+      owner = "Xyce";
+      repo = "Xyce_Regression";
+      rev = "Release-${version}";
+      hash = "sha256-aA/4UpzSb+EeJ1RVkVwSKiNh7BDcLHxNDnKXZmnCBmI=";
+    };
+    patches = [
+      # remove after next release
+      (fetchpatch {
+        url = "https://github.com/Xyce/Xyce_Regression/commit/a77e39e409d3ab2ae05d6dcbf08d9e42e3fd0f15.patch";
+        hash = "sha256-BJJO2qSwQf+u2HUWhdyBUwP3j4HbMPfXrAhgdzeTZgc=";
+      })
+    ];
   };
 in
 
@@ -80,7 +91,6 @@ stdenv.mkDerivation rec {
         koma-script
         optional
         framed
-        enumitem
         multirow
         newtx
         preprint
@@ -164,11 +174,14 @@ stdenv.mkDerivation rec {
     local docFiles=("doc/Users_Guide/Xyce_UG"
       "doc/Reference_Guide/Xyce_RG"
       "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}")
+    # hotfix for: https://github.com/Xyce/Xyce/issues/177
+    substituteInPlace doc/Reference_Guide/Xyce_RG_macros.tex \
+      --replace-fail "\\def\\device{\\goodbreak" "\\def\\device{\\item[]\\goodbreak"
 
     # SANDIA LaTeX class and some organization logos are not publicly available see
     # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ
     for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do
-      sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
+      sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
     done
 
     install -d $doc/share/doc/${pname}-${version}/

From e33fa3a3326f7e808d43b316cc27ca6083d2cca1 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 22 Apr 2026 22:06:28 +0200
Subject: [PATCH 33/59] gclient2nix: update depot-tools

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

diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix
index 660062a0c3b1..b683352b3664 100644
--- a/pkgs/by-name/gc/gclient2nix/package.nix
+++ b/pkgs/by-name/gc/gclient2nix/package.nix
@@ -68,8 +68,8 @@ runCommand "gclient2nix"
     # substitutions
     depot_tools_checkout = fetchgit {
       url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
-      rev = "fa63ec7437108dcb3a611c6a6c5f3d96771e9581";
-      hash = "sha256-hRIwhIdRF2GbyXbpOdi/lla+/XYM+gKosoK+T+kYYu0=";
+      rev = "977d597d75def6781f890cdce459969a9568ea07";
+      hash = "sha256-OCIay+a+DHvKKIbDMSjTf6CbHHVfp8k0n1AO3E4yx1U=";
     };
 
     passthru = {

From 5c3005cce7752d3aa7ccfb951ce666ba8fe2f512 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 22 Apr 2026 22:00:41 +0200
Subject: [PATCH 34/59] electron-source.electron_39: 39.8.7 -> 39.8.9

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.7...v39.8.9
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6312
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 pkgs/development/tools/electron/39-angle-patchdir.patch | 6 ++++--
 pkgs/development/tools/electron/info.json               | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/electron/39-angle-patchdir.patch b/pkgs/development/tools/electron/39-angle-patchdir.patch
index 1b53bfb2aa85..3e7d49e922dc 100644
--- a/pkgs/development/tools/electron/39-angle-patchdir.patch
+++ b/pkgs/development/tools/electron/39-angle-patchdir.patch
@@ -6,6 +6,8 @@ index f5dbe8600f..9e1e5e0704 100644
    { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
    { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
    { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
--  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
+-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
++  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
+   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
+   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
  ]
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 141cd63c6139..dace7d81da38 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -56,10 +56,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-RrqxAum+OEmuh/f2PfPFDulmU3LhTqUtwww8Nb+F7NI=",
+                    "hash": "sha256-y2aqNUsE8XmM+SoLThECL2J5b4NVydj0WAoy7t4AiJg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v39.8.7"
+                    "tag": "v39.8.9"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1345,7 +1345,7 @@
         "electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=",
         "modules": "140",
         "node": "22.22.1",
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "chrome": "144.0.7559.236",

From c7fc3ffe0569f5638fa97b334afb01a136331d3c Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 22 Apr 2026 22:02:05 +0200
Subject: [PATCH 35/59] electron-source.electron_40: 40.8.5 -> 40.9.2

- Changelog: https://github.com/electron/electron/releases/tag/v40.9.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.5...v40.9.2
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 .../tools/electron/40-angle-patchdir.patch         |  6 ++++--
 pkgs/development/tools/electron/info.json          | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/electron/40-angle-patchdir.patch b/pkgs/development/tools/electron/40-angle-patchdir.patch
index 595d93b35891..82a3b7f40eca 100644
--- a/pkgs/development/tools/electron/40-angle-patchdir.patch
+++ b/pkgs/development/tools/electron/40-angle-patchdir.patch
@@ -6,6 +6,8 @@ index f5dbe8600f..9e1e5e0704 100644
    { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
    { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
    { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
--  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
+-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
++  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
+   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
+   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
  ]
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index dace7d81da38..5e66ac65c5f8 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1404,10 +1404,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Uvgjmq/xfD1IjYMC2CSmNHGWtsV9V2RJmtKhhRKITyM=",
+                    "hash": "sha256-wTKT4XA0ylL5uUZWfp9XhxiGUkfXrtEzw3Pw+nGwr4w=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v40.8.5"
+                    "tag": "v40.9.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1741,10 +1741,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UvFXQgkp60pQ6K0/ifXq1BX1HzFHCXrseascaQ7rmW0=",
+                    "hash": "sha256-WJSNbXox5oT6WQXARbl9B+DcEaHrCpu96s5Pvq48bfE=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v24.14.0"
+                    "tag": "v24.14.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2690,10 +2690,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "sha256-+7UFFBC4awv3Eg7aB5fKgIysAA2QIpds7s7xN2DuoP8=",
+        "electron_yarn_hash": "sha256-0P2Kt1uJA0lmZjIOr4Bpu6NDl4CwEKEgRz/B92oCs9M=",
         "modules": "143",
-        "node": "24.14.0",
-        "version": "40.8.5"
+        "node": "24.14.1",
+        "version": "40.9.2"
     },
     "41": {
         "chrome": "146.0.7680.179",

From 335bcca477c7119bc820a37cdafebafe08c5d64c Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 22 Apr 2026 22:19:43 +0200
Subject: [PATCH 36/59] electron-source.electron_41: 41.2.0 -> 41.2.2

- Changelog: https://github.com/electron/electron/releases/tag/v41.2.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v41.2.0...v41.2.2
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6312
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
---
 pkgs/development/tools/electron/info.json | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 5e66ac65c5f8..12473a5114d3 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2696,7 +2696,7 @@
         "version": "40.9.2"
     },
     "41": {
-        "chrome": "146.0.7680.179",
+        "chrome": "146.0.7680.188",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2705,15 +2705,15 @@
                     "version": "0-unstable-2026-02-05"
                 }
             },
-            "version": "146.0.7680.179"
+            "version": "146.0.7680.188"
         },
         "chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-HTeAvITnXbFdNiKmXWlOPfWFRjJ1ES2QkY5LjwX4OII=",
+                    "hash": "sha256-EKShXS1zF3TWCNLj8gCxjXlr80rA99QGM9ip28kgQH0=",
                     "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "146.0.7680.179",
+                    "tag": "146.0.7680.188",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2752,10 +2752,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Pt/BZVy3kSREabV0LvLAQN5D2v2GHBvnRKUuZ9DIQ+Y=",
+                    "hash": "sha256-3ZAPYER2e3xNUYgwJiqG0K9EKkBx9mTnUpaNaD9FxQw=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v41.2.0"
+                    "tag": "v41.2.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2785,8 +2785,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=",
-                    "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
+                    "hash": "sha256-u/2B+93xg1sMlg+R9zjAFXpyjgLCyzB7JY4bjLafFFE=",
+                    "rev": "d1100603964278cd89c5eb94707fbca242c788bf",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3089,10 +3089,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UvFXQgkp60pQ6K0/ifXq1BX1HzFHCXrseascaQ7rmW0=",
+                    "hash": "sha256-WJSNbXox5oT6WQXARbl9B+DcEaHrCpu96s5Pvq48bfE=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v24.14.0"
+                    "tag": "v24.14.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3628,8 +3628,8 @@
             },
             "src/third_party/pdfium": {
                 "args": {
-                    "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=",
-                    "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",
+                    "hash": "sha256-/reVJqqKSGUX1INmwOPQabPodYwlbhlxTIO0pAlnJnY=",
+                    "rev": "9e6326d6112c90f525c5f85cd7e39318bc705317",
                     "url": "https://pdfium.googlesource.com/pdfium.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3999,8 +3999,8 @@
             },
             "src/third_party/webrtc": {
                 "args": {
-                    "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=",
-                    "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
+                    "hash": "sha256-2yynA/qNvjP6KN2jShDuwnaSMJ1xRduWP4xsbODPDOE=",
+                    "rev": "70d86bbfaeeadffb1193c2aad245edd23ef251ef",
                     "url": "https://webrtc.googlesource.com/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -4047,8 +4047,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=",
-                    "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
+                    "hash": "sha256-NFz9p4EWq46Tm+Y/hBXk4Vb0Ljy/s1BTbuiMH351IJs=",
+                    "rev": "f09a91282a26caa91d016c962d785d852cfdec36",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -4056,7 +4056,7 @@
         },
         "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",
         "modules": "145",
-        "node": "24.14.0",
-        "version": "41.2.0"
+        "node": "24.14.1",
+        "version": "41.2.2"
     }
 }

From 60aa3481d1e0c9babad6a6417bba46948429e32e Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Thu, 23 Apr 2026 00:11:48 +0200
Subject: [PATCH 37/59] librepods: 0.2.0-alpha.2 -> 0.2.0

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

diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
index 421b5b4abd80..4ac898aff051 100644
--- a/pkgs/by-name/li/librepods/package.nix
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librepods";
-  version = "0.2.0-alpha.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "kavishdevar";
     repo = "librepods";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-37dLiXC+eO4f5waLKgMMpHXH1m6W54O/l2axJsnyU5M=";
+    hash = "sha256-nLRbVnm+4jr7yH6e/BsygkC4kOx1PJNy6jU5ioe2c54=";
   };
 
   sourceRoot = "source/linux";

From 51735a6dcc7d09d6ecebbd59d3ec7547efe8b0ba Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Thu, 23 Apr 2026 00:00:54 +0200
Subject: [PATCH 38/59] nixos/livekit-ingress: allow port -1 to disable
 WHIP/RTMP

LiveKit Ingress allows disabling these services by setting their
ports to -1 in the configuration file. Expose that in the NixOS
module interface.
---
 .../services/networking/livekit-ingress.nix   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/livekit-ingress.nix b/nixos/modules/services/networking/livekit-ingress.nix
index 7aaf6d1397af..d67d9fe120b6 100644
--- a/nixos/modules/services/networking/livekit-ingress.nix
+++ b/nixos/modules/services/networking/livekit-ingress.nix
@@ -10,6 +10,20 @@ let
   format = pkgs.formats.yaml { };
   settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;
 
+  optionalPort = (lib.types.ints.between (-1) 65535);
+
+  normalisePort =
+    defaultPort: configValue:
+    if configValue == -1 then
+      null
+    else if configValue == 0 then
+      defaultPort
+    else
+      configValue;
+
+  actualRTMPPort = normalisePort 1935 cfg.settings.rtmp_port;
+  actualWHIPPort = normalisePort 8080 cfg.settings.whip_port;
+
   isLocallyDistributed = config.services.livekit.enable;
 in
 {
@@ -43,15 +57,15 @@ in
         freeformType = format.type;
         options = {
           rtmp_port = lib.mkOption {
-            type = lib.types.port;
+            type = optionalPort;
             default = 1935;
-            description = "TCP port for RTMP connections";
+            description = "TCP port for RTMP connections. -1 to disable";
           };
 
           whip_port = lib.mkOption {
-            type = lib.types.port;
+            type = optionalPort;
             default = 8080;
-            description = "TCP port for WHIP connections";
+            description = "TCP port for WHIP connections. -1 to disable";
           };
 
           redis = {
@@ -120,10 +134,21 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.openFirewall.rtmp -> actualRTMPPort != null;
+        message = "services.livekit-ingress: configured to open RTMP port, but the RTMP service is disabled";
+      }
+      {
+        assertion = cfg.openFirewall.whip -> actualWHIPPort != null;
+        message = "services.livekit-ingress: configured to open WHIP port, but the WHIP service is disabled";
+      }
+    ];
+
     networking.firewall = {
       allowedTCPPorts = lib.mkMerge [
-        (lib.mkIf cfg.openFirewall.rtmp [ cfg.settings.rtmp_port ])
-        (lib.mkIf cfg.openFirewall.whip [ cfg.settings.whip_port ])
+        (lib.mkIf cfg.openFirewall.rtmp [ actualRTMPPort ])
+        (lib.mkIf cfg.openFirewall.whip [ actualWHIPPort ])
       ];
       allowedUDPPortRanges = lib.mkIf cfg.openFirewall.rtc [
         {

From feba26527527e86f6aff070bd61021c096084ce7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Apr 2026 13:25:49 +1000
Subject: [PATCH 39/59] nixos/hydra: fix args for createdb

> createdb: error: too many command-line arguments (first is "hydra")
---
 nixos/modules/services/continuous-integration/hydra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 65df56ef39f1..2fd38e50459d 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -360,7 +360,7 @@ in
         ${lib.optionalString haveLocalDB ''
           if ! [ -e ${baseDir}/.db-created ]; then
             runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
-            runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra
+            runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
             touch ${baseDir}/.db-created
           fi
           echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra

From 7c5d06dee06ded969d8f60faf07d6dd21fb69a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 22 Apr 2026 20:31:52 -0700
Subject: [PATCH 40/59] python3Packages.litellm: 1.82.3 -> 1.83.7

Diff: https://github.com/BerriAI/litellm/compare/v1.82.3-stable...v1.83.7-stable

Changelog: https://github.com/BerriAI/litellm/releases/tag/v1.83.7-stable
---
 .../development/python-modules/litellm/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 008c58b2d61f..4c7a10963b3d 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.82.3";
+  version = "1.83.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BerriAI";
     repo = "litellm";
     tag = "v${version}-stable";
-    hash = "sha256-oeaK8Flt/oSX9nA7tFHyBp+hvsDeRK+w16zljyA9vdE=";
+    hash = "sha256-oVQ0FHZmXDY7HU4AMEQ9xcl10mIbqja9/j2mdunTWI4=";
   };
 
   build-system = [ poetry-core ];
@@ -122,8 +122,14 @@ buildPythonPackage rec {
     "litellm_enterprise"
   ];
 
-  # Relax dependency check on openai, may not be needed in the future
-  pythonRelaxDeps = [ "openai" ];
+  pythonRelaxDeps = [
+    "aiohttp"
+    "click"
+    "importlib-metadata"
+    "jsonschema"
+    "openai"
+    "python-dotenv"
+  ];
 
   # access network
   doCheck = false;

From fe38f9405ddaecceaf1047c828b7844768fd6947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Bj=C3=B8rnkj=C3=A6r=20Bennedsgaard?=
 <abbennedsgaard@gmail.com>
Date: Thu, 23 Apr 2026 09:53:51 +0200
Subject: [PATCH 41/59] databricks-cli: 0.290.1 -> 0.290.2

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

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 4b670236dbe4..dc930df6dd71 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.290.1";
+  version = "0.290.2";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KSwgEju6RRFV0B0dbnutZ/xgnBeSnPW6pyIQwBYg8Ew=";
+    hash = "sha256-kIliLlOd6/1lddWK3VtxoXvP30SajDWB6zVO4gKe9Fo=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev

From d9b19289e9492565033fb88497b842d6c5e0c043 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Thu, 23 Apr 2026 13:02:00 +0200
Subject: [PATCH 42/59] electron-source.electron_41: 41.2.2 -> 41.3.0

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

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 12473a5114d3..9782b841607e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2752,10 +2752,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-3ZAPYER2e3xNUYgwJiqG0K9EKkBx9mTnUpaNaD9FxQw=",
+                    "hash": "sha256-x3XSMSq1GuSTwQuOqbg9hCaMCoKx8UPGMDtJu5y1qfA=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v41.2.2"
+                    "tag": "v41.3.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3089,10 +3089,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-WJSNbXox5oT6WQXARbl9B+DcEaHrCpu96s5Pvq48bfE=",
+                    "hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v24.14.1"
+                    "tag": "v24.15.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -4056,7 +4056,7 @@
         },
         "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",
         "modules": "145",
-        "node": "24.14.1",
-        "version": "41.2.2"
+        "node": "24.15.0",
+        "version": "41.3.0"
     }
 }

From 35dc8d5a4e9b8b23db1621d3cecc1df05e2110aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Apr 2026 14:29:23 +0000
Subject: [PATCH 43/59] kotlin: 2.3.20 -> 2.3.21

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index f3e8510c0d8b..84802712f5f4 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.3.20";
+  version = "2.3.21";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-IiulFs3EBSzgvp0uxq3zxcZPxTFW192R0fUxeAlDG5g=";
+    sha256 = "sha256-qM/B1izU0N5NBPQldeQBNb1iBYjBfVaKIOucfCWa8U8=";
   };
 
   propagatedBuildInputs = [ jre ];

From b52547f3e496c3cc2f1132283efb2a9aa3a252db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 23 Apr 2026 08:38:45 -0400
Subject: [PATCH 44/59] itsycal: 0.15.10 -> 0.15.12

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

diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index f5e0c161ab44..41bac816c8cb 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -6,18 +6,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "itsycal";
-  version = "0.15.10";
+  version = "0.15.12";
 
   src = fetchzip {
     url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
-    hash = "sha256-6+E/4SbRIChJMc2VDMNYongsAWRtcFxtIj6lvTiexrU=";
+    hash = "sha256-2Xu1ZQnNl0o2/AYOIjxZPDnc0TxMXrqKej7CCZEVV9I=";
+    stripRoot = false;
   };
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/Applications/Itsycal.app"
-    cp -R . "$out/Applications/Itsycal.app"
+    mkdir -p "$out/Applications"
+    cp -R Itsycal.app "$out/Applications/"
 
     runHook postInstall
   '';

From c153f6b738fe45d2850db8575c4205537cf4c958 Mon Sep 17 00:00:00 2001
From: FlameFlag <git@ps1.sh>
Date: Tue, 7 Apr 2026 20:15:46 +0300
Subject: [PATCH 45/59] discord: fetch distros at build time

`discord-development` linux tarball changed layout in 0.0.235,
`discord-canary` followed in 1.0.927, and `discord-ptb` followed in
1.0.188

Instead of bundling the channel binary directly, these channels now ship
only a small `updater_bootstrap` ELF that downloads the real app into
`$XDG_CONFIG_HOME/<channel>/app-<version>/` on first run

That bootstrap always hits `/manifests/latest` with no way to pin a
version, which would make the build impure and the nix version a lie

Reverse engineering the Rust ELF confirmed there is no CLI flag, env
var, or config to override this

First seen downstream in FlameFlag/nixcord workflow run 24025186671

Fetch the brotli-compressed `.distro` tars directly from the
distributions API at build time instead

`update.py` resolves the latest version via
`updates.discord.com/distributions/app/manifests/latest?channel=<ch>`
and pins the host + all module URLs with SHA256s into `sources.json`

`installPhase` detects the distro layout via `isDistro`, brotli-decodes
the host tar into `$out/opt/<binaryName>`, and extracts each module
under `$out/opt/<binaryName>/modules/<name>/`. `autoPatchelfHook`
handles the binary and native `.node` modules as usual

Discord's JS `moduleUpdater` looks for modules under
`<host_dir>/<version>/modules/<name>/`

A `stageModules` wrapper symlinks them from the nix store on first
launch and pre-writes `installed.json` so the updater treats them as
already installed, otherwise the first launch crashes with `Cannot find
module 'discord_desktop_core'`

The bundled native modules link against openssl 1.1 and libpulseaudio,
added both to `buildInputs` gated on `isDistro` so the legacy stable
package is unaffected
---
 .../instant-messengers/discord/darwin.nix     |   8 +-
 .../instant-messengers/discord/default.nix    |   9 +-
 .../instant-messengers/discord/linux.nix      | 200 ++++++++++----
 .../instant-messengers/discord/sources.json   | 248 ++++++++++++++++--
 .../instant-messengers/discord/update.py      | 129 +++++++--
 5 files changed, 481 insertions(+), 113 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index 87cce491f157..aabb23a155a1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -1,13 +1,13 @@
 {
   pname,
-  version,
-  src,
+  source,
   meta,
   stdenv,
   binaryName,
   desktopName,
   self,
   lib,
+  fetchurl,
   undmg,
   makeWrapper,
   writeScript,
@@ -33,6 +33,9 @@ let
   ];
   enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
 
+  inherit (source) version;
+  src = fetchurl { inherit (source) url hash; };
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -106,6 +109,7 @@ stdenv.mkDerivation {
   passthru = {
     # make it possible to run disableBreakingUpdates standalone
     inherit disableBreakingUpdates;
+    inherit source;
     updateScript = ./update.py;
 
     tests = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 182394149aa8..409078b739ec 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,6 +1,5 @@
 {
   callPackage,
-  fetchurl,
   lib,
   stdenv,
   discord,
@@ -101,13 +100,7 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ]
   callPackage package (
     args
     // {
-      inherit pname;
-      inherit (source) version;
-
-      src = fetchurl {
-        inherit (source) url hash;
-      };
-
+      inherit pname source;
       meta = meta // {
         mainProgram = args.binaryName;
       };
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index f4616191e3bd..8304d23ce9ce 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -1,12 +1,12 @@
 {
   pname,
-  version,
-  src,
+  source,
   meta,
   binaryName,
   desktopName,
   self,
   autoPatchelfHook,
+  fetchurl,
   makeDesktopItem,
   lib,
   stdenv,
@@ -44,15 +44,18 @@
   libxrender,
   libxtst,
   libxcb,
+  libxkbcommon,
   libxshmfence,
   libgbm,
   nspr,
   nss,
+  openssl_1_1,
   pango,
   systemdLibs,
   libappindicator-gtk3,
   libdbusmenu,
-  writeScript,
+  brotli,
+  writeShellScript,
   pipewire,
   python3,
   runCommand,
@@ -85,6 +88,97 @@ let
   ];
   enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
 
+  # Starting with discord-development 0.0.235, the linux tarball ships only a
+  # small `updater_bootstrap` ELF that downloads the real app at first launch
+  #
+  # That binary always fetches the latest version from Discord's CDN with no way
+  # to pin, making the build impure and the nix version a lie
+  #
+  # Instead we fetch the app directly from the distributions API at build time:
+  # https://updates.discord.com/distributions/app/manifests/latest?channel=...
+  # The host + module distros are brotli-compressed tars on Discord's CDN at
+  # predictable URLs with SHA256 hashes in the manifest
+  isDistro = source.kind == "distro";
+
+  inherit (source) version;
+
+  src =
+    if isDistro then
+      fetchurl { inherit (source.distro) url hash; }
+    else
+      fetchurl { inherit (source) url hash; };
+
+  moduleSrcs = lib.optionalAttrs isDistro (
+    lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules
+  );
+
+  moduleVersions = lib.optionalAttrs isDistro (lib.mapAttrs (_: mod: mod.version) source.modules);
+
+  libPath = lib.makeLibraryPath (
+    [
+      libcxx
+      systemdLibs
+      libpulseaudio
+      libdrm
+      libgbm
+      stdenv.cc.cc
+      alsa-lib
+      atk
+      at-spi2-atk
+      at-spi2-core
+      cairo
+      cups
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libglvnd
+      libnotify
+      libx11
+      libxcomposite
+      libunity
+      libuuid
+      libva
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxrandr
+      libxrender
+      libxtst
+      nspr
+      nss
+      libxcb
+      libxkbcommon
+      pango
+      pipewire
+      libxscrnsaver
+      libappindicator-gtk3
+      libdbusmenu
+      wayland
+    ]
+    ++ lib.optionals withTTS [ speechd-minimal ]
+  );
+
+  # Symlink native modules from the nix store into the user config dir
+  # where Discord's JS moduleUpdater expects them.
+  stageModules = writeShellScript "discord-stage-modules" ''
+    store_modules="$1"
+    modules_dir="''${XDG_CONFIG_HOME:-$HOME/.config}/${lib.toLower binaryName}/${version}/modules"
+    if [ ! -f "$modules_dir/installed.json" ]; then
+      mkdir -p "$modules_dir"
+      for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
+        ln -sfn "$store_modules/$m" "$modules_dir/$m"
+      done
+      echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
+        > "$modules_dir/installed.json"
+    fi
+  '';
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -123,7 +217,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxshmfence
     wrapGAppsHook3
     makeShellWrapper
-  ];
+  ]
+  ++ lib.optionals isDistro [ brotli ];
 
   dontWrapGApps = true;
 
@@ -132,67 +227,59 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     nspr
     nss
+  ]
+  # The new distro layout ships prebuilt `.node` modules:
+  # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio
+  ++ lib.optionals isDistro [
+    openssl_1_1
+    libpulseaudio
   ];
 
   strictDeps = true;
 
-  libPath = lib.makeLibraryPath (
-    [
-      libcxx
-      systemdLibs
-      libpulseaudio
-      libdrm
-      libgbm
-      stdenv.cc.cc
-      alsa-lib
-      atk
-      at-spi2-atk
-      at-spi2-core
-      cairo
-      cups
-      dbus
-      expat
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      gtk3
-      libglvnd
-      libnotify
-      libx11
-      libxcomposite
-      libunity
-      libuuid
-      libva
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      nspr
-      libxcb
-      pango
-      pipewire
-      libxscrnsaver
-      libappindicator-gtk3
-      libdbusmenu
-      wayland
-    ]
-    ++ lib.optionals withTTS [ speechd-minimal ]
-  );
+  dontUnpack = isDistro;
+
+  inherit libPath;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/256x256/apps}
-    mv * $out/opt/${binaryName}
+  ''
+  + (
+    if isDistro then
+      ''
+        # Distro layout (currently discord-ptb, discord-canary and discord-development):
+        #
+        # The host distro is a brotli-compressed tar with all files under a `files/`
+        # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros
+        # follow the same format with module contents under `files/`
+        #
+        # The module directory layout must match what Discord's node runtime
+        # expects: modules/<name>/ (the moduleUpdater extracts zips into
+        # path.join(moduleInstallPath, moduleName) see processUnzipQueue)
 
-    chmod +x $out/opt/${binaryName}/${binaryName}
-    patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
-        $out/opt/${binaryName}/${binaryName}
+        brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName}
+        chmod +x $out/opt/${binaryName}/${binaryName}
+
+        # Extract native modules
+        ${lib.concatStringsSep "\n" (
+          lib.mapAttrsToList (name: src: ''
+            mkdir -p $out/opt/${binaryName}/modules/${name}
+            brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name}
+          '') moduleSrcs
+        )}
+
+      ''
+    else
+      ''
+        # Tarball layout (stable): the tarball unpacks into a
+        # directory containing the channel binary directly
+        mv * $out/opt/${binaryName}
+        chmod +x $out/opt/${binaryName}/${binaryName}
+      ''
+  )
+  + ''
 
     wrapProgramShell $out/opt/${binaryName}/${binaryName} \
         "''${gappsWrapperArgs[@]}" \
@@ -205,6 +292,7 @@ stdenv.mkDerivation (finalAttrs: {
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \
         ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
+        ${lib.strings.optionalString isDistro ''--run "${stageModules} $out/opt/${binaryName}/modules"''} \
         --add-flags ${lib.escapeShellArg commandLineArgs}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
@@ -258,6 +346,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     # make it possible to run disableBreakingUpdates standalone
     inherit disableBreakingUpdates;
+    # Exposed so reviewers can inspect which distro modules are pinned
+    inherit source moduleVersions;
     updateScript = ./update.py;
 
     tests = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json
index 63eca3c991a1..2ca81a052f0e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/sources.json
+++ b/pkgs/applications/networking/instant-messengers/discord/sources.json
@@ -1,42 +1,242 @@
 {
   "linux-canary": {
-    "hash": "sha256-wTAmrtGcJpI/DIrLQu/++WuVzMr9EcJs+AIFkAilFvk=",
-    "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.927/discord-canary-0.0.927.tar.gz",
-    "version": "0.0.927"
+    "distro": {
+      "hash": "sha256-4xA+Kh6UiwtoUt5A2kPI5rcbSEc/SoZzJbwFdjMNVpE=",
+      "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-3dcVKm/Sz9bqhEm8xVMtRcWrU6JWtv2Dh8oz/3K489E=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-7zcFkh3f9BVjHlevCkZXUFNdeLCkM2+sysuSUyPcQlA=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-TD1vWHt4y3xkAEc/BV2HZe3tNdP0PTZsXhVeeHvRAU4=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-nv6kKT+ZWfwkH4BvOWtjF8VZoznzYRN0hK8kiTbcX/I=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-Ru8zXxDGwHrpMnnraAVR0Z7jRA4PRLHX7pBz8jctar8=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-zkhTv+8qzyrZBHpZeCzJX6z8HCK0M4Jt6Kr+InbVT80=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-j5UE4ZugIF4HTsOgxK3Dfp0WP3Sya1fbDjERxGu2qSM=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-HaUt+G05Im2uNkUB9Ry1c6X/iadc7xLrcEgJCVgpgsY=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-8cOwisLqnxGsbqPYStBAaKEaALIM0M5d3RPLtoHxClw=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-hfQu3fT9ON0j8xEAwCRY7/ALYYq/a70W/8HeT3KhZF0=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-JJXt5wHat6AtxW1GIzsPnMHJPzX1DlPgB3kDcg9Bnts=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-PMlqdAI44AngVh75Eq66zHLEoJkI0262FcFUffPykCk=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.962"
   },
   "linux-development": {
-    "hash": "sha256-Xe5PjHDWXU+eIAcBID34gjuADmAl1JAQLmXUAi/p4tg=",
-    "url": "https://development.dl2.discordapp.net/apps/linux/0.0.99/discord-development-0.0.99.tar.gz",
-    "version": "0.0.99"
+    "distro": {
+      "hash": "sha256-6MLiRO2GYXkBRQjzOwmKHVqMqGsVjk0E3ocvdYyg8qs=",
+      "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-6yEFPNHqs5Mk+1V2x4R/ZwFgwb2Z+O9iOrX78/G3ynM=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-Z82Y9I4brUOvGiZhgL5V+wXRFfDH/XazWJG3OMYyo3s=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-MTjgc8SfL7i4O+QkYQu0Os04iAM1x85AAZxuooI5Oog=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-JQAgkIpev2+1dlfPW/bg/Iek/cL3+V92IpZIa8e+Fp8=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-ixKdUlXhDVmk3P41gFixSpPJCMnd3c/yLQF1J7DYI+M=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-UJmBXQm0SXbCOjtJN72BZJCViULhpJgc0rgqDrhhNR0=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-+TH9x91upIuX9nwvpF9pX4w58YRqu6+hbF1RSyiykdM=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-cGK1qN8jUiw2l9KNbb7eucWWPw191AHzh/4C6T8gI44=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-b/X24WJi2Mi0x7Ynqphmtr6FSYUMSR9dDPPUF/k/TN8=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-+dslIrgHH5r7sz95Ixb+5DDOQA8PEr4BcqkJTchf3WQ=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-7rg5Ct/BPJaOak0HOeTuYMbfdhHBvI4qML1nnYzZ+IE=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-XKJNd/9l3PJX1GTHT0hvsB9pqI6oDkAvay2L3bOIk/0=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.976"
   },
   "linux-ptb": {
-    "hash": "sha256-vnzEamdX8pCzFtYLoWHvxcznHD1FCcgKnwQOx8BkWu0=",
-    "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.183/discord-ptb-0.0.183.tar.gz",
-    "version": "0.0.183"
+    "distro": {
+      "hash": "sha256-dVLGOL//a1mCw0NyekrCemfu9u7pA9t1+UnQ8zmMCwI=",
+      "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-cLqmwjFWUnRnBY3iEqpyv2mtuHI4TanGxbI1cT4V9Ic=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-UmAYyAVVwVZINIobQejXSEK01C/oQJBjxBQ1p45AMOg=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-/WfqrWgqCXSUodMqlhgiHTQAiRSfg1dfA4c3CxKZuJk=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-MXBUoaeC1Refb80mqyZQ6vE8lRV04K5yZbhHMN5XuTY=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-P4s5/5aeLjzaD0HwHlpHCWaiVlsq+TFlfEqfCym4rH0=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-hwLHumM78aJv/OSX1LAxqpUGZmiVWGg2Sc6SmOdg+Oc=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-UGS9Znl5QWiQ5nG2I2GxUmQ3sRaaXcCyPPzh3AjAyQA=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-izqFS9ePjv+4VTqrrnwdlNCdpQik5Y7D3pmznP74ULA=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-ykwur5DajvoAvNyhTb3wbtduv2NgLhrEEKKI2O/CqC8=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-HKHbGqYK8AyJu+PnVaZIv+HJr6pc6LtnnXI29rSFPmI=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-HL/eZQpc0r+5N7LBFZdUVZWQT4nUtX3gBZlOPR1pLfs=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-P/8cVdak4Sz7SfHzi8DJPgZi9LRu6FWWI9hjoe8LY8o=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.188"
   },
   "linux-stable": {
-    "hash": "sha256-FMIM/CWPk3Kcqp8iIg+gxiCpjD2DNk7dSBqnCBvzn5w=",
-    "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.130/discord-0.0.130.tar.gz",
-    "version": "0.0.130"
+    "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=",
+    "kind": "legacy",
+    "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.134/discord-0.0.134.tar.gz",
+    "version": "0.0.134"
   },
   "osx-canary": {
-    "hash": "sha256-9bknJCpZv07BaF5v0g7t+YrGR3+HsYCHl4gjduQsABo=",
-    "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1040/DiscordCanary.dmg",
-    "version": "0.0.1040"
+    "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=",
+    "kind": "legacy",
+    "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1088/DiscordCanary.dmg",
+    "version": "0.0.1088"
   },
   "osx-development": {
-    "hash": "sha256-dCRl0gpxFdnEa81sSymj8Te0+KmmI9uXsmCXSY1EeNw=",
-    "url": "https://development.dl2.discordapp.net/apps/osx/0.0.119/DiscordDevelopment.dmg",
-    "version": "0.0.119"
+    "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=",
+    "kind": "legacy",
+    "url": "https://development.dl2.discordapp.net/apps/osx/1.0.982/DiscordDevelopment.dmg",
+    "version": "1.0.982"
   },
   "osx-ptb": {
-    "hash": "sha256-SV6ZdD0CCnNNkSWyIDqCmg9dpdQr4JLbrD3+k8943PQ=",
-    "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.226/DiscordPTB.dmg",
-    "version": "0.0.226"
+    "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=",
+    "kind": "legacy",
+    "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.231/DiscordPTB.dmg",
+    "version": "0.0.231"
   },
   "osx-stable": {
-    "hash": "sha256-vBadXUHrYhvkqzkCvGnKf25A19TKcFs5D0tzC54E0Hk=",
-    "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.382/Discord.dmg",
-    "version": "0.0.382"
+    "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=",
+    "kind": "legacy",
+    "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.387/Discord.dmg",
+    "version": "0.0.387"
   }
 }
diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/applications/networking/instant-messengers/discord/update.py
index d2577eab8c91..49f90ca9e1c5 100755
--- a/pkgs/applications/networking/instant-messengers/discord/update.py
+++ b/pkgs/applications/networking/instant-messengers/discord/update.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p python3
 
+from dataclasses import asdict, dataclass, field
 from enum import StrEnum
-from typing import List, Tuple
+from typing import List
 from subprocess import PIPE, Popen
 import json
 import urllib.request
@@ -33,18 +34,35 @@ class Branch(StrEnum):
     DEVELOPMENT = "development"
 
 
-Variant = Tuple[Platform, Branch]
+class Kind(StrEnum):
+    # Single tarball or dmg fetched via discord.com/api/download redirect
+    LEGACY = "legacy"
+    # Brotli-compressed host + module distros from the distributions API
+    DISTRO = "distro"
+
+
+@dataclass(frozen=True)
+class Variant:
+    platform: Platform
+    branch: Branch
+    kind: Kind
+
+
+# The distributions API rejects requests that don't send a Discord-Updater
+# User-Agent, so we can't identify ourselves as Nixpkgs here
+DISTRO_USER_AGENT = "Discord-Updater/1"
 
 
 def serialize_variant(variant: Variant) -> str:
-    platform, branch = variant
-    return f"{platform}-{branch}"
+    return f"{variant.platform}-{variant.branch}"
 
 
 def url_for_variant(variant: Variant) -> str:
-    platform, branch = variant
+    return f"https://discord.com/api/download/{variant.branch.value}?platform={variant.platform.value}&format={variant.platform.format_type()}"
 
-    return f"https://discord.com/api/download/{branch.value}?platform={platform.value}&format={platform.format_type()}"
+
+def distro_manifest_url_for_variant(variant: Variant) -> str:
+    return f"https://updates.discord.com/distributions/app/manifests/latest?channel={variant.branch.value}&platform={variant.platform.value}&arch=x64"
 
 
 def fetch_redirect_url(url: str) -> str:
@@ -75,31 +93,94 @@ def prefetch(url: str) -> str:
     return sri_hash
 
 
+@dataclass
+class LegacySource:
+    version: str
+    url: str
+    hash: str
+    kind: Kind = Kind.LEGACY
+
+
+@dataclass
+class DistroRef:
+    url: str
+    hash: str
+
+
+@dataclass
+class DistroModule:
+    version: int
+    url: str
+    hash: str
+
+
+@dataclass
+class DistroSource:
+    version: str
+    distro: DistroRef
+    modules: dict[str, DistroModule] = field(default_factory=dict)
+    kind: Kind = Kind.DISTRO
+
+
+def fetch_distro_manifest(variant: Variant) -> dict:
+    url = distro_manifest_url_for_variant(variant)
+    req = urllib.request.Request(url, headers={"User-Agent": DISTRO_USER_AGENT})
+    with urllib.request.urlopen(req) as response:
+        return json.loads(response.read())
+
+
+def version_triple_to_str(triple: list) -> str:
+    return ".".join(str(x) for x in triple)
+
+
+def fetch_distro_source(variant: Variant) -> DistroSource:
+    manifest = fetch_distro_manifest(variant)
+
+    distro_url = manifest["full"]["url"]
+    modules = {
+        name: DistroModule(
+            version=mod["full"]["module_version"],
+            url=mod["full"]["url"],
+            hash=prefetch(mod["full"]["url"]),
+        )
+        for name, mod in manifest["modules"].items()
+    }
+
+    return DistroSource(
+        version=version_triple_to_str(manifest["full"]["host_version"]),
+        distro=DistroRef(url=distro_url, hash=prefetch(distro_url)),
+        modules=modules,
+    )
+
+
+def fetch_legacy_source(variant: Variant) -> LegacySource:
+    url = fetch_redirect_url(url_for_variant(variant))
+    return LegacySource(
+        version=version_from_url(url),
+        url=url,
+        hash=prefetch(url),
+    )
+
+
 def main():
     variants: List[Variant] = [
-        (Platform.LINUX, Branch.STABLE),
-        (Platform.LINUX, Branch.PTB),
-        (Platform.LINUX, Branch.CANARY),
-        (Platform.LINUX, Branch.DEVELOPMENT),
-        (Platform.MACOS, Branch.STABLE),
-        (Platform.MACOS, Branch.PTB),
-        (Platform.MACOS, Branch.CANARY),
-        (Platform.MACOS, Branch.DEVELOPMENT),
+        Variant(Platform.LINUX, Branch.STABLE, Kind.LEGACY),
+        Variant(Platform.LINUX, Branch.PTB, Kind.DISTRO),
+        Variant(Platform.LINUX, Branch.CANARY, Kind.DISTRO),
+        Variant(Platform.LINUX, Branch.DEVELOPMENT, Kind.DISTRO),
+        Variant(Platform.MACOS, Branch.STABLE, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.PTB, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.CANARY, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.LEGACY),
     ]
 
     sources = {}
 
     for v in variants:
-        url = url_for_variant(v)
-        url = fetch_redirect_url(url)
-        version = version_from_url(url)
-        sri_hash = prefetch(url)
-
-        sources[serialize_variant(v)] = {
-            "url": url,
-            "version": version,
-            "hash": sri_hash,
-        }
+        source = (
+            fetch_distro_source(v) if v.kind == Kind.DISTRO else fetch_legacy_source(v)
+        )
+        sources[serialize_variant(v)] = asdict(source)
 
     with open(os.path.join(os.path.dirname(__file__), "sources.json"), "w") as f:
         json.dump(sources, f, indent=2, sort_keys=True)

From ab9655da89d5672d1990af2fc6a0e907e188f03d Mon Sep 17 00:00:00 2001
From: Conor <conorbhoyle@gmail.com>
Date: Fri, 24 Apr 2026 00:34:14 +0100
Subject: [PATCH 46/59] maintainers: add @chocoblocko9

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8adce8dda6ee..8ba9b453cc63 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4842,6 +4842,12 @@
     github = "CHN-beta";
     githubId = 35858462;
   };
+  choco98 = {
+    name = "Conor Boyle";
+    email = "conorboyle07@protonmail.com";
+    github = "chocoblocko9";
+    githubId = 91826251;
+  };
   ChocolateLoverRaj = {
     email = "paranjperajas@gmail.com";
     github = "ChocolateLoverRaj";

From 91dc8aa090c7530f4f3f90b2ff5a6deafc96a2ac Mon Sep 17 00:00:00 2001
From: Conor <conorbhoyle@gmail.com>
Date: Fri, 24 Apr 2026 00:47:59 +0100
Subject: [PATCH 47/59] Abaddon: add chocoblocko9 as maintainer

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

diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 538a35f6f8e9..3ec1de372934 100644
--- a/pkgs/by-name/ab/abaddon/package.nix
+++ b/pkgs/by-name/ab/abaddon/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     mainProgram = "abaddon";
     homepage = "https://github.com/uowuo/abaddon";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ choco98 ];
     platforms = lib.platforms.linux;
   };
 }

From d12e33217cdac4262745b93614e74a38bff808e1 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Mon, 9 Mar 2026 02:51:10 +0100
Subject: [PATCH 48/59] python3Packages.amd-aiter: init at 0.1.11-post1

Co-authored-by: Luna Nova <git@lunnova.dev>
---
 .../python-modules/amd-aiter/default.nix      | 134 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 136 insertions(+)
 create mode 100644 pkgs/development/python-modules/amd-aiter/default.nix

diff --git a/pkgs/development/python-modules/amd-aiter/default.nix b/pkgs/development/python-modules/amd-aiter/default.nix
new file mode 100644
index 000000000000..c3f1f3bd9db4
--- /dev/null
+++ b/pkgs/development/python-modules/amd-aiter/default.nix
@@ -0,0 +1,134 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  packaging,
+  psutil,
+  pybind11,
+  einops,
+  ninja,
+  numpy,
+  pandas,
+  rocmPackages,
+  torch,
+  writableTmpDirAsHomeHook,
+
+  gpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
+  # From validate_and_update_archs at https://github.com/ROCm/aiter/blob/main/aiter/jit/core.py
+  supportedGpuTargets ? [
+    "gfx90a"
+    "gfx940"
+    "gfx941"
+    "gfx942"
+    "gfx1100"
+    "gfx1101"
+    "gfx1102"
+    "gfx1103"
+    "gfx1150"
+    "gfx1151"
+    "gfx1152"
+    "gfx1153"
+    "gfx1200"
+    "gfx1201"
+    "gfx950"
+  ],
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "amd-aiter";
+  version = "0.1.11.post1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "aiter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9CCSmEw0kIoxERhtkKhBkaAGx42kCssH7IPjTgbg9LA=";
+  };
+
+  postPatch = ''
+    rmdir 3rdparty/composable_kernel
+    ln -sf ${rocmPackages.composable_kernel.src} 3rdparty/composable_kernel
+
+    # python relax deps hook?
+    substituteInPlace pyproject.toml \
+      --replace-fail '"flydsl==0.0.1.dev95158637"' ""
+
+    # TODO: upstream fix. get_git_commit_id_short() assumes a git clone;
+    # fails in hermetic builds, should fall back gracefully.
+    substituteInPlace csrc/cpp_itfs/utils.py \
+      --replace-fail \
+        'commit_id = get_git_commit_id_short()' \
+        'commit_id = "${finalAttrs.version}"'
+
+    # setuptools runs setup.py twice (metadata + wheel). prepare_packaging()
+    # copies 3rdparty/ (with nix store read-only files) into aiter_meta/, then
+    # the second run can't rmtree or overwrite them.
+    substituteInPlace setup.py \
+      --replace-fail \
+        $'prepare_packaging()\n\n\nclass' \
+        $'if not os.path.exists("aiter_meta"): prepare_packaging()\n\n\nclass' \
+      --replace-fail \
+        'if os.path.exists("aiter_meta") and os.path.isdir("aiter_meta"):' \
+        'if False:'
+  '';
+
+  env = {
+    SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+    PREBUILD_KERNELS = "0";
+    BUILD_TARGET = "rocm";
+    ROCM_PATH = "${rocmPackages.clr}";
+    # FIXME does it even matter when PREBUILD_KERNELS is off?
+    GPU_ARCHS = lib.concatStringsSep ";" (lib.lists.intersectLists gpuTargets supportedGpuTargets);
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    packaging
+    psutil
+    pybind11
+    ninja
+    pandas
+  ];
+
+  buildInputs = [ rocmPackages.clr ];
+
+  nativeBuildInputs = [
+    rocmPackages.hipcc
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "aiter" ];
+
+  dependencies = [
+    einops
+    ninja
+    numpy
+    packaging
+    pandas
+    psutil
+    pybind11
+    torch
+  ];
+
+  # Import requires writable $HOME (JIT cache) and ROCm GPU
+  # pythonImportsCheck = [ "aiter" ];
+
+  # Most of the tests require gpu
+  doCheck = false;
+
+  meta = {
+    description = "AI Tensor Engine for ROCm";
+    homepage = "https://github.com/ROCm/aiter";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode
+    ];
+    maintainers = with lib.maintainers; [ lach ];
+    teams = [ lib.teams.rocm ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c14b91280b61..c16a93a2e78d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -722,6 +722,8 @@ self: super: with self; {
 
   amcrest = callPackage ../development/python-modules/amcrest { };
 
+  amd-aiter = callPackage ../development/python-modules/amd-aiter { };
+
   amd-quark = callPackage ../development/python-modules/amd-quark { };
 
   amdsmi = toPythonModule (

From c842253ddda374a3c967c12b1c9f54ec9d57b146 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Fri, 10 Apr 2026 09:36:37 -0700
Subject: [PATCH 49/59] python3Packages.amd-aiter: fix JIT include path, add
 passthru tests

---
 .../python-modules/amd-aiter/default.nix      | 128 ++++++++++++------
 1 file changed, 87 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/python-modules/amd-aiter/default.nix b/pkgs/development/python-modules/amd-aiter/default.nix
index c3f1f3bd9db4..021d39ae5836 100644
--- a/pkgs/development/python-modules/amd-aiter/default.nix
+++ b/pkgs/development/python-modules/amd-aiter/default.nix
@@ -1,40 +1,46 @@
 {
   lib,
+  amd-aiter,
   buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
-  packaging,
-  psutil,
-  pybind11,
   einops,
+  fetchFromGitHub,
   ninja,
   numpy,
+  packaging,
   pandas,
+  psutil,
+  pybind11,
+  python,
   rocmPackages,
+  runCommand,
+  setuptools,
+  setuptools-scm,
   torch,
   writableTmpDirAsHomeHook,
-
-  gpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
-  # From validate_and_update_archs at https://github.com/ROCm/aiter/blob/main/aiter/jit/core.py
-  supportedGpuTargets ? [
-    "gfx90a"
-    "gfx940"
-    "gfx941"
-    "gfx942"
-    "gfx1100"
-    "gfx1101"
-    "gfx1102"
-    "gfx1103"
-    "gfx1150"
-    "gfx1151"
-    "gfx1152"
-    "gfx1153"
-    "gfx1200"
-    "gfx1201"
-    "gfx950"
-  ],
 }:
+let
+  # Provide a default set of include paths needed by aiter at runtime for JIT modules
+  defaultRocmIncl = lib.makeIncludePath (
+    (with rocmPackages; [
+      clr
+      hipblas
+      hipblas-common
+      hipblaslt
+      hipcub
+      hipfft
+      hipsolver
+      hipsparse
+      rocblas
+      rocprim
+      rocsolver
+      rocsparse
+      rocthrust
+    ])
+    ++ [
+      pybind11
+    ]
+  );
+in
 buildPythonPackage (finalAttrs: {
   pname = "amd-aiter";
   version = "0.1.11.post1";
@@ -51,7 +57,6 @@ buildPythonPackage (finalAttrs: {
     rmdir 3rdparty/composable_kernel
     ln -sf ${rocmPackages.composable_kernel.src} 3rdparty/composable_kernel
 
-    # python relax deps hook?
     substituteInPlace pyproject.toml \
       --replace-fail '"flydsl==0.0.1.dev95158637"' ""
 
@@ -62,6 +67,13 @@ buildPythonPackage (finalAttrs: {
         'commit_id = get_git_commit_id_short()' \
         'commit_id = "${finalAttrs.version}"'
 
+    # NIX_AITER_ROCM_INCL is a colon-separated list of include dirs
+    # defaults to packages known to be needed by aiter
+    substituteInPlace aiter/jit/utils/cpp_extension.py \
+      --replace-fail \
+        'paths.append(_join_rocm_home("include"))' \
+        'paths.append(_join_rocm_home("include")); paths.extend(os.environ.get("NIX_AITER_ROCM_INCL", "${defaultRocmIncl}").split(":"))'
+
     # setuptools runs setup.py twice (metadata + wheel). prepare_packaging()
     # copies 3rdparty/ (with nix store read-only files) into aiter_meta/, then
     # the second run can't rmtree or overwrite them.
@@ -75,22 +87,20 @@ buildPythonPackage (finalAttrs: {
   '';
 
   env = {
-    SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-    PREBUILD_KERNELS = "0";
     BUILD_TARGET = "rocm";
+    PREBUILD_KERNELS = "0";
     ROCM_PATH = "${rocmPackages.clr}";
-    # FIXME does it even matter when PREBUILD_KERNELS is off?
-    GPU_ARCHS = lib.concatStringsSep ";" (lib.lists.intersectLists gpuTargets supportedGpuTargets);
+    SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
   };
 
   build-system = [
-    setuptools
-    setuptools-scm
+    ninja
     packaging
+    pandas
     psutil
     pybind11
-    ninja
-    pandas
+    setuptools
+    setuptools-scm
   ];
 
   buildInputs = [ rocmPackages.clr ];
@@ -100,8 +110,6 @@ buildPythonPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  pythonImportsCheck = [ "aiter" ];
-
   dependencies = [
     einops
     ninja
@@ -113,12 +121,50 @@ buildPythonPackage (finalAttrs: {
     torch
   ];
 
-  # Import requires writable $HOME (JIT cache) and ROCm GPU
-  # pythonImportsCheck = [ "aiter" ];
-
-  # Most of the tests require gpu
+  # Most tests and imports require a GPU and writable $HOME for JIT cache
   doCheck = false;
 
+  # Test JIT module builds for CDNA3 iff rocm enabled for torch
+  passthru.tests = lib.optionalAttrs torch.rocmSupport (
+    let
+      mkJitTest =
+        name: moduleName:
+        runCommand "amd-aiter-jit-${name}"
+          {
+            nativeBuildInputs = [
+              (python.withPackages (_: [ amd-aiter ]))
+              rocmPackages.clr
+              writableTmpDirAsHomeHook
+            ];
+            env = {
+              CXX = "amdclang++";
+              GPU_ARCHS = "gfx942";
+              PYTORCH_ROCM_ARCH = "gfx942";
+            };
+          }
+          ''
+            export AITER_JIT_DIR=$(mktemp -d)
+            python3 -c "
+            from aiter.jit.core import get_args_of_build, build_module
+            args = get_args_of_build('${moduleName}')
+            build_module(
+                '${moduleName}',
+                args['srcs'], args['flags_extra_cc'], args['flags_extra_hip'],
+                args['blob_gen_cmd'], args['extra_include'], args['extra_ldflags'],
+                args['verbose'], args['is_python_module'], args['is_standalone'],
+                args['torch_exclude'],
+            )
+            print('JIT compile of ${moduleName} finished')
+            "
+            touch $out
+          '';
+    in
+    {
+      jit-module-opus-sort = mkJitTest "opus-sort" "module_moe_sorting_opus";
+      jit-module-mhc = mkJitTest "mhc" "module_mhc";
+    }
+  );
+
   meta = {
     description = "AI Tensor Engine for ROCm";
     homepage = "https://github.com/ROCm/aiter";

From 7409a900400e7178aae120fe4ccadcbf37119e31 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:50:23 -0700
Subject: [PATCH 50/59] limesuite: migrate to by-name

---
 .../default.nix => by-name/li/limesuite/package.nix} |  0
 pkgs/by-name/li/limesuiteWithGui/package.nix         |  7 +++++++
 pkgs/top-level/all-packages.nix                      | 12 ------------
 3 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{applications/radio/limesuite/default.nix => by-name/li/limesuite/package.nix} (100%)
 create mode 100644 pkgs/by-name/li/limesuiteWithGui/package.nix

diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/by-name/li/limesuite/package.nix
similarity index 100%
rename from pkgs/applications/radio/limesuite/default.nix
rename to pkgs/by-name/li/limesuite/package.nix
diff --git a/pkgs/by-name/li/limesuiteWithGui/package.nix b/pkgs/by-name/li/limesuiteWithGui/package.nix
new file mode 100644
index 000000000000..3c6de9daaaad
--- /dev/null
+++ b/pkgs/by-name/li/limesuiteWithGui/package.nix
@@ -0,0 +1,7 @@
+{
+  limesuite,
+}:
+
+limesuite.override {
+  withGui = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbd14bed93e4..61809863fdeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2865,18 +2865,6 @@ with pkgs;
 
   licensee = callPackage ../tools/package-management/licensee { };
 
-  inherit
-    ({
-      limesuite = callPackage ../applications/radio/limesuite {
-      };
-      limesuiteWithGui = limesuite.override {
-        withGui = true;
-      };
-    })
-    limesuite
-    limesuiteWithGui
-    ;
-
   linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };
 
   liquidctl = with python3Packages; toPythonApplication liquidctl;

From 75fef8b911b1bc6f28fb0faa40bfaaf8838d0380 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:57:56 -0700
Subject: [PATCH 51/59] soapysdr: migrate to by-name

---
 .../so/soapysdr-with-plugins/package.nix      | 34 +++++++++++++++++++
 .../so/soapysdr/package.nix}                  |  0
 pkgs/top-level/all-packages.nix               | 18 ----------
 3 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/so/soapysdr-with-plugins/package.nix
 rename pkgs/{applications/radio/soapysdr/default.nix => by-name/so/soapysdr/package.nix} (100%)

diff --git a/pkgs/by-name/so/soapysdr-with-plugins/package.nix b/pkgs/by-name/so/soapysdr-with-plugins/package.nix
new file mode 100644
index 000000000000..7a15466cf6b8
--- /dev/null
+++ b/pkgs/by-name/so/soapysdr-with-plugins/package.nix
@@ -0,0 +1,34 @@
+{
+  stdenvNoCC,
+  lib,
+  soapysdr,
+  limesuite,
+  soapyairspy,
+  soapyaudio,
+  soapybladerf,
+  soapyhackrf,
+  soapyplutosdr,
+  soapyremote,
+  soapyrtlsdr,
+  soapyuhd,
+  python ? null,
+  usePython ? false,
+}:
+
+soapysdr.override {
+  extraPackages = [
+    limesuite
+    soapyairspy
+    soapyaudio
+    soapybladerf
+    soapyhackrf
+    soapyplutosdr
+    soapyremote
+    soapyrtlsdr
+  ]
+  ++ (lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    soapyuhd
+  ]);
+
+  inherit python usePython;
+}
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/by-name/so/soapysdr/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapysdr/default.nix
rename to pkgs/by-name/so/soapysdr/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61809863fdeb..0c47dbaef155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7380,24 +7380,6 @@ with pkgs;
     scheme = guile;
   };
 
-  soapysdr = callPackage ../applications/radio/soapysdr { };
-
-  soapysdr-with-plugins = callPackage ../applications/radio/soapysdr {
-    extraPackages = [
-      limesuite
-      soapyairspy
-      soapyaudio
-      soapybladerf
-      soapyhackrf
-      soapyplutosdr
-      soapyremote
-      soapyrtlsdr
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isLinux [
-      soapyuhd
-    ]);
-  };
-
   spandsp = callPackage ../development/libraries/spandsp { };
   spandsp3 = callPackage ../development/libraries/spandsp/3.nix { };
 

From acdc000ae969b849922510889a7a5fae63cb96b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 02:33:26 +0000
Subject: [PATCH 52/59] terraform-providers.baidubce_baiducloud: 1.22.25 ->
 1.23.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7ed19826dd1f..f176c25ec75d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -101,11 +101,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-5OwkxWisWpnPF0wwjmqb3OKBw+a9ypSQUKRSB06EC0I=",
+    "hash": "sha256-Pdtt5XY0XbnEP8qmq0Y2xDS++IGFLBYmfR/BlUDOCbU=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.25",
+    "rev": "v1.23.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 887130c6e8fa5bdf2da9470513e18e74d36277e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 02:47:01 +0000
Subject: [PATCH 53/59] python3Packages.pycaption: 2.2.20 -> 2.2.21

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

diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index ea83e9dead9d..ee577817e98a 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pycaption";
-  version = "2.2.20";
+  version = "2.2.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pbs";
     repo = "pycaption";
     tag = version;
-    hash = "sha256-SDUTQ2oYLstFHw0rO9I3jeKIfEoAU7we66Uj4+vTXyE=";
+    hash = "sha256-kcxsbxqupXzW1VIxIxEjorp4m936d93iAtyfCei30Lg=";
   };
 
   build-system = [ setuptools ];

From 26c4cf808ada77fc1748c8361035e4900656bfd6 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:47 +0200
Subject: [PATCH 54/59] electron_39-bin: 39.8.7 -> 39.8.9

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.7...v39.8.9
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6312
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 4c4791aeba72..846449f3fdb9 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "86fa117ba10e36149ca33d7c22de2cfc3fb7490ca88b07ce953d2efe1f2a41cd",
-            "aarch64-linux": "fd721650a0e25829b76d307e944383be828533cdddd53e44a0b772e96e3e019b",
-            "armv7l-linux": "5d0a75a53cdba1ecfc678910084802fe500f13f470310ae1d2c66840d3c7390b",
-            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "5dfe5559fd283c3962221c674b30a5b986895b644b1b4bc179e0c7673a14f1cf",
-            "x86_64-linux": "233b2775f1c46e5ebd5afeb4fb95ce9fda61229bad20aef1031468eb54b3656e"
+            "aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa",
+            "aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97",
+            "armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40",
+            "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
+            "x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d",
+            "x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33"
         },
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "hashes": {

From 27fa3902f63794cf9a10cb215cc385f6d486d0b3 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:49 +0200
Subject: [PATCH 55/59] electron-chromedriver_39: 39.8.7 -> 39.8.9

- Changelog: https://github.com/electron/electron/releases/tag/v39.8.9
- Diff: https://github.com/electron/electron/compare/refs/tags/v39.8.7...v39.8.9
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6312
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index acbf58fdf2d5..33849fbd99a9 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "2e2a3533f9969ded3b11eb0baa5357abeb652975d9bcaea0b0725c9bd0866061",
-            "aarch64-linux": "a8caf72372eb47deb336dc440eb183c30d228b3fef5349dac7571d86103f117c",
-            "armv7l-linux": "5d5f02b2e28e8328435d2fd83207098e69dc3e5fecbbbdc2612792370ab2c4ec",
-            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "c74882bcbdd53f6e8cd65906809ac446bb032dce3ce8f109e2376d49b9b394ee",
-            "x86_64-linux": "e336dc2dce9d11d44f6eb5b5cc655d3311a9a109ea184625da3ac51181c3ad27"
+            "aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf",
+            "aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3",
+            "armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6",
+            "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
+            "x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69",
+            "x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14"
         },
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "hashes": {

From 69c17264a090f13370a36d7dc0278fd27e5f5b75 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:52 +0200
Subject: [PATCH 56/59] electron_40-bin: 40.8.5 -> 40.9.2

- Changelog: https://github.com/electron/electron/releases/tag/v40.9.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.5...v40.9.2
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 846449f3fdb9..6d0fa7474876 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "7a400c28aeba7bdf691ff03d2a620b76c7f8c75fdfac1f4543a8dc13b039fa24",
-            "aarch64-linux": "5af0073c52a8dc729e118340b5f50c4b2932bd94ba992e1c5380fe1545330373",
-            "armv7l-linux": "8f65d16758cdec2d4474732fb60e1f28e1829b4ee7ba67fcb9b5b6510652e667",
-            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "2600d89b2ffa452bb5dc2fe11f0f7719ae001273f6f6c68988140986e5f95508",
-            "x86_64-linux": "3bce6ee4e4e481f7ce6d0be384f6c539ce16e0b9b7f46115aec6516770f6c26d"
+            "aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7",
+            "aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634",
+            "armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5",
+            "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
+            "x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0",
+            "x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8"
         },
-        "version": "40.8.5"
+        "version": "40.9.2"
     },
     "41": {
         "hashes": {

From d7c2e8759fe26c3bc5abb4cffd43f85ad17e095e Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:54 +0200
Subject: [PATCH 57/59] electron-chromedriver_40: 40.8.5 -> 40.9.2

- Changelog: https://github.com/electron/electron/releases/tag/v40.9.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v40.8.5...v40.9.2
- Fixes CVE-2026-6296
- Fixes CVE-2026-6297
- Fixes CVE-2026-6298
- Fixes CVE-2026-6299
- Fixes CVE-2026-6300
- Fixes CVE-2026-6301
- Fixes CVE-2026-6302
- Fixes CVE-2026-6303
- Fixes CVE-2026-6304
- Fixes CVE-2026-6305
- Fixes CVE-2026-6306
- Fixes CVE-2026-6307
- Fixes CVE-2026-6308
- Fixes CVE-2026-6309
- Fixes CVE-2026-6311
- Fixes CVE-2026-6313
- Fixes CVE-2026-6314
- Fixes CVE-2026-6316
- Fixes CVE-2026-6318
- Fixes CVE-2026-6358
- Fixes CVE-2026-6359
- Fixes CVE-2026-6360
- Fixes CVE-2026-6361
- Fixes CVE-2026-6362
- Fixes CVE-2026-6363
- Fixes CVE-2026-6364
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 33849fbd99a9..f738307d6df1 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "60a199b111b7cb032f6400371064cfa75457c13fd1699aa25dae2ca780e10b63",
-            "aarch64-linux": "6dec383c6f0779daffdd7b8e106d7a4261bc798acf7c250195a98de79f0e92d5",
-            "armv7l-linux": "57304ae9d455ba9be1fc079138ccaa1c4f168dece10aec970477beea7b92270f",
-            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "6e774f3ae2d69accc3745e09f39fce6dc18d7cbe63e2698dfb7f36a2881b2f05",
-            "x86_64-linux": "804d1cd1c20c44691e071a2f9a25e42cfd28f4ccfd4368552072e37ad18ad807"
+            "aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528",
+            "aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107",
+            "armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4",
+            "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
+            "x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a",
+            "x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432"
         },
-        "version": "40.8.5"
+        "version": "40.9.2"
     },
     "41": {
         "hashes": {

From 34b9596a5933b689a5addb5630fcc753c589945c Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:57 +0200
Subject: [PATCH 58/59] electron_41-bin: 41.2.0 -> 41.3.0

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

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 6d0fa7474876..315ec0c2a500 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "e018684f96c873415fbea4713fc7db96b6d1e2bd3db4513e2b8c1887ec83a719",
-            "aarch64-linux": "f8983c877df8f2b93c76d35e45af9df82c9eb5f294b183f8fe5930e5155fdc4e",
-            "armv7l-linux": "71e8db75ab19d3c403c5476fdec120bbd19750b0c4cbe9086ff729e0e0c712c4",
-            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
-            "x86_64-darwin": "fb3750bcfccc0146065708bf065288252da02489d51414a6d5b77d04f94a3f2a",
-            "x86_64-linux": "fb0b31f5bb2b248d571c08ab57437c08a69b57f63ccdf9e55d6692b6132848d4"
+            "aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0",
+            "aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a",
+            "armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c",
+            "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
+            "x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737",
+            "x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2"
         },
-        "version": "41.2.0"
+        "version": "41.3.0"
     }
 }

From 7b204c047fe214032c3ad740d533c04912cf6d27 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Fri, 24 Apr 2026 08:18:59 +0200
Subject: [PATCH 59/59] electron-chromedriver_41: 41.2.0 -> 41.3.0

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

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index f738307d6df1..6dd2fa8085d3 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "9f8e18fec80a8a93d123549e379f1524c61bdd7c005d90a4df02a5aa5c9b779b",
-            "aarch64-linux": "83c9570411fb2ed83548b08b1a95928a3828ecb5f8a5f7c862f4188611420614",
-            "armv7l-linux": "217ffd04268cd8f459e1f6be0cd81431f45a04af3175073e0e56a4f15068e372",
-            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
-            "x86_64-darwin": "9e7fc8ded16d5f4c82373a4b048d48beec8529b6126bad188f08fc7923f8b40d",
-            "x86_64-linux": "84009c924c7e5feabee8066f7dbf54abf1997d033d9156a6a36e3b8cf9f0b148"
+            "aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16",
+            "aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5",
+            "armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee",
+            "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
+            "x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9",
+            "x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f"
         },
-        "version": "41.2.0"
+        "version": "41.3.0"
     }
 }