From 4a7e14bf851605d35468a37b635bdff5d2fd94bb Mon Sep 17 00:00:00 2001
From: roconnor <roconnor@r6.ca>
Date: Tue, 30 Dec 2025 13:41:22 -0500
Subject: [PATCH 001/316] bitcoin: Remove libsodium transistive dependency from
 bitcoin

The official binaries for bitcoin-core explicitly configure their dependencies to minimize them.
In this commit we bring the zeromq dependency closer to

    https://github.com/bitcoin/bitcoin/blob/94ddc2dced5736612e358a3b80f2bc718fbd8161/depends/packages/zeromq.mk

In particular, libsodium is no longer a runtime dependency of bitcoin.
---
 pkgs/by-name/ze/zeromq/package.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix    |  8 ++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ze/zeromq/package.nix b/pkgs/by-name/ze/zeromq/package.nix
index cc6869e87bc9..b8aafdf9e5e2 100644
--- a/pkgs/by-name/ze/zeromq/package.nix
+++ b/pkgs/by-name/ze/zeromq/package.nix
@@ -4,11 +4,13 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libsodium,
+  libsodium ? null,
   asciidoc,
   xmlto,
+  enableCurve ? true,
   enableDrafts ? false,
   fetchpatch,
+  withLibsodium ? libsodium != null,
   # for passthru.tests
   azmq,
   cppzmq,
@@ -61,13 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
     xmlto
   ];
 
-  buildInputs = [ libsodium ];
+  buildInputs = lib.optionals withLibsodium [ libsodium ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
-    (lib.cmakeBool "ENABLE_CURVE" true)
+    (lib.cmakeBool "ENABLE_CURVE" enableCurve)
     (lib.cmakeBool "ENABLE_DRAFTS" enableDrafts)
-    (lib.cmakeBool "WITH_LIBSODIUM" true)
+    (lib.cmakeBool "WITH_LIBSODIUM" withLibsodium)
   ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1ad51ba358c..276783503a35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12546,12 +12546,16 @@ with pkgs;
 
   bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin {
     withGui = true;
+    zeromq = zeromq.override {
+      enableCurve = false;
+      enableDrafts = false;
+      libsodium = null;
+    };
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  bitcoind = callPackage ../applications/blockchains/bitcoin {
+  bitcoind = bitcoin.override {
     withGui = false;
-    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   bitcoin-knots = libsForQt5.callPackage ../applications/blockchains/bitcoin-knots {

From 57b26dec73a9f26c301322e4ceec0618a51994aa Mon Sep 17 00:00:00 2001
From: roconnor <roconnor@r6.ca>
Date: Sun, 28 Dec 2025 09:50:54 -0500
Subject: [PATCH 002/316] bitcoin: Remove zlib transistive dependency from
 bitcoin

The official binaries for bitcoin-core explicitly configure their dependencies to minimize them.
In this commit we remove zlib from the sqlite dependency to stop it propogating to bitcoin.
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 276783503a35..6ea6a0e2be14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12546,6 +12546,9 @@ with pkgs;
 
   bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin {
     withGui = true;
+    sqlite = sqlite.override {
+      zlib = null;
+    };
     zeromq = zeromq.override {
       enableCurve = false;
       enableDrafts = false;

From ac8124497c83b46837a1f12e9211e5642c7df243 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Feb 2026 01:35:03 +0000
Subject: [PATCH 003/316] hockeypuck: 2.1.0 -> 2.3.2

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

diff --git a/pkgs/by-name/ho/hockeypuck/package.nix b/pkgs/by-name/ho/hockeypuck/package.nix
index a79bbf3f1186..095d6d02990f 100644
--- a/pkgs/by-name/ho/hockeypuck/package.nix
+++ b/pkgs/by-name/ho/hockeypuck/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "hockeypuck";
-  version = "2.1.0";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "hockeypuck";
     repo = "hockeypuck";
     rev = finalAttrs.version;
-    sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
+    sha256 = "sha256-m1PI6YRFf2ZKvtsGtmTcERiB/7aZdhAcQODREb2K7ro=";
   };
 
   modRoot = "src/hockeypuck/";

From d09dda8038d75eeb2bb3b24b700c1be5758f86c4 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 03:29:35 +0200
Subject: [PATCH 004/316] sddm-astronaut: refactor

- Drop rec
- Move local let variables to global let
- Inline homepage URL
---
 pkgs/by-name/sd/sddm-astronaut/package.nix | 44 ++++++++++------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index 330c0ca4f122..45c69844946b 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -7,7 +7,12 @@
   themeConfig ? null,
   embeddedTheme ? "astronaut",
 }:
-stdenvNoCC.mkDerivation rec {
+let
+  configFile = (formats.ini { }).generate "" { General = themeConfig; };
+  basePath = "$out/share/sddm/themes/sddm-astronaut-theme";
+  sedString = "ConfigFile=Themes/";
+in
+stdenvNoCC.mkDerivation {
   pname = "sddm-astronaut";
   version = "1.0-unstable-2025-01-05";
 
@@ -26,34 +31,25 @@ stdenvNoCC.mkDerivation rec {
     qtvirtualkeyboard
   ];
 
-  installPhase =
-    let
-      iniFormat = formats.ini { };
-      configFile = iniFormat.generate "" { General = themeConfig; };
+  installPhase = ''
+    mkdir -p ${basePath}
+    cp -r $src/* ${basePath}
+  ''
+  + lib.optionalString (embeddedTheme != "astronaut") ''
 
-      basePath = "$out/share/sddm/themes/sddm-astronaut-theme";
-      sedString = "ConfigFile=Themes/";
-    in
-    ''
-      mkdir -p ${basePath}
-      cp -r $src/* ${basePath}
-    ''
-    + lib.optionalString (embeddedTheme != "astronaut") ''
-
-      # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9.
-      # ConfigFile=Themes/astronaut.conf.
-      sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop
-    ''
-    + lib.optionalString (themeConfig != null) ''
-      chmod u+w ${basePath}/Themes/
-      ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user
-    '';
+    # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9.
+    # ConfigFile=Themes/astronaut.conf.
+    sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop
+  ''
+  + lib.optionalString (themeConfig != null) ''
+    chmod u+w ${basePath}/Themes/
+    ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user
+  '';
 
   meta = {
     description = "Modern looking qt6 sddm theme";
-    homepage = "https://github.com/${src.owner}/${src.repo}";
+    homepage = "https://github.com/Keyitdev/sddm-astronaut-theme";
     license = lib.licenses.gpl3;
-
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       danid3v

From 5bc013aed0f64d5513c0b537dd5e9fe67792489f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 03:29:47 +0200
Subject: [PATCH 005/316] sddm-astronaut: add nix-update-script with version
 branch

---
 pkgs/by-name/sd/sddm-astronaut/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index 45c69844946b..f322551d64c6 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   kdePackages,
   formats,
+  nix-update-script,
   themeConfig ? null,
   embeddedTheme ? "astronaut",
 }:
@@ -46,6 +47,8 @@ stdenvNoCC.mkDerivation {
     ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user
   '';
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
   meta = {
     description = "Modern looking qt6 sddm theme";
     homepage = "https://github.com/Keyitdev/sddm-astronaut-theme";

From 569391490853cb90f4e52f55df7eee9f9ba2d38c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 03:30:02 +0200
Subject: [PATCH 006/316] sddm-astronaut: 1.0-unstable-2025-01-05 ->
 0-unstable-2025-12-06

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

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index f322551d64c6..e9d40df6b35a 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -15,13 +15,13 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "sddm-astronaut";
-  version = "1.0-unstable-2025-01-05";
+  version = "0-unstable-2025-12-06";
 
   src = fetchFromGitHub {
     owner = "Keyitdev";
     repo = "sddm-astronaut-theme";
-    rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3";
-    hash = "sha256-gBSz+k/qgEaIWh1Txdgwlou/Lfrfv3ABzyxYwlrLjDk=";
+    rev = "d73842c761f7d7859f3bdd80e4360f09180fad41";
+    hash = "sha256-+94WVxOWfVhIEiVNWwnNBRmN+d1kbZCIF10Gjorea9M=";
   };
 
   dontWrapQtApps = true;

From 0415b16d1f0562b7bfdce74574b29c1b829d07b1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 03:30:13 +0200
Subject: [PATCH 007/316] sddm-astronaut: add qweered as maintainer

---
 pkgs/by-name/sd/sddm-astronaut/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index e9d40df6b35a..47690d708fa5 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation {
     maintainers = with lib.maintainers; [
       danid3v
       uxodb
+      qweered
     ];
   };
 }

From f05295674ba68ce2ea091b63075ee2f8bc310e57 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 20 Feb 2026 04:01:49 +0200
Subject: [PATCH 008/316] sddm-astronaut: avoid .dev outputs propagation

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

diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
index 47690d708fa5..ebee2033d09d 100644
--- a/pkgs/by-name/sd/sddm-astronaut/package.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -27,9 +27,10 @@ stdenvNoCC.mkDerivation {
   dontWrapQtApps = true;
 
   propagatedBuildInputs = with kdePackages; [
-    qtsvg
-    qtmultimedia
-    qtvirtualkeyboard
+    # avoid .dev outputs propagation
+    qtsvg.out
+    qtmultimedia.out
+    qtvirtualkeyboard.out
   ];
 
   installPhase = ''

From c971eead70dea41bb9e30660e4fa74da39b71b14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Feb 2026 08:18:07 +0000
Subject: [PATCH 009/316] ov: 0.50.2 -> 0.51.1

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

diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index 06294835c3b0..0588d876d4fb 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ov";
-  version = "0.50.2";
+  version = "0.51.1";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tmGOyafVocbeEfHQcvysBuX/LJO62xRuclQ6Xy+Q1Gs=";
+    hash = "sha256-Wt7XF1/l5WwdlrnFLyJPYoXyaWhE+uF1RAN68iol3qM=";
   };
 
-  vendorHash = "sha256-Y+rNTJoSbTccHVPA/TTQGkkYpYr72WB8gqwzWfqPRH0=";
+  vendorHash = "sha256-rfUE38Wfo29s9GRsg/F/FCIto9yikE4b9QwLxYjvSg8=";
 
   ldflags = [
     "-s"

From a1d3dbb09397fbe33f3dbc536b455f7d512c9966 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Feb 2026 20:02:48 +0000
Subject: [PATCH 010/316] githooks: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix
index c96a85500d13..589ea0e014b5 100644
--- a/pkgs/by-name/gi/githooks/package.nix
+++ b/pkgs/by-name/gi/githooks/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "githooks";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "gabyx";
     repo = "githooks";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw=";
+    hash = "sha256-aVrMM7gZF7o6WR2/8SEsfLFsqTSbXpr7UtcSB+eO/oQ=";
   };
 
   modRoot = "./githooks";

From 22b889f9d6a2f8ba83775d8d64d9075c72b93ea7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Feb 2026 19:57:00 +0000
Subject: [PATCH 011/316] goose: 3.26.0 -> 3.27.0

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

diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index 02e59578d690..27b63ca43ba1 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "goose";
-  version = "3.26.0";
+  version = "3.27.0";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = "goose";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3F9dnlu7fJ08Pcr64q6V3oRkDpm+N0Ot8drRp9m5YhU=";
+    hash = "sha256-wpnheZJ2+xnk8N/hE5Cyf38/yODQC5+SlDml9vH0oRw=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Cpw2xJWWW85LUS5K+KM2fCUISYwLFjsdk0gPRgIZKP4=";
+  vendorHash = "sha256-0G6kE5ScpsIG2hLzZ9hnyig4LuN6rTdwirR+ldC2+ps=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''

From dd8adf0f6d6726ed5418e65302fb8737b6e1c3af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2026 12:31:32 +0000
Subject: [PATCH 012/316] xe-guest-utilities: 8.4.0 -> 10.0.0

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

diff --git a/pkgs/by-name/xe/xe-guest-utilities/package.nix b/pkgs/by-name/xe/xe-guest-utilities/package.nix
index 41f7ee34b7fb..34090fe878b0 100644
--- a/pkgs/by-name/xe/xe-guest-utilities/package.nix
+++ b/pkgs/by-name/xe/xe-guest-utilities/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "xe-guest-utilities";
-  version = "8.4.0";
+  version = "10.0.0";
 
   src = fetchFromGitHub {
     owner = "xenserver";
     repo = "xe-guest-utilities";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LpZx+Km2qRywYK/eFLP3aCDku6K6HC4+MzEODH+8Gvs=";
+    hash = "sha256-U4s2g5hB0vQ4cI58/GtFbWpWgP4I+GZ/OLYI55Sw4wI=";
   };
 
   nativeBuildInputs = [

From 4543182ba2b5ebd69032143cb639678134ee248e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 09:35:42 +0000
Subject: [PATCH 013/316] velero: 1.17.2 -> 1.18.0

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

diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index b15c3271e71d..dca03d5b72b2 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "velero";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cDOsLwSp7VtHeylgDGhotBn1VN2HzBEq1kZsx7wN2r8=";
+    hash = "sha256-LhoJDIK0S3w2RTpMC7QDcU1nHMUk4rNZSCY/1Wfiaqc=";
   };
 
   ldflags = [
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
   ];
 
-  vendorHash = "sha256-1ikbyWXK3jL4I+FxiqOsvPvqk+/DIndc4myTajDxFko=";
+  vendorHash = "sha256-lSzUbHm9xqvflZa3uSRv5yzSbSnmYc29bBkOl4oW+Jw=";
 
   excludedPackages = [
     "issue-template-gen"

From eaf6c3747309572fe334769383e49fedaa1cbf1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2026 03:52:49 +0000
Subject: [PATCH 014/316] risor: 1.8.1 -> 2.1.0

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

diff --git a/pkgs/by-name/ri/risor/package.nix b/pkgs/by-name/ri/risor/package.nix
index 4f08e91a481e..cd582f7d5ff9 100644
--- a/pkgs/by-name/ri/risor/package.nix
+++ b/pkgs/by-name/ri/risor/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "risor";
-  version = "1.8.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "risor-io";
     repo = "risor";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vw0fslKtBGdL6BjzNYzGRneQ+jtNDvAymlUxNa0lKZ8=";
+    hash = "sha256-SXUaSJmtWul4LYRdoxv4lXBB4HHp62xrWbEchI691YY=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-yVvryqPB35Jc3MXIJyRlFhAHU8H8PmSs60EO/JABHDs=";
+  vendorHash = "sha256-WUvCzdDSsCan4K568k53oveYIzFQCxFi2B9gQEaeFEM=";
 
   subPackages = [
     "cmd/risor"

From 262f3f23bad5b1a9db60232976ec0549f60a3ca8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2026 19:56:35 +0000
Subject: [PATCH 015/316] fq: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix
index cb842850bd83..b4fd41668921 100644
--- a/pkgs/by-name/fq/fq/package.nix
+++ b/pkgs/by-name/fq/fq/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fq";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "wader";
     repo = "fq";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18=";
+    hash = "sha256-rGuUvuq9hZrqt3Uy1s1he8O+c+iF83RU6PsUlatrPcQ=";
   };
 
-  vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8=";
+  vendorHash = "sha256-Iga9g9VMTxtdselFn+8udjtInXWW9sNUfSzIc7OgvbY=";
 
   ldflags = [
     "-s"

From 7842b63d3f3a8983135e07290527d4e16d52eba6 Mon Sep 17 00:00:00 2001
From: sund3RRR <evenquantity@gmail.com>
Date: Tue, 17 Mar 2026 11:03:21 +0300
Subject: [PATCH 016/316] amnezia-vpn: 4.8.14.1 -> 4.8.14.5

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

diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index 4dd29a00faa8..9db6232d93ac 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -68,13 +68,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.14.1";
+  version = "4.8.14.5";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-NZku10mU6Psl03lT4ITYhjWDkKH70RAw+axUuKe22j0=";
+    hash = "sha256-ijo6PC1Be06K8hxvgjybLvU80xEYUPahBV4f5JqabLc=";
     fetchSubmodules = true;
   };
 

From 3053f4ef2e369a7446f8987d7753f826fa7017c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2026 00:47:27 +0000
Subject: [PATCH 017/316] kdePackages.kquickimageedit: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix
index 66dc6981c355..5e2ea565969e 100644
--- a/pkgs/development/libraries/kquickimageedit/default.nix
+++ b/pkgs/development/libraries/kquickimageedit/default.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation rec {
   pname = "kquickimageeditor";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "kquickimageeditor";
     rev = "v${version}";
-    sha256 = "sha256-NhZ9aAZuIk9vUL2X7eivNbEs0zahuQpy8kl6dSdy5Lo=";
+    sha256 = "sha256-MluY8nkMtg1uLAStDZFDxyJoeDrcp3smZ4U5IG5sXMk=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];

From e6e897d3cc40c96874b7dc7a0911d49e3913893a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 20 Mar 2026 23:55:51 +0700
Subject: [PATCH 018/316] goose-cli: 1.23.2 -> 1.28.0

---
 pkgs/by-name/go/goose-cli/fetchers.nix    | 21 +++++++++++++++++++
 pkgs/by-name/go/goose-cli/librusty_v8.nix | 12 +++++++++++
 pkgs/by-name/go/goose-cli/package.nix     | 25 ++++++++++++++++++-----
 3 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/go/goose-cli/fetchers.nix
 create mode 100644 pkgs/by-name/go/goose-cli/librusty_v8.nix

diff --git a/pkgs/by-name/go/goose-cli/fetchers.nix b/pkgs/by-name/go/goose-cli/fetchers.nix
new file mode 100644
index 000000000000..5fa6745ed073
--- /dev/null
+++ b/pkgs/by-name/go/goose-cli/fetchers.nix
@@ -0,0 +1,21 @@
+# not a stable interface, do not reference outside the goose-cli package but make a
+# copy if you need
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+{
+  fetchLibrustyV8 =
+    args:
+    fetchurl {
+      name = "librusty_v8-${args.version}";
+      url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
+      sha256 = args.shas.${stdenv.hostPlatform.system};
+      meta = {
+        inherit (args) version;
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+      };
+    };
+}
diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix
new file mode 100644
index 000000000000..3ace8f706ca8
--- /dev/null
+++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix
@@ -0,0 +1,12 @@
+# auto-generated file -- DO NOT EDIT!
+{ fetchLibrustyV8 }:
+
+fetchLibrustyV8 {
+  version = "145.0.0"; # From source's Cargo.lock
+  shas = {
+    x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
+    aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
+    x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
+    aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
+  };
+}
diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index acc6820fa763..e96740633413 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -1,17 +1,23 @@
 {
   lib,
   stdenv,
+  callPackage,
   fetchFromGitHub,
   fetchurl,
   rustPlatform,
+  cmake,
   dbus,
   libxcb,
   pkg-config,
   protobuf,
   openssl,
+  cacert,
   writableTmpDirAsHomeHook,
   nix-update-script,
   llvmPackages,
+  librusty_v8 ? callPackage ./librusty_v8.nix {
+    inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
+  },
 }:
 
 let
@@ -28,16 +34,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "goose-cli";
-  version = "1.23.2";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "goose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zwb3y9XhtmKxJG6XOIHl49YVZMBsYtOPePM7heJfEvE=";
+    hash = "sha256-/1TtsnNiLoTkvyeFR282qSpo+Jt3pvFxduJ7lyzsTXI=";
   };
 
-  cargoHash = "sha256-G6Jok2OfSlOVlkF62gxivrKM0VlGqWFNdR0pQh79A0Q=";
+  cargoHash = "sha256-bhnbSjGqyWbQd5PjZ116JH91vjVy6R/+iBlNKL6debg=";
 
   cargoBuildFlags = [
     "--bin"
@@ -47,8 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    cmake
     pkg-config
     protobuf
+    rustPlatform.bindgenHook
   ];
 
   buildInputs = [
@@ -57,7 +65,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
 
-  env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
+  env = {
+    LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
+    RUSTY_V8_ARCHIVE = librusty_v8;
+  };
 
   preBuild = ''
     mkdir -p tokenizer_files/Xenova--gpt-4o tokenizer_files/Xenova--claude-tokenizer
@@ -65,7 +76,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s ${claude-tokenizer} tokenizer_files/Xenova--claude-tokenizer/tokenizer.json
   '';
 
-  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    cacert
+  ];
 
   __darwinAllowLocalNetworking = true;
 
@@ -128,6 +142,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       cloudripper
       thardin
       brittonr
+      miniharinn
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

From 6ec1e96e19af8e918b0a875a16685faec994c404 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 21 Mar 2026 00:02:46 +0700
Subject: [PATCH 019/316] goose-cli: add versionCheckHook

---
 pkgs/by-name/go/goose-cli/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index e96740633413..66362484deb1 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -13,6 +13,7 @@
   openssl,
   cacert,
   writableTmpDirAsHomeHook,
+  versionCheckHook,
   nix-update-script,
   llvmPackages,
   librusty_v8 ? callPackage ./librusty_v8.nix {
@@ -131,6 +132,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=test_session_id_propagation_to_llm"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From ae580b011f4abeab1c4ddb3af988393aba126ea2 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 21 Mar 2026 12:53:35 +0700
Subject: [PATCH 020/316] goose-cli: skip broken tests on aarch64-linux

---
 pkgs/by-name/go/goose-cli/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 66362484deb1..382b40566fb6 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -123,6 +123,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=context_mgmt::auto_compact::tests::test_auto_compact_respects_config"
     "--skip=scheduler::tests::test_scheduled_session_has_schedule_id"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Broken on aarch64-linux: request capture races across session_id_propagation_test cases
+    "--skip=test_session_id_matches_across_calls"
+    "--skip=test_session_id_propagation_to_llm"
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--skip=logging::tests::test_log_file_name_no_session"
     "--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_basic"

From 76ec555e9ecbc48e1d3a2014ca0164618598d80d Mon Sep 17 00:00:00 2001
From: Coca <me@coca.codes>
Date: Sun, 22 Mar 2026 06:40:48 +0000
Subject: [PATCH 021/316] space-station-14-launcher:  add dbus

Fixes file dialogs in-game by providing the dependency for the bundled SDL
---
 pkgs/by-name/sp/space-station-14-launcher/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index a777882775ae..a5a5025d689d 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -27,6 +27,7 @@
   libxkbcommon,
   wayland,
   fontconfig,
+  dbus,
   alsaSupport ? stdenv.hostPlatform.isLinux,
   jackSupport ? stdenv.hostPlatform.isLinux,
   pipewireSupport ? stdenv.hostPlatform.isLinux,
@@ -99,6 +100,7 @@ buildDotnetModule rec {
     libxkbcommon
     wayland
     fontconfig.lib
+    dbus
   ]
   ++ lib.optional alsaSupport alsa-lib
   ++ lib.optional jackSupport libjack2

From 2c889f2a8d163d6d927efd3004481029aee151d5 Mon Sep 17 00:00:00 2001
From: Sim-hu <gisa0142@gmail.com>
Date: Sun, 22 Mar 2026 20:34:43 +0900
Subject: [PATCH 022/316] amtterm: fix broken homepage link

The previous homepage at kraxel.org/cgit/amtterm/ returns a 404. The
package source is already fetched from GitHub, so updated the homepage
to match.
---
 pkgs/by-name/am/amtterm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix
index 8e90685b40c3..dd3b15d92bf7 100644
--- a/pkgs/by-name/am/amtterm/package.nix
+++ b/pkgs/by-name/am/amtterm/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Intel AMT® SoL client + tools";
-    homepage = "https://www.kraxel.org/cgit/amtterm/";
+    homepage = "https://github.com/kraxel/amtterm";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };

From d421f81f9a043aff1bd786b368b76c7744fd4f4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 15:14:45 +0000
Subject: [PATCH 023/316] alioth: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index ba8f12cc16f0..21a68f4daf82 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alioth";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "alioth";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VkyR9NOxv5PVuW172Sw2ign6sApDnKTnH2BBlVl6GFk=";
+    hash = "sha256-Ny/YrXHo4qP8NDiRNtXv843RjJKzKFuSH20ZoGp3ODQ=";
   };
 
   # Checks use `debug_assert_eq!`
   checkType = "debug";
 
-  cargoHash = "sha256-NUbu2AL5gD7OOskNGO0pitJaTlgCYxAr6GYyv8nuytI=";
+  cargoHash = "sha256-eWozwXaVtR/3k7w7+tPzK1xlt9/DtvTYC+YPL/A+sU0=";
 
   separateDebugInfo = true;
 

From 1629f9680682a489eb6fd3d77d05d89580057dca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 16:37:36 +0000
Subject: [PATCH 024/316] starcharts: 1.9.1 -> 1.11.0

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

diff --git a/pkgs/by-name/st/starcharts/package.nix b/pkgs/by-name/st/starcharts/package.nix
index cee0e54fcde5..c72904221d21 100644
--- a/pkgs/by-name/st/starcharts/package.nix
+++ b/pkgs/by-name/st/starcharts/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "starcharts";
-  version = "1.9.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "starcharts";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RLGKf5+HqJlZUhA5C3cwDumIhlbXcOr5iitI+7GZPBc=";
+    hash = "sha256-+CP+9lWBL1u8d/7KAtIQunOVJSY30jgV0/mafNN3TWw=";
   };
 
-  vendorHash = "sha256-BlVjGG6dhh7VO9driT0rnpbW6lORojiV+YhrV1Zlj4M=";
+  vendorHash = "sha256-9Z4meJHZeT/eF6WD25tP5CMGB7syxWWqHUTWrW03AME=";
 
   ldflags = [
     "-s"

From 712705a21310a7f814f60e519793ba5851300fbd Mon Sep 17 00:00:00 2001
From: MayNiklas <info@niklas-steffen.de>
Date: Sun, 22 Mar 2026 22:45:04 +0100
Subject: [PATCH 025/316] spoolman: 0.22.1 -> 0.23.1

---
 pkgs/by-name/sp/spoolman/common.nix   |  4 ++--
 pkgs/by-name/sp/spoolman/frontend.nix |  2 +-
 pkgs/by-name/sp/spoolman/package.nix  | 30 ++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sp/spoolman/common.nix b/pkgs/by-name/sp/spoolman/common.nix
index a6c8908b81b1..95b160cba3c1 100644
--- a/pkgs/by-name/sp/spoolman/common.nix
+++ b/pkgs/by-name/sp/spoolman/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 let
-  version = "0.22.1";
+  version = "0.23.1";
 in
 {
   inherit version;
@@ -9,7 +9,7 @@ in
     owner = "Donkie";
     repo = "Spoolman";
     rev = "v${version}";
-    hash = "sha256-EVGpwcjEh4u8Vtgu2LypqMqArYLZe7oh1qYhGZpgjh0=";
+    hash = "sha256-Oa/cNmpc0hWRf0EQI5aXIE/p9//Sos5Nj3QFEjKgj5o=";
   };
 
   meta = {
diff --git a/pkgs/by-name/sp/spoolman/frontend.nix b/pkgs/by-name/sp/spoolman/frontend.nix
index 9386853458e0..87d5f474f2ca 100644
--- a/pkgs/by-name/sp/spoolman/frontend.nix
+++ b/pkgs/by-name/sp/spoolman/frontend.nix
@@ -10,7 +10,7 @@ buildNpmPackage {
 
   src = "${common.src}/client";
 
-  npmDepsHash = "sha256-E4DvEOSHfwwM0C+vTRMDQbCNv2IDyFOFwfqszrI+uOA=";
+  npmDepsHash = "sha256-8ojD7xMxRE9+b4O7vJdwKwrg8aYukYc3l+LF5enKFgA=";
 
   VITE_APIURL = "/api/v1";
 
diff --git a/pkgs/by-name/sp/spoolman/package.nix b/pkgs/by-name/sp/spoolman/package.nix
index f31ed152bb19..6d91dfd2d56a 100644
--- a/pkgs/by-name/sp/spoolman/package.nix
+++ b/pkgs/by-name/sp/spoolman/package.nix
@@ -10,6 +10,13 @@ let
   common = callPackage ./common.nix { };
   frontend = callPackage ./frontend.nix { };
   python = python312;
+  hishel_0_1 = python.pkgs.hishel.overrideAttrs (old: rec {
+    version = "0.1.5";
+    src = old.src.override {
+      tag = version;
+      hash = "sha256-OyQR/ruowNk5z4ITRHcIJn1kc0xLZiofmxajf6hNR9k=";
+    };
+  });
 in
 
 python.pkgs.buildPythonPackage rec {
@@ -21,22 +28,39 @@ python.pkgs.buildPythonPackage rec {
 
   nativeBuildInputs = [
     makeWrapper
-    python.pkgs.pdm-backend
+    python.pkgs.setuptools
     python.pkgs.pythonRelaxDepsHook
   ];
 
-  pythonRelaxDeps = [ "setuptools" ];
+  pythonRelaxDeps = [
+    "setuptools"
+    "websockets"
+  ];
 
   postPatch = ''
     substituteInPlace pyproject.toml --replace-fail psycopg2-binary psycopg2
+
+    # upstream removed [build-system] in 0.23.x, causing setuptools
+    # to fail on the flat layout with multiple top-level directories
+    cat >> pyproject.toml <<EOF
+
+    [build-system]
+    requires = ["setuptools"]
+    build-backend = "setuptools.build_meta"
+
+    [tool.setuptools.packages.find]
+    include = ["spoolman*"]
+    EOF
   '';
 
   propagatedBuildInputs = with python.pkgs; [
     uvloop
     alembic
+    aiomysql
+    anysqlite
     asyncpg
     fastapi
-    hishel
+    hishel_0_1
     httptools
     httpx
     aiosqlite

From 2851c6124e9496a9388650b4fbe6b7d3f6e08005 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 06:22:33 +0000
Subject: [PATCH 026/316] traefik: 3.7.0-ea.1 -> 3.7.0-ea.2

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

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index 6dba4660da06..7a61e2eb3b3f 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -8,16 +8,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "traefik";
-  version = "3.7.0-ea.1";
+  version = "3.7.0-ea.2";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-WrePvE9zzeUgVCK3zUdETFFJJRNLAONhjf05jg7Ogx0=";
+    hash = "sha256-GxOqCSLKGOg5gC1vFRP1JHgEOEFAe9aAzi4mqjcuv4E=";
     stripRoot = false;
   };
 
-  vendorHash = "sha256-pCk2ujaUW5K7AiwHYO9Q29pQSptLHWG2j6XSeqTABR4=";
+  vendorHash = "sha256-wsqxM4hJh6iZIkUouWItgQOzk52gglawRnyYO8Y5gZs=";
 
   proxyVendor = true;
 

From 93e8c9e165bed4eb28556719056b21b6a36dbd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 11 Feb 2026 21:19:07 +0100
Subject: [PATCH 027/316] command-not-found: enable and default to channel
 release's dbPath

---
 doc/release-notes/rl-2605.section.md          |  2 +
 .../command-not-found/command-not-found.nix   | 58 +++++++++++--------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 54c1f3d750c5..7b829a454fd3 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -101,6 +101,8 @@
 
 - `nodePackages.browserify` has been removed, as it was unmaintained within nixpkgs.
 
+- `command-not-found` package will be enabled by default if the source of nixpkgs contains the file `programs.sqlite`. This is the case if a nixpkgs tarball from https://channels.nixos.org is used. This usage will also make the database of `command-no-found` stateless.
+
 - `nodePackages.sass` has been removed, as it was unmaintained within nixpkgs.
 
 - All `@tailwindcss` packages in the `nodePackages` set have been removed, as they are libraries that should instead be locked by JS projects that utilize them.
diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index d1e8f91a525b..51ec0922c4f7 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -38,8 +38,6 @@ in
         Whether interactive shells should show which Nix package (if
         any) provides a missing command.
 
-        Requires nix-channels to be set and downloaded (sudo nix-channel --update.)
-
         See also nix-index and nix-index-database as an alternative for flakes-based systems.
 
         Additionally, having the env var NIX_AUTO_RUN set will automatically run the matching package, and with NIX_AUTO_RUN_INTERACTIVE it will confirm the package before running.
@@ -47,38 +45,48 @@ in
     };
 
     dbPath = lib.mkOption {
-      default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite";
       description = ''
-        Absolute path to programs.sqlite.
+        Absolute path to `programs.sqlite`, which contains mappings from binary names to package names.
 
-        By default this file will be provided by your channel
-        (nixexprs.tar.xz).
+        If a nixpkgs tarball from https://channels.nixos.org is used as the source of nixpkgs, this file will be provided and this option be set by default.
+
+        To use the stateful `programs.sqlite` database, set this option to
+        `/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite`.
+        If you do so, you can update it with `sudo nix-channels --update`.
       '';
       type = lib.types.path;
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    programs.bash.interactiveShellInit = ''
-      command_not_found_handle() {
-        '${commandNotFound}/bin/command-not-found' "$@"
-      }
-    '';
+  config = lib.mkMerge [
+    {
+      programs.command-not-found = {
+        enable = lib.mkOptionDefault (builtins.pathExists cfg.dbPath);
+        dbPath = pkgs.path + "/programs.sqlite";
+      };
+    }
 
-    programs.zsh.interactiveShellInit = ''
-      command_not_found_handler() {
-        '${commandNotFound}/bin/command-not-found' "$@"
-      }
-    '';
+    (lib.mkIf cfg.enable {
+      programs.bash.interactiveShellInit = ''
+        command_not_found_handle() {
+          '${commandNotFound}/bin/command-not-found' "$@"
+        }
+      '';
 
-    # NOTE: Fish by itself checks for nixos command-not-found, let's instead makes it explicit.
-    programs.fish.interactiveShellInit = ''
-      function fish_command_not_found
-         "${commandNotFound}/bin/command-not-found" $argv
-      end
-    '';
+      programs.zsh.interactiveShellInit = ''
+        command_not_found_handler() {
+          '${commandNotFound}/bin/command-not-found' "$@"
+        }
+      '';
 
-    environment.systemPackages = [ commandNotFound ];
-  };
+      # NOTE: Fish by itself checks for nixos command-not-found, let's instead makes it explicit.
+      programs.fish.interactiveShellInit = ''
+        function fish_command_not_found
+           "${commandNotFound}/bin/command-not-found" $argv
+        end
+      '';
 
+      environment.systemPackages = [ commandNotFound ];
+    })
+  ];
 }

From 81c3814ea7e1adf14aa35cb708aaa2b1b895a86e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 10:43:51 +0000
Subject: [PATCH 028/316] lprobe: 0.1.7 -> 0.1.9

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

diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix
index af19d4b98bdb..56c63b8dde02 100644
--- a/pkgs/by-name/lp/lprobe/package.nix
+++ b/pkgs/by-name/lp/lprobe/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lprobe";
-  version = "0.1.7";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "fivexl";
     repo = "lprobe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5ho5S6zkmA204mUaz/JqWhhuzJl0KwRKmU1lNegwg6c=";
+    hash = "sha256-eR4WJD0Wa1+erwrmZBfH3wD1iSjH9s33nxaO+6bwMGE=";
   };
 
-  vendorHash = "sha256-/Jhfkb2c6GeT9O/buiwKsDbMkPCzQNRXfOcn96sVaJw=";
+  vendorHash = "sha256-kA4vXOOaQicjaoQeQest1NPAXXK4hmMXz2uFo4QGWO8=";
 
   buildInputs = [
     libpcap

From 3e9c65b4f7dea91f6b8a257726e18d608dca06a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 14:49:09 +0000
Subject: [PATCH 029/316] regal: 0.38.1 -> 0.39.0

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

diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index caf8ca8e0041..c41fe92dd7c9 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "regal";
-  version = "0.38.1";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "regal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/WGZCwT9VJ5zjEmL4PZqPymaUJFaWzjbgq2KMBfl6uQ=";
+    hash = "sha256-AqEeHtGO51snFDZU6L4iKBy+kfs/KZRXJSmH/IO9/g0=";
   };
 
-  vendorHash = "sha256-b7Q9eqq/lDykIQ0tkwBWk2ukAoScBTApfwoE2Ubm5iQ=";
+  vendorHash = "sha256-PBDxK26GjjpeqTj4ZmHxVotEB4JCRU2Qbfo8XsisLBc=";
 
   # Only build the main binary, exclude build/lsp/main.go
   subPackages = [ "." ];

From 5a967c01e9fde0071b11b5ecb64199b65553cf86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 15:36:07 +0000
Subject: [PATCH 030/316] conmon-rs: 0.7.3 -> 0.8.0

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

diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix
index 5076edd450ce..1a51e8bada43 100644
--- a/pkgs/by-name/co/conmon-rs/package.nix
+++ b/pkgs/by-name/co/conmon-rs/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "conmon-rs";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon-rs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fs+IcibhyoC5+Sbr9lWtBbb0Sk6Uf+YVockXNbCLXCY=";
+    hash = "sha256-3+W+keg+4XwbtQDps/9FRVPtX3yuR2sQbkoSusDiLmA=";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doCheck = false;
 
-  cargoHash = "sha256-l+FcrLPE+EGb3IEWikUJ1Ak8lOSlYz9WvUffGHzU0tc=";
+  cargoHash = "sha256-shfufw5Ompcp8rv5tnuojEP7t7r7eGTvomPVoFv2AFE=";
 
   meta = {
     description = "OCI container runtime monitor written in Rust";

From b00967b5744870d5c717d6bcf6c078a15f78b77d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 20:37:07 +0000
Subject: [PATCH 031/316] ent-go: 0.14.3 -> 0.14.6

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

diff --git a/pkgs/by-name/en/ent-go/package.nix b/pkgs/by-name/en/ent-go/package.nix
index 6e5063983960..0600a3bc4fd9 100644
--- a/pkgs/by-name/en/ent-go/package.nix
+++ b/pkgs/by-name/en/ent-go/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ent-go";
-  version = "0.14.3";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
     owner = "ent";
     repo = "ent";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rKGzYOdNaSbFyHIuytuppYjpiTz1/tcvXel1SjtwEhA=";
+    sha256 = "sha256-pkD8MYyinvuKCtSpHGfFE9y8GRP40qdeyjhB32yeiK4=";
   };
 
-  vendorHash = "sha256-ec5tA9TsDKGnHVZWilLj7bdHrd46uQcNQ8YCK/s6UAY=";
+  vendorHash = "sha256-CCjZv9ef/F+Cx6qmIkG/isX2Dd8WO/1mtjsJ4d8E3m0=";
 
   patches = [
     # patch in version information so we don't get "version = "(devel)";"

From 4c156745a1d9d5582ad7d5a7f59c74d2b7564ccd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2026 00:59:59 +0000
Subject: [PATCH 032/316] libxfs: 6.17.0 -> 6.19.0

---
 nixos/doc/manual/release-notes/rl-2605.section.md | 3 +++
 pkgs/by-name/xf/xfsprogs/package.nix              | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index d401f76983ea..720d104a7567 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -250,6 +250,9 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
   - SQLite paths are now relative to `service.rootpath` unless absolute. Startup now validates file
     storage and OAuth providers.
 
+- `xfsprogs` was updated to version 6.18.0, which enables parent pointers and exchange-range by default. Upstream recommends not to use these features with kernels older than 6.18.
+   GRUB2 is likely unable to boot from filesystems with these features enabled.
+
 - `lunarvim` package has been removed, as it was abandoned upstream and relied on an old version of `neovim` to work properly.
 
 - `opengfw` package and `services.opengfw` module have been removed as the upstream GitHub repository and website have been shut down.
diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix
index 567261f2521d..ed780f6ecd4c 100644
--- a/pkgs/by-name/xf/xfsprogs/package.nix
+++ b/pkgs/by-name/xf/xfsprogs/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfsprogs";
-  version = "6.17.0";
+  version = "6.19.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Ww9WqB9kEyYmb3Yq6KVjsp2Vzbzag7x5OPaM4SLx7dk=";
+    hash = "sha256-87DXWO04ArIPg4/vxCu/9DHg8N8v4DzVDQqkrYbc0Pw=";
   };
 
   postPatch = ''

From b147b6bdcff549941935cfa3cc3739ce701a4dc7 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 26 Mar 2026 10:38:16 +0100
Subject: [PATCH 033/316] nixos/tests/installer/lvm: use ext4 boot partition

---
 nixos/tests/installer.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 892c066c568b..5e54b9f02634 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1310,7 +1310,7 @@ in
   };
 
   # Create two physical LVM partitions combined into one volume group
-  # that contains the logical swap and root partitions.
+  # that contains the logical swap, boot and root partitions.
   lvm = makeInstallerTest "lvm" {
     createPartitions = ''
       installer.succeed(
@@ -1323,11 +1323,15 @@ in
           "pvcreate /dev/vda1 /dev/vda2",
           "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
           "lvcreate --size 1G --name swap MyVolGroup",
-          "lvcreate --size 6G --name nixos MyVolGroup",
+          "lvcreate --size 1G --name boot MyVolGroup",
+          "lvcreate --size 5G --name nixos MyVolGroup",
           "mkswap -f /dev/MyVolGroup/swap -L swap",
           "swapon -L swap",
+          "mkfs.ext4 -L boot /dev/MyVolGroup/boot",
           "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
           "mount LABEL=nixos /mnt",
+          "mkdir /mnt/boot",
+          "mount LABEL=boot /mnt/boot",
       )
     '';
     extraConfig = optionalString systemdStage1 ''

From ee3125aae27ea38b04744ecc710549f1f8067f0b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 26 Mar 2026 22:39:26 +0700
Subject: [PATCH 034/316] goose-cli: fix missing extension dependencies

---
 pkgs/by-name/go/goose-cli/package.nix | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 382b40566fb6..85f5526c094b 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -16,9 +16,22 @@
   versionCheckHook,
   nix-update-script,
   llvmPackages,
+  makeWrapper,
   librusty_v8 ? callPackage ./librusty_v8.nix {
     inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
   },
+
+  # Extension(s) Dependencies
+  python3,
+  bash,
+  # X11
+  xdotool,
+  wmctrl,
+  xclip,
+  xwininfo,
+  # Wayland
+  wtype,
+  wl-clipboard,
 }:
 
 let
@@ -58,6 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pkg-config
     protobuf
     rustPlatform.bindgenHook
+    makeWrapper
   ];
 
   buildInputs = [
@@ -77,6 +91,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ln -s ${claude-tokenizer} tokenizer_files/Xenova--claude-tokenizer/tokenizer.json
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/goose \
+      --prefix PATH : ${
+        lib.makeBinPath (
+          [
+            bash
+            python3
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [
+            # X11
+            xdotool
+            wmctrl
+            xclip
+            xwininfo
+            # Wayland
+            wtype
+            wl-clipboard
+          ]
+        )
+      }
+  '';
+
   nativeCheckInputs = [
     writableTmpDirAsHomeHook
     cacert

From d9b7c69c3d23087786213146d01996a54f7c24d7 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 26 Mar 2026 22:41:00 +0700
Subject: [PATCH 035/316] goose-cli: add caniko as a maintainer

---
 pkgs/by-name/go/goose-cli/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 85f5526c094b..d0ca81708564 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -189,6 +189,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       thardin
       brittonr
       miniharinn
+      caniko
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

From ea347698ec2cf668248715699b3a3a8779f0fd1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2026 19:08:31 +0000
Subject: [PATCH 036/316] pulumiPackages.pulumi-scala: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix
index 7947e82db3a8..2c9382d91128 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "pulumi-scala";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "VirtusLab";
     repo = "besom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iJLIwc8yVURz7YdL42hJBfvYNpaehJbPIAB51umsLEE=";
+    hash = "sha256-gy/a8xd+Ny47euxQbVxcOlgcJNSP25Cump2NJ63bkV4=";
   };
 
   sourceRoot = "source/language-plugin/pulumi-language-scala";

From aa0ce606782ba6c536dfae5b52b6b502f4707799 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2026 23:51:38 +0000
Subject: [PATCH 037/316] stax: 0.25.1 -> 0.37.0

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

diff --git a/pkgs/by-name/st/stax/package.nix b/pkgs/by-name/st/stax/package.nix
index b77bd71e3590..238d8e0efb8d 100644
--- a/pkgs/by-name/st/stax/package.nix
+++ b/pkgs/by-name/st/stax/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stax";
-  version = "0.25.1";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "cesarferreira";
     repo = "stax";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HHunRVDoijBOcIzj0xknj2O+m+A1nmkkxu97XZcvmJw=";
+    hash = "sha256-8LIc0/z6HJuej9VWMqpW9RTu/kGDQHN59vopDr+iF6w=";
   };
 
   nativeBuildInputs = [ perl ];
 
-  cargoHash = "sha256-cJmK5uX3HCz4own2UtXFkHdGFETjina2/UW18f/g/bA=";
+  cargoHash = "sha256-lOQzFz579p89hDBh3Z7oO2iTITpJG9fFqW/rEq8DwJ0=";
 
   doInstallCheck = true;
   doCheck = false;

From 5b98c50919dcccdd60d7139452bdf8ce99f82932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 21:51:37 +0000
Subject: [PATCH 038/316] ghorg: 1.11.9 -> 1.11.10

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

diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix
index 920a4b293c34..5115f59acb52 100644
--- a/pkgs/by-name/gh/ghorg/package.nix
+++ b/pkgs/by-name/gh/ghorg/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ghorg";
-  version = "1.11.9";
+  version = "1.11.10";
 
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rbbPa1svbGOrjWepPpZyTU+NHdwR2A2nkI1HA/UOhnI=";
+    sha256 = "sha256-LgbvCXmyiNBGTY+IYBWNGThtc00AC2rXelYG8PAFdOg=";
   };
 
   doCheck = false;

From 99f5b563723a3967751140584d3661f391215b3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 18:59:29 +0000
Subject: [PATCH 039/316] sigtop: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/by-name/si/sigtop/package.nix b/pkgs/by-name/si/sigtop/package.nix
index e8fa28ac8c1c..dad47b1a982b 100644
--- a/pkgs/by-name/si/sigtop/package.nix
+++ b/pkgs/by-name/si/sigtop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sigtop";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "tbvdm";
     repo = "sigtop";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EvdO7fGnNdu1/f61c4k2dpeMUqKaq9xKGgevAQ+f3q0=";
+    sha256 = "sha256-HxU0A5t+O3414dIK/dmL1tUz3M7qrN4nQpEQfSmzhmc=";
   };
 
-  vendorHash = "sha256-EAMnuDm3Lmw2i4sumgCTE58JCtMq9QeT6pjtmC/PKMA=";
+  vendorHash = "sha256-qUXevafaUDxtaj+4e7ZxrUtkkX0T2WANp+axXdtQr+A=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsecret ];

From d47e4024287a732ced62e64bcd75f4d2455e5441 Mon Sep 17 00:00:00 2001
From: Nicolas Dumazet <nicdumz.commits@gmail.com>
Date: Tue, 31 Mar 2026 21:52:47 +0200
Subject: [PATCH 040/316] nixos/sddm: fix unit: add RequiresMountsFor for state
 directory

This helps correctness for systems which need to mount particular
directories (impermanence, preservation). This option has no effect if
the system does not need to mount directories / if no mountpoints exist
for this directory or its parents.

Signed-off-by: Nicolas Dumazet <nicdumz.commits@gmail.com>
---
 nixos/modules/services/display-managers/sddm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
index b960c7e63d8d..ec6397179acc 100644
--- a/nixos/modules/services/display-managers/sddm.nix
+++ b/nixos/modules/services/display-managers/sddm.nix
@@ -439,6 +439,10 @@ in
           "plymouth-quit.service"
           "systemd-logind.service"
         ];
+        # sddm stores state in this directory, which should be mounted.
+        unitConfig.RequiresMountsFor = [
+          config.users.users.sddm.home
+        ];
       };
     };
   };

From a8584cb457efd15f402d5d6ce845f5e6aa4e3518 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2026 01:34:27 +0000
Subject: [PATCH 041/316] unpoller: 2.34.0 -> 2.39.0

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

diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index 22e23deead1f..b26af29538e6 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "unpoller";
-  version = "2.34.0";
+  version = "2.39.0";
 
   src = fetchFromGitHub {
     owner = "unpoller";
     repo = "unpoller";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zsWPXO0JgzMJwCvpWA/UzyXyrNJL2wFDstrVKeAZvPo=";
+    hash = "sha256-9cA8SkAfuAOQpA61BzqXVTWoHdAR9JQ6aITNaju20vQ=";
   };
 
-  vendorHash = "sha256-yh2ErDf3YMvA+y52LfdB8u+uR/tW29h35UGB9r5bh8E=";
+  vendorHash = "sha256-7IUdVnM97kuikuUz95Jsl9iSyhJyifaRTj1TonwFRVU=";
 
   ldflags = [
     "-w"

From 052c707c36d3286383ecb99d4516e1dd110f2040 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2026 17:55:19 +0000
Subject: [PATCH 042/316] glooctl: 1.20.10 -> 1.21.2

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 39a18f043aed..4992e5e51a60 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glooctl";
-  version = "1.20.10";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZoeXxWaILJfsIQ7sowqT9Kt0PT7a3g5CdYk7ulP8ZEs=";
+    hash = "sha256-EURfI5fpT9aFKrUTB2x8JZAsk0HrxWNlSYK3m2ej4fw=";
   };
 
-  vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
+  vendorHash = "sha256-Gl4gIbGfNNl29mWwZGVcMQ80F7A4heEStFAMdW114Os=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 

From 9595d7f870adc42682fea682940fb9a43bc15ae1 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 3 Apr 2026 19:21:27 +0000
Subject: [PATCH 043/316] nixos/buffyboard: document new `keyboard.*` options

---
 nixos/modules/services/hardware/buffyboard.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix
index 26b83882c12b..eb6833ec22bd 100644
--- a/nixos/modules/services/hardware/buffyboard.nix
+++ b/nixos/modules/services/hardware/buffyboard.nix
@@ -68,6 +68,24 @@ in
         type = types.submodule {
           freeformType = ini.type;
 
+          options.keyboard.haptic_feedback = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = ''
+              Enable or disable vibrations when pressing keys.
+            '';
+          };
+
+          options.keyboard.sticky_shift = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = ''
+              Changes shift key behavior. When true, the keyboard remains in uppercase mode until
+              the shift key is pressed again (sticky). When false, the keyboard switches back to
+              lowercase mode and the shift key deactivates after a non-modifier key is pressed.
+            '';
+          };
+
           options.input.pointer = mkOption {
             type = types.nullOr types.bool;
             default = null;

From 73176866937a0392273e12a5b429cc52585ba3ad Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 3 Apr 2026 19:23:28 +0000
Subject: [PATCH 044/316] nixos/buffyboard: fix DE integration docs for 3.5.1

---
 nixos/modules/services/hardware/buffyboard.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix
index eb6833ec22bd..525d5cac2f1f 100644
--- a/nixos/modules/services/hardware/buffyboard.nix
+++ b/nixos/modules/services/hardware/buffyboard.nix
@@ -10,8 +10,8 @@
 # Desktop users are recommended to either:
 # 1. Stop buffyboard once your DE is started.
 #   e.g. `services.buffyboard.unitConfig.Conflicts = [ "my-de.service" ];`
-# 2. Configure your DE to ignore input events from buffyboard (product-id=25209; vendor-id=26214; name=rd)
-#   e.g. `echo 'input "26214:25209:rd" events disabled' > ~/.config/sway/config`
+# 2. Configure your DE to ignore input events from buffyboard (product-id=0; vendor-id=0; name=buffyboard)
+#   e.g. `echo 'input "0:0:buffyboard" events disabled' > ~/.config/sway/config`
 
 {
   config,

From ac1423d61f18e5f522f1f003c3ef045768f81a16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 12:57:05 +0000
Subject: [PATCH 045/316] sloth: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/by-name/sl/sloth/package.nix b/pkgs/by-name/sl/sloth/package.nix
index 7d883422853d..219d9f1ec8b8 100644
--- a/pkgs/by-name/sl/sloth/package.nix
+++ b/pkgs/by-name/sl/sloth/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sloth";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "slok";
     repo = "sloth";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VwktgkJjJ1tMlGZwhr1bvaCDiatZKlylFY//8YpXPYw=";
+    hash = "sha256-/sDjefcuZZFqzEAppuDefctayfITktbpi0dHB0vu27M=";
   };
 
-  vendorHash = "sha256-5TTOQ9u7BDrwGa2X8y6d0C6Vb92ZBk451V0kpsUhl9c=";
+  vendorHash = "sha256-/1bZNarqCI24pm/SXtOZ+PDDTVpCdFebx6ccDSvnf5o=";
 
   subPackages = [ "cmd/sloth" ];
 

From 8f83d1a8d7f0dc1a2d45ad3881e85a55ab52a3e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 13:52:08 +0000
Subject: [PATCH 046/316] hcl2json: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix
index 65ae1b1ccfde..187b3b434f92 100644
--- a/pkgs/by-name/hc/hcl2json/package.nix
+++ b/pkgs/by-name/hc/hcl2json/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hcl2json";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = "hcl2json";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jE106vWj1uVPmN9iofg/sWZCpSYDyh2/SHwPg5xHatE=";
+    sha256 = "sha256-CiF5xbRov28xWWygSI9JIG1t/irUyuUxM2vzGnbazGg=";
   };
 
-  vendorHash = "sha256-W5SKD0q3AdIE9Hihnwu6MGoXk1EgBo6ipZaQ73u2tLU=";
+  vendorHash = "sha256-bQFm3BmYxvSe5NRbh1+tG6wWP5C3DSr3g+E36oqk5oY=";
 
   subPackages = [ "." ];
 

From 8ac0cfcd40b103337509a36496116e373daa06de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 20:49:58 +0000
Subject: [PATCH 047/316] rancher: 2.13.4 -> 2.14.0

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index 73d0f9c7fc60..5e4458d81e87 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "rancher";
-  version = "2.13.4";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3/8xGp8jmmfvblikNSNUxXd6w1PJnvgraGthEmOesXI=";
+    hash = "sha256-rFOIimXgcbC0WMr/6pqendsMD0NvkClP+r+tP4oo1ws=";
   };
 
   env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     "-static"
   ];
 
-  vendorHash = "sha256-nEmnbWhDQg7/KHcRYQvrxzFRSHmbOwpEq2H44Pizmuk=";
+  vendorHash = "sha256-3TUIpa5bA54j0aabmQGZRQCA+oqcDlBHBMbpLL+sK9w=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 4c217b7c8057c6a07fa74615d152a881c1e63bef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 17:14:18 +0000
Subject: [PATCH 048/316] python3Packages.pyslurm: 25.11.0 -> 25.11.1

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

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 5a2e2295984d..fb1f2e03dd31 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "25.11.0";
+  version = "25.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
     tag = "v${version}";
-    hash = "sha256-t6otxWBxu4mxTZpIS+lhlcXf4bOaxNgeDmW6BCNTclc=";
+    hash = "sha256-0VQ/f6ppUIt4j94CFsRB+kBUrFPAjqXPqwzIaK4StfA=";
   };
 
   nativeBuildInputs = [ setuptools ];

From a5fba1777467c09555dd95e2af5c9c07c1d0b436 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Sat, 4 Apr 2026 16:47:46 +0200
Subject: [PATCH 049/316] actual-server: unbreak on darwin

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

diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix
index ef1e664a7551..e8b9e915f943 100644
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -4,9 +4,10 @@
   cctools,
   fetchFromGitHub,
   jq,
-  makeWrapper,
+  makeBinaryWrapper,
   nodejs_22,
   python3,
+  xcbuild,
   yarn-berry_4,
   nixosTests,
 }:
@@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     nodejs
     (yarn-berry.yarnBerryConfigHook.override { inherit nodejs; })
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp
-    makeWrapper
+    makeBinaryWrapper
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cctools
+    xcbuild
   ];
 
   env = {
@@ -121,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     rm -r node_modules/.bin
     cp -r ./node_modules $out/lib/actual/
 
-    makeWrapper ${lib.getExe nodejs} "$out/bin/actual-server" \
+    makeBinaryWrapper ${lib.getExe nodejs} "$out/bin/actual-server" \
       --add-flags "$out/lib/actual/packages/sync-server/bin/actual-server.js" \
       --set NODE_PATH "$out/actual/lib/node_modules"
 
@@ -139,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://actualbudget.org/";
     mainProgram = "actual-server";
     license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
     maintainers = [
       lib.maintainers.oddlama
       lib.maintainers.patrickdag

From 7ce3e769190b3cb5e127baceb441b6983a8473a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 11:34:48 +0000
Subject: [PATCH 050/316] git-wt: 0.17.0 -> 0.26.2

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

diff --git a/pkgs/by-name/gi/git-wt/package.nix b/pkgs/by-name/gi/git-wt/package.nix
index 9ca091f0c848..24d545dfd094 100644
--- a/pkgs/by-name/gi/git-wt/package.nix
+++ b/pkgs/by-name/gi/git-wt/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-wt";
-  version = "0.17.0";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "git-wt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gZO3SAIrOQ+wEKf1VAg+e5bLVDt2/s73INZougMXH4k=";
+    hash = "sha256-zAQxo9rgNq9L+NOMx4xS+h0oBGukZqfRg0Y3OYdelA0=";
   };
 
-  vendorHash = "sha256-LkyH7czzBkiyAYGrKuPSeB4pNAZLmgwXgp6fmYBps6s=";
+  vendorHash = "sha256-stE3S6+ogv0bei6+eiyrR/fHMu+jizSEuL1NGakPszU=";
 
   nativeCheckInputs = [ git ];
 

From a86155865ec3cb522e04e834d3f50f375cd1961b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:59:04 +0100
Subject: [PATCH 051/316] croaring: 4.3.1 -> 4.6.1

---
 pkgs/by-name/cr/croaring/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index 0d0b0e38ea22..4f4326b12d04 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "croaring";
-  version = "4.3.1";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "RoaringBitmap";
     repo = "CRoaring";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c4o8AMCtDGLChXxJKJyxkWhuYu7axqLb2ce8IOGk920=";
+    hash = "sha256-wks7kkF0va7RUJXY74ku/yWTSsHQKlFczfhAHyuNudM=";
   };
 
   # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor
@@ -28,6 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  postPatch = ''
+    # Fixes the build of dependent projects by updating the supported
+    # CMake version.
+    # Issue: https://github.com/RoaringBitmap/CRoaring/issues/793
+    # PR: https://github.com/RoaringBitmap/CRoaring/pull/794
+    substituteInPlace CMakeLists.txt \
+      --replace-fail '2.8...3.15' '3.15'
+  '';
+
   preConfigure = ''
     mkdir -p dependencies/.cache
     ln -s ${

From 7e21bec4d101001379489d16633e31f9a672999f Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:53:54 +0200
Subject: [PATCH 052/316] croaring: add hythera as maintainer

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

diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index 4f4326b12d04..ccc77ce42f7a 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
     platforms = lib.platforms.all;
   };
 })

From 8f7f5fe021883b6a7f8f65555c22cac10cd7d610 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:04:03 +0800
Subject: [PATCH 053/316] maintainers: add winterec

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cdcb7f59fffc..a946fd59a3aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29208,6 +29208,12 @@
     githubId = 78392041;
     name = "Winter";
   };
+  winterec = {
+    github = "winterec";
+    githubId = 9159652;
+    name = "Edward";
+    keys = [ { fingerprint = "0BC2F3C6AE5D73DAE870CB0E8AE4DE0EFB6CC443"; } ];
+  };
   wirew0rm = {
     email = "alex@wirew0rm.de";
     github = "wirew0rm";

From b6f4e83f66475559699b3a996ba2dc5e5e0e0135 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:13:34 +0800
Subject: [PATCH 054/316] edukai: 5.0 -> 5.1

---
 pkgs/by-name/ed/edukai/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index a9a3c9ec9374..4a697e5b1ad5 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -4,13 +4,13 @@
   fetchzip,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "edukai";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchzip {
-    url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${version}.zip";
-    sha256 = "sha256-3+w9n6GJQg9+HfHYukC7tlm4GVs8vEOO23hrLw6qjTY=";
+    url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${finalAttrs.version}.zip";
+    sha256 = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
   };
 
   installPhase = ''
@@ -21,13 +21,15 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)";
     longDescription = ''
-      The MOE Standard Kai Font is a kai (regular srcipt) font
-      provided by
-      the Midistry of Education, Republic of China (Taiwan).
-      It currently includes 13,076 Chinese characters.
+      The MOE Standard Kai Font is a kai (regular script) font
+      provided by the Ministry of Education, Republic of China (Taiwan).
+      It currently includes 13,084 Chinese characters.
     '';
-    homepage = "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=47";
+    homepage = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai.pdf";
     license = lib.licenses.cc-by-nd-30;
-    maintainers = with lib.maintainers; [ ShamrockLee ];
+    maintainers = with lib.maintainers; [
+      ShamrockLee
+      winterec
+    ];
   };
-}
+})

From 9da7ef54e488dbccf985e27db30b8c44d63474f6 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:41:50 +0800
Subject: [PATCH 055/316] edukai: use installFonts hook

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

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index 4a697e5b1ad5..371f3f4d4970 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -2,6 +2,7 @@
   stdenvNoCC,
   lib,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -13,10 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sha256 = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
   };
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/
-    mv *.ttf $out/share/fonts/
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)";

From af2d14c5be67bfcf5d4a582e9e086e40dc884e42 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:37:29 +0800
Subject: [PATCH 056/316] edusong: 4.0 -> 4.4

---
 pkgs/by-name/ed/edusong/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix
index 96a436d44061..7d88cdf4d334 100644
--- a/pkgs/by-name/ed/edusong/package.nix
+++ b/pkgs/by-name/ed/edusong/package.nix
@@ -6,12 +6,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "edusong";
-  version = "4.0";
+  version = "4.4";
 
   src = fetchzip {
     name = "edusong-${finalAttrs.version}";
     url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip";
-    hash = "sha256-4NBnwMrYufeZbgSiD2fAhe4tuy0aAA5u9tWwjQQjEQk=";
+    hash = "sha256-+wH6I0sOfzytstDNT81LMuqknGQuYekl31e1tYaDvRg=";
   };
 
   installPhase = ''
@@ -24,8 +24,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     longDescription = ''
       A Song-style Chinese character typeface published by the Ministry of Education of the Republic of China (Taiwan). The Song style is also referred to as 宋體, 宋体, sòngtǐ, 明體, 明体, or míngtǐ, in Chinese; 명조체, 明朝體, or myeongjo in Korean; 明朝体, みんちょうたい, or minchōtai in Japanese.
     '';
-    homepage = "https://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48";
+    homepage = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edusun.pdf";
     license = lib.licenses.cc-by-nd-30;
-    maintainers = with lib.maintainers; [ ShamrockLee ];
+    maintainers = with lib.maintainers; [
+      ShamrockLee
+      winterec
+    ];
   };
 })

From 8d03b42f15dbe42aadafa27d117307c087758092 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:37:57 +0800
Subject: [PATCH 057/316] edusong: use installFonts hook

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

diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix
index 7d88cdf4d334..74096de36cae 100644
--- a/pkgs/by-name/ed/edusong/package.nix
+++ b/pkgs/by-name/ed/edusong/package.nix
@@ -2,6 +2,7 @@
   stdenvNoCC,
   lib,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -14,10 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-+wH6I0sOfzytstDNT81LMuqknGQuYekl31e1tYaDvRg=";
   };
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/
-    mv eduSong_Unicode*.ttf $out/share/fonts/eduSong_Unicode\(2024年12月\).ttf
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "MOE Song font, a Song-style Chinese character typeface";

From c59b0caf17238a8c9f0d3d059ec927da9d4c8463 Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:48:03 +0800
Subject: [PATCH 058/316] eduli: use installFonts hook

---
 pkgs/by-name/ed/eduli/package.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix
index f4f547f43ba2..d813b0c96a61 100644
--- a/pkgs/by-name/ed/eduli/package.nix
+++ b/pkgs/by-name/ed/eduli/package.nix
@@ -2,35 +2,33 @@
   stdenvNoCC,
   lib,
   fetchzip,
+  installFonts,
 }:
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eduli";
   version = "3.0";
 
   src = fetchzip {
-    url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip";
+    url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-${finalAttrs.version}.zip";
     hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw=";
   };
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/
-    for name in *.ttf; do
-      mv "$name" "$out/share/fonts/$(echo $name | sed -r 's/(.*)\(.*\)\.ttf/\1.ttf/')"
-    done
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)";
     longDescription = ''
-      The MOE Li Font is a li (clerical srcipt) font
-      provided by
-      the Midistry of Education, Republic of China (Taiwan).
+      The MOE Li Font is a li (clerical script) font provided by
+      the Ministry of Education, Republic of China (Taiwan).
       It currently includes 4,808 Chinese characters.
       The clerical script (lishu) is an archaic style of Chinese calligraphy.
     '';
-    homepage = "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=49";
+    homepage = "https://language.moe.gov.tw/material/info?m=9fe3fb11-c3d5-41f2-b029-6d18a2c2fd0d";
     license = lib.licenses.cc-by-nd-30;
-    maintainers = with lib.maintainers; [ ShamrockLee ];
+    maintainers = with lib.maintainers; [
+      ShamrockLee
+      winterec
+    ];
   };
-}
+})

From 11dee07c8dd3a6ef3567c4c2e0fe050c124fa98e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 14:48:14 +0000
Subject: [PATCH 059/316] chezmoi: 2.69.4 -> 2.70.1

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

diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 228aaabf4159..6db92f2b7043 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -7,16 +7,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "chezmoi";
-  version = "2.69.4";
+  version = "2.70.1";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x809oaZk6vwkXMUAtIAnB2YTXH0zOjZVh75uClfBkH4=";
+    hash = "sha256-wGNv5O339fjzEPpK4/xAkUpgbOlRq3+DN9e0R7A393Y=";
   };
 
-  vendorHash = "sha256-mPZaxrIhwRMcC0mmYBXU1lDcZy1p7iMSO7sfRUI/dU0=";
+  vendorHash = "sha256-URvpoVW763bIBRFJvHMiTNobSRBA8lGualeRfNtKkYE=";
 
   nativeBuildInputs = [
     installShellFiles

From c5320a096c0bf92d64110304c9e9ef510ce12c10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 16:59:13 +0000
Subject: [PATCH 060/316] lefthook: 2.1.1 -> 2.1.5

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index cab9b7e0ba2e..99363cb56b44 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lefthook";
-  version = "2.1.1";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DrBN1u7GwQaCIe7sCkEHbtDGhkxXj/yhwBkw+oK6fTQ=";
+    hash = "sha256-HLC6X9JjiiR3Ecg5MQ33vELs6ooLLjQ9x++4xB1qyHU=";
   };
 
-  vendorHash = "sha256-azhyyp9vsO6DrYVHRC/NKLMoE2AIXV+su1Vh8/xHtrY=";
+  vendorHash = "sha256-75jrXoBXoPCE/Ue7OlGAA4nUDXHM5ccIaK4rsKgfG84=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 33dda4903b9c2612c8e29228338c79aa672f617c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 17:30:08 +0000
Subject: [PATCH 061/316] qxmpp: 1.14.4 -> 1.15.1

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

diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix
index f650dcbcf552..e2d934d1d762 100644
--- a/pkgs/by-name/qx/qxmpp/package.nix
+++ b/pkgs/by-name/qx/qxmpp/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qxmpp";
-  version = "1.14.4";
+  version = "1.15.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "qxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ltk707viMBDbi7LID0jdLylWkd6Z7Iy6bpORXzODjYc=";
+    hash = "sha256-PkdzEQKI0NiLvDyI+SEoKainF7UiAU3UVJQjgwYKHuo=";
   };
 
   nativeBuildInputs = [

From e11577bb12fce8e1e967750d339927961b3339eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 17:37:40 +0000
Subject: [PATCH 062/316] autobrr: 1.75.1 -> 1.76.0

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

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 8da8322a2f9a..da87e3dcd880 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -16,12 +16,12 @@
 
 let
   pname = "autobrr";
-  version = "1.75.1";
+  version = "1.76.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-y1whIPx4s399WmO2xzjLFXPKhINE9b3+jHJcmsP+3ZA=";
+    hash = "sha256-MGqsRRN73L6i/lhdhnoi3ehnDIRDQpgFYluO6ZeOPT0=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -46,7 +46,7 @@ let
         ;
       pnpm = pnpm_10;
       fetcherVersion = 3;
-      hash = "sha256-euDGtNERNq3IgxggiHoLmcq2+e2SslXLSfY8TTFnqoE=";
+      hash = "sha256-BEsYcS0SiWLQyQc7CRadoQ146VAnq0zmHxdd838H6iI=";
     };
 
     postBuild = ''
@@ -66,7 +66,7 @@ buildGoModule (finalAttrs: {
     src
     ;
 
-  vendorHash = "sha256-kxly/+7wnPbxs1LKzoSFRYcPBWqZg4tgzV3uYJji+yA=";
+  vendorHash = "sha256-HjHRT/PAZdMM/2JWmNMK/I9Gc0ThTAFDSxWW/ATYxW8=";
 
   preBuild = ''
     cp -r ${autobrr-web}/* web/dist

From 66dc3545d341209d459575a4ca7202faaa85df1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 06:05:12 +0000
Subject: [PATCH 063/316] gh-poi: 0.14.1 -> 0.16.4

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

diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index 90d73a9c51c1..009967f289b7 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-poi";
-  version = "0.14.1";
+  version = "0.16.4";
 
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HwFmSeDPpX1zbJh+0laekphmpnAsEdFBhgoLfT7CCYY=";
+    hash = "sha256-n/pwgNZyVpK5y5mK2xFS2pWpDyX7YGc734zkJLoKEJo=";
   };
 
   ldflags = [
@@ -20,10 +20,10 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
-  vendorHash = "sha256-ciOJpVqSPJJLX/sqrztqB3YSoMUrEnn52gGddE80rV0=";
+  vendorHash = "sha256-o3ys+Em27sx3VS3AQIP7G/tWRiBlPnvBq37jLtj9QVQ=";
 
   # Skip checks because some of test suites require fixture.
-  # See: https://github.com/seachicken/gh-poi/blob/v0.14.1/.github/workflows/contract-test.yml#L28-L29
+  # See: https://github.com/seachicken/gh-poi/blob/v0.16.4/.github/workflows/contract-test.yml#L28-L29
   doCheck = false;
 
   meta = {

From ad8f3ea1292f76640bf9fc06e2db9372d8bf94d1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 11 Apr 2026 17:33:38 +0000
Subject: [PATCH 064/316] python313Packages.plotly: 6.6.0 -> 6.7.0

---
 .../python-modules/plotly/default.nix          | 18 ++++--------------
 .../numpy-2.4-percentile-interpolation.patch   | 17 -----------------
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ffeff510fb61..c2eec531c728 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -5,8 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  jupyter-packaging,
-  setuptools,
+  hatchling,
 
   # dependencies
   narwhals,
@@ -38,31 +37,23 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "plotly";
-  version = "6.6.0";
+  version = "6.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t1IYu3PL/B71fhX5LVQrjAKkQSjPC+wZjMnBp4kPTNY=";
+    hash = "sha256-gykhl1aBgKCkJVv507UJk4xdYaruV/aU+JLYmvyFYbY=";
   };
 
   patches = [
-    # https://numpy.org/devdocs/release/2.4.0-notes.html#removed-interpolation-parameter-from-quantile-and-percentile-functions
-    # Upstream PR: https://github.com/plotly/plotly.py/pull/5505
-    ./numpy-2.4-percentile-interpolation.patch
-
     # https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d
     # Upstream PR: https://github.com/plotly/plotly.py/pull/5522
     ./numpy-2.4-in1d.patch
   ];
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail '"hatch", ' "" \
-      --replace-fail "jupyter_packaging~=0.10.0" jupyter_packaging
-
     # `pytest_ignore_collect` takes only `collection_path` starting with
     # pytest 9. Most of the paths referenced in `plotly/conftest.py`
     # don't exist anymore and wouldn't be collected anyway, so we can just
@@ -75,8 +66,7 @@ buildPythonPackage (finalAttrs: {
   env.SKIP_NPM = true;
 
   build-system = [
-    setuptools
-    jupyter-packaging
+    hatchling
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch b/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch
deleted file mode 100644
index d5d945e473a4..000000000000
--- a/pkgs/development/python-modules/plotly/numpy-2.4-percentile-interpolation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/plotly/figure_factory/_violin.py b/plotly/figure_factory/_violin.py
-index 55924e692..e89db0e11 100644
---- a/plotly/figure_factory/_violin.py
-+++ b/plotly/figure_factory/_violin.py
-@@ -17,9 +17,9 @@ def calc_stats(data):
-     x = np.asarray(data, float)
-     vals_min = np.min(x)
-     vals_max = np.max(x)
--    q2 = np.percentile(x, 50, interpolation="linear")
--    q1 = np.percentile(x, 25, interpolation="lower")
--    q3 = np.percentile(x, 75, interpolation="higher")
-+    q2 = np.percentile(x, 50, method="linear")
-+    q1 = np.percentile(x, 25, method="lower")
-+    q3 = np.percentile(x, 75, method="higher")
-     iqr = q3 - q1
-     whisker_dist = 1.5 * iqr
- 

From 78718b433188896e1b083c7101b7658293c433c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 17:40:13 +0000
Subject: [PATCH 065/316] step-kms-plugin: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index ffc71c475733..db0994185772 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "step-kms-plugin";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "step-kms-plugin";
     rev = "v${version}";
-    hash = "sha256-q06so1hbiBhQ3TYKEI6C9yO0KctWVMnqGaMJpnWiEag=";
+    hash = "sha256-c9QRyrohktS/ZjG6DOeNXaFRiqxDCdst00m0xjcg9SQ=";
   };
 
-  vendorHash = "sha256-kuKKATZ7GoAy4NU8Zs/zHYdjZ++OTcT9Ep3sunEOpR0=";
+  vendorHash = "sha256-5bnYtj4Dda3PiU9NAP32tOC6hZxwIbAynNZuAmMOs+A=";
 
   proxyVendor = true;
 

From 351c44a8dc509cb9c3a0d38a1eaee307d7d9c34b Mon Sep 17 00:00:00 2001
From: Ayush Thoren <ayushthoren@gmail.com>
Date: Mon, 13 Apr 2026 22:09:54 -0700
Subject: [PATCH 066/316] calamares-nixos-extensions: quote username in
 users.users attribute

---
 .../ca/calamares-nixos-extensions/src/modules/nixos/main.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
index 40815d27b4ac..b078774f4c6c 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
@@ -247,7 +247,7 @@ cfgmisc = """  # Enable CUPS to print documents.
 
 """
 cfgusers = """  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.@@username@@ = {
+  users.users."@@username@@" = {
     isNormalUser = true;
     description = "@@fullname@@";
     extraGroups = [ @@groups@@ ];

From bf753a4a117e9856ae7808e8fb27bbdf598b564e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 03:07:58 +0000
Subject: [PATCH 067/316] alpaca-proxy: 2.0.11 -> 2.0.12

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

diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix
index 340a239bcaa7..04122e8912a0 100644
--- a/pkgs/by-name/al/alpaca-proxy/package.nix
+++ b/pkgs/by-name/al/alpaca-proxy/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "alpaca-proxy";
-  version = "2.0.11";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "samuong";
     repo = "alpaca";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-74JQ9ltJ7+sasySgNN3AaXlBILP7VgFN06adoNJG+Bc=";
+    hash = "sha256-Yz90kJGyf2iA3LCj9d/oG5rLVUZVI//cqI6w67iV9Tc=";
   };
 
-  vendorHash = "sha256-N9qpyCQg6H1v/JGJ2wCxDX+ZTM9x6/BM6wQ26xC+dlE=";
+  vendorHash = "sha256-3A88gc8j0OrxBIAFBNlz3Np5CV9xpwwIDCnnfXyBj4Q=";
 
   ldflags = [
     "-s"

From 8b3204902df4d8dec80499a6a7bbdcf8c8beb3d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 04:02:35 +0000
Subject: [PATCH 068/316] calico-kube-controllers: 3.31.3 -> 3.31.5

---
 pkgs/applications/networking/cluster/calico/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index c8efe0324264..63a9d7107b47 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.31.3";
+      version = "3.31.5";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-w+dStKYbytNekl3HxBAek8kS+FC5Aeu7OEU4SIFLURY=";
+        hash = "sha256-HdTnERSuqJ2ORijvI8AbzLGTwXaRl349p9onKgH4HE8=";
       };
 
-      vendorHash = "sha256-J9X7W7UozsxNlXQwXYeDi++KkyjxwtnYvs4EkUq4Vec=";
+      vendorHash = "sha256-LwOEshx4VU+a0oBlq/881RC/ViQVDnZZlZs/U3BMJ7M=";
 
       inherit doCheck subPackages;
 

From c4577fe9054614b0381d68b3ccb9cd43086b5c96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 07:22:58 +0000
Subject: [PATCH 069/316] tigerbeetle: 0.16.78 -> 0.17.0

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

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index b99dec74289e..d47bb774b67e 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-xL2D05My1EgM8d6ku5+2GqYLwcyWljqyMowb8A1lsh0=";
-    "x86_64-linux" = "sha256-exI0jZ4LXcUXYcYL6wVXZhmjD4LFvTzqy+IaokmLs/M=";
-    "aarch64-linux" = "sha256-MBUpe8o0/0sa4qSGmzv3CYrDDqGiiW/NrUnmmfn0dBc=";
+    "universal-macos" = "sha256-PzlZt+Fou0I4360thQJ3gihGQkH40DrlLZh+i7Uds0o=";
+    "x86_64-linux" = "sha256-7bjM+3sN/D9reEhZ2iwWMghyjp0/8rXVauzY2OdW9rI=";
+    "aarch64-linux" = "sha256-P+7zui/lpc7ilrpNsyB9v+K/WaeuG8jUsbQEH6xEmpk=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.78";
+  version = "0.17.0";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From 3c0f35411adfaff5e3c59be684cdd995e4a364b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 09:19:12 +0000
Subject: [PATCH 070/316] notesnook: 3.3.12 -> 3.3.14

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

diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index 642101b5fa61..2c1973f7c623 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "notesnook";
-  version = "3.3.12";
+  version = "3.3.14";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -27,10 +27,10 @@ let
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash =
       {
-        x86_64-linux = "sha256-KW5FstIDT/5qdWZuprLzeR1LzBsoYLGq6D6xBiPKY7w=";
-        aarch64-linux = "sha256-54yew9wo1wYbzCupvZsnM+2F3xL2WZ5Uj76CQFkW5+o=";
-        x86_64-darwin = "sha256-g/NnQq8A4ithTp3ajFuRzfpRCCKZqIqdSFnH1EkW9mc=";
-        aarch64-darwin = "sha256-bEX5vObXYEOeS48bQniA1gzDMHtvQrmYa3uZ6CTLnwo=";
+        x86_64-linux = "sha256-fI9EI+XltHztwqVLLzHW49NqXNrxw4xZ1nxjEoz3D2o=";
+        aarch64-linux = "sha256-efg+g2ROR7rlWrcmeqL4y+YgbrOP/9Ylr5RqiLtMCNY=";
+        x86_64-darwin = "sha256-+cbrTM1w2nOROJvJOr4NBYyXw583aa3xOwYZVf10BCs=";
+        aarch64-darwin = "sha256-70EB93WXp8ds3izCvaAetmZgIq1PMNCTXXAgBcH1DSM=";
       }
       .${system} or throwSystem;
   };

From e80411077441e73e74d11008b30dc28649d6b4d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 01:34:00 +0000
Subject: [PATCH 071/316] snip: 0.9.0 -> 0.15.0

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

diff --git a/pkgs/by-name/sn/snip/package.nix b/pkgs/by-name/sn/snip/package.nix
index 1ec50d9473e8..563d66d02c57 100644
--- a/pkgs/by-name/sn/snip/package.nix
+++ b/pkgs/by-name/sn/snip/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "snip";
-  version = "0.9.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "edouard-claude";
     repo = "snip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-af27LOFlUxMrLFjubeTTcdGYZtU86MJlVpoDgJnjTtg=";
+    hash = "sha256-pRYxTHNdR2NGiE+RdThcmz3zVP5rKVRbt+IEILIgavk=";
   };
 
   vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY=";

From f5e062fd272275f69fb32a5baf273be331d2b13a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 03:32:09 +0000
Subject: [PATCH 072/316] kaniko: 1.25.6 -> 1.25.13

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

diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix
index ad9789e5254d..f048a2d8f11e 100644
--- a/pkgs/by-name/ka/kaniko/package.nix
+++ b/pkgs/by-name/ka/kaniko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kaniko";
-  version = "1.25.6";
+  version = "1.25.13";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "kaniko";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Bdu8oTTRbyOmHxqznDNLP27QpsMlvn//y/S28tRmj8E=";
+    hash = "sha256-5Cz6RVoG4HBSpVLux1AKRQt64VzXdGDNG5WvJEDPxUo=";
   };
 
   vendorHash = null;

From 147a4f3b10a7fa2e352e33aade0138ec5cc91826 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 16:59:42 +0000
Subject: [PATCH 073/316] kubernetes-helmPlugins.helm-dt: 0.4.12 -> 0.7.0

---
 pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
index 68ee881aa07b..9b3f55377731 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "helm-dt";
-  version = "0.4.12";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "vmware-labs";
     repo = "distribution-tooling-for-helm";
     tag = "v${version}";
-    hash = "sha256-/fU56Dw7tvUnby4S78tyH/dasg4n3rb0hMlIkzvrv4M=";
+    hash = "sha256-WBrRVlYruokNKW0fSRd/YESH5Vw+hKFa76R/2ABphr8=";
   };
 
   vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18=";

From d227757d41e50b1b0c468baa045ea74f5ab87a2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 19:07:16 +0000
Subject: [PATCH 074/316] trinity: 1.9-unstable-2025-09-02 ->
 1.9-unstable-2026-04-11

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

diff --git a/pkgs/by-name/tr/trinity/package.nix b/pkgs/by-name/tr/trinity/package.nix
index fb21b1c18468..27d7977c7e45 100644
--- a/pkgs/by-name/tr/trinity/package.nix
+++ b/pkgs/by-name/tr/trinity/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "trinity";
-  version = "1.9-unstable-2025-09-02";
+  version = "1.9-unstable-2026-04-11";
 
   src = fetchFromGitHub {
     owner = "kernelslacker";
     repo = "trinity";
-    rev = "294c46522620afffd7b57af7ef743131ff55a488";
-    hash = "sha256-Fm9bwJ/ofDgSbe/YUgl22Rf0F+NCV32xLPA2kw36zFs=";
+    rev = "4ecfd4492750cc7a92e0ccba197a308c5456b564";
+    hash = "sha256-4n44ZqA7T9SoQdUwXa4LJIDwyU91rV0lRMGiQqxTn1c=";
   };
 
   postPatch = ''

From dc58a4aeb57bb9436c768e1b415b44984842ec39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 19:38:29 +0000
Subject: [PATCH 075/316] cloud-nuke: 0.46.0 -> 0.49.0

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

diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index 1714d800460c..0204d898c4e7 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloud-nuke";
-  version = "0.46.0";
+  version = "0.49.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uuTyLT6Qfnv7cLP//avPcNZreTWGHJRS6kxMC+UT39U=";
+    hash = "sha256-ygmgGe89YdvvP60zl8RWTXchXVNd23fodyFjiSDwQAI=";
   };
 
-  vendorHash = "sha256-EYIfecD3X3EdllR9FoqfEWSwB7wh6IxQTKItSivSPDs=";
+  vendorHash = "sha256-1DMwVJvr3zU96yAV2Vb4v58VNt7xg9dLCH7XGEMopjQ=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 71cc8ae70279a3a46c79cb41a3ce724c661af4cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 04:48:21 +0000
Subject: [PATCH 076/316] zsh-forgit: 26.04.1 -> 26.04.2

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

diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index edcf7cde83c1..966ec325823b 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-forgit";
-  version = "26.04.1";
+  version = "26.04.2";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     tag = finalAttrs.version;
-    hash = "sha256-/tG//6s0km8IUJXI4f++/UUCTAOYTDE/C5bbkHFhdNY=";
+    hash = "sha256-/zFws4/QkAuoV2edtxW3jK1HbftigYNZzTkSg5Y4Phg=";
   };
 
   strictDeps = true;

From 565c90aa16f56c7f20fd14b1fe0f7dd7d324e49a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 11:13:58 +0000
Subject: [PATCH 077/316] dolt: 1.84.1 -> 1.86.2

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 889bc07ed584..e1115895beec 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "1.84.1";
+  version = "1.86.2";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gV5KqBo3Sk+oUER/VOgQVwnCucc4IZF/QmqZRTddI04=";
+    hash = "sha256-CXhdt9uIhdSEW3M21pL2WeT+zKPUxyYrU4fGTgMgun4=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-SRwxzkBNNVnGVDDhi3YR4ZXY1q2O78S2I+kp79Wh+50=";
+  vendorHash = "sha256-JdpPKao8LOGzKzzLtfiYh3rUn1OLLcA7YIrztHwTLmU=";
   proxyVendor = true;
   doCheck = false;
 

From 5898d99924c16b0c566f79985e345628b2440e51 Mon Sep 17 00:00:00 2001
From: Mynacol <git@mynacol.xyz>
Date: Fri, 30 Jan 2026 13:13:43 +0000
Subject: [PATCH 078/316] deno: build librusty_v8 from source

---
 ...-__rust_no_alloc_shim_is_unstable_v2.patch |  13 ++
 pkgs/by-name/de/deno/librusty_v8.nix          | 179 ++++++++++++++++--
 .../de/deno/librusty_v8_no_downloads.patch    |  30 +++
 ...librusty_v8_revert_-fno-lifetime-dse.patch |  19 ++
 pkgs/by-name/de/deno/package.nix              |   6 +-
 pkgs/by-name/de/deno/update.sh                |  18 ++
 pkgs/by-name/de/deno/update/common.ts         |  51 -----
 pkgs/by-name/de/deno/update/src.ts            |  67 -------
 pkgs/by-name/de/deno/update/update.ts         |  43 -----
 9 files changed, 250 insertions(+), 176 deletions(-)
 create mode 100644 pkgs/by-name/de/deno/librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
 create mode 100644 pkgs/by-name/de/deno/librusty_v8_no_downloads.patch
 create mode 100644 pkgs/by-name/de/deno/librusty_v8_revert_-fno-lifetime-dse.patch
 create mode 100755 pkgs/by-name/de/deno/update.sh
 delete mode 100644 pkgs/by-name/de/deno/update/common.ts
 delete mode 100644 pkgs/by-name/de/deno/update/src.ts
 delete mode 100755 pkgs/by-name/de/deno/update/update.ts

diff --git a/pkgs/by-name/de/deno/librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch b/pkgs/by-name/de/deno/librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
new file mode 100644
index 000000000000..8a01b8beadb3
--- /dev/null
+++ b/pkgs/by-name/de/deno/librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
@@ -0,0 +1,13 @@
+Submodule build contains modified content
+diff --git a/build/rust/allocator/lib.rs b/build/rust/allocator/lib.rs
+index 4b834e322..1970d664e 100644
+--- a/build/rust/allocator/lib.rs
++++ b/build/rust/allocator/lib.rs
+@@ -87,7 +87,6 @@ mod both_allocators {
+     /// rustc-generated shims we must define this symbol, since we are opting in
+     /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
+     #[rustc_std_internal_symbol]
+-    #[linkage = "weak"]
+     fn __rust_no_alloc_shim_is_unstable_v2() {}
+ 
+     #[cfg(not(RUST_ALLOCATOR_NIGHTLY_CAPABILITY))]
diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix
index 2260c8ca9d93..55d1e24088f7 100644
--- a/pkgs/by-name/de/deno/librusty_v8.nix
+++ b/pkgs/by-name/de/deno/librusty_v8.nix
@@ -1,12 +1,169 @@
-# auto-generated file -- DO NOT EDIT!
-{ fetchLibrustyV8 }:
-
-fetchLibrustyV8 {
-  version = "147.0.0";
-  shas = {
-    x86_64-linux = "sha256-PXLRowkOBRVWeonQDTN6e4BQlSLK/kobCX7eE0Y1NLY=";
-    aarch64-linux = "sha256-6jaFVmmYYOZNZmk6UHUAGyibSBQn51Ie57hB7CIZBFI=";
-    x86_64-darwin = "sha256-yTrxJ5ABXg1r0myZqy4J3m/ivYdXnsgG089PrD5cMhY=";
-    aarch64-darwin = "sha256-HVr7hNzZk4qQTct2Px7DvSJAnyq1duJCqJawY475SR4=";
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  rustPlatform,
+  rustc,
+  rustc-unwrapped,
+  rust-bindgen,
+  rust-analyzer,
+  rustfmt,
+  cargo,
+  clippy,
+  llvmPackages ? rustc.llvmPackages,
+  pkg-config,
+  stdenv,
+  glib,
+  glibc,
+  icu,
+  python3,
+  gn,
+  ninja,
+  xcbuild,
+  apple-sdk_15,
+  symlinkJoin,
+  deno,
+}:
+let
+  rustToolchain = symlinkJoin {
+    name = "rusty-v8-rust-toolchain";
+    paths = [
+      rustc
+      rustc-unwrapped
+      rust-bindgen
+      rust-analyzer
+      rustfmt
+      cargo
+      clippy
+      llvmPackages.libclang.lib
+    ];
+    postBuild = ''
+      mkdir -p "$out/lib/rustlib/src/rust"
+      cp -r '${rustPlatform.rustcSrc}'/* "$out/lib/rustlib/src/rust/"
+      chmod u+w "$out/lib/rustlib/src/rust/library/"
+      ln -s '${rustPlatform.rustVendorSrc}' "$out/lib/rustlib/src/rust/library/vendor"
+    '';
   };
-}
+
+  clangBasePath = symlinkJoin {
+    name = "rusty-v8-llvm-toolchain";
+    paths = [
+      llvmPackages.clang-unwrapped.lib
+      llvmPackages.clang
+      llvmPackages.llvm
+      llvmPackages.lld
+    ];
+    postBuild =
+      if stdenv.targetPlatform.isDarwin then
+        ''
+          dir="$out/lib/clang/${lib.versions.major llvmPackages.clang.version}/lib/darwin/"
+          mkdir -p "$dir"
+          ln -s ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt.osx* "$dir/libclang_rt.osx${stdenv.hostPlatform.extensions.staticLibrary}"
+        ''
+      else
+        ''
+          dir="$out/lib/clang/${lib.versions.major llvmPackages.clang.version}/lib/${stdenv.hostPlatform.config}/"
+          mkdir -p "$dir"
+          ln -s ${llvmPackages.compiler-rt}/lib/linux/libclang_rt.builtins-* "$dir/libclang_rt.builtins${stdenv.hostPlatform.extensions.staticLibrary}"
+        '';
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rusty-v8";
+  version = "147.1.0";
+
+  src = fetchFromGitHub {
+    owner = "denoland";
+    repo = "rusty_v8";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-USCQtK5pJBpU1FTLMQ/bNwJXnVNkdX/EtCWqs2kVL50=";
+  };
+
+  patches = [
+    ./librusty_v8_no_downloads.patch
+    (fetchpatch {
+      name = "chromium-146-revert-Update-fsanitizer=array-bounds-config.patch";
+      # https://chromium-review.googlesource.com/c/chromium/src/+/7539408
+      url = "https://chromium.googlesource.com/chromium/src/+/acb47d9a6b56c4889a2ed4216e9968cfc740086c^!?format=TEXT";
+      decode = "base64 -d";
+      revert = true;
+      includes = [ "build/config/compiler/BUILD.gn" ];
+      hash = "sha256-0yEK66IEyS8xABDHY4W8oIvl4Ga1JfL1wxQy8PhXyqI=";
+    })
+    ./librusty_v8_revert_-fno-lifetime-dse.patch
+  ]
+  ++ lib.optionals stdenv.targetPlatform.isDarwin [
+    ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
+  ];
+
+  cargoHash = "sha256-FKwXdms9j+izRKsm5TKJ8Ct8lvBuG/tYXfNzVsbs8cM=";
+
+  nativeBuildInputs = [
+    llvmPackages.clang
+    python3
+    pkg-config
+    llvmPackages.lld
+  ]
+  ++ lib.optionals stdenv.targetPlatform.isLinux [
+    glibc
+  ]
+  ++ lib.optionals stdenv.targetPlatform.isDarwin [
+    xcbuild
+  ];
+  buildInputs = [
+    glib
+    icu
+  ]
+  ++ lib.optionals stdenv.targetPlatform.isDarwin [
+    apple-sdk_15
+  ];
+
+  env = {
+    V8_FROM_SOURCE = 1;
+    PYTHON = "python3";
+    NINJA = lib.getExe ninja;
+    GN = lib.getExe gn;
+    RUSTC_BOOTSTRAP = 1;
+    EXTRA_GN_ARGS = lib.concatStringsSep " " (
+      [
+        "use_sysroot=false" # prevent download of debian sysroot
+        "clang_version=\"${lib.versions.major llvmPackages.clang.version}\""
+        "rustc_version=\"${rustc.version}\""
+        "rust_sysroot_absolute=\"${rustToolchain}\""
+        "rust_bindgen_root=\"${rustToolchain}\""
+        "use_chromium_rust_toolchain=true"
+        # To accomodate our newer rustc compiler
+        "removed_rust_stdlib_libs=[\"adler\"]"
+        "added_rust_stdlib_libs=[\"adler2\"]"
+      ]
+      ++ lib.optional stdenv.targetPlatform.isDarwin "mac_deployment_target=\"${stdenv.targetPlatform.darwinMinVersion}\""
+    );
+    LIBCLANG_PATH = lib.makeLibraryPath [ llvmPackages.libclang ];
+    CLANG_BASE_PATH = clangBasePath;
+  };
+
+  buildFeatures = [ "simdutf" ];
+
+  checkFlags = [
+    # These tests probably fail due to a more recent rustc version (upstream: 1.89.0, here: 1.93.0)
+    "--skip=ui"
+    "--skip=scope"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp target/*/release/gn_out/obj/librusty_v8${stdenv.hostPlatform.extensions.staticLibrary} $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Rust bindings for the V8 JavaScript engine";
+    homepage = "https://github.com/denoland/rusty_v8";
+    license = lib.licenses.mit;
+    maintainers = deno.meta.maintainers;
+    platforms = deno.meta.platforms;
+  };
+})
diff --git a/pkgs/by-name/de/deno/librusty_v8_no_downloads.patch b/pkgs/by-name/de/deno/librusty_v8_no_downloads.patch
new file mode 100644
index 000000000000..90baaf8ac2fc
--- /dev/null
+++ b/pkgs/by-name/de/deno/librusty_v8_no_downloads.patch
@@ -0,0 +1,30 @@
+diff --git a/build.rs b/build.rs
+index 970e88bb..afb92e8a 100644
+--- a/build.rs
++++ b/build.rs
+@@ -251,7 +251,6 @@ fn build_v8(is_asan: bool) {
+     download_ninja_gn_binaries();
+   }
+ 
+-  download_rust_toolchain();
+ 
+   // `#[cfg(...)]` attributes don't work as expected from build.rs -- they refer to the configuration
+   // of the host system which the build.rs script will be running on. In short, `cfg!(target_<os/arch>)`
+@@ -461,17 +460,6 @@ fn maybe_clone_repo(dest: &str, repo: &str) {
+ }
+ 
+ fn maybe_install_sysroot(arch: &str) {
+-  let sysroot_path = format!("build/linux/debian_sid_{arch}-sysroot");
+-  if !PathBuf::from(sysroot_path).is_dir() {
+-    assert!(
+-      Command::new(python())
+-        .arg("./build/linux/sysroot_scripts/install-sysroot.py")
+-        .arg(format!("--arch={arch}"))
+-        .status()
+-        .unwrap()
+-        .success()
+-    );
+-  }
+ }
+ 
+ fn download_ninja_gn_binaries() {
diff --git a/pkgs/by-name/de/deno/librusty_v8_revert_-fno-lifetime-dse.patch b/pkgs/by-name/de/deno/librusty_v8_revert_-fno-lifetime-dse.patch
new file mode 100644
index 000000000000..6035fa552d00
--- /dev/null
+++ b/pkgs/by-name/de/deno/librusty_v8_revert_-fno-lifetime-dse.patch
@@ -0,0 +1,19 @@
+Submodule build contains modified content
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ff8022f04..59699e1d4 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -625,13 +625,6 @@ config("compiler") {
+       ]
+     }
+ 
+-    # The performance improvement does not seem worth the risk. See
+-    # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
+-    # for discussion.
+-    if (!is_wasm) {
+-      cflags += [ "-fno-lifetime-dse" ]
+-    }
+-
+     # TODO(hans): Remove this once Clang generates better optimized debug info
+     # by default. https://crbug.com/765793
+     cflags += [
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 763ba2d517b3..57aff45e4a04 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -9,9 +9,7 @@
   protobuf,
   installShellFiles,
   makeBinaryWrapper,
-  librusty_v8 ? callPackage ./librusty_v8.nix {
-    inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
-  },
+  librusty_v8 ? callPackage ./librusty_v8.nix { },
   libffi,
   sqlite,
   lld,
@@ -252,7 +250,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = ./update/update.ts;
+    updateScript = ./update.sh;
     tests = callPackage ./tests { };
     inherit librusty_v8;
   };
diff --git a/pkgs/by-name/de/deno/update.sh b/pkgs/by-name/de/deno/update.sh
new file mode 100755
index 000000000000..b29fad7471c4
--- /dev/null
+++ b/pkgs/by-name/de/deno/update.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update curl yq
+
+old_version="$(nix-instantiate --raw --eval -A deno.version)"
+
+nix-update deno
+
+new_version="$(nix-instantiate --raw --eval -A deno.version)"
+
+if [ "$old_version" = "$new_version" ]; then
+  echo "No deno update, nothing to do"
+  exit 0
+fi
+
+new_v8_version="$(curl -sL "https://raw.githubusercontent.com/denoland/deno/refs/tags/v$new_version/Cargo.lock" | \
+  tomlq -r ".package[] | select(.name == \"v8\") | .version")"
+
+nix-update deno.librusty_v8 "--version=$new_v8_version"
diff --git a/pkgs/by-name/de/deno/update/common.ts b/pkgs/by-name/de/deno/update/common.ts
deleted file mode 100644
index ee0d2c0dd1ff..000000000000
--- a/pkgs/by-name/de/deno/update/common.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-interface GHRelease {
-  tag_name: string;
-}
-
-const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer);
-export const run = async (command: string, args: string[]) => {
-  const cmd = new Deno.Command(command, { args });
-  const { code, stdout, stderr } = await cmd.output();
-  if (code !== 0) {
-    const error = decode(stderr).trimEnd();
-    // Known error we can ignore
-    if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {
-      // Extract the target sha256 out of the error
-      const target = "  got:    sha256:";
-      const match = error
-        .split("\n")
-        .find((l) => l.includes(target))
-        ?.split(target)[1];
-      if (typeof match !== "undefined") {
-        return match;
-      }
-    }
-    throw new Error(error);
-  }
-  return decode(stdout).trimEnd();
-};
-
-// Exports
-export const versionRegExp = /\d+\.\d+\.\d+/;
-export const sha256RegExp = /[a-z0-9]{52}|sha256-.{44}/;
-
-export const getExistingVersion = async (filePath: string) =>
-  read(filePath).then(
-    (s) => s.match(genValueRegExp("version", versionRegExp))?.shift() || "",
-  );
-
-export const getLatestVersion = (owner: string, repo: string) =>
-  fetch(`https://api.github.com/repos/${owner}/${repo}/releases`)
-    .then((res) => res.json())
-    .then((res: GHRelease[]) => res[0].tag_name);
-
-// The (?<=) and (?=) allow replace to only change inside
-// Match the regex passed in or empty
-export const genValueRegExp = (key: string, regex: RegExp) =>
-  new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`);
-
-export const logger = (name: string) => (...a: any) =>
-  console.log(`[${name}]`, ...a);
-
-export const read = Deno.readTextFile;
-export const write = Deno.writeTextFile;
diff --git a/pkgs/by-name/de/deno/update/src.ts b/pkgs/by-name/de/deno/update/src.ts
deleted file mode 100644
index 11c215b44645..000000000000
--- a/pkgs/by-name/de/deno/update/src.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import {
-  genValueRegExp,
-  logger,
-  read,
-  run,
-  sha256RegExp,
-  versionRegExp,
-  write,
-} from "./common.ts";
-
-interface Replacer {
-  regex: RegExp;
-  value: string;
-}
-
-const log = logger("src");
-
-const prefetchHash = (nixpkgs: string, version: string) =>
-  run("nurl", ["https://github.com/denoland/deno", version, "-H", "-n", nixpkgs, "-S"]);
-const prefetchCargoHash = (nixpkgs: string) =>
-  run(
-    "nurl",
-    ["-e", `(import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; })`]
-  );
-
-const replace = (str: string, replacers: Replacer[]) =>
-  replacers.reduce(
-    (str, r) => str.replace(r.regex, r.value),
-    str,
-  );
-
-const updateNix = (filePath: string, replacers: Replacer[]) =>
-  read(filePath).then((str) => write(filePath, replace(str, replacers)));
-
-const genVerReplacer = (k: string, value: string): Replacer => (
-  { regex: genValueRegExp(k, versionRegExp), value }
-);
-const genShaReplacer = (k: string, value: string): Replacer => (
-  { regex: genValueRegExp(k, sha256RegExp), value }
-);
-
-export async function updateSrc(
-  filePath: string,
-  nixpkgs: string,
-  denoVersion: string,
-) {
-  log("Starting src update");
-  const trimVersion = denoVersion.substring(1);
-  log("Fetching hash for:", trimVersion);
-  const sha256 = await prefetchHash(nixpkgs, denoVersion);
-  log("sha256 to update:", sha256);
-  await updateNix(
-    filePath,
-    [
-      genVerReplacer("version", trimVersion),
-      genShaReplacer("hash", sha256),
-    ],
-  );
-  log("Fetching cargoHash for:", sha256);
-  const cargoHash = await prefetchCargoHash(nixpkgs);
-  log("cargoHash to update:", cargoHash);
-  await updateNix(
-    filePath,
-    [genShaReplacer("cargoHash", cargoHash)],
-  );
-  log("Finished src update");
-}
diff --git a/pkgs/by-name/de/deno/update/update.ts b/pkgs/by-name/de/deno/update/update.ts
deleted file mode 100755
index 70f091a99d0c..000000000000
--- a/pkgs/by-name/de/deno/update/update.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env nix-shell
-/*
-#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nurl
-*/
-import { getExistingVersion, getLatestVersion, logger } from "./common.ts";
-import { Architecture, updateLibrustyV8 } from "./librusty_v8.ts";
-import { updateSrc } from "./src.ts";
-
-const log = logger("update");
-// TODO: Getting current file position to more-safely point to nixpkgs root
-const nixpkgs = Deno.cwd();
-// TODO: Read values from default.nix
-const owner = "denoland";
-const repo = "deno";
-const denoDir = `${nixpkgs}/pkgs/by-name/de/${repo}`;
-const src = `${denoDir}/package.nix`;
-const librusty_v8 = `${denoDir}/librusty_v8.nix`;
-const architectures: Architecture[] = [
-  { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" },
-  { nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" },
-  { nix: "x86_64-darwin", rust: "x86_64-apple-darwin" },
-  { nix: "aarch64-darwin", rust: "aarch64-apple-darwin" },
-];
-
-log("Updating deno");
-
-log("Getting latest deno version");
-const version = await getLatestVersion(owner, repo);
-const existingVersion = await getExistingVersion(src);
-const trimVersion = version.substr(1); // Strip v from v0.0.0
-log("Latest version:   ", trimVersion);
-log("Extracted version:", existingVersion);
-if (trimVersion === existingVersion) {
-  log("Version already matches latest, skipping...");
-  Deno.exit(0);
-}
-
-const tasks = [
-  updateSrc(src, nixpkgs, version),
-  updateLibrustyV8(librusty_v8, owner, repo, version, architectures),
-];
-await Promise.all(tasks);
-log("Updating deno complete");

From 6807e69762f9662fbcb12c10db09ec982c7b7193 Mon Sep 17 00:00:00 2001
From: Mynacol <Mynacol@users.noreply.github.com>
Date: Fri, 17 Apr 2026 07:35:00 +0000
Subject: [PATCH 079/316] deno: add myself as maintainer

As suggested by ofalvai.
---
 pkgs/by-name/de/deno/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 57aff45e4a04..d8f4c882674c 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -273,6 +273,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       jk
       ofalvai
+      mynacol
     ];
     platforms = [
       "x86_64-linux"

From 0fd0929c3bb6ebd62160f0ab8bacd4a994212abc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 14:20:06 +0000
Subject: [PATCH 080/316] jumppad: 0.25.1 -> 0.27.1

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

diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix
index 30df4c28faf2..0daa953d2e26 100644
--- a/pkgs/by-name/ju/jumppad/package.nix
+++ b/pkgs/by-name/ju/jumppad/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "jumppad";
-  version = "0.25.1";
+  version = "0.27.1";
 
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
     rev = finalAttrs.version;
-    hash = "sha256-Dqwug09ESljbgANQdmRyQCOswGDxOwhkd7yQiLdEh8M=";
+    hash = "sha256-AhSomz4YrDuIMupMTvFwpye8BDGGrU/IlRUtE+RIUC0=";
   };
   vendorHash = "sha256-5eI41EKgi61dVFAvsgxI2Vk1zrxtVinxYKquKlaSOyQ=";
 

From d4aaf5af4718d584f1199adb42d97747a986742b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 14:20:33 +0000
Subject: [PATCH 081/316] airwindows: 0-unstable-2026-04-04 ->
 0-unstable-2026-04-11

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

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 572f20876adf..57162aaa2c9a 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2026-04-04";
+  version = "0-unstable-2026-04-11";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "714ffb2db6f799067e63bf1f88ae8a89f4ee0d3c";
-    hash = "sha256-Ed8U0AC+9ggsPS+fWfm7yBdnygjhHIdUtJlML2J4zKY=";
+    rev = "7f9131b826e12b2dabe8a06c7cc4b002b9952be1";
+    hash = "sha256-Rt4Q/fxh181bPFAhD3WgEVbq0ClQfhGjJoHa99lgguw=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From e841c13e3d0b6d41032b904ddadf5983da2e62cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 14:22:43 +0000
Subject: [PATCH 082/316] buffrs: 0.13.0 -> 0.13.2

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

diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index 025d3f05ad03..4d0b22fc659e 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "buffrs";
-  version = "0.13.0";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "helsing-ai";
     repo = "buffrs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DTA30wVgThUu76AHWcpxAiOQZf92N6hMDPUHOUjg1vA=";
+    hash = "sha256-IKL8zBDM83TgyYHcGOBn+6nzIo6ywvlZk+G5cBC4ijE=";
   };
 
-  cargoHash = "sha256-c8Y81+IUpOWWlCsnltFWgbWW9I2ZkardzT94wGTKMVo=";
+  cargoHash = "sha256-Mku0H3fwyxtHgPuJndHA/lcd7/rGVw69+j1GdFt5JyQ=";
 
   # Disabling tests meant to work over the network, as they will fail
   # inside the builder.

From 06b0d56a378bbdd3ce88e56a21085a5b08f2a2ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 15:17:06 +0000
Subject: [PATCH 083/316] apko: 1.1.12 -> 1.2.3

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

diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 43da427faabd..60c294fe2238 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.1.12";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UqvmHIHHMNJ3VX6UT/CdK6vhrAW6TLwtfvmRPPGXjVI=";
+    hash = "sha256-YHehcCaMclkWkiOFL7FzVUKdLcIjhUXNJUaFEXNdubI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-Pi0egpWT/12CZI84NtJKYpRT7OwzwF9MTq9Q+9DN2cw=";
+  vendorHash = "sha256-6KLdW45fUb1smdjEuVEe3PBhmC5Z6LnlHp8OkRKghno=";
 
   excludedPackages = [
     "internal/gen-jsonschema"

From b8c962487e3cfa50fb07f1360af331354e4c2700 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 15:27:47 +0000
Subject: [PATCH 084/316] skopeo: 1.22.1 -> 1.22.2

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

diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix
index 44214cf15087..26222a9a4b31 100644
--- a/pkgs/by-name/sk/skopeo/package.nix
+++ b/pkgs/by-name/sk/skopeo/package.nix
@@ -19,13 +19,13 @@
 
 buildGoModule rec {
   pname = "skopeo";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    hash = "sha256-MS91KzOxcVhmH420zdUcSUw0UggRt3hQ6c3A3QSAYkA=";
+    hash = "sha256-TyLJvCZosRaoUVmpe+uxGzgLDIFi8QgpRecaLmRGTxU=";
   };
 
   outputs = [

From bb58ebe9229e2940b397a2062d53c5bb5301d22d Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 17 Apr 2026 20:06:04 +0200
Subject: [PATCH 085/316] owi: 0.2-unstable-2026-04-08 ->
 0.2-unstable-2026-04-12

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

diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index 7a516efd3dd7..abc86ccf0112 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage {
   pname = "owi";
-  version = "0.2-unstable-2026-04-08";
+  version = "0.2-unstable-2026-04-12";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "8357ccd5a43d1e2f9d5648a96286c6b8e6b59b37";
+    rev = "cd54ee715561dc40c9338a16d37eabaa65cbbeaf";
     fetchSubmodules = true;
-    hash = "sha256-4QOUX8iwn826g2rB2fwsFZhrzViZsKONXa5yxCFPT/8=";
+    hash = "sha256-ET/UHwQ0wwXtP1CzAksPi7BRJXyefE4qvi+2r1vl3OI=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From eb96990cf1324079753896305708e8c1745ee545 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 18:21:19 +0000
Subject: [PATCH 086/316] xdg-desktop-portal-wlr: 0.8.1 -> 0.8.2

---
 pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index 77df77dbbede..011979b6b7c4 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-wlr";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "xdg-desktop-portal-wlr";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-FltwfZtxKdbJuDYVQJTTtEE/WHV5AaDnwPnAkN76qTY=";
+    sha256 = "sha256-HITf/hgiASWvn/z49mzS8IS1vuyXwdk1JiAOOHRSQMo=";
   };
 
   strictDeps = true;

From 905328f08162ad078db22c160bbee926a9adefb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 18:30:03 +0000
Subject: [PATCH 087/316] vscode-extensions.davidlday.languagetool-linter:
 0.25.5 -> 0.25.7

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f51850b13839..260de887d51f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1260,8 +1260,8 @@ let
         mktplcRef = {
           name = "languagetool-linter";
           publisher = "davidlday";
-          version = "0.25.5";
-          hash = "sha256-/ZSxaxiv76aJ+KmDlR5h8PrkEo0pPMvb9C3KGdKCNK8=";
+          version = "0.25.7";
+          hash = "sha256-XLW49YkgDuojNEzqWRztK8mKWKbVU5OeGOjHl0heH/w=";
         };
         meta = {
           description = "LanguageTool integration for VS Code";

From 484be92645e3ccd451bdbe20f6902b301276dfd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 19:34:44 +0000
Subject: [PATCH 088/316] vscode-extensions.oracle.oracle-java: 25.0.1 ->
 25.1.0

---
 .../editors/vscode/extensions/oracle.oracle-java/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
index a94b3bff2e48..388d00066800 100644
--- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "oracle-java";
     publisher = "oracle";
-    version = "25.0.1";
-    hash = "sha256-6l1StFyGixGCvOfpq4iyHkoGQb1UZGlB4j0IQxAuXl8=";
+    version = "25.1.0";
+    hash = "sha256-HjDSlvG6khFJA/3ukjVCrPqbQiAKVhgP6KcCfC/jUrc=";
   };
 
   meta = {

From 6f786042315c1a961e76fff7aad6c46e09e8838c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 20:12:02 +0000
Subject: [PATCH 089/316] lunar-client: 3.6.4 -> 3.6.6

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index b1e655347933..17e8a4561ac1 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-JpFYTBAewvxmJLvhHPLNyUw74EmcflThK5qjADZhfJR+buZgpbbLCOho00auRWTIg0+xoyNM9ZGGYWfjxfIe9Q==";
+    hash = "sha512-9vIR6nNpy2cCtZHQipDJHTIC7qPpxRFmH9LrtwxHyTOJW4BGW6LlEWh+ZEe9FRZyU4iv66iTPlHw53RE9QF+cA==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8e45c604ebb3c7fbd96564b16d6fbb08c60fb6e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 20:14:11 +0000
Subject: [PATCH 090/316] mattermost: 10.11.13 -> 10.11.14

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 14c84a120070..11cfca7f6a8c 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -20,8 +20,8 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.11\\.[0-9]+)$";
-    version = "10.11.13";
-    srcHash = "sha256-jh1Ez+5pJiB9eBbOkVMVWryok0NsHrg0p/1d2723fwU=";
+    version = "10.11.14";
+    srcHash = "sha256-rcKsfCJSot9mz8ds4LoIurF0NsgGQuuqhb9PRPjyxqU=";
     vendorHash = "sha256-hKAKM2qFn5Zvr/Sc33XmFl7l59agMaEvlvVD5aOyaxI=";
     npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''

From d75a93776a5cc9bfef7417e29576be8436783d12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 20:35:13 +0000
Subject: [PATCH 091/316] ecspresso: 2.8.0 -> 2.8.1

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

diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index c57e84377e25..e8d76dac5918 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "ecspresso";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mcKvjNHpyP6s9D1KVIqZLmSPOUZ0RkXioGXWbRsp3uc=";
+    hash = "sha256-EJP7wvMalb+Usd2NAUUihhbNcWXT7KaB1HM0Ao3RDTM=";
   };
 
   subPackages = [
     "cmd/ecspresso"
   ];
 
-  vendorHash = "sha256-gkCs7wtaRdpA8BY8H309fJKRB8NwMehGvIW8tNNFb/I=";
+  vendorHash = "sha256-G7IA2aQfvvretp310uh/t/u1NiqeJQzIUHdKyJdNDeg=";
 
   ldflags = [
     "-s"

From d0bc773ce4d8a9f45b145349dd399e02e24ac10f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 21:04:45 +0000
Subject: [PATCH 092/316] python3Packages.lizard: 1.21.3 -> 1.21.6

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

diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index 65596190372d..bbd8b64672c8 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "lizard";
-  version = "1.21.3";
+  version = "1.21.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "terryyin";
     repo = "lizard";
     tag = version;
-    hash = "sha256-tUy5IrK7TzIJKglkRKtS9qaBq9vdzUy7SOhyWja+B3s=";
+    hash = "sha256-ZRXO9XijsZdtDffEvQ6iYVr8PKP93JD01L/bg9NOEpM=";
   };
 
   propagatedBuildInputs = [

From bebbdb0a9eb1cd46afc8e17679b77c3150b01f77 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Apr 2026 23:36:42 +0200
Subject: [PATCH 093/316] python314Packages.bitcoinrpc: fix build

---
 pkgs/development/python-modules/bitcoinrpc/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix
index 5bf2f03077ce..b6c91ee1dc88 100644
--- a/pkgs/development/python-modules/bitcoinrpc/default.nix
+++ b/pkgs/development/python-modules/bitcoinrpc/default.nix
@@ -6,6 +6,7 @@
   httpx,
   typing-extensions,
   pytestCheckHook,
+  pytest-asyncio,
 }:
 
 buildPythonPackage rec {
@@ -26,7 +27,12 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  disabledTestPaths = [ "tests/test_connection.py" ];
 
   pythonImportsCheck = [ "bitcoinrpc" ];
 

From fd9559e08fa450edb01b366240f49490012e03ef Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Apr 2026 23:37:26 +0200
Subject: [PATCH 094/316] python314Packages.bitcoinrpc: modernize

---
 .../python-modules/bitcoinrpc/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix
index b6c91ee1dc88..5d94e8edf36c 100644
--- a/pkgs/development/python-modules/bitcoinrpc/default.nix
+++ b/pkgs/development/python-modules/bitcoinrpc/default.nix
@@ -4,24 +4,27 @@
   buildPythonPackage,
   orjson,
   httpx,
+  setuptools,
   typing-extensions,
   pytestCheckHook,
   pytest-asyncio,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bitcoinrpc";
   version = "0.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bibajz";
     repo = "bitcoin-python-async-rpc";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QrLAhX2OZNP6k6TZ7OkD9phQidsExbep8MxWxQpqAU8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     orjson
     httpx
     typing-extensions
@@ -42,4 +45,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 361420518504567abf0a360a913c6d5fa5bd4694 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 23:33:49 +0000
Subject: [PATCH 095/316] python3Packages.pyvista: 0.47.2 -> 0.47.3

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

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index 7a752e62971a..cb414eecc765 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.47.2";
+  version = "0.47.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-59Crx2YeCLUcmiFeBGa9yrefRgamW58OqGIO933zkJc=";
+    hash = "sha256-r2kBAHKaRmcTchF8/5mGz6OYJ0wNLN+e+aitxWvGbXM=";
   };
 
   build-system = [ setuptools ];

From 728ce4151535b6ef4c9d68ef3819a1cb3e6e29ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Apr 2026 23:44:09 +0000
Subject: [PATCH 096/316] livekit: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 668cd40a68c7..51f8ff662532 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-D1OQUWaDnB4tBy5Rf5hnuqT8CHGnLZKKdpoe+Oe1LpM=";
+    hash = "sha256-9YWZIZXXphsyYXaBFSUHNyulcBmob7vExkI+LM4DeFY=";
   };
 
-  vendorHash = "sha256-LoJNJZPeS3vZlfFYBJ03XzooVFzSMGgmgbQ8yAq5BhA=";
+  vendorHash = "sha256-Fa2GHoXP8jm5aiPXLz9newQR/KAoUgJ3Pv/Bw2IYsrA=";
 
   subPackages = [ "cmd/server" ];
 

From 64c5a3f73123758907915166a0609975a459eb99 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 17 Apr 2026 18:07:54 -0600
Subject: [PATCH 097/316] python3Packages.stackprinter: 0.2.12 -> 0.2.13

https://github.com/cknd/stackprinter/releases/tag/0.2.13
Diff: https://github.com/cknd/stackprinter/compare/0.2.12...0.2.13
---
 pkgs/development/python-modules/stackprinter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stackprinter/default.nix b/pkgs/development/python-modules/stackprinter/default.nix
index 189cc0ab2641..f4a34a60b3fb 100644
--- a/pkgs/development/python-modules/stackprinter/default.nix
+++ b/pkgs/development/python-modules/stackprinter/default.nix
@@ -10,14 +10,14 @@
 }:
 buildPythonPackage rec {
   pname = "stackprinter";
-  version = "0.2.12";
+  version = "0.2.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cknd";
     repo = "stackprinter";
     tag = version;
-    hash = "sha256-Offow68i2Nh65sh5ZowlSdV1SKF2RIfwlRv4z1bCu+k=";
+    hash = "sha256-R6s1YBbb52oK1zIQtRR80W+6Ca/gATtC6S3rUEC4Mes=";
   };
 
   build-system = [

From 2581b9091253809277214b085507e7cde885ec1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 00:58:00 +0000
Subject: [PATCH 098/316] swagger-codegen: 2.4.50 -> 2.4.52

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

diff --git a/pkgs/by-name/sw/swagger-codegen/package.nix b/pkgs/by-name/sw/swagger-codegen/package.nix
index 279e5627aecd..ee80872c3a69 100644
--- a/pkgs/by-name/sw/swagger-codegen/package.nix
+++ b/pkgs/by-name/sw/swagger-codegen/package.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.50";
+  version = "2.4.52";
   pname = "swagger-codegen";
 
   jarfilename = "${pname}-cli-${version}.jar";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}";
-    sha256 = "sha256-rsoQFd5XTIcAz32jv2vv/OkqSSC3wCvxBeRbVJhZfLA=";
+    sha256 = "sha256-8MwqDGP6A2V2B0kGOTVpf66yOGzUCe1bFOO/l+GBrmY=";
   };
 
   dontUnpack = true;

From 113673461f242656ee55c9eda52d57dd7ac09862 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 01:32:12 +0000
Subject: [PATCH 099/316] grafanaPlugins.grafana-mqtt-datasource: 1.1.0-beta.3
 -> 1.3.1

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

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
index eb4e60088746..35e98d929097 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin {
   pname = "grafana-mqtt-datasource";
-  version = "1.1.0-beta.3";
+  version = "1.3.1";
   zipHash = {
-    x86_64-linux = "sha256-/0hZc0lFV1LXl6532nLJmJ6fJPdRx+sMt7Uep4GTeX0=";
-    aarch64-linux = "sha256-KPIa/yYkzbKm4/mB84/DdIsdqfQBOc0+LGxl2GHDVGk=";
-    x86_64-darwin = "sha256-7gGw/RCuzHmj/vaIAweXLPqQYAl0EMSXXjPCtjRC4vU=";
-    aarch64-darwin = "sha256-i2/lE7QickowFSvHoo7CuaZ1ChFVpsQgZjvuBTQapq4=";
+    x86_64-linux = "sha256-/a/15VPcRr37QL7ZN5VgTXqioqC9dWMODdigLJTPkr8=";
+    aarch64-linux = "sha256-kSzyQkC+fHZVJPA3xBtfDD2i4rszlbu+gCMDbzZmlL0=";
+    x86_64-darwin = "sha256-MKMDXsk+5cfohl7Dx4BwjjbPn3aXsQ4d917GmdBkwZI=";
+    aarch64-darwin = "sha256-tWNkGZebMTMmoNtB7WevoWIEAYyOcba9PETaLwz8chI=";
   };
   meta = {
     description = "Visualize streaming MQTT data from within Grafana";

From ccd17912c35e7e0c238a3d05f77c147395a0d7ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 01:38:34 +0000
Subject: [PATCH 100/316] mieru: 3.30.1 -> 3.31.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 438ca1a04ddb..98e2fea15628 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mieru";
-  version = "3.30.1";
+  version = "3.31.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kS7da5cO/g0FD5cs1zqz2RRhTExzv3ohnxMfAaDbhHc=";
+    hash = "sha256-jiu0q8S7Ab73S8adE6GgoCvkBhimGmF3wPQZj9L6dV8=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From eb4c1c8592ac59af36720cc1c1f323c3d80d02cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 02:13:00 +0000
Subject: [PATCH 101/316] python3Packages.pytapo: 3.4.12 -> 3.4.13

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

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index afd473b952d8..1ba3142797bb 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytapo";
-  version = "3.4.12";
+  version = "3.4.13";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-FK8ELrhCZ7jHyziK+mOGPj4NW7R8FN0mkynSUfnQ17s=";
+    hash = "sha256-+PQ5x8ob59AhcCaqs/KKS3/7ywe0bkZUvun/sVGBtNA=";
   };
 
   build-system = [ setuptools ];

From 214b95df651b114ca54972d40216a95e0481419a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 04:31:51 +0000
Subject: [PATCH 102/316] proto: 0.56.0 -> 0.56.3

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

diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 67568933acbb..0a59eeadf9c4 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proto";
-  version = "0.56.0";
+  version = "0.56.3";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QVqtESS2c4gr8rDqw1WL6ai+Szo24aBSmGzwQEuRhG4=";
+    hash = "sha256-WMc1UpxP32gTRjxemAnFVQ4YxSNirEJJnUUWRDoU9os=";
   };
 
-  cargoHash = "sha256-/rUuQSrOn8jkbeqF9aOAYTjkyKrcKRznP9snUWZsvbU=";
+  cargoHash = "sha256-umbwQVUClF5pW3MzVyqDANmyQoCAqlRl5OwwEkg4UaQ=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From 3dd734e1e7f5d386f01c7836f98e80f205b06eee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 05:01:08 +0000
Subject: [PATCH 103/316] python3Packages.swcgeom: 0.21.2 -> 0.21.5

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

diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix
index 166d15a7d928..a03d97b2838f 100644
--- a/pkgs/development/python-modules/swcgeom/default.nix
+++ b/pkgs/development/python-modules/swcgeom/default.nix
@@ -26,7 +26,7 @@
 }:
 
 let
-  version = "0.21.2";
+  version = "0.21.5";
 in
 buildPythonPackage rec {
   pname = "swcgeom";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "yzx9";
     repo = "swcgeom";
     tag = "v${version}";
-    hash = "sha256-A6N6i7GESMIhG81xXDsNXiM0yBXWGhcdELll79F3Evk=";
+    hash = "sha256-QLo2tfoQFuoKee/e/t5l3bUwOtobV57Od9UvAze78FE=";
   };
 
   build-system = [

From 1f16653b873e20dde9182fc445ecbb3042c327ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Apr 2026 02:58:24 +0000
Subject: [PATCH 104/316] ocamlPackages.smtml: 0.24.0 -> 0.25.0

---
 pkgs/development/ocaml-modules/smtml/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index 70887215bfe1..69fba965db35 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -5,6 +5,7 @@
   ocaml,
   fetchFromGitHub,
   menhir,
+  darwin,
   bitwuzla-cxx,
   bos,
   cmdliner,
@@ -30,19 +31,22 @@
 
 buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9499a8ngL8rTeyhWumn08ZjymD8zOMyyG0ZgjVITSPQ=";
+    hash = "sha256-dWZrN0hTxxqGC2queit91GDuw/x5fyRPwHbmKxkvc/w=";
   };
 
   minimalOCamlVersion = "4.14";
 
   nativeBuildInputs = [
     menhir
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
   ];
 
   buildInputs = [

From 48c236d212118890f93125239ec65c6a7a7f75f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 09:15:34 +0000
Subject: [PATCH 105/316] tempo: 2.10.3 -> 2.10.4

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

diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 9546772ea5f0..25cf8cc431e8 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "tempo";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-3c8I7a++PqY2omQHpNrdaCz6MKaCQ2shdkhHgaKWgZI=";
+    hash = "sha256-0RW77pa6e8+kg7T5z2VLTd0bnJKpf+io7FaHWWQDpcQ=";
   };
 
   vendorHash = null;

From 8b38e2d51ea736a13ebe7c4bf20c5c8f608b4e54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 09:23:58 +0000
Subject: [PATCH 106/316] vscode-extensions.firsttris.vscode-jest-runner:
 0.4.144 -> 0.4.147

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..511e90c1e832 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1744,8 +1744,8 @@ let
         mktplcRef = {
           name = "vscode-jest-runner";
           publisher = "firsttris";
-          version = "0.4.144";
-          hash = "sha256-gKs0DNloispkKb7F6V38W5LoPk4OFPayv7MX9bQLJ2k=";
+          version = "0.4.147";
+          hash = "sha256-gMlGU6XSvWEufaaszFJ7VmPM9q5oI5K/hFzIwQGTSCE=";
         };
         meta = {
           description = "Simple way to run or debug a single (or multiple) tests from context-menu";

From 7ebd6550905d7e1f01f0e6a9af00717117f062cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 09:43:15 +0000
Subject: [PATCH 107/316] vfox: 1.0.8 -> 1.0.10

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

diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix
index 4a7c7a168874..1c5ae3d18c0e 100644
--- a/pkgs/by-name/vf/vfox/package.nix
+++ b/pkgs/by-name/vf/vfox/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vfox";
-  version = "1.0.8";
+  version = "1.0.10";
 
   src = fetchFromGitHub {
     owner = "version-fox";
     repo = "vfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wpMxqt9m2Bh4oYSVmxG8AYZx3kzwmjBZC54UlBKWZz4=";
+    hash = "sha256-ItSILzr7CaZsuNb1ukF+gMGhKf7FC5lJPnnvGmqLrwk=";
   };
 
   vendorHash = "sha256-494nqL6KiUk4VeKlG9YHFpgACgaYC3SR1I1EViD71Jw=";

From 1ea6ab58ee481d0488b044b30796a89e8b28d99b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 09:46:09 +0000
Subject: [PATCH 108/316] xlights: 2026.05 -> 2026.06

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

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 7f1003f6fc2a..be1aa4b5702c 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2026.05";
+  version = "2026.06";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-W1Il2dIDFUtkwPsPptdD2s/5eluGAeH7tw/ZmArN8dY=";
+    hash = "sha256-qRMICQVQEUOWMXrhbCHQSwKSur0WMZDLN4gz1fBhNQM=";
   };
 
   meta = {

From a1ecf2d8f668042c56c4e847c256d701a0527be5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 10:39:35 +0000
Subject: [PATCH 109/316] python3Packages.langgraph-checkpoint: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index 28f425b623b2..0a2177b27e53 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-checkpoint";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpoint==${finalAttrs.version}";
-    hash = "sha256-NJSmpVshj/x6ws+jFYXGarNKNztbk5OIIMA1neFOyIY=";
+    hash = "sha256-k0V+/kZlpMttgVId+mLgEMvK+l20NEmf8S1ylPWjjsU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/checkpoint";

From df812e914f55fde42d3b4bd7f5a667617ecdbf51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 11:56:23 +0000
Subject: [PATCH 110/316] vscode-extensions.redhat.java: 1.53.0 -> 1.54.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..cd46c4959b82 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3877,8 +3877,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "java";
-          version = "1.53.0";
-          hash = "sha256-4gMFV6uMpExqZgWwcPYLxOnHJBQtT02LY3VqfzRLoaQ=";
+          version = "1.54.0";
+          hash = "sha256-G1L8fSRXj4rmyGFyvPuz7zoQ367Lc5PoyVOZnHPHcu0=";
         };
         buildInputs = [ jdk ];
         meta = {

From c3aefb16a572ff41c589e7e9f15589a506af727f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 12:29:54 +0000
Subject: [PATCH 111/316] yaml-language-server: 1.21.0 -> 1.22.0

---
 pkgs/by-name/ya/yaml-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 56301c6bf570..60dee43afd92 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-kZo47yQ1p8GGYVQ9TMTuvVuFJtk6rEBkQpu1jHaKEik=";
+    hash = "sha256-NCJsnA0m8DUeAUpQW83f8QUXzZ9DRHA7eOrVcj40RVk=";
   };
 
-  npmDepsHash = "sha256-UZWCVRv9Lv3MYR2AMdTIg6rslN/ajAp9g8+7QWS+0QQ=";
+  npmDepsHash = "sha256-DCEutA4DubP/iQIWMKjbepnhgd5L1GXnlzBokneqtWg=";
 
   strictDeps = true;
 

From eaf098d6fe9bed1d8dba2a38b4aac2930322efcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 13:36:04 +0000
Subject: [PATCH 112/316] vscode-extensions.vscjava.vscode-gradle: 3.17.2 ->
 3.17.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..2f15b91b6898 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5076,8 +5076,8 @@ let
         mktplcRef = {
           name = "vscode-gradle";
           publisher = "vscjava";
-          version = "3.17.2";
-          hash = "sha256-oBtUDkuGMu7/CvxiHxvbiHHTQ2dG85VY08es9u3xKJk=";
+          version = "3.17.3";
+          hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0=";
         };
 
         meta = {

From 25e899aa9f61d022812f5ba681ec2ace8b4515cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 14:05:17 +0000
Subject: [PATCH 113/316] gitcs: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/gi/gitcs/package.nix b/pkgs/by-name/gi/gitcs/package.nix
index fae3107e06a4..40a697730849 100644
--- a/pkgs/by-name/gi/gitcs/package.nix
+++ b/pkgs/by-name/gi/gitcs/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitcs";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "hrtsegv";
     repo = "gitcs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eAza/ni8MYrve0YCTkleOyOXPWmH4CEh8j5L+78wzsQ=";
+    hash = "sha256-mRQfW0sY6la8SyO+zDr/HcakDugRShW/Aea9uj6G/gA=";
   };
 
   vendorHash = "sha256-bG0BaH8yYp8TUiK/7xvghB4T48LcBEvmF1uvY5eYkww=";

From 79ff7eced3018ad8c688399c06bf1eaeea3aa2a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 14:37:09 +0000
Subject: [PATCH 114/316] uutils-util-linux: 0.0.1-unstable-2026-04-10 ->
 0.0.1-unstable-2026-04-16

---
 pkgs/by-name/uu/uutils-util-linux/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix
index 80c7405dee0b..1ca72935ddcf 100644
--- a/pkgs/by-name/uu/uutils-util-linux/package.nix
+++ b/pkgs/by-name/uu/uutils-util-linux/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-util-linux";
-  version = "0.0.1-unstable-2026-04-10";
+  version = "0.0.1-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "util-linux";
-    rev = "1906c2a2aaae1ea13a8c8ea58759bae6a762e9f8";
-    hash = "sha256-sQz/ynjYtgb2OcRBxOPgw2fWUBbKCP6FQYrA0ml4Ghc=";
+    rev = "0d9acbc3298cf7da42d4441b0d62f461c70faf75";
+    hash = "sha256-bhpHxhhl1W2IZbDiMf7BZCksoSo6T2N1JA/xUjwcCRY=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"'
   '';
 
-  cargoHash = "sha256-9AT9i3Q+C07GpaQmuepkbnhKG/pbsFWXTmWXIhtL8+E=";
+  cargoHash = "sha256-DluiMOAuwgM2a/DXWOXXezk+QSJTty8VmlV7Mf8kRlk=";
 
   nativeBuildInputs = [
     pkg-config

From 8c5848cea3b903012ccab9859bac64ae7105369a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 14:39:23 +0000
Subject: [PATCH 115/316] uutils-procps: 0.0.1-unstable-2026-04-10 ->
 0.0.1-unstable-2026-04-16

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

diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix
index b6fe22006c83..37f738d5887c 100644
--- a/pkgs/by-name/uu/uutils-procps/package.nix
+++ b/pkgs/by-name/uu/uutils-procps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-procps";
-  version = "0.0.1-unstable-2026-04-10";
+  version = "0.0.1-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "procps";
-    rev = "a6321bdbcb3c1810581cba24a2e7329c7781dd87";
-    hash = "sha256-QYeb7Kw2UzJTpKFv+5vnUjq+QpSkQa2Ch6AITXh1qXs=";
+    rev = "0ef16701f37b6ad3e7b1bbe8398aae29f3844de0";
+    hash = "sha256-WR8z2dTee4tn3xQA6/2C+E3e0z36kI7hk8Q3Hr4+BAQ=";
   };
 
-  cargoHash = "sha256-tYeUQxFkTQdQ9aOeEi77FoQIpxY1OiLZIMZTK/dxf7o=";
+  cargoHash = "sha256-EkRPd0QCTaV090QdLnCCt2BnwPuPEFjnlkcDQtF99c4=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 27629e76c0946f2047977453b99c254486fb6c86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 15:07:14 +0000
Subject: [PATCH 116/316] fastly: 14.3.0 -> 14.3.1

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

diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix
index 8e1736c3adb0..0584155bdc01 100644
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fastly";
-  version = "14.3.0";
+  version = "14.3.1";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lUhBSx6iPKk4j4jkSaSM4UrJkX84XJVgziayRlZ7bcg=";
+    hash = "sha256-8RdJNGI8FzM2HVkJNbWqr2Cw+CkPUTZ7uiiLQVEKTGM=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,

From 453f8524fbb29baaf246ba36910d742e46685409 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 17:07:17 +0000
Subject: [PATCH 117/316] v2ray-domain-list-community: 20260409151144 ->
 20260418094517

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index ac8fee64001a..ed526a6c7138 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20260409151144";
+    version = "20260418094517";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-/GFcIoRMv0AB5m4z0kL3Gh51cVqeil9MpnAOcwvudxE=";
+      hash = "sha256-6UmTW+Fc8Kp9nmov4t56haCYCZ2RZuuGvghXlePA8r4=";
     };
     vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk=";
     meta = {

From 5c9fd2e79097d1d4614da6fed28ac075aa0340ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 17:47:40 +0000
Subject: [PATCH 118/316] vscode-extensions.gitlab.gitlab-workflow: 6.72.0 ->
 6.74.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..cd666e240a66 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1998,8 +1998,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.72.0";
-          hash = "sha256-QqoGCxGJ0l69Q6P+L/AsEIN99xP9ReYzRC2AJVpk/gU=";
+          version = "6.74.3";
+          hash = "sha256-2G/dyedhmjN8630yMccY58ZtNwPPtBB8HFFkZ0dLYDA=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From 289e774bd54f086ba04ac43bd73e5e118729e9ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 18:19:39 +0000
Subject: [PATCH 119/316] runn: 1.6.1 -> 1.9.1

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

diff --git a/pkgs/by-name/ru/runn/package.nix b/pkgs/by-name/ru/runn/package.nix
index 0dcd9ae7480a..1814c1067d67 100644
--- a/pkgs/by-name/ru/runn/package.nix
+++ b/pkgs/by-name/ru/runn/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "runn";
-  version = "1.6.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "runn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fLZNp5QKg+EFE1nykck37gCbLBzJTE+AGdad1bEzLgQ=";
+    hash = "sha256-zq8clHp0j+lCAIRL5aOKp2k7Z1S52fYhf3Nsgd1h16s=";
   };
 
-  vendorHash = "sha256-rz7Yc4Cvn100Xgf/yOpvZs4WjoyxNwuS4gPEJ49/gkE=";
+  vendorHash = "sha256-XR9FulUi9V86Ic140A2pK953+Udm0btBvSIRshsqdAQ=";
 
   subPackages = [ "cmd/runn" ];
 

From ea559d1b3037db5604a4c4d6103b1c9bb9baa1d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 20:22:21 +0000
Subject: [PATCH 120/316] ghgrab: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/by-name/gh/ghgrab/package.nix b/pkgs/by-name/gh/ghgrab/package.nix
index 1ed827e79dbd..68cbd698a663 100644
--- a/pkgs/by-name/gh/ghgrab/package.nix
+++ b/pkgs/by-name/gh/ghgrab/package.nix
@@ -8,16 +8,16 @@
 # note: upstream has a flake
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghgrab";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "abhixdd";
     repo = "ghgrab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ea5JdOKu4LBD77Nlj9gmISb6GPDhOZc3XCrRj2X/cB0=";
+    hash = "sha256-Wg0tDsK29RZ4iunaoLp2IbU4rC7GBlihGWbTJs0l480=";
   };
 
-  cargoHash = "sha256-S1wkdPYVvH+4rfCQ/IohrqvHsiVWlb9OW5Dva3jNeis=";
+  cargoHash = "sha256-6B9rVTqA2IoYCYOKy1Dc0f+3YZUJFeFQfEXF1OXZmEQ=";
 
   doInstallCheck = true;
   versionCheckProgramArg = "--version";

From 54588ccf04aa2d484d5356dde4fd2fda77657d87 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 19 Apr 2026 00:29:18 +0200
Subject: [PATCH 121/316] espflash: 4.3.0 -> 4.4.0

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

diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index eb5f9cad400a..3f2830fae857 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espflash";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espflash";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CeXkC+3M22EmHG0KL0wMXn49bUbxgD33ojQvbeaf5Gs=";
+    hash = "sha256-SXXFXwr+oO+BbBQ/BZgCKhbdcaybVr1JY66q+xM2Quc=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-Vgf3k0pT8VswESXuWIIeZlCFLm861BYrteRFkmhk/3M=";
+  cargoHash = "sha256-ZAp9hEzDrzjYSJLKeMCjAoiybOqPdDLqIGOvBTCr5uU=";
 
   cargoBuildFlags = [
     "--exclude=xtask"

From 321d62cd3199ea2145e3820239316ef95c7cbe7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 22:33:25 +0000
Subject: [PATCH 122/316] kubernetes-helmPlugins.helm-diff: 3.15.5 -> 3.15.6

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 24836dcc489f..ef79f6773f29 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.15.5";
+  version = "3.15.6";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = "helm-diff";
     rev = "v${version}";
-    hash = "sha256-ti247vkYPW6PH0DNkgdH99MyUy2uc2n+zHgpNET/cgU=";
+    hash = "sha256-DGJtvCQ3WGY/Aajrpn/QUQebjb0K9otyRtqCZa4iqMY=";
   };
 
-  vendorHash = "sha256-b479InQ1ZoOtRgY1cyKeDDoGrOIg0aPqNfDrrY1E4tQ=";
+  vendorHash = "sha256-psfNtI5rf5B/dQKPjPPwuG14Z/hsJWmuL5JiLuux6ng=";
 
   ldflags = [
     "-s"

From 44971ba5aee5a6129bee8a4ad79ec0140c46ed88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 22:45:19 +0000
Subject: [PATCH 123/316] oxide-rs: 0.15.0+2026021301.0.0 ->
 0.16.0+2026032500.0.0

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

diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index a36a9a239409..0c37af03f119 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxide-rs";
-  version = "0.15.0+2026021301.0.0";
+  version = "0.16.0+2026032500.0.0";
 
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "oxide.rs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PFcQ4zNLh1Q5wMgBeWptix9+ii4TY2RtnI6JIyMYa14=";
+    hash = "sha256-0zlH7Gws7Cn161whwx4myBF1wTL46fFcr0mjPrvCTmQ=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=test_cmd_auth_debug_logging"
   ];
 
-  cargoHash = "sha256-Yf5PG5jRoufP+rf3WHCwT3zvDp++68Ewl2KFTCO5w54=";
+  cargoHash = "sha256-x6jYTwrfdAKl42AleIYXxWLjnwi1IYMtWnfosueiHp0=";
 
   cargoBuildFlags = [
     "--package=oxide-cli"

From f4c9c0b15a1eeaa3da9e174494f7ef6419eb3327 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 18 Apr 2026 00:25:41 +0200
Subject: [PATCH 124/316] python3Packages.pymystem3: drop

---
 .../python-modules/pymystem3/default.nix      | 41 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pymystem3/default.nix

diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix
deleted file mode 100644
index 9c62fa60de85..000000000000
--- a/pkgs/development/python-modules/pymystem3/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  fetchPypi,
-  buildPythonPackage,
-  isPy3k,
-  requests,
-  flake8,
-  mock,
-  pytest,
-  mystem,
-}:
-
-buildPythonPackage rec {
-  pname = "pymystem3";
-  version = "0.2.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "15gv78m17g958gfka6rr3rg230g6b5ssgk8bfpsp7k2iajhxdbhs";
-  };
-
-  propagatedBuildInputs = [ requests ];
-  nativeCheckInputs = [
-    flake8
-    mock
-    pytest
-  ];
-  doCheck = isPy3k; # fails on linting
-
-  postPatch = ''
-    sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py
-  '';
-
-  meta = {
-    description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language";
-    homepage = "https://github.com/nlpub/pymystem3";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 070b98284fbf..943a5c69d63a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -419,6 +419,7 @@ mapAliases {
   pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
   PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
   pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29
+  pymystem3 = throw "'pymystem3' has been removed because it is broken and unmaintained"; # Added 2026-04-19
   pyobject = throw "'pyobject' has been removed because it was only supporting python 2"; # Added 2026-01-24
   pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5873e2d0343..f3d88b9dc5e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14374,8 +14374,6 @@ self: super: with self; {
 
   pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
 
-  pymystem3 = callPackage ../development/python-modules/pymystem3 { };
-
   pynac = callPackage ../development/python-modules/pynac { };
 
   pynacl = callPackage ../development/python-modules/pynacl { };

From 08082eff4c42b8d4385d3f5b84861b3c604c334f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 23:22:51 +0000
Subject: [PATCH 125/316] python3Packages.plantuml-markdown: 3.11.1 -> 3.11.2

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

diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index 3f203385238a..777c49df870e 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "plantuml-markdown";
-  version = "3.11.1";
+  version = "3.11.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mikitex70";
     repo = "plantuml-markdown";
     tag = version;
-    hash = "sha256-DgHWqwPsZ5q1XqrfaAiUslKnJdHX4Pzw9lygF3iaxz4=";
+    hash = "sha256-GyV9EHEyW75OWj4iG4MsNV5wEvygaBz4GpyxOzIB8oY=";
   };
 
   postPatch = ''

From 595f813a5408b773ee0a24395b61303a30a91d04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 23:30:44 +0000
Subject: [PATCH 126/316] dosage-tracker: 2.1.6 -> 2.1.7

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

diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix
index 7e3613bc9ada..6016474be28d 100644
--- a/pkgs/by-name/do/dosage-tracker/package.nix
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosage";
-  version = "2.1.6";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Dd7q/txbgvlpKi7/sTvxyo9DarZ19BUCYRaO37zK/tU=";
+    hash = "sha256-Tgsab1KzdEQ9C9gkh09M5gKpocrMrgxQ16pIJ4zcKsY=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/318830

From a960e872b4f2a7f77d0aaa3ff773d5fbec28954b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 00:28:57 +0000
Subject: [PATCH 127/316] skaffold: 2.17.1 -> 2.18.3

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

diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix
index fd3dc591194f..be803484f427 100644
--- a/pkgs/by-name/sk/skaffold/package.nix
+++ b/pkgs/by-name/sk/skaffold/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "skaffold";
-  version = "2.17.1";
+  version = "2.18.3";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Cbpfz0IXFopCeKNDwx8mB/1quhcOO3IWStsFmKeNPYg=";
+    hash = "sha256-5/Ty3YqDEqHwJ/ghGOasmDiVgXzQ/fhpgqqkyjb8ID4=";
   };
 
   vendorHash = null;

From a0724076e470c6a0458fc2220f7b6e2d255af3ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 00:52:40 +0000
Subject: [PATCH 128/316] xdg-ninja: 0.2.0.2-unstable-2025-11-01 ->
 0.2.0.2-unstable-2026-04-18

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

diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index 3fe8205507bb..a0fe11636903 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "xdg-ninja";
-  version = "0.2.0.2-unstable-2025-11-01";
+  version = "0.2.0.2-unstable-2026-04-18";
 
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    rev = "cb09ebd6479e276070a55fcffae9a5320bc52ed5";
-    hash = "sha256-VpMSMWwYD0GIPtAuSkdG417RxSx6XCRh09IMrLDOi6A=";
+    rev = "3cb5c53293838d624d29ae249fb3507703af4631";
+    hash = "sha256-iviya6odP0qEguvxcxni5wLGAFTWt8pnWmIEo1bNCbI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 39d7d711a8caf7636fe0f6c23f144f59cd0137d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 01:30:33 +0000
Subject: [PATCH 129/316] easyeffects: 8.1.8 -> 8.2.0

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

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 03804d56a666..a76152aeaf29 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -59,13 +59,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "easyeffects";
-  version = "8.1.8";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U0+OGxej5my2KpqzRTiHrB80arkWT1mxHOSxOCDsnb0=";
+    hash = "sha256-HBCYXFFDOhwVebwPIduYNGJ61LFw9lOTZyYmt1k6CuA=";
   };
 
   nativeBuildInputs = [

From 32f8668a7ff6b7bf9d4c1a419d9c54b658bc7297 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 01:56:30 +0000
Subject: [PATCH 130/316] ao3downloader: 2026.2.0 -> 2026.4.7

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

diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix
index 7cc0ad9f6be6..cd9fb3456d07 100644
--- a/pkgs/by-name/ao/ao3downloader/package.nix
+++ b/pkgs/by-name/ao/ao3downloader/package.nix
@@ -8,14 +8,14 @@
 # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
 python312Packages.buildPythonApplication (finalAttrs: {
   pname = "ao3downloader";
-  version = "2026.2.0";
+  version = "2026.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nianeyna";
     repo = "ao3downloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NrVzRYNxvy8LOvXy0/1go0wEQyLt56inu+f93UFX1CM=";
+    hash = "sha256-PlMVhvUX/XeNrKfwe+/sFv8Y4k7GEzCR+xIO/zuspxM=";
   };
 
   build-system = with python312Packages; [

From d77f63c0244a8e7acc7bc6c5b534baec0fa8cb97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 02:15:01 +0000
Subject: [PATCH 131/316] all-the-package-names: 2.0.2413 -> 2.0.2421

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

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index bd39063249df..3d89c261f569 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2413";
+  version = "2.0.2421";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-loI9wKz0EcePvM2kXqmxNx9rfC/VaMCmJtm0dTjWoOk=";
+    hash = "sha256-1ES2T8PjajmXtNM2xIxM795ub5OKQ0WRa1XH9te+8+0=";
   };
 
-  npmDepsHash = "sha256-6XLDdamRG+IVq/zdyKKlIsnfUVD8pKES7K7hm+yTQ78=";
+  npmDepsHash = "sha256-cYCNNc9+jM6sVBc15OlNaTo0BZ7XudI5c1SODrXD548=";
 
   passthru.updateScript = nix-update-script { };
 

From 016041b0e20ef5465d71a301433888619c943ea7 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 18 Apr 2026 23:53:41 -0300
Subject: [PATCH 132/316] dotnetCorePackages: fix evaluation in cross

---
 pkgs/development/compilers/dotnet/default.nix | 91 +++++++++----------
 1 file changed, 45 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 840196c9c895..b0629746d176 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -11,41 +11,44 @@
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   writeScriptBin,
+  buildPackages,
+  newScope,
 }:
 
-let
-  scope = makeScopeWithSplicing' {
-    otherSplices = generateSplicesForMkScope "dotnetCorePackages";
-    f = (
-      self:
-      let
-        callPackage = self.callPackage;
+makeScopeWithSplicing' {
+  otherSplices = generateSplicesForMkScope "dotnetCorePackages";
+  f = (
+    self:
+    let
+      callPackage = self.callPackage;
 
-        fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { };
+      fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { };
 
-        buildDotnetSdk =
-          let
-            buildDotnet = attrs: callPackage (import ./binary/build-dotnet.nix attrs) { };
-          in
-          version:
-          import version {
-            inherit fetchNupkg;
-            buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
-            buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; });
-            buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
-          };
-
-        runtimeIdentifierMap = {
-          "x86_64-linux" = "linux-x64";
-          "aarch64-linux" = "linux-arm64";
-          "x86_64-darwin" = "osx-x64";
-          "aarch64-darwin" = "osx-arm64";
-          "x86_64-windows" = "win-x64";
-          "i686-windows" = "win-x86";
+      buildDotnetSdk =
+        let
+          buildDotnet = attrs: callWithUtils (import ./binary/build-dotnet.nix attrs) { };
+        in
+        version:
+        import version {
+          inherit fetchNupkg;
+          buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
+          buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; });
+          buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
         };
 
-      in
-      {
+      runtimeIdentifierMap = {
+        "x86_64-linux" = "linux-x64";
+        "aarch64-linux" = "linux-arm64";
+        "x86_64-darwin" = "osx-x64";
+        "aarch64-darwin" = "osx-arm64";
+        "x86_64-windows" = "win-x64";
+        "i686-windows" = "win-x86";
+      };
+
+      # used to break cycle in attribute names
+      callWithUtils = newScope (utils // { callPackage = callWithUtils; });
+
+      utils = {
         inherit
           callPackage
           fetchNupkg
@@ -63,7 +66,7 @@ let
 
         combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { };
 
-        patchNupkgs = callPackage ./patch-nupkgs.nix { };
+        patchNupkgs = buildPackages.callPackage ./patch-nupkgs.nix { };
         nugetPackageHook = callPackage ./nuget-package-hook.nix { };
         autoPatchcilHook = callPackage ../../../build-support/dotnet/auto-patchcil-hook { };
 
@@ -73,39 +76,35 @@ let
         mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { };
         mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
         addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { };
-      }
-    );
-  };
+      };
 
-  callPackage = scope.callPackage;
-
-  pkgs =
-    scope
+    in
+    utils
     // (
       let
-        dotnet_6 = callPackage ./dotnet.nix {
+        dotnet_6 = callWithUtils ./dotnet.nix {
           channel = "6.0";
           withVMR = false;
         };
 
-        dotnet_7 = callPackage ./dotnet.nix {
+        dotnet_7 = callWithUtils ./dotnet.nix {
           channel = "7.0";
           withVMR = false;
         };
 
-        dotnet_8 = callPackage ./dotnet.nix {
+        dotnet_8 = callWithUtils ./dotnet.nix {
           channel = "8.0";
         };
 
-        dotnet_9 = callPackage ./dotnet.nix {
+        dotnet_9 = callWithUtils ./dotnet.nix {
           channel = "9.0";
         };
 
-        dotnet_10 = callPackage ./dotnet.nix {
+        dotnet_10 = callWithUtils ./dotnet.nix {
           channel = "10.0";
         };
 
-        dotnet_11 = callPackage ./dotnet.nix {
+        dotnet_11 = callWithUtils ./dotnet.nix {
           channel = "11.0";
         };
       in
@@ -125,6 +124,6 @@ let
         dotnet_10
         dotnet_11
       ]
-    );
-in
-pkgs
+    )
+  );
+}

From 9cd61530d615c92a08d7932228205c9df63cadea Mon Sep 17 00:00:00 2001
From: mattkang <2027430+mattkang@users.noreply.github.com>
Date: Sat, 18 Apr 2026 23:55:52 -0400
Subject: [PATCH 133/316] tmuxPlugins.dotbar: 0.3.0 -> 0.3.2

---
 pkgs/misc/tmux-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 08f7906c5168..fe432aa28ee8 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -242,12 +242,12 @@ in
 
   dotbar = mkTmuxPlugin rec {
     pluginName = "dotbar";
-    version = "0.3.0";
+    version = "0.3.2";
     src = fetchFromGitHub {
       owner = "vaaleyard";
       repo = "tmux-dotbar";
       tag = version;
-      hash = "sha256-n9k18pJnd5mnp9a7VsMBmEHDwo3j06K6/G6p7/DTyIY=";
+      hash = "sha256-WaRKepmPqiE+W8Tm0dBc6hGiqqZP122eXjrG0rJnt0w=";
     };
     meta = {
       homepage = "https://github.com/vaaleyard/tmux-dotbar";

From 2b2c9d8cf8100537c4c0c7306546acd3b2643fc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 08:12:23 +0000
Subject: [PATCH 134/316] waytrogen: 0.9.3 -> 0.9.5

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

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 2a8cda3f91f4..d6962c45425c 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.9.3";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-0WBV6s6THXSg8HabnFFi+Gco+sXy7zQO21IgXykMBHc=";
+    hash = "sha256-+1HiTmJAkhd+zbLAyRRk9tHDbR7qcslkfJ2HyGipZCo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 4dfc4176d47fba5e55f6c766311d741d2fac2402 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 09:00:03 +0000
Subject: [PATCH 135/316] pi-coding-agent: 0.66.1 -> 0.67.68

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

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index c9d806f2d530..7be07adbf169 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -10,16 +10,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.66.1";
+  version = "0.67.68";
 
   src = fetchFromGitHub {
     owner = "badlogic";
     repo = "pi-mono";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZLa4IU7WpXixn9q158m17AvsofE43qj11JoaHCA1BWI=";
+    hash = "sha256-1k9tHb5Dle37a5qHm8xT14vI5cQZOb8ASGQ1KxzPCr4=";
   };
 
-  npmDepsHash = "sha256-ZR9KAu9zKqYw7Kduf2lkijNVJ03iGzUhty8txSSliD4=";
+  npmDepsHash = "sha256-xQQZECkDuiCdu0FlKbAKgk6EatLf2jMIXKDfRRwN/gA=";
 
   npmWorkspace = "packages/coding-agent";
 

From bbc75a2a6ff0aca862282a10b979d7a7a4837d66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 09:16:18 +0000
Subject: [PATCH 136/316] python3Packages.flask-marshmallow: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 8c6360c50eac..360e5b15aa4c 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "flask-marshmallow";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "flask-marshmallow";
     tag = version;
-    hash = "sha256-YyXsCyIJmXb1p1J5wvGg57bGbsAbz83vW6hxpnbpOSw=";
+    hash = "sha256-IzeVVkyf4BRxtUVQIfzAvyjaKG+BLwhruXZHFJ6iGmw=";
   };
 
   build-system = [ flit-core ];

From a98a091c42290b435648caf4464525183d44381c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 19 Apr 2026 11:50:33 +0200
Subject: [PATCH 137/316] mate-panel-with-applets: fix buildInputs for
 structuredAttrs

Using forEach/map over selectedApplets we end up with nested lists of
their build inputs, but buildInputs should be one flat list.

If __structuredAttrs are enabled, this means the list array cannot be
exported to a bash array as-is and is an empty array instead.

Fix this by using concatMap instead.
---
 pkgs/by-name/ma/mate-panel-with-applets/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mate-panel-with-applets/package.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
index 438e55635153..a3a52ced0d43 100644
--- a/pkgs/by-name/ma/mate-panel-with-applets/package.nix
+++ b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs =
-    lib.forEach selectedApplets (x: x.buildInputs)
+    lib.concatMap (x: x.buildInputs) selectedApplets
     ++ selectedApplets
     ++ [ mate-panel ]
     ++ mate-panel.buildInputs

From 56ca1c308e4fdb4a2653d064b53ec091a858691c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 19 Apr 2026 12:05:29 +0200
Subject: [PATCH 138/316] qemu-user: update URL in comment

It seems they delete old versions, so let's just use master and hope
this stays current.

Co-authored-by: Emily <vcs@emily.moe>
Link: https://github.com/NixOS/nixpkgs/pull/502485/changes#r3005185252
---
 pkgs/by-name/qe/qemu/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix
index be472939ad21..31515f58d636 100644
--- a/pkgs/by-name/qe/qemu/package.nix
+++ b/pkgs/by-name/qe/qemu/package.nix
@@ -451,7 +451,7 @@ stdenv.mkDerivation (finalAttrs: {
     // lib.optionalAttrs (!toolsOnly && !userOnly) {
       mainProgram = "qemu-kvm";
     }
-    # userOnly: https://qemu.readthedocs.io/en/v9.0.2/user/main.html
+    # userOnly: https://qemu.readthedocs.io/en/master/user/main.html#supported-operating-systems
     // lib.optionalAttrs userOnly {
       platforms = with lib.platforms; (linux ++ freebsd ++ openbsd ++ netbsd);
       description = "QEMU User space emulator - launch executables compiled for one CPU on another CPU";

From 024301e1b65e1344ca32eaa5be4561b7b0644699 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 19 Apr 2026 13:11:27 +0200
Subject: [PATCH 139/316] yazi: use ffmpeg-headless for video previews

The bundled video previewer only invokes `ffmpeg` and `ffprobe`
(yazi-plugin/preset/plugins/video.lua), never `ffplay`. The full
ffmpeg's `ffplay` links SDL, which transitively pulls in gtk3, gtk4,
zenity, gst-plugins-bad and flite.

Closure: 1.1G -> 494M.

Matches what comparable in-tree thumbnailers already do
(ffmpegthumbnailer, mcat, yt-dlp, navidrome).
---
 pkgs/by-name/ya/yazi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix
index 917605f0bfc6..02438b9c3630 100644
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@@ -9,7 +9,7 @@
     jq
     poppler-utils
     _7zz
-    ffmpeg
+    ffmpeg-headless
     fd
     ripgrep
     fzf
@@ -27,7 +27,7 @@
   jq,
   poppler-utils,
   _7zz,
-  ffmpeg,
+  ffmpeg-headless,
   fd,
   ripgrep,
   fzf,

From 4d5beb48978ff9b1048db51a87e49abeb91b235c Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@stud.hs-kempten.de>
Date: Thu, 16 Apr 2026 08:38:23 +0200
Subject: [PATCH 140/316] migrate-to-uv: 0.11.1 -> 0.12.0 and change repo owner

---
 pkgs/by-name/mi/migrate-to-uv/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/mi/migrate-to-uv/package.nix b/pkgs/by-name/mi/migrate-to-uv/package.nix
index d976530655b5..3184068161dc 100644
--- a/pkgs/by-name/mi/migrate-to-uv/package.nix
+++ b/pkgs/by-name/mi/migrate-to-uv/package.nix
@@ -11,19 +11,19 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "migrate-to-uv";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "mkniewallner";
+    owner = "osprey-oss";
     repo = "migrate-to-uv";
     tag = finalAttrs.version;
-    hash = "sha256-gKiLGuHlUtSFdZCZZIxK7V6apvHMJ7sBZZo0auK4w2s=";
+    hash = "sha256-+UXPgFYgTlLmUYpE2aWsO2OdelP9dCZsB3cWjG4negA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-CZEZ1zLXAerUPgKRmzkN4Q3v/tNDI438V0yfYYZK+pQ=";
+    hash = "sha256-evsc5uOZnN6+tRXmN1SQD5Iqnm4Y+TjmBzWaGQQj2UQ=";
   };
 
   build-system = [
@@ -39,8 +39,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Migrate a project from Poetry/Pipenv/pip-tools/pip to uv package manager";
-    homepage = "https://mkniewallner.github.io/migrate-to-uv/";
-    changelog = "https://github.com/mkniewallner/migrate-to-uv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    homepage = "https://osprey-oss.github.io/migrate-to-uv/";
+    changelog = "https://osprey-oss.github.io/migrate-to-uv/CHANGELOG/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ malik ];
     mainProgram = "migrate-to-uv";

From edecd6b2ca776b1bf7eace22fa46642750ba7ebf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 13:25:12 +0000
Subject: [PATCH 141/316] highscore-mupen64plus: 0-unstable-2026-04-10 ->
 0-unstable-2026-04-11

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

diff --git a/pkgs/by-name/hi/highscore-mupen64plus/package.nix b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
index 326b0005d161..bf51bd613105 100644
--- a/pkgs/by-name/hi/highscore-mupen64plus/package.nix
+++ b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-mupen64plus";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-11";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mupen64plus-highscore";
-    rev = "867c94907cd47f4843f3c8bddd371166c460ba8b";
-    hash = "sha256-hnDhyYcKkKh0mvksAOJOLYnyp5gNCk38dxMBT/1ItLQ=";
+    rev = "9654f94da5ab382e4257c26c9a26cbab4fe6b43f";
+    hash = "sha256-oE7yDKYxDz4WTrttOLHY8zvHw0Xnu1ERfBjAOeqkSOQ=";
   };
 
   postPatch = ''

From 1327a23761adf8d4ad2e81dcec5946aae1d27616 Mon Sep 17 00:00:00 2001
From: Christopher Crouse <mail@amz-x.com>
Date: Sun, 19 Apr 2026 16:26:45 +0200
Subject: [PATCH 142/316] pantheon.elementary-terminal: 7.2.0 -> 8.0.0

---
 .../apps/elementary-terminal/default.nix      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 6c88700cdf7f..0eafd0227808 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -8,26 +8,24 @@
   ninja,
   vala,
   desktop-file-utils,
-  gtk3,
-  granite,
-  libhandy,
-  libnotify,
-  vte,
+  gtk4,
+  granite7,
+  libadwaita,
+  vte-gtk4,
   libgee,
   pcre2,
-  wrapGAppsHook3,
-  xvfb-run,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
-  version = "7.2.0";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
     tag = version;
-    hash = "sha256-fYOX48zGJY/1iIcL0SaHLyt/c6tr9qTeH1i5hTsZvvE=";
+    hash = "sha256-IzLaM9FPMRGJKvlXktyrhDYSyP4LJ8yFW8/FmsmZjU4=";
   };
 
   nativeBuildInputs = [
@@ -36,18 +34,16 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     vala
-    wrapGAppsHook3
-    xvfb-run
+    wrapGAppsHook4
   ];
 
   buildInputs = [
-    granite
-    gtk3
+    granite7
+    gtk4
+    libadwaita
     libgee
-    libhandy
-    libnotify
     pcre2
-    vte
+    vte-gtk4
   ];
 
   passthru = {

From 072321f59f920904656e47d3599d0cd6287c4b8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 15:13:54 +0000
Subject: [PATCH 143/316] openasar: 0-unstable-2026-03-28 ->
 0-unstable-2026-04-18

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

diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index 944a6d3264cd..5cf613960499 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -14,13 +14,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openasar";
-  version = "0-unstable-2026-03-28";
+  version = "0-unstable-2026-04-18";
 
   src = fetchFromGitHub {
     owner = "GooseMod";
     repo = "OpenAsar";
-    rev = "2fa6bb6145320cb72c033bfffbf8162c5386a32f";
-    hash = "sha256-uzIbtoWCBbVpIxfc75H4isOOTJItH01S7hWzb17oDcg=";
+    rev = "6232c4f44ddf26d1256ae201aa539eadccd71b24";
+    hash = "sha256-ktS0aqv9BSFuZ44A1ux3QsXAHO5z7B33psaJ3Q7+nYk=";
   };
 
   postPatch = ''

From 65797fd2fde58736c4427e48a870f2be770e2c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 15:31:36 +0000
Subject: [PATCH 144/316] chirpstack-concentratord: 4.7.0 -> 4.7.1

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

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

From be6a8771c023a76b1106f5cb8206e82b837833a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 16:31:10 +0000
Subject: [PATCH 145/316] crawley: 1.7.18 -> 1.7.19

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

diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index 616a7572eaa0..3abb7ee8197a 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "crawley";
-  version = "1.7.18";
+  version = "1.7.19";
 
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fopIRHaHiLYLA6/WHuY18Y91vF/BOPs0dHE7KCFXtj4=";
+    hash = "sha256-d854JL2/ZhEKQUG8tJ7TctDaicWnAKEFl0mJF6MIvls=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-0CGkRyW353JD04f0/F5dcRCD6YE5DXYaNetEx8moAGY=";
+  vendorHash = "sha256-lptFxIt5b7d6hIXdAqakA1K78NGJ86u0p/XfbQMiTsc=";
 
   ldflags = [
     "-w"

From 976be401533f2e37b5d2d659b8aa307e87c813aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 16:49:11 +0000
Subject: [PATCH 146/316] automatic-timezoned: 2.0.125 -> 2.0.126

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

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 72942ef3ebcd..a9a0557fbcdc 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
-  version = "2.0.125";
+  version = "2.0.126";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-YYI0ISLaOcKZu2AFf08DmriApTLKdUUgLF5AhEhGf04=";
+    sha256 = "sha256-e6r8XfzwIdcGlQwN64bfSQ481b1ViLI+9jTxUYNsA3w=";
   };
 
-  cargoHash = "sha256-jhsW33xDTDBDi2ySSwePjjNmIFKKm6ZnP5xklvB4+Iw=";
+  cargoHash = "sha256-0iUBZXybkK6y19RsZXSibcSRh4jEYwSSYUDyCI3ihOc=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From e5c7790f863940bed5f73dc90f6c2da7f81c9146 Mon Sep 17 00:00:00 2001
From: mattkang <2027430+mattkang@users.noreply.github.com>
Date: Sun, 19 Apr 2026 01:37:54 -0400
Subject: [PATCH 147/316] tmuxPlugins.battery: unstable-2019-07-04 -> 2.0.0

---
 pkgs/misc/tmux-plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 08f7906c5168..712eb1c754e6 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -75,14 +75,14 @@ in
 {
   inherit mkTmuxPlugin;
 
-  battery = mkTmuxPlugin {
+  battery = mkTmuxPlugin rec {
     pluginName = "battery";
-    version = "unstable-2019-07-04";
+    version = "2.0.0";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-battery";
-      rev = "f8b8e8451990365e0c98c38c184962e4f83b793b";
-      hash = "sha256-NfKaM4dPt7YaxG7kHMNxf95Mz0hIEhxqlVi2Obr+Da4=";
+      tag = "v${version}";
+      hash = "sha256-kyUrJdraDDye8WEBP2RgHN7kHmafToYtLmrMJ9u0f+0=";
     };
   };
 

From cb80893d164c5b6091adb8877cb01efeb06a35ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 17:35:56 +0000
Subject: [PATCH 148/316] python3Packages.mhcgnomes: 3.31.1 -> 3.32.1

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

diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix
index 8bb6f97d5631..9ff62ac44743 100644
--- a/pkgs/development/python-modules/mhcgnomes/default.nix
+++ b/pkgs/development/python-modules/mhcgnomes/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mhcgnomes";
-  version = "3.31.1";
+  version = "3.32.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pirl-unc";
     repo = "mhcgnomes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SP7hE0tJXBeJ8+NJbz1e8ZpPgVimIE25BgEPyKZ1nLg=";
+    hash = "sha256-6YYmIXuZXCaozkrVhqlxSQ9TG7vthHcMhVl0QpWChZE=";
   };
 
   build-system = [

From 7c7f811dec49f342a8786ac8b8a38fec50062e5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 17:58:33 +0000
Subject: [PATCH 149/316] nushell-plugin-skim: 0.25.0 -> 0.27.0

---
 pkgs/by-name/nu/nushell-plugin-skim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-skim/package.nix b/pkgs/by-name/nu/nushell-plugin-skim/package.nix
index 65f638d99e88..7665f340ce90 100644
--- a/pkgs/by-name/nu/nushell-plugin-skim/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-skim/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_skim";
-  version = "0.25.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "idanarye";
     repo = "nu_plugin_skim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uS6xCefVPnYmNl1MLHOk6WDwHgoJFyRcsmbxoVHvwZg=";
+    hash = "sha256-2bhPRYbOGUMbc5BVHAJpVFPq9iDpNh8dKvZZN2cqkxw=";
   };
 
-  cargoHash = "sha256-bT7RqN102o85Z+g/psz7KVq7ZCaE9Tk5huMxAMAO2J0=";
+  cargoHash = "sha256-HyMDgs41pRSUBg30F3IWU2hWSE8S41aLxWMp06gN0zk=";
 
   nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From c958d77ed3349f4393f28df8a7d37bfabeb3f091 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 18:26:21 +0000
Subject: [PATCH 150/316] vipsdisp: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/by-name/vi/vipsdisp/package.nix b/pkgs/by-name/vi/vipsdisp/package.nix
index a4e40412a224..e5156f1f4bcc 100644
--- a/pkgs/by-name/vi/vipsdisp/package.nix
+++ b/pkgs/by-name/vi/vipsdisp/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vipsdisp";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "jcupitt";
     repo = "vipsdisp";
     tag = "v${version}";
-    hash = "sha256-xTvs52k+OHDaKXu83kKc17lpx0/SmdOI6BaUmBQ/WoY=";
+    hash = "sha256-DXXDU/EtpWfNvV0PhQ+qjlxTBNERn9GGNeD00n9ejN0=";
   };
 
   postPatch = ''

From f7ddafb182fc697362400ce65b61b1bd49a0b9c1 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@frozenkiwi.net>
Date: Sun, 19 Apr 2026 20:38:48 +0200
Subject: [PATCH 151/316] github-copilot-cli: 1.0.26 -> 1.0.32

---
 pkgs/by-name/gi/github-copilot-cli/sources.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gi/github-copilot-cli/sources.json b/pkgs/by-name/gi/github-copilot-cli/sources.json
index 82eff4c0068e..aa1ce96c7ba5 100644
--- a/pkgs/by-name/gi/github-copilot-cli/sources.json
+++ b/pkgs/by-name/gi/github-copilot-cli/sources.json
@@ -1,19 +1,19 @@
 {
-  "version": "1.0.26",
+  "version": "1.0.32",
   "x86_64-linux": {
     "name": "copilot-linux-x64",
-    "hash": "sha256-i77fn0DOW/VjCzXY4mQbmtADQ2pFsju4zPM9iZNmmG8="
+    "hash": "sha256-K0UH4DsBNpKnypnOWjyVBF/tKQFRC/Se06RA1eZPt3M="
   },
   "aarch64-linux": {
     "name": "copilot-linux-arm64",
-    "hash": "sha256-bc/MoSL8RvCRLE1Qkwi9OdZpSIYc7LW6tjGU+kqb6nI="
+    "hash": "sha256-9snR+MC8EZESZde/xRQ28z8h/5vTFDMboAm60gOjilk="
   },
   "x86_64-darwin": {
     "name": "copilot-darwin-x64",
-    "hash": "sha256-l316KVesMJtZflglg1fYgYvmBAM3LvaK2B9YxuInpLg="
+    "hash": "sha256-fGY8ahkymJXAlcREgVB8UkICtn3zP52w1Lhur+F7LaY="
   },
   "aarch64-darwin": {
     "name": "copilot-darwin-arm64",
-    "hash": "sha256-Y3/7JUU3g5sssXxJ/1+ERpJ9XOkYl0gPM+6vzwQO79U="
+    "hash": "sha256-8Lzl6JJc1tpR1hO9gv/ck+zRy4zO7/ieLwfnppgKsLM="
   }
 }

From 6b795109b6caee29632a41d4c2571b8339b031c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 19:25:51 +0000
Subject: [PATCH 152/316] oxigraph: 0.5.6 -> 0.5.7

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

diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index 45a8ea83c610..b9ffec5fc182 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -14,17 +14,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxigraph";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EF4Lor7Z+ADsmTAswUtd8M+IIrMZIvQbrhj/vsX0afs=";
+    hash = "sha256-J4cx/fzdsgRXeWsP9Gt5q/0crWoc1OP8+xbuvQJTj34=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-JAbGkVIkeku50c8WMLBgAsagIZT35AjYynD8k2gRAv0=";
+  cargoHash = "sha256-BvL1rGJcU28TLkxJ3pKah6qfaa0SdUt143UgBYJrLsE=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 9098af30a9eb1a435df5a3a091d3b13fdc265a66 Mon Sep 17 00:00:00 2001
From: Grant DeFayette <grant@cavebatsofware.com>
Date: Sun, 19 Apr 2026 15:29:02 -0400
Subject: [PATCH 153/316] lmstudio: fix lms segfault on linux_x86_64

As described in #510446 lms segfaults due to an unnecessary "--set-rpath" .

Removing that argument resolves the issue with lms.
---
 pkgs/by-name/lm/lmstudio/linux.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix
index 054bb7b900c3..3ee92f83149c 100644
--- a/pkgs/by-name/lm/lmstudio/linux.nix
+++ b/pkgs/by-name/lm/lmstudio/linux.nix
@@ -51,9 +51,6 @@ appimageTools.wrapType2 {
     # lms cli tool
     install -m 755 ${appimageContents}/resources/app/.webpack/lms $out/bin/
 
-    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
-    --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:$out/lib:${
-      lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]
-    }" $out/bin/lms
+    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/bin/lms
   '';
 }

From 32662905c66a82b7a4d05b1508bcde4753af7b93 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Apr 2026 21:46:04 +0200
Subject: [PATCH 154/316] python3Packages.iamdata: 0.1.202604181 ->
 0.1.202604191

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604181...v0.1.202604191

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202604191
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 1c8d5b0e69e8..3b0fe8a8e3e7 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604181";
+  version = "0.1.202604191";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QtdDm4ZKbk1/gyY6X/yRBt2Eklvs1BAgrbkCt5BsaZc=";
+    hash = "sha256-cS7eh68a1EQmoqOkCnkvmYefUazQm7qClMZwRWXsSOo=";
   };
 
   __darwinAllowLocalNetworking = true;

From 77b586463784253fecee96082a90eb00f5f981dd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 19 Apr 2026 20:28:17 +0100
Subject: [PATCH 155/316] lib.modules: submodule emptyValue must evaluate
 sub-option defaults

`emptyValue` for `types.submodule` was `{ value = { }; }`, i.e. none
of the type-declared options or their defaults.

Previously submodules without defs would simply fail for lack of a default,
but since PR #500104 repurposed `emptyValue` as the fallback when no
definitions exist, submodule options without an explicit `default = { }`
(new additions) silently lost their sub-option defaults
(e.g. `requiredFeatures.devnet` in the nixos-test-driver, #511413).

Main change: `emptyValue`: `{ }` -> `{ value = base.config; }`

Additionally, skip `emptyValue`-based default rendering in docs for
types with submodules, because their sub-options are already documented
individually, and forcing evaluation here can break on modules with
invalid or incomplete definitions.
---
 lib/options.nix                | 11 ++++++++++-
 lib/tests/modules.sh           |  2 ++
 lib/tests/modules/defaults.nix | 25 ++++++++++++++++++++++++-
 lib/types.nix                  |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 0cda30fc3544..6191a876cdd4 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -590,7 +590,16 @@ rec {
           );
         }
         //
-          optionalAttrs (opt ? defaultText || opt ? default || ((opt.type or { }).emptyValue or { }) ? value)
+          optionalAttrs
+            (
+              opt ? defaultText
+              || opt ? default
+              # Render emptyValue-based defaults, but only for types without
+              # submodules (e.g. types.submodule). Submodules may evaluate to
+              # error without user defs, and their sub-options are documented
+              # individually, so best to skip those here.
+              || ((opt.type or { }).emptyValue or { }) ? value && (opt.type or { }).getSubModules or null == null
+            )
             {
               default =
                 builtins.addErrorContext
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 765ca31a48e7..515ab169fe43 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -686,6 +686,8 @@ checkConfigOutput "\[\]" config.unique ./defaults.nix
 checkConfigOutput "\[\]" config.coercedTo ./defaults.nix
 # These types don't have empty values
 checkConfigError 'The option .int. was accessed but has no value defined. Try setting the option.' config.int ./defaults.nix
+## submodule emptyValue must evaluate sub-option defaults
+checkConfigOutput "ok" config.result ./defaults.nix
 
 # types.unique
 #   requires a single definition
diff --git a/lib/tests/modules/defaults.nix b/lib/tests/modules/defaults.nix
index 56eee2c9c286..160245df27ad 100644
--- a/lib/tests/modules/defaults.nix
+++ b/lib/tests/modules/defaults.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, config, ... }:
 let
   inherit (lib) types;
 in
@@ -19,6 +19,18 @@ in
     submodule = lib.mkOption {
       type = types.submodule { };
     };
+    submoduleWithDefaults = lib.mkOption {
+      type = types.submodule {
+        options.enabled = lib.mkOption {
+          type = types.bool;
+          default = true;
+        };
+        options.count = lib.mkOption {
+          type = types.int;
+          default = 13;
+        };
+      };
+    };
     unique = lib.mkOption {
       type = types.unique { message = "hi"; } (types.listOf types.int);
     };
@@ -29,5 +41,16 @@ in
     int = lib.mkOption {
       type = types.int;
     };
+
+    result = lib.mkOption {
+      type = types.str;
+      default =
+        assert
+          config.submoduleWithDefaults == {
+            enabled = true;
+            count = 13;
+          };
+        "ok";
+    };
   };
 }
diff --git a/lib/types.nix b/lib/types.nix
index 9fb99b9cc66e..f2c5f7897cdc 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1320,7 +1320,7 @@ rec {
           };
       };
       emptyValue = {
-        value = { };
+        value = base.config;
       };
       getSubOptions =
         prefix:

From a0c1e07c0c6b0d699e3a424563fb0da8e3834406 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 20:09:21 +0000
Subject: [PATCH 156/316] python3Packages.gardena-bluetooth: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix
index 3a86a308c880..89e51bcb059b 100644
--- a/pkgs/development/python-modules/gardena-bluetooth/default.nix
+++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gardena-bluetooth";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "gardena-bluetooth";
     tag = finalAttrs.version;
-    hash = "sha256-QIjCIfsD/YOPfbmHoerynb5iqne0MBlK0y89cc7gR1U=";
+    hash = "sha256-VqGcMz9tFXlrekwWQx2Wx1umbf/q3U9XkQKSkze2cCU=";
   };
 
   build-system = [ setuptools ];

From 6be5caeeba691f3182c6761959decf596854eadd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 20:18:36 +0000
Subject: [PATCH 157/316] containerd: 2.2.1 -> 2.2.3

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

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index cbc5bdfe5c3d..af5cd5fbd366 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.2.1";
+  version = "2.2.3";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-fDOfN0XESrBTDW7Nxj9niqU93BQ5/JaGLwAR3u6Xaik=";
+    hash = "sha256-jaOLZf246kmvBHHrwgvqrhxuh+n1HE6NDqckZK4tvnM=";
   };
 
   postPatch = ''

From 64c58ed90f69324707b553f1c8811a614b174ab7 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 15 Oct 2025 12:29:07 +0100
Subject: [PATCH 158/316] dtsfmt: init at 0.8.0

---
 pkgs/by-name/dt/dtsfmt/package.nix | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/dt/dtsfmt/package.nix

diff --git a/pkgs/by-name/dt/dtsfmt/package.nix b/pkgs/by-name/dt/dtsfmt/package.nix
new file mode 100644
index 000000000000..be7b41f01ce4
--- /dev/null
+++ b/pkgs/by-name/dt/dtsfmt/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dtsfmt";
+  version = "0.8.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "mskelton";
+    repo = "dtsfmt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2DKfmWnz9Iaxs4VN16BHOzsncEFXaX2mwR2Ta9AyYn0=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-BbX/IEfn5qhyW/IkgARfxD0rTx+hcoq8TmoDmUqclHQ=";
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Auto formatter for device tree files";
+    homepage = "https://github.com/mskelton/dtsfmt";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ toodeluna ];
+    mainProgram = "dtsfmt";
+  };
+})

From dcf8ade6116d53131b46919235dc34ec20d8ae82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 20:53:27 +0000
Subject: [PATCH 159/316] mattermostLatest: 11.5.1 -> 11.5.3

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

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 138b7df0cfdf..7f5ef6c0490b 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -13,9 +13,9 @@ mattermost.override (
       # and make sure the version regex is up to date here.
       # Ensure you also check ../mattermost/package.nix for ESR releases.
       regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
-      version = "11.5.1";
-      srcHash = "sha256-3ij6JYGectkAYc2z6caD3L0NUP1UJJ6QaR2qLcTWXoI=";
-      vendorHash = "sha256-ao8jWfrzMTs9JJokaGH0kuoZ0d3VnIDGc5uDN2hCrhk=";
+      version = "11.5.3";
+      srcHash = "sha256-r7rfiQ4C0E511QWdpQihydsuoRZCzboodmh1iT4a8r4=";
+      vendorHash = "sha256-/ts6j86tvbYFjVACkJwcSnXDd+8BXzpaFVdV9DRHkqY=";
       npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
       lockfileOverlay = ''
         unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From 7fe1afddc8452d825bef4a6091700153e9337511 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 20:56:02 +0000
Subject: [PATCH 160/316] opcr-policy: 0.3.2 -> 0.3.6

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

diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index 269132054426..60292437057c 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "opcr-policy";
-  version = "0.3.2";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "opcr-io";
     repo = "policy";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-T6awF6NXVsglYBBVzGfuIF42imXjqCwxUAI3RPZNmGo=";
+    sha256 = "sha256-i7hS5RAIm/WxyQQyKcYlyXOfkVNL0knMcr/8v5AqyhY=";
   };
-  vendorHash = "sha256-0oZpogeKMQW4SS4e2n5qK6nStYwB/nsHleftvrdXWrw=";
+  vendorHash = "sha256-3mqatgEDC3W+NVDETupdb7y/UZucEW44qW4e3lJubkE=";
 
   ldflags = [
     "-s"

From c04cd6afd5ace4856cfecadb48b2678b2e818c56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 21:08:22 +0000
Subject: [PATCH 161/316] authelia: 4.39.18 -> 4.39.19

---
 pkgs/by-name/au/authelia/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/au/authelia/sources.nix b/pkgs/by-name/au/authelia/sources.nix
index 095d522635ad..cd9372cc2662 100644
--- a/pkgs/by-name/au/authelia/sources.nix
+++ b/pkgs/by-name/au/authelia/sources.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub }:
 rec {
   pname = "authelia";
-  version = "4.39.18";
+  version = "4.39.19";
 
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
     rev = "v${version}";
-    hash = "sha256-IROdncF3TC1X9000jw0RGtrcFrzqRpG7g2QuLGQ/Q4k=";
+    hash = "sha256-wMOurdgdjykFekn0Pej3meM6WSzq9tJ+kZV9sVDvRwM=";
   };
   vendorHash = "sha256-ZDsLRMip2B8PPZu8VxW+91FVvwC2rXzohhAZFifT26g=";
-  pnpmDepsHash = "sha256-ki/jXNT9dIno1UIcDgBcsLdiKcaiw/dwnff3t9xv07o=";
+  pnpmDepsHash = "sha256-HMrC5V+Ak2dF1uPtbh8kgFc8kZI2FPMmZHJciWRYx9w=";
 }

From 001a2e68106b17e13e7cb287777b4bc4143f2c86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 21:24:41 +0000
Subject: [PATCH 162/316] wastebin: 3.4.1 -> 3.5.0

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

diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index b555e9e670ca..de4cfdc1dc1a 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wastebin";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "matze";
     repo = "wastebin";
     rev = finalAttrs.version;
-    hash = "sha256-435d/MBLRBvJ5LQ2ohhIOtPmHNjnWQCp1wVS+Wv8t6U=";
+    hash = "sha256-3CXxRYPI0C2E0QvDETbJLW/2K/MG8UZgXcdOXYEgJeY=";
   };
 
-  cargoHash = "sha256-S9aQsdnpq/3D6nnRG+cCIM5Cljcax4+KxavRj3kxeQo=";
+  cargoHash = "sha256-lXHKYoPWzD3Icb2iPuqGJHACKGCjAVYkmgoGOBQ4V0U=";
 
   nativeBuildInputs = [
     pkg-config

From 46eeea691b3a3f6ab238d38855a5819baa4fe938 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Apr 2026 22:47:50 +0200
Subject: [PATCH 163/316] wappalyzergo: init at 0.2.77

Implementation of the Wappalyzer Technology Detection Library

https://github.com/projectdiscovery/wappalyzergo
---
 pkgs/by-name/wa/wappalyzergo/package.nix | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/wa/wappalyzergo/package.nix

diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix
new file mode 100644
index 000000000000..3d7bbf2da7ff
--- /dev/null
+++ b/pkgs/by-name/wa/wappalyzergo/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "wappalyzergo";
+  version = "0.2.77";
+
+  src = fetchFromGitHub {
+    owner = "projectdiscovery";
+    repo = "wappalyzergo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lU9AhjbM2Ph54aVNyJB+c7CnbovkSIQmGsUa+2SHd14=";
+  };
+
+  vendorHash = "sha256-HTh1iNGQXmYe9eNEBhZixr8jyBqWsKhTcUHX4vzItIU=";
+
+  ldflags = [ "-s" ];
+
+  __structuredAttrs = true;
+
+  strictDeps = true;
+
+  meta = {
+    description = "Implementation of the Wappalyzer Technology Detection Library";
+    homepage = "https://github.com/projectdiscovery/wappalyzergo";
+    changelog = "https://github.com/projectdiscovery/wappalyzergo/releases/tag/v${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "wappalyzergo";
+  };
+})

From 580e211e6b7b841a1f651977d42ea2e8094aa757 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Apr 2026 23:38:45 +0200
Subject: [PATCH 164/316] vulnx: rename, 1.0.0 -> 2.0.1

---
 pkgs/by-name/cv/cvemap/package.nix | 37 --------------------------
 pkgs/by-name/vu/vulnx/package.nix  | 42 ++++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix         |  1 +
 3 files changed, 43 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/by-name/cv/cvemap/package.nix
 create mode 100644 pkgs/by-name/vu/vulnx/package.nix

diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix
deleted file mode 100644
index 1a2e6cd835c8..000000000000
--- a/pkgs/by-name/cv/cvemap/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "cvemap";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "projectdiscovery";
-    repo = "cvemap";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-pzCLzSsAaoiRrTBENnmyqaSyDnHQdDAcTNyaxpc7mt4=";
-  };
-
-  vendorHash = "sha256-4GW1mgwOXbdiDmQoN1yxVOJC8mXpqkKliabWZzvOff4=";
-
-  subPackages = [
-    "cmd/cvemap/"
-  ];
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  meta = {
-    description = "Tool to work with CVEs";
-    homepage = "https://github.com/projectdiscovery/cvemap";
-    changelog = "https://github.com/projectdiscovery/cvemap/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
-    mainProgram = "cvemap";
-  };
-})
diff --git a/pkgs/by-name/vu/vulnx/package.nix b/pkgs/by-name/vu/vulnx/package.nix
new file mode 100644
index 000000000000..d2d44c2c582c
--- /dev/null
+++ b/pkgs/by-name/vu/vulnx/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "vulnx";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "projectdiscovery";
+    repo = "vulnx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HejAK/KXpQ9HouA3JpX7MoMzMUoMmKX7eEKwMGfgSx4=";
+  };
+
+  vendorHash = "sha256-WVskArdIieEof/GDlzEZbY4QDYfAQyP0+Le24q+Kfu0=";
+
+  subPackages = [ "cmd/vulnx/" ];
+
+  ldflags = [ "-s" ];
+
+  __structuredAttrs = true;
+
+  strictDeps = true;
+
+  # Issue with updater and version check
+  # nativeInstallCheckInputs = [ versionCheckHook ];
+  # doInstallCheck = true;
+  # versionCheckProgramArg = [ "version" ];
+
+  meta = {
+    description = "Tool to work with CVEs";
+    homepage = "https://github.com/projectdiscovery/vulnx";
+    changelog = "https://github.com/projectdiscovery/vulnx/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "vulnx";
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd1cbe95997e..fcb47874b3ba 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -575,6 +575,7 @@ mapAliases {
   curl-impersonate-chrome = warnAlias "curl-impersonate-chrome has been renamed to curl-impersonate" curl-impersonate; # Added 2025-11-02
   curl-impersonate-ff = throw "curl-impersonate-ff has been removed because it is unmaintained upstream and has vulnerable dependencies. Use curl-impersonate instead."; # Added 2025-11-02
   curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
+  cvemap = vulnx; # Added 2026-04-19
   cwe-client-cli = throw "cwe-client-cli has been removed because it is archived and has unclear licensing"; # Added 2026-01-10
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

From 8d0db52747644cc43d3fe79a8c4fb4720bf3dd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 21:56:08 +0000
Subject: [PATCH 165/316] websurfx: 1.27.0 -> 1.28.0

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

diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index b56320b601b1..30afcecce649 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.27.0";
+  version = "1.28.0";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-j2CELNuHNMlxvdSEXOz5I7npzeq/s6hGLnFdmxN/m+c=";
+    hash = "sha256-FQkwRRa4QmkDZ7JIxFjumCDLgzREVQm3K4U1ACpiZX0=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoHash = "sha256-0MXx17Jm/uXo70HoI2dbEl7XBzXGXKMZ+PYw/dQiJ5U=";
+  cargoHash = "sha256-3wq9KN1n0XCXF9b2VldtlW6DeYt2euBoSIThLWeGCWk=";
 
   postPatch = ''
     substituteInPlace src/handler.rs \

From 02ee953064c0b15e9bcc91e2004f77eec146d694 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 22:22:15 +0000
Subject: [PATCH 166/316] minder: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix
index 80ac2d76452a..73fc557c5fa8 100644
--- a/pkgs/by-name/mi/minder/package.nix
+++ b/pkgs/by-name/mi/minder/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minder";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "minder";
     tag = finalAttrs.version;
-    hash = "sha256-5W2ff0TJPQnuUAqw4oRjUv/h1x1goVfUsYPyrqDwc9Q=";
+    hash = "sha256-QPXgxWOftTZaybBB1GjGZVFNBzZiKiSDHIPEYElsY/8=";
   };
 
   nativeBuildInputs = [

From e999470c07fce6d5ca70e4fb66a48bed66d77036 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 22:25:23 +0000
Subject: [PATCH 167/316] vscode-extensions.wakatime.vscode-wakatime: 30.0.5 ->
 30.0.8

---
 .../vscode/extensions/WakaTime.vscode-wakatime/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
index c34a13aa7e95..159d7df1b9d2 100644
--- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-wakatime";
     publisher = "WakaTime";
-    version = "30.0.5";
-    hash = "sha256-8K8EgdHOGL3sYW5j8hpfbZFifbInMNWEYe60F1UGsj4=";
+    version = "30.0.8";
+    hash = "sha256-IRpjwlLzof2Ll2s/k9K6LPFYp4NTvpfZWfMbMMk+rbY=";
   };
 
   meta = {

From 08f0ca1ac5642d9e3994a5ec6248ac4666b954ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 22:26:30 +0000
Subject: [PATCH 168/316] python3Packages.yara-x: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix
index 8444ddd1f908..a4479a804025 100644
--- a/pkgs/development/python-modules/yara-x/default.nix
+++ b/pkgs/development/python-modules/yara-x/default.nix
@@ -9,21 +9,21 @@
 
 buildPythonPackage rec {
   pname = "yara-x";
-  version = "1.14.0";
+  version = "1.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${version}";
-    hash = "sha256-gGkBmJoUa9WiIozSwhe18N8i5uSiKsSQ3J1NAT41ro4=";
+    hash = "sha256-P0VxfsyjtgLNJcZMh+BHj7ujg/ReB4xycinfCS3NJyU=";
   };
 
   buildAndTestSubdir = "py";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src version;
-    hash = "sha256-j+sIxYPvkI1EnAN7LcBoS4m04rYdKlK48tGO0uFa7KU=";
+    hash = "sha256-FIZihLzpP9EhqQU/L6hKQQsMAhd1SsVzKap3GlghHSk=";
   };
 
   nativeBuildInputs = [

From 2e8a5f682f1a28b353c0996869b5932a693783b7 Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Sun, 19 Apr 2026 18:01:16 -0500
Subject: [PATCH 169/316] python3packages.sqlalchemy-adapter: init at 1.9.0

---
 .../sqlalchemy-adapter/default.nix            | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/sqlalchemy-adapter/default.nix

diff --git a/pkgs/development/python-modules/sqlalchemy-adapter/default.nix b/pkgs/development/python-modules/sqlalchemy-adapter/default.nix
new file mode 100644
index 000000000000..0a2cbe6f46ff
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy-adapter/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  pycasbin,
+  sqlalchemy,
+  setuptools,
+
+  pytestCheckHook,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "sqlalchemy-adapter";
+  version = "1.9.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "officialpycasbin";
+    repo = "sqlalchemy-adapter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FjxRSJ+3IIdtKkpZvkL/KzH7gn4IJjCTchABglfcyQ4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pycasbin
+    sqlalchemy
+  ];
+
+  pythonImportsCheck = [
+    "sqlalchemy_adapter"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "SQLAlchemy Adapter for PyCasbin";
+    homepage = "https://github.com/officialpycasbin/sqlalchemy-adapter";
+    changelog = "https://github.com/apache/casbin-python-sqlalchemy-adapter/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ daspk04 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2602606f955b..fa9bb11f7be5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18422,6 +18422,8 @@ self: super: with self; {
 
   sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
 
+  sqlalchemy-adapter = callPackage ../development/python-modules/sqlalchemy-adapter { };
+
   sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
 
   sqlalchemy-cockroachdb = callPackage ../development/python-modules/sqlalchemy-cockroachdb { };

From 50eed9773439b1cb72f35d010c82ed5726ec29bf Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Sun, 19 Apr 2026 18:02:32 -0500
Subject: [PATCH 170/316] python3packages.types-paramiko: init at
 4.0.0.20250822

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

diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix
new file mode 100644
index 000000000000..3a5525a8ce3c
--- /dev/null
+++ b/pkgs/development/python-modules/types-paramiko/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  cryptography,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "types-paramiko";
+  version = "4.0.0.20250822";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "types_paramiko";
+    inherit (finalAttrs) version;
+    hash = "sha256-G1awy9Puw9L9EjyesnBOYSt3fhWhdwWoBCeeplJeDFM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+  ];
+
+  # Modules doesn't have tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "paramiko-stubs" ];
+
+  meta = {
+    description = "Typing stubs for paramiko";
+    homepage = "https://github.com/python/typeshed";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ daspk04 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa9bb11f7be5..5807b8c03188 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20387,6 +20387,8 @@ self: super: with self; {
 
   types-openpyxl = callPackage ../development/python-modules/types-openpyxl { };
 
+  types-paramiko = callPackage ../development/python-modules/types-paramiko { };
+
   types-pillow = callPackage ../development/python-modules/types-pillow { };
 
   types-protobuf = callPackage ../development/python-modules/types-protobuf { };

From e20944e842dd3d946fef1256be4e7a7011e1aa0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 22:54:08 +0000
Subject: [PATCH 171/316] rtk: 0.35.0 -> 0.37.1

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

diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix
index 4c855a81d91e..1c79051414da 100644
--- a/pkgs/by-name/rt/rtk/package.nix
+++ b/pkgs/by-name/rt/rtk/package.nix
@@ -12,18 +12,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rtk";
-  version = "0.35.0";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "rtk-ai";
     repo = "rtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7DAL4dsnq2ZWmkyoI+BeN21ouK0VyLvSxOCt5hPWCl4=";
+    hash = "sha256-uKf3GLabsZ094VviTXF90FohLiyXFqTV/hHlm/l+ICQ=";
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
-  cargoHash = "sha256-r/PCA15MsmERCq3z8nObxdbX3KijsrInxsgJ6aqRVc4=";
+  cargoHash = "sha256-Vr1WKy+poeJnqjV7LvekC/jV1jolJDgxwNUp229EEWk=";
 
   nativeBuildInputs = [
     makeWrapper

From 7c0c73159f71e2aa535d362f1fb7940cc600b308 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 19 Apr 2026 18:03:23 -0500
Subject: [PATCH 172/316] yaziPlugins: update on 2026-04-19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mactag: 26.1.22-unstable-2026-02-27 → 26.1.22-unstable-2026-04-10
  Compare: https://github.com/yazi-rs/plugins/compare/0897e20d41b79a5ec8e80e645b041bb950547a0b...babfd0f6144aedcc7af11852ce962b989d052898
- mediainfo: 26.1.22-unstable-2026-03-31 → 26.1.22-unstable-2026-04-10
  Compare: https://github.com/boydaihungst/mediainfo.yazi/compare/75f93be8f153709a22b798105462de6105f54d90...49f5ab722d617a64b3bea87944e3e4e17ba3a46b
- mount: 25.12.29-unstable-2026-01-31 → 25.12.29-unstable-2026-04-09
  Compare: https://github.com/yazi-rs/plugins/compare/d078b01ecbdb0f85f6ea8836a851c6bf72f9f865...7749958b00d461d3c0fba4aa651940d778d1fc3f
- split-tabs: 0-unstable-2026-04-09 → 0-unstable-2026-04-13
  Compare: https://github.com/terrakok/split-tabs.yazi/compare/3f297277ed79cef5d22ea19883ce4d22e40c45a8...6c0931840d764bffa0c38677b6a84e69928e283f
- vcs-files: 26.1.22-unstable-2026-01-24 → 26.1.22-unstable-2026-04-10
  Compare: https://github.com/yazi-rs/plugins/compare/6c71385af67c71cb3d62359e94077f2e940b15df...babfd0f6144aedcc7af11852ce962b989d052898
---
 pkgs/by-name/ya/yazi/plugins/mactag/default.nix     | 6 +++---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix  | 6 +++---
 pkgs/by-name/ya/yazi/plugins/mount/default.nix      | 6 +++---
 pkgs/by-name/ya/yazi/plugins/split-tabs/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix  | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
index 62cda1f82031..5162d0384852 100644
--- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mactag.yazi";
-  version = "26.1.22-unstable-2026-02-27";
+  version = "26.1.22-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "0897e20d41b79a5ec8e80e645b041bb950547a0b";
-    hash = "sha256-tHOHWFH9E7aGrmHb8bUD1sLGU0OIdTjQ2p4SbJVfh/s=";
+    rev = "babfd0f6144aedcc7af11852ce962b989d052898";
+    hash = "sha256-y/UnRuZ2QytCdtGhxkbVvaGXglpqwufaUddXOzs7fzo=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 9184688477ea..c01d405f5b99 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "26.1.22-unstable-2026-03-31";
+  version = "26.1.22-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "75f93be8f153709a22b798105462de6105f54d90";
-    hash = "sha256-G3Nh56OdQInByHDQbI+yFe0s2fEaQlejLdakcoJFf4I=";
+    rev = "49f5ab722d617a64b3bea87944e3e4e17ba3a46b";
+    hash = "sha256-PcGrFG06XiJYgBWq+c7fYsx1kjkCvIYRaBiWaJT+xkw=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 0d47247a2aa1..4a13b1103470 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mount.yazi";
-  version = "25.12.29-unstable-2026-01-31";
+  version = "25.12.29-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "d078b01ecbdb0f85f6ea8836a851c6bf72f9f865";
-    hash = "sha256-aPe1AntPE76xq0VA/4FtBtRXmj+tfDjdMlQ9B9MkM+U=";
+    rev = "7749958b00d461d3c0fba4aa651940d778d1fc3f";
+    hash = "sha256-DZNhqIuGZIEEEH1TrCtAjZKa+7CWZeS1wO9aA9C0Eec=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/split-tabs/default.nix b/pkgs/by-name/ya/yazi/plugins/split-tabs/default.nix
index 1990aa5722c7..d8542fdcb333 100644
--- a/pkgs/by-name/ya/yazi/plugins/split-tabs/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/split-tabs/default.nix
@@ -6,13 +6,13 @@
 
 mkYaziPlugin {
   pname = "split-tabs.yazi";
-  version = "0-unstable-2026-04-09";
+  version = "0-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     owner = "terrakok";
     repo = "split-tabs.yazi";
-    rev = "3f297277ed79cef5d22ea19883ce4d22e40c45a8";
-    hash = "sha256-exa9I5GaF5T2dBnKIcB1gSdtdp2QlzbHv2J9FGxfpBM=";
+    rev = "6c0931840d764bffa0c38677b6a84e69928e283f";
+    hash = "sha256-FqeXVVFk4+aXn8d+LLs8idRBkLLzRPeVol6vMCh6mQ4=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index 406368906de2..8f64eb90c992 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "vcs-files.yazi";
-  version = "26.1.22-unstable-2026-01-24";
+  version = "26.1.22-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
-    hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
+    rev = "babfd0f6144aedcc7af11852ce962b989d052898";
+    hash = "sha256-y/UnRuZ2QytCdtGhxkbVvaGXglpqwufaUddXOzs7fzo=";
   };
 
   meta = {

From aa606d4c3b4791af2c82137c4cc928a50b6f1951 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 20 Apr 2026 01:08:23 +0200
Subject: [PATCH 173/316] treewide: substitute pname for strings (by-name)

repeat of #410679 as-is, part of #346453
---
 pkgs/by-name/li/libtypec/package.nix                        | 4 ++--
 pkgs/by-name/na/nano-syntax-highlighting/package.nix        | 4 ++--
 pkgs/by-name/nv/nvfancontrol/package.nix                    | 2 +-
 pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix | 2 +-
 pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix     | 6 +++---
 pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix  | 2 +-
 pkgs/by-name/pr/prometheus-flow-exporter/package.nix        | 2 +-
 .../pr/prometheus-gitlab-ci-pipelines-exporter/package.nix  | 4 ++--
 pkgs/by-name/pr/prometheus-nats-exporter/package.nix        | 2 +-
 pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix     | 2 +-
 pkgs/by-name/pr/prometheus-pihole-exporter/package.nix      | 2 +-
 pkgs/by-name/pr/prometheus-process-exporter/package.nix     | 2 +-
 pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix     | 6 +++---
 pkgs/by-name/pr/prometheus-script-exporter/package.nix      | 2 +-
 pkgs/by-name/pr/prometheus-sql-exporter/package.nix         | 2 +-
 pkgs/by-name/pr/prometheus-systemd-exporter/package.nix     | 2 +-
 pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix          | 2 +-
 pkgs/by-name/pr/prometheus-zfs-exporter/package.nix         | 4 ++--
 pkgs/by-name/sc/scopehal-apps/package.nix                   | 4 ++--
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/li/libtypec/package.nix b/pkgs/by-name/li/libtypec/package.nix
index 74f6dea699a4..e1abf9046b1d 100644
--- a/pkgs/by-name/li/libtypec/package.nix
+++ b/pkgs/by-name/li/libtypec/package.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "libtypec";
-    repo = pname;
-    rev = "${pname}-${version}";
+    repo = "libtypec";
+    rev = "libtypec-${version}";
     hash = "sha256-XkT0bgBjoJTAFa9NLZdzbJSpchiXxKjeu88PeT/AlPY=";
   };
 
diff --git a/pkgs/by-name/na/nano-syntax-highlighting/package.nix b/pkgs/by-name/na/nano-syntax-highlighting/package.nix
index bed650d0729e..d5c7944cee66 100644
--- a/pkgs/by-name/na/nano-syntax-highlighting/package.nix
+++ b/pkgs/by-name/na/nano-syntax-highlighting/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   src = fetchFromGitHub {
     owner = "galenguyer";
-    repo = pname;
+    repo = "nano-syntax-highlighting";
     tag = version;
     hash = "sha256-H0F57b8M+onhpVtvna03t919xk6+z/dJP37y9hcqfCY=";
   };
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: rec {
           for nanorcPath in ${finalAttrs.finalPackage}/share/*.nanorc; do
             nano --rcfile "$nanorcPath" --listsyntaxes \
             | tail --lines +2 \
-            | xargs --max-args 1 expect -f ${expectScript}/bin/${pname}-test-syntax.exp "$nanorcPath"
+            | xargs --max-args 1 expect -f ${expectScript}/bin/nano-syntax-highlighting-test-syntax.exp "$nanorcPath"
           done;
           touch $out
         ''
diff --git a/pkgs/by-name/nv/nvfancontrol/package.nix b/pkgs/by-name/nv/nvfancontrol/package.nix
index 7fa9d965320d..1d79639b80bd 100644
--- a/pkgs/by-name/nv/nvfancontrol/package.nix
+++ b/pkgs/by-name/nv/nvfancontrol/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "foucault";
-    repo = pname;
+    repo = "nvfancontrol";
     rev = version;
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
diff --git a/pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix b/pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix
index 7aa56f74cd45..873d2a64cf22 100644
--- a/pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "peimanja";
-    repo = pname;
+    repo = "artifactory_exporter";
     rev = rev;
     hash = "sha256-ffICacOaYD3/wB38qQ/qYOfDwQxe1tndRdR2BHxolcA=";
   };
diff --git a/pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix b/pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix
index a17a7ce5dc69..962f01032e8e 100644
--- a/pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "jvstein";
-    repo = pname;
+    repo = "bitcoin-prometheus-exporter";
     tag = "v${version}";
     sha256 = "sha256-08QG/5Kj++rjWz7OciqKSJUk00lSJCbfB5XwwP+h4so=";
   };
@@ -31,8 +31,8 @@ python3Packages.buildPythonApplication rec {
     mkdir -p $out/bin
     cp bitcoind-monitor.py $out/bin/
 
-    mkdir -p $out/share/${pname}
-    cp -r dashboard README.md $out/share/${pname}/
+    mkdir -p $out/share/bitcoin-prometheus-exporter
+    cp -r dashboard README.md $out/share/bitcoin-prometheus-exporter/
   '';
 
   meta = {
diff --git a/pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix b/pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix
index bc2ff882794b..48413d45efc0 100644
--- a/pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "lablabs";
-    repo = pname;
+    repo = "cloudflare-exporter";
     tag = "cloudflare-exporter-${version}";
     sha256 = "sha256-rfnAGBuY6HoWzZkYp9u+Ee3xhWb6Se2RkkSIWBvjUYY=";
   };
diff --git a/pkgs/by-name/pr/prometheus-flow-exporter/package.nix b/pkgs/by-name/pr/prometheus-flow-exporter/package.nix
index 84a6fc634a05..68eff558f629 100644
--- a/pkgs/by-name/pr/prometheus-flow-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-flow-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "neptune-networks";
-    repo = pname;
+    repo = "flow-exporter";
     sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix b/pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix
index 65edab7dd9d3..61866cfd7276 100644
--- a/pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix
@@ -10,12 +10,12 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "mvisonneau";
-    repo = pname;
+    repo = "gitlab-ci-pipelines-exporter";
     rev = "v${version}";
     sha256 = "sha256-r/6tRecbLN9bX2+HYyk4tT0uNiAqtZwMoMMQUJ7niJI=";
   };
 
-  subPackages = [ "cmd/${pname}" ];
+  subPackages = [ "cmd/gitlab-ci-pipelines-exporter" ];
 
   ldflags = [
     "-X main.version=v${version}"
diff --git a/pkgs/by-name/pr/prometheus-nats-exporter/package.nix b/pkgs/by-name/pr/prometheus-nats-exporter/package.nix
index d680f70117af..e515f34a5e50 100644
--- a/pkgs/by-name/pr/prometheus-nats-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-nats-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "nats-io";
-    repo = pname;
+    repo = "prometheus-nats-exporter";
     rev = "v${version}";
     sha256 = "sha256-siucc55qi1SS2R07xgxh25CWYjxncUqvzxo0XoIPyOo=";
   };
diff --git a/pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix b/pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix
index 0c2901f2d1ab..929d2c804a70 100644
--- a/pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "hipages";
-    repo = pname;
+    repo = "php-fpm_exporter";
     rev = "v${version}";
     hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE=";
   };
diff --git a/pkgs/by-name/pr/prometheus-pihole-exporter/package.nix b/pkgs/by-name/pr/prometheus-pihole-exporter/package.nix
index f5a94094e94a..9917a79c9511 100644
--- a/pkgs/by-name/pr/prometheus-pihole-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-pihole-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "eko";
-    repo = pname;
+    repo = "pihole-exporter";
     rev = "v${version}";
     sha256 = "sha256-ge4+sWQkJ2Zc7Y7+IYAq6OK6pYkaE3jjFo1rhTaDMu4=";
   };
diff --git a/pkgs/by-name/pr/prometheus-process-exporter/package.nix b/pkgs/by-name/pr/prometheus-process-exporter/package.nix
index 1c77acfbf356..9f369bf394da 100644
--- a/pkgs/by-name/pr/prometheus-process-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-process-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "ncabatoff";
-    repo = pname;
+    repo = "process-exporter";
     rev = "v${version}";
     sha256 = "sha256-dxXBhrZdYM+mH73K/cdaSmfzbzZaPJYCTzcfXGYMlyY=";
   };
diff --git a/pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix b/pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix
index d8bf75af4856..927ee93ecde9 100644
--- a/pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "msroest";
-    repo = pname;
+    repo = "sabnzbd_exporter";
     tag = version;
     hash = "sha256-9oL9Zbzzbr0hZjOdkaH86Tho6gaR+/6uAMreLwYzB8o=";
   };
@@ -29,8 +29,8 @@ python3Packages.buildPythonApplication rec {
     mkdir -p $out/bin
     cp sabnzbd_exporter.py $out/bin/
 
-    mkdir -p $out/share/${pname}
-    cp examples/* $out/share/${pname}/
+    mkdir -p $out/share/sabnzbd_exporter
+    cp examples/* $out/share/sabnzbd_exporter/
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/pr/prometheus-script-exporter/package.nix b/pkgs/by-name/pr/prometheus-script-exporter/package.nix
index 32bef1268ee7..3c939d2e3119 100644
--- a/pkgs/by-name/pr/prometheus-script-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-script-exporter/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "ricoberger";
-    repo = pname;
+    repo = "script_exporter";
     rev = "v${version}";
     hash = "sha256-TanhxXQYiMVkY89TfuzlHNrExe0u6FCPUlmuLgCN1RQ=";
   };
diff --git a/pkgs/by-name/pr/prometheus-sql-exporter/package.nix b/pkgs/by-name/pr/prometheus-sql-exporter/package.nix
index 8f3f73cf8c2a..b4d4f84d245a 100644
--- a/pkgs/by-name/pr/prometheus-sql-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-sql-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "justwatchcom";
-    repo = pname;
+    repo = "sql_exporter";
     rev = "v${version}";
     sha256 = "sha256-fbPjUMSDNqF8TPnhRaTgIRsuTcHhaRkTND9KdCwaCUI=";
   };
diff --git a/pkgs/by-name/pr/prometheus-systemd-exporter/package.nix b/pkgs/by-name/pr/prometheus-systemd-exporter/package.nix
index 69e73407b3af..876dc06cea61 100644
--- a/pkgs/by-name/pr/prometheus-systemd-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-systemd-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "prometheus-community";
-    repo = pname;
+    repo = "systemd_exporter";
     rev = "v${version}";
     sha256 = "sha256-wWXtAyQ48fsh/9BBo2tHXf4QS3Pbsmj6rha28TdBRWI=";
   };
diff --git a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
index d1c2bba0bc5e..dc18f47d6965 100644
--- a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
+++ b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "jelmer";
-    repo = pname;
+    repo = "prometheus-xmpp-alerts";
     rev = "v${version}";
     sha256 = "sha256-kXcadJnPPhMKF/1CHMLdGCqWouAKDBFTdvPpn80yK4A=";
   };
diff --git a/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix b/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
index 3d7672b1b840..72a9610d1ebc 100644
--- a/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "pdf";
-    repo = pname;
+    repo = "zfs_exporter";
     rev = "v" + version;
     hash = "sha256-4nuZhPqBqGOR5zM1yyxPD0M4bVZNaIm72uSus6CvCrU=";
   };
@@ -28,7 +28,7 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    install -Dm444 -t $out/share/doc/${pname} *.md
+    install -Dm444 -t $out/share/doc/zfs_exporter *.md
   '';
 
   meta = {
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index ac2ec7a529c4..988f32c71f08 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -33,12 +33,12 @@ let
   version = "0.1.1";
 in
 stdenv.mkDerivation {
-  pname = "${pname}";
+  pname = "scopehal-apps";
   version = "${version}";
 
   src = fetchFromGitHub {
     owner = "ngscopeclient";
-    repo = "${pname}";
+    repo = "scopehal-apps";
     tag = "v${version}";
     hash = "sha256-7ZXfxfRa+1fbMj2IDF/boNL/qCy4i9IyMnzIgOZunDw=";
     fetchSubmodules = true;

From 8ddd2e9e1658e54bbb287a272cd0ba39ae84c698 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 23:16:09 +0000
Subject: [PATCH 174/316] wayland-proxy-virtwl: 0-unstable-2026-04-03 ->
 0-unstable-2026-04-16

---
 pkgs/by-name/wa/wayland-proxy-virtwl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
index c40f2eaa3884..55ae2edd6ec4 100644
--- a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
+++ b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
@@ -9,13 +9,13 @@
 
 ocamlPackages.buildDunePackage {
   pname = "wayland-proxy-virtwl";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "talex5";
     repo = "wayland-proxy-virtwl";
-    rev = "34d499a119b9a903730144ba5836e70a73f812ac";
-    sha256 = "sha256-eU0HU0808Tp4Mw+RY2CZVikFIL1lk6rJg6lNVWj35jg=";
+    rev = "60e759ca3e4e26444c4956fb85e24b7944d4d81a";
+    sha256 = "sha256-cqBXINcJJ8yrNzvMHio+6+eO0PFGUWR+sZSvBDxxOvs=";
   };
 
   minimalOCamlVersion = "5.0";

From d488c50018ed400e99ad78a756230db006e42229 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 19 Apr 2026 18:16:44 -0500
Subject: [PATCH 175/316] luaPackages: update on 2026-04-19

---
 .../lua-modules/generated-packages.nix        | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d9310de861cd..76f07a76156b 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1008,15 +1008,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2565-1";
+      version = "0.0.2615-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2565-1.rockspec";
-          sha256 = "1ipcw3xx7ahspr57nn400v1zvdxqcf1685dh7dynsishw5y2fny1";
+          url = "mirror://luarocks/fzf-lua-0.0.2615-1.rockspec";
+          sha256 = "04y7lh9mm7lj605xpsrb6p142mpmnnisf781slfmcsgl2zbm4pk9";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/9f0432fdd7825ab163520045831a40b6df82ea28.zip";
-        sha256 = "0m416my25nc9crawfbhp4askng69xcnhvwwbsvkvakv2ak1i2bbh";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/cebf88881a4fab2c20a2a950269953417af1c3e8.zip";
+        sha256 = "13b4zrx4j2pnl9sh6mcyx120gm29flk7zr03vkik2difpcpdi518";
       };
 
       disabled = luaOlder "5.1";
@@ -1105,15 +1105,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.65-1";
+      version = "1.6.67-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.65-1.rockspec";
-          sha256 = "111gpirhbxha8ynih644vdw6qahqxfil19wvzbci9wc1s8d1097k";
+          url = "mirror://luarocks/grug-far.nvim-1.6.67-1.rockspec";
+          sha256 = "1bjkfzi6l7mzsz5345jh0a69rmsk16xmp94dx47iidrflqpqmbd8";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/37d0eafc6a2dcf8641aa19fc2a8db5e391b7f16b.zip";
-        sha256 = "0gk1fq4pyhzc1pd7dnzdvvzkszxih7shwk4fn2gfkhh7av9n0pac";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/21604255d0e8f9968322f61f2b6c09e5efe1285a.zip";
+        sha256 = "1vc4c0wdj3il8ig8jdb56870zwkriw3ql306vyjfl5ii7z4jbrnz";
       };
 
       disabled = luaOlder "5.1";
@@ -1136,15 +1136,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "haskell-tools.nvim";
-      version = "8.1.1-1";
+      version = "9.0.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/haskell-tools.nvim-8.1.1-1.rockspec";
-          sha256 = "06k911dmlfwf0nnswpi454xph96waymvqjywbqrs3k517p1ch2dw";
+          url = "mirror://luarocks/haskell-tools.nvim-9.0.1-1.rockspec";
+          sha256 = "0gjwv0hijxzb8hmdv6ana77adyvwszx4j4lr8dddikpggd3i6iw0";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v8.1.1.zip";
-        sha256 = "178a8qgrigcnf662xzbw7yzh400vyhl7xvacv4k1sy5rk7f236l3";
+        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v9.0.1.zip";
+        sha256 = "1sfwm86zz9pdk9w937knlm9dj4ai29rx0zx0r59accgl0rzaav7j";
       };
 
       disabled = luaOlder "5.1";
@@ -1920,17 +1920,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "ltreesitter";
-      version = "0.2.0-1";
+      version = "0.3.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/ltreesitter-0.2.0-1.rockspec";
-          sha256 = "0qhmx73hkskzmf5s3yv843234ri8n3gqj4dad79b018j5ilwiria";
+          url = "mirror://luarocks/ltreesitter-0.3.0-1.rockspec";
+          sha256 = "1vb8jbdl36syqmd4sjqswsqy42rq59kchxk4sx0ns9va4c0kim4v";
         }).outPath;
       src = fetchFromGitHub {
         owner = "euclidianAce";
         repo = "ltreesitter";
-        tag = "v0.2.0";
-        hash = "sha256-PYM6UAwp8w0qZxua5G6RFXI78Q6L3Vlc3eolXlNrN8k=";
+        tag = "v0.3.0";
+        hash = "sha256-tiNcc/1hnY8GWgpdlBfOTA7400916tqiAXeXJLfgtNE=";
       };
 
       meta = {
@@ -3277,17 +3277,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lualine.nvim";
-      version = "scm-2";
+      version = "scm-3";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lualine.nvim-scm-2.rockspec";
-          sha256 = "0lfwmiq9jcrxyhg6qk7l7znab356lwndrp52b9f3h86a48v5ywj0";
+          url = "mirror://luarocks/lualine.nvim-scm-3.rockspec";
+          sha256 = "1d2wxz9qvczy9l3rislaiwgiwdsvphws0s5y59gcpdnvfl353scx";
         }).outPath;
       src = fetchFromGitHub {
         owner = "nvim-lualine";
         repo = "lualine.nvim";
-        rev = "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8";
-        hash = "sha256-woyw4T0rG5Q3ipbsvI0F094tzJ8bnOOlaCzsibi/AKw=";
+        rev = "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c";
+        hash = "sha256-PHunrG0yd3pDw3c1S9w1AXQx5/1nT68M+mjxT53enmM=";
       };
 
       disabled = luaOlder "5.1";
@@ -5137,8 +5137,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-lua";
         repo = "plenary.nvim";
-        rev = "b9fd5226c2f76c951fc8ed5923d85e4de065e509";
-        hash = "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0=";
+        rev = "74b06c6c75e4eeb3108ec01852001636d85a932b";
+        hash = "sha256-nkfETDkPiE+Kd2BWYZijgUp9bP8RgFwRmvqJz2BMuq4=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -5411,15 +5411,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rocks.nvim";
-      version = "2.47.4-1";
+      version = "2.47.5-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rocks.nvim-2.47.4-1.rockspec";
-          sha256 = "0wc3ddd926qq186yvsh5ylyxygr1wg5a72p1ch4d8hrgnddpb3ii";
+          url = "mirror://luarocks/rocks.nvim-2.47.5-1.rockspec";
+          sha256 = "1zxywv6sa6cwzf072fz7cdhq96zw420kzc7dczrb50r7jh7sczxx";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.4.zip";
-        sha256 = "1gzy55m1d86wg5skf6pczd9d6wxrmh9bly32asw6rbs6k4fz0lpb";
+        url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.5.zip";
+        sha256 = "1a109916ldarqxc1sfi7n0a2ifslhcwlhf6hp6jsisx3gm8v2nv9";
       };
 
       disabled = lua.luaversion != "5.1";
@@ -5495,21 +5495,21 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "9.0.1-2";
+      version = "9.0.2-2";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-9.0.1-2.rockspec";
-          sha256 = "0r33jq01qyrspl2vsk0bv5bx32ycyyhkhylfs5xxrilgpzv0rh5h";
+          url = "mirror://luarocks/rustaceanvim-9.0.2-2.rockspec";
+          sha256 = "09vq53b68a9ywilb7fa1bsn52wmdzdvbflih0p8ppjzsk1lyilsv";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.1.zip";
-        sha256 = "1vzp5vf5wpkpsp40zwwkl9l29ifiap4h2hr8wxjhgznsjk3y8y5y";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
+        sha256 = "0kmd12d234fwrikhz33y7npdmyi7ahldb9mjdwlvl3kgq0lkpg74";
       };
 
       disabled = lua.luaversion != "5.1";
 
       meta = {
-        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.1.zip";
+        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0-only";
         description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
@@ -5882,8 +5882,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "48d2656e54d3e3953ae647153ccdaffa50d4d76b";
-        hash = "sha256-PtNTNzNk6V5SoxytHk6KYiY1LreMug7Qw3B7WtyHeHs=";
+        rev = "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc";
+        hash = "sha256-xU/lozREXuXkjBq8L94sLwyEE6f7k8Q3y0BkjPssB1Y=";
       };
 
       disabled = lua.luaversion != "5.1";

From d6f0fc515c93b3b0efc71d0bebeaa9199230f29b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 23:30:09 +0000
Subject: [PATCH 176/316] fabric-ai: 1.4.444 -> 1.4.448

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

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index a80ae0e1ca42..21804902d488 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fabric-ai";
-  version = "1.4.444";
+  version = "1.4.448";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-986ny/DRchsu+MkZFnmGrWaCPaw+SFYJzY768ZEPtfQ=";
+    hash = "sha256-4soF/1a5w9Wm8sGUZlDO4Y0JaKV9ro4F8mXxV8HtG3A=";
   };
 
-  vendorHash = "sha256-G1N/cPPReI5jrZ9orrWEAV/cRPrGbUZyhht+8iMDRb0=";
+  vendorHash = "sha256-MxQfHrF9iwoQEa0p24FnmdfHyiCOYpMRv3EukV3Onzo=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;

From 06877b0aaeb3fee9cbf44a3008a82ef61246245e Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Sun, 19 Apr 2026 18:33:26 -0500
Subject: [PATCH 177/316] skypilot: 0.8.1 -> 0.12.0

---
 pkgs/by-name/sk/skypilot/package.nix | 253 +++++++++++++++++++++++----
 1 file changed, 223 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index 33092f7aa1dd..80319b78edfb 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -1,48 +1,240 @@
 {
   lib,
+  pkgs,
   fetchFromGitHub,
   python3Packages,
+  buildNpmPackage,
+  writableTmpDirAsHomeHook,
 }:
-
-python3Packages.buildPythonApplication (finalAttrs: {
+let
   pname = "skypilot";
-  version = "0.8.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "skypilot-org";
     repo = "skypilot";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-jLjYsBkb5Tba3q/mdqCWK04FLg0pEdHyZH3vuMIP6tg=";
+    tag = "v${version}";
+    hash = "sha256-zxkduComvFuSbWnWSw1PYalGdVhiwCIjElXEg7VPw88=";
   };
 
+  dashboard = buildNpmPackage {
+    inherit pname version src;
+
+    sourceRoot = "${src.name}/sky/dashboard";
+    npmDepsHash = "sha256-8uZzkDJkaDPFXXsGy29jkaw6g8bPe3drbboYHHa6YuU=";
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r out/* $out/
+    '';
+  };
+in
+python3Packages.buildPythonApplication (finalAttrs: {
+  inherit pname version src;
+
   pyproject = true;
+  pythonRelaxDeps = true;
 
-  build-system = with python3Packages; [ setuptools ];
+  nativeBuildInputs = [
+    writableTmpDirAsHomeHook
+  ];
 
-  # when updating, please ensure package version constraints stipulaed
-  # in setup.py are met
-  propagatedBuildInputs = with python3Packages; [
-    cachetools
-    click
-    colorama
-    cryptography
-    filelock
-    jinja2
-    jsonschema
-    networkx
-    packaging
-    pandas
-    pendulum
-    prettytable
-    psutil
-    python-dotenv
-    pyyaml
-    pulp
-    requests
-    rich
-    tabulate
-    typing-extensions
-    wheel
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  postPatch = ''
+    substituteInPlace sky/setup_files/dependencies.py --replace-fail 'casbin' 'pycasbin'
+    substituteInPlace pyproject.toml --replace-fail 'buildkite-test-collector' ""
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  # https://github.com/skypilot-org/skypilot/blob/master/sky/setup_files/dependencies.py
+  dependencies =
+    with python3Packages;
+    [
+      aiohttp
+      aiofiles
+      aiosqlite
+      alembic
+      asyncpg
+      bcrypt
+      cachetools
+      click
+      colorama
+      cryptography
+      filelock
+      fastapi
+      gitpython
+      httpx
+      ijson
+      jinja2
+      jsonschema
+      networkx
+      packaging
+      pandas
+      paramiko
+      passlib
+      pendulum
+      pip
+      prettytable
+      prometheus-client
+      psutil
+      psycopg2-binary
+      pycasbin
+      pydantic
+      pyjwt
+      python-dotenv
+      pyyaml
+      python-multipart
+      pulp
+      requests
+      rich
+      setproctitle
+      sqlalchemy
+      sqlalchemy-adapter
+      tabulate
+      types-paramiko
+      typing-extensions
+      uvicorn
+      wheel
+    ]
+    ++ aiohttp.optional-dependencies.speedups
+    ++ fastapi.optional-dependencies.all
+    ++ uvicorn.optional-dependencies.standard;
+
+  optional-dependencies =
+    with python3Packages;
+    lib.fix (self: {
+
+      all = with self; [
+        aws
+        azure
+        cloudfare
+        docker
+        fluidstack
+        gcp
+        ibm
+        kubernates
+        lambda
+        paperspace
+        ray
+        remote
+        server
+        scp
+        ssh
+        vsphere
+      ];
+
+      aws = [
+        awscli
+        boto3
+        botocore
+        colorama
+      ];
+
+      azure = [
+        azure-cli
+        azure-core
+        azure-identity
+        azure-mgmt-compute
+        azure-mgmt-network
+        azure-storage-blob
+        msgraph-sdk
+      ]
+      ++ self.ray;
+
+      cloudfare = self.aws;
+
+      #    cudo = [cudo-compute];
+      #
+      #    do = [pydo azure-core azure-common];
+
+      docker = [ docker ];
+
+      fluidstack = [ ];
+
+      gcp = [
+        google-api-python-client
+        google-cloud-storage
+        pyopenssl
+      ];
+
+      ibm = [
+        ibm-cloud-sdk-core
+        #      ibm-cos-sdk
+        #      ibm-platform-services
+        #      ibm-vpc
+      ]
+      ++ self.ray;
+
+      kubernetes = [
+        kubernetes
+        websockets
+      ];
+
+      lambda = [ ];
+
+      #    nebius = [
+      #      nebius
+      #    ]
+      #    ++ self.aws;
+
+      paperspace = [ ];
+
+      ray = [ ray ] ++ ray.optional-dependencies.default;
+
+      remote = [
+        grpcio
+        protobuf
+      ];
+
+      # runpod = [ runpod ];
+
+      server = [
+        pycasbin
+        passlib
+        pyjwt
+        sqlalchemy-adapter
+      ];
+
+      scp = self.ray;
+
+      ssh = self.kubernetes;
+
+      # vast = [vastai-sdk];
+
+      vsphere = [
+        pyvmomi
+        # vsphere-automation-sdk
+      ];
+    });
+
+  postInstall = ''
+    mkdir -p $out/${python3Packages.python.sitePackages}/sky/dashboard/out
+    cp -r ${dashboard}/* $out/${python3Packages.python.sitePackages}/sky/dashboard/out/
+  '';
+
+  # Excluding the tests as it fails with error:
+  # Message: 'Config loaded from /build/source/examples/admin_policy/restful_policy.yaml:\nadmin_policy: http://localhost:8080\n'
+  #Arguments: ()
+  #--- Logging error ---
+  #Traceback (most recent call last):
+  #  File "/nix/store/pzdalg368npikvpq4ncz2saxnz19v53k-python3-3.13.12/lib/python3.13/logging/__init__.py", line 1154, in emit
+  #    stream.write(msg + self.terminator)
+  #    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
+  #ValueError: I/O operation on closed file.
+  #  nativeCheckInputs = with python3Packages; [
+  #    pytestCheckHook
+  #    boto3
+  #    pytest-env
+  #    pytest-xdist
+  #  ];
+
+  pythonImportsCheck = [
+    "sky"
   ];
 
   meta = {
@@ -53,6 +245,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       managed execution.
     '';
     homepage = "https://github.com/skypilot-org/skypilot";
+    changelog = "https://github.com/skypilot-org/skypilot/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ seanrmurphy ];
     mainProgram = "sky";

From be48fe65306b17ff5712f2f8f0e3fdf30c97ac90 Mon Sep 17 00:00:00 2001
From: daspk04 <dpratyush.k@gmail.com>
Date: Sun, 19 Apr 2026 18:34:00 -0500
Subject: [PATCH 178/316] skypilot: add daspk04 to maintainers

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

diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index 80319b78edfb..d48db1649d1a 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -247,7 +247,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/skypilot-org/skypilot";
     changelog = "https://github.com/skypilot-org/skypilot/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ seanrmurphy ];
+    maintainers = with lib.maintainers; [
+      seanrmurphy
+      daspk04
+    ];
     mainProgram = "sky";
   };
 })

From 3b3f29515a2806b082300a9e9459e19021406062 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 18 Apr 2026 10:59:26 -0700
Subject: [PATCH 179/316] python3Packages.celery: remove pytest-xdist as
 incomplete tests then hang pytestRemoveBytecode

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 2d76c8c237c3..5c41e1a4e529 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -154,9 +154,13 @@ buildPythonPackage (finalAttrs: {
     pytest-celery
     pytest-click
     pytest-timeout
-    pytest-xdist
     pytestCheckHook
   ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Using `pytest-xdist` leads to incomplete tests which hang `pytestRemoveBytecode`
+    # under `sandbox=false` (the default on Darwin).
+    pytest-xdist
+  ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
   disabledTestPaths = [

From f908f5fa3847f28d78ef35ebd40dece83f9dbb8e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 20 Apr 2026 01:41:23 +0200
Subject: [PATCH 180/316] treewide: substitute pname for strings
 (python-modules)

repeat of #410679 limited to `pkgs/development/python-modules/`, part of #346453
---
 pkgs/development/python-modules/cddlparser/default.nix      | 2 +-
 .../python-modules/copier-template-tester/default.nix       | 2 +-
 pkgs/development/python-modules/corallium/default.nix       | 2 +-
 pkgs/development/python-modules/cron-converter/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-insta/default.nix    | 4 ++--
 pkgs/development/python-modules/pytest-reraise/default.nix  | 2 +-
 pkgs/development/python-modules/qiskit-finance/default.nix  | 2 +-
 .../python-modules/qiskit-machine-learning/default.nix      | 2 +-
 pkgs/development/python-modules/qiskit-nature/default.nix   | 2 +-
 .../python-modules/qiskit-optimization/default.nix          | 2 +-
 pkgs/development/python-modules/sphinx-tippy/default.nix    | 2 +-
 pkgs/development/python-modules/textx/default.nix           | 6 +++---
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/cddlparser/default.nix b/pkgs/development/python-modules/cddlparser/default.nix
index ba7237bcc840..c9442bdb9362 100644
--- a/pkgs/development/python-modules/cddlparser/default.nix
+++ b/pkgs/development/python-modules/cddlparser/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tidoust";
-    repo = pname;
+    repo = "cddlparser";
     tag = "v${version}";
     sha256 = "sha256-LcIxU77bYpsuE4j1QgzdD3d7CO/EUEA9xwn+uIV68Oc=";
   };
diff --git a/pkgs/development/python-modules/copier-template-tester/default.nix b/pkgs/development/python-modules/copier-template-tester/default.nix
index 1876c44c75a0..636c90b83140 100644
--- a/pkgs/development/python-modules/copier-template-tester/default.nix
+++ b/pkgs/development/python-modules/copier-template-tester/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "KyleKing";
-    repo = pname;
+    repo = "copier-template-tester";
     tag = version;
     hash = "sha256-n/39Gl4q24QKfVFaeeqqu0AQt2jRSRrcnEOFRHQ+SQE=";
   };
diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix
index 0f3b69a06a22..8378e4ee4dba 100644
--- a/pkgs/development/python-modules/corallium/default.nix
+++ b/pkgs/development/python-modules/corallium/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "KyleKing";
-    repo = pname;
+    repo = "corallium";
     tag = version;
     hash = "sha256-0P8qmX+1zigL4jaA4TTuqAzFkyhQUfdGmPLxkFnT0qE=";
   };
diff --git a/pkgs/development/python-modules/cron-converter/default.nix b/pkgs/development/python-modules/cron-converter/default.nix
index c8ea6bf12473..5f0d74307eb9 100644
--- a/pkgs/development/python-modules/cron-converter/default.nix
+++ b/pkgs/development/python-modules/cron-converter/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Sonic0";
-    repo = pname;
+    repo = "cron-converter";
     rev = "v${version}";
     hash = "sha256-zNDEBckvSwnqBfNyh5Gv7ICOsPaSx2NKl92ZlyDfukw=";
   };
diff --git a/pkgs/development/python-modules/pytest-insta/default.nix b/pkgs/development/python-modules/pytest-insta/default.nix
index d5915d05c96e..d13adb3aba8b 100644
--- a/pkgs/development/python-modules/pytest-insta/default.nix
+++ b/pkgs/development/python-modules/pytest-insta/default.nix
@@ -8,14 +8,14 @@
   wrapt,
 }:
 
-buildPythonPackage (finalAttrs: rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytest-insta";
   version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vberlier";
-    repo = pname;
+    repo = "pytest-insta";
     tag = "v${finalAttrs.version}";
     hash = "sha256-zOhWDaCGkE/Ke2MLRyttDH85t+I9kfBZZwVDRN1sprs=";
   };
diff --git a/pkgs/development/python-modules/pytest-reraise/default.nix b/pkgs/development/python-modules/pytest-reraise/default.nix
index a55040017dd8..28de417c80f2 100644
--- a/pkgs/development/python-modules/pytest-reraise/default.nix
+++ b/pkgs/development/python-modules/pytest-reraise/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bjoluc";
-    repo = pname;
+    repo = "pytest-reraise";
     tag = "v${version}";
     hash = "sha256-mgNKoZ+2sinArTZhSwhLxzBTb4QfiT1LWBs7w5MHXWA=";
   };
diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix
index aacc7b0d031b..407a84ff2134 100644
--- a/pkgs/development/python-modules/qiskit-finance/default.nix
+++ b/pkgs/development/python-modules/qiskit-finance/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "qiskit";
-    repo = pname;
+    repo = "qiskit-finance";
     tag = version;
     hash = "sha256-zYhYhojCzlENzgYSenwewjeVHUBX2X6eQbbzc9znBsk=";
   };
diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index 3db09bded56b..06ccbc340445 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "qiskit";
-    repo = pname;
+    repo = "qiskit-machine-learning";
     tag = version;
     hash = "sha256-l7lzdGSarj1DiC0igeyr6kP+GYYE+eGKdW9+IN+2uh8=";
   };
diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix
index 7635b0b82646..ca8d4f9f21f8 100644
--- a/pkgs/development/python-modules/qiskit-nature/default.nix
+++ b/pkgs/development/python-modules/qiskit-nature/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Qiskit";
-    repo = pname;
+    repo = "qiskit-nature";
     tag = version;
     hash = "sha256-SVzg3McB885RMyAp90Kr6/iVKw3Su9ucTob2jBckBo0=";
   };
diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix
index ab1c66a47774..d51312439c8d 100644
--- a/pkgs/development/python-modules/qiskit-optimization/default.nix
+++ b/pkgs/development/python-modules/qiskit-optimization/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "qiskit";
-    repo = pname;
+    repo = "qiskit-optimization";
     tag = version;
     hash = "sha256-aonL08avVZlpGQ/FCZnrsPMvu1lbhRiadzKf/oPndZk=";
   };
diff --git a/pkgs/development/python-modules/sphinx-tippy/default.nix b/pkgs/development/python-modules/sphinx-tippy/default.nix
index ec3a3adac2cd..2b7fd8221b68 100644
--- a/pkgs/development/python-modules/sphinx-tippy/default.nix
+++ b/pkgs/development/python-modules/sphinx-tippy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sphinx-extensions2";
-    repo = pname;
+    repo = "sphinx-tippy";
     tag = "v${version}";
     hash = "sha256-+EXvj8Q6eMu51Gh4hLD6h8I7PDZaeVH+2pZuQUMVH+4=";
   };
diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 9acf41408e6f..30d2ba3a19d9 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -16,8 +16,8 @@ let
     pyproject = true;
 
     src = fetchFromGitHub {
-      owner = pname;
-      repo = pname;
+      owner = "textx";
+      repo = "textx";
       tag = version;
       hash = "sha256-2sRMMbWJN9H34zD++9T499Y4+wv5ZSSkN6xevH2fuVs=";
     };
@@ -33,7 +33,7 @@ let
 
     postInstall = ''
       # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx
-      cp "$src/textx/textx.tx" "$out/${python.sitePackages}/${pname}/"
+      cp "$src/textx/textx.tx" "$out/${python.sitePackages}/textx/"
 
       # Install tests as the tests output.
       mkdir $testout

From 1b06bb58c32597211752f4775e14b243485a374d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Apr 2026 23:56:15 +0000
Subject: [PATCH 181/316] vscode-extensions.foam.foam-vscode: 0.35.0 -> 0.38.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..f316aa12e82c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1760,8 +1760,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.35.0";
-          hash = "sha256-5tjSXwjiNMC8NlGAa0NQ5uWw+wTEPePL1GgRhnBAtUo=";
+          version = "0.38.0";
+          hash = "sha256-SJozi2AlV+wHD0wuhpgkG6Ve5AGIhsVDC37eE8/bnKM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";

From fc58a350c7e8b0a2f9884b0592ed1574c092a42d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:00:53 +0000
Subject: [PATCH 182/316] turso-cli: 1.0.19 -> 1.0.20

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index da553c06ed89..016e5485a24d 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "turso-cli";
-  version = "1.0.19";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-A0stg1w3nlrybqRcMROlWF3PnvYEYqy8KskjIXXA7Rk=";
+    hash = "sha256-Vby81LYVEqysUmPU1P5d+VEME/SVYch14m1Mj7YvOXc=";
   };
 
   vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk=";

From 298b7b8f1653b924412ee00d1df51c2dc2c51e6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:13:14 +0000
Subject: [PATCH 183/316] python3Packages.cantools: 41.3.0 -> 41.3.1

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

diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 97a441062849..f8bdedb5e8ac 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cantools";
-  version = "41.3.0";
+  version = "41.3.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-VRuYBZLGbmsSX4xF8Styb6hzUrKTG5AmsHY2o3dQSp4=";
+    hash = "sha256-Y5ZbAorAKrG0yGeqIH7Zn5D1WziuEHq+KH19ZtVDXZ8=";
   };
 
   build-system = [

From 014db793415ef42397b687fa4790befb69fafca8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:28:15 +0000
Subject: [PATCH 184/316] gnome-pass-search-provider: 1.4.0 -> 1.5.0

---
 pkgs/by-name/gn/gnome-pass-search-provider/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
index 69e06977c9c2..32b5ed6be5b4 100644
--- a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
+++ b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-pass-search-provider";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "jle64";
     repo = "gnome-pass-search-provider";
     rev = finalAttrs.version;
-    hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
+    hash = "sha256-AJyfvA7PrBwQROHcczvQjL+UxI/61mRir1HmCr3BwDY=";
   };
 
   nativeBuildInputs = [

From 8c753c588c55b8c9b30f100bf886fe524b9aae98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:30:37 +0000
Subject: [PATCH 185/316] the-foundation: 1.12.0 -> 1.12.2

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

diff --git a/pkgs/by-name/th/the-foundation/package.nix b/pkgs/by-name/th/the-foundation/package.nix
index 7d7b2c920595..c041ba532b99 100644
--- a/pkgs/by-name/th/the-foundation/package.nix
+++ b/pkgs/by-name/th/the-foundation/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-foundation";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchFromGitea {
     domain = "git.skyjake.fi";
     owner = "skyjake";
     repo = "the_Foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dAeeeu0nWS/Tz4/t/s9xKcx2io5FGooHhWiK12GHJpQ=";
+    hash = "sha256-1mHZ+ihGeslOnLATf6PjaemkJBXSbqe4ULvwAluH6JM=";
   };
 
   nativeBuildInputs = [

From 21a2bb22e40c18bc907ee62012481380dbfa003b Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Mon, 20 Apr 2026 02:34:35 +0200
Subject: [PATCH 186/316] check-meta-test.nix: add tests for compound licenses

---
 pkgs/stdenv/generic/check-meta-test.nix | 155 ++++++++++++++----------
 1 file changed, 89 insertions(+), 66 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta-test.nix b/pkgs/stdenv/generic/check-meta-test.nix
index 0dedb25afbd2..bbd24acf8614 100644
--- a/pkgs/stdenv/generic/check-meta-test.nix
+++ b/pkgs/stdenv/generic/check-meta-test.nix
@@ -22,14 +22,17 @@ let
     assertMsg
     generators
     licenses
+    nameValuePair
     recurseIntoAttrs
+    replaceString
     ;
 
-  mkUnfreePkg = name: {
+  mkPkg = name: license: {
     pname = name;
     version = "1.0";
-    meta.license = licenses.unfree;
+    meta.license = license;
   };
+
   assertValidity =
     {
       nixpkgsConfig,
@@ -52,77 +55,97 @@ let
       toPretty = generators.toPretty { };
     in
     assertMsg (actual.success == expected) ''
-      Expected validity of package ${lib.getName pkg} to be ${toPretty expected},
-      but got ${toPretty actual} with config:
+      Expected validity of package '${lib.getName pkg}' with unfree license
+      '${licenses.toSPDX pkg.meta.license}' to be ${toPretty expected}, but got
+      ${toPretty actual}
+      with config:
       ${toPretty nixpkgsConfig}
     '';
 
   runAssertions = assertions: lib.deepSeq assertions "";
 
-in
-recurseIntoAttrs {
-
-  allowOnlyFreePackagesByDefault = assertValidity {
-    nixpkgsConfig = { };
-    pkg = mkUnfreePkg "forbidden";
-    expected = false;
-  };
-
-  allowAllUnfreePackages = assertValidity {
-    nixpkgsConfig = {
-      allowUnfree = true;
+  mkTests = mkUnfreePkg: {
+    allowOnlyFreePackagesByDefault = assertValidity {
+      nixpkgsConfig = { };
+      pkg = mkUnfreePkg "forbidden";
+      expected = false;
     };
-    pkg = mkUnfreePkg "allowed";
+
+    allowAllUnfreePackages = assertValidity {
+      nixpkgsConfig = {
+        allowUnfree = true;
+      };
+      pkg = mkUnfreePkg "allowed";
+    };
+
+    allowUnfreePackagesWithPredicate =
+      let
+        nixpkgsConfig = {
+          allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate";
+        };
+      in
+      [
+        (assertValidity {
+          inherit nixpkgsConfig;
+          pkg = mkUnfreePkg "allowed-by-predicate";
+        })
+        (assertValidity {
+          inherit nixpkgsConfig;
+          pkg = mkUnfreePkg "allowed-by-nothing";
+          expected = false;
+        })
+      ];
+
+    allowUnfreeWithPackages = runAssertions [
+      (assertValidity {
+        nixpkgsConfig = {
+          allowUnfreePackages = [ "unfree" ];
+        };
+        pkg = mkUnfreePkg "unfree";
+        expected = true;
+      })
+    ];
+
+    allowUnfreePackagesOrPredicate =
+      let
+        nixpkgsConfig = {
+          allowUnfreePackages = [ "allowed-by-packages" ];
+          allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate";
+        };
+      in
+      runAssertions [
+        (assertValidity {
+          inherit nixpkgsConfig;
+          pkg = mkUnfreePkg "allowed-by-packages";
+        })
+        (assertValidity {
+          inherit nixpkgsConfig;
+          pkg = mkUnfreePkg "allowed-by-predicate";
+        })
+        (assertValidity {
+          inherit nixpkgsConfig;
+          pkg = mkUnfreePkg "forbidden";
+          expected = false;
+        })
+      ];
   };
 
-  allowUnfreePackagesWithPredicate =
-    let
-      nixpkgsConfig = {
-        allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate";
-      };
-    in
-    [
-      (assertValidity {
-        inherit nixpkgsConfig;
-        pkg = mkUnfreePkg "allowed-by-predicate";
-      })
-      (assertValidity {
-        inherit nixpkgsConfig;
-        pkg = mkUnfreePkg "allowed-by-nothing";
-        expected = false;
-      })
-    ];
-
-  allowUnfreeWithPackages = runAssertions [
-    (assertValidity {
-      nixpkgsConfig = {
-        allowUnfreePackages = [ "unfree" ];
-      };
-      pkg = mkUnfreePkg "unfree";
-      expected = true;
-    })
+  unfreeLicenses = [
+    licenses.unfree
+    (licenses.AND [
+      licenses.free
+      licenses.unfree
+    ])
   ];
+in
 
-  allowUnfreePackagesOrPredicate =
-    let
-      nixpkgsConfig = {
-        allowUnfreePackages = [ "allowed-by-packages" ];
-        allowUnfreePredicate = pkg: lib.getName pkg == "allowed-by-predicate";
-      };
-    in
-    runAssertions [
-      (assertValidity {
-        inherit nixpkgsConfig;
-        pkg = mkUnfreePkg "allowed-by-packages";
-      })
-      (assertValidity {
-        inherit nixpkgsConfig;
-        pkg = mkUnfreePkg "allowed-by-predicate";
-      })
-      (assertValidity {
-        inherit nixpkgsConfig;
-        pkg = mkUnfreePkg "forbidden";
-        expected = false;
-      })
-    ];
-}
+recurseIntoAttrs (
+  builtins.listToAttrs (
+    map (
+      license:
+      nameValuePair (replaceString " " "-" (licenses.toSPDX license)) (
+        recurseIntoAttrs (mkTests (name: mkPkg name license))
+      )
+    ) unfreeLicenses
+  )
+)

From ca779c6ddf41bf491408f3899f9f8b4143c0eb40 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Mon, 20 Apr 2026 02:36:55 +0200
Subject: [PATCH 187/316] check-meta.nix: fix check for license type attr

The license type attribute is named `licenseType`, not `type`.
---
 pkgs/stdenv/generic/check-meta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 6c3a49c4957c..e651e012d34e 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -90,7 +90,7 @@ let
       && (
         if isList attrs.meta.license then
           any (l: elem l list) attrs.meta.license
-        else if attrs.meta.license ? "type" then
+        else if attrs.meta.license ? "licenseType" then
           lib.licenses.containsLicenses list attrs.meta.license
         else
           elem attrs.meta.license list
@@ -105,7 +105,7 @@ let
 
   isUnfree =
     licenses:
-    if isAttrs licenses && licenses ? "type" then
+    if isAttrs licenses && licenses ? "licenseType" then
       !(lib.licenses.isFree licenses)
     else if isAttrs licenses then
       !(licenses.free or true)

From 72aa95d045b79bb2541cfc3688b572cd6f878457 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:45:31 +0000
Subject: [PATCH 188/316] rimgo: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix
index 7900b47483aa..aac5222d7453 100644
--- a/pkgs/by-name/ri/rimgo/package.nix
+++ b/pkgs/by-name/ri/rimgo/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "rimgo";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromCodeberg {
     owner = "rimgo";
     repo = "rimgo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0P2+U4wXiFybpGzV7IB1DXZWC+qIdeQtR6mtiYrrih0=";
+    hash = "sha256-ZdGPZFhjn7jsqHcj8neOocpDweB5TeYXNPfrDw2m7uY=";
   };
 
-  vendorHash = "sha256-unqml6T50BTBzYXXGcL4cc+q9qJJ9W2b2flPBPheBpk=";
+  vendorHash = "sha256-/aflGVI3M1dy6/5/CkQo1wPA59cb7m1XJcoF8nTm35Y=";
 
   nativeBuildInputs = [ tailwindcss_4 ];
 

From 46d7b540ae13e1d9844ce495479a7dc8c6504b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 00:59:20 +0000
Subject: [PATCH 189/316] troubadix: 26.4.2 -> 26.4.4

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index e7dbb0c766db..381c800c2b27 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.4.2";
+  version = "26.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kHi2Q+h6aRikuSZcErLmeUTGSCIXoML0uePgLKuO+Lw=";
+    hash = "sha256-OByl6SYPgM6pFp2OQyHMZHGr3JJ4kTJTZByWjdEnF7c=";
   };
 
   pythonRelaxDeps = [

From 52d3cfbc32d2064534eb0151d63181145772ec1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 01:20:19 +0000
Subject: [PATCH 190/316] phpPackages.grumphp: 2.19.0 -> 2.20.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 558c064d2f1b..c80fd5ca4bea 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.19.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UkIIOr+FgOxBn7lK4VbEUG3AdvIG2Ij3YWr0mLzc+SM=";
+    hash = "sha256-S+zF1IodekM21BpTiL/7EjPqi57r9LRCeF8oqPYFSXs=";
   };
 
-  vendorHash = "sha256-DJJ3y1Rm9wFmrVz7H1M5fTxrMGiU12SXJydTqXcSZQA=";
+  vendorHash = "sha256-jM7oH72C64mTIIcPUj754sHzXI+b8OOOB0zd2qpKuAA=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From bfe18296de6b59d1414342ecf58ba8f652df5e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Apr 2026 18:14:56 -0700
Subject: [PATCH 191/316] python3Packages.ariadne: 0.29.0 -> 1.0.1

Diff: https://github.com/mirumee/ariadne/compare/0.29.0...1.0.1

Changelog: https://github.com/mirumee/ariadne/blob/1.0.1/CHANGELOG.md
---
 .../python-modules/ariadne/default.nix        | 29 +++----------------
 .../ariadne/remove-opentracing.patch          | 12 --------
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ariadne/remove-opentracing.patch

diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix
index acec77ed30a0..6fff47cb42dd 100644
--- a/pkgs/development/python-modules/ariadne/default.nix
+++ b/pkgs/development/python-modules/ariadne/default.nix
@@ -6,6 +6,7 @@
   graphql-core,
   hatchling,
   httpx,
+  opentelemetry-api,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
@@ -18,20 +19,16 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ariadne";
-  version = "0.29.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "ariadne";
     tag = finalAttrs.version;
-    hash = "sha256-u6iKgugj30OxIEQ3P0+e05IC/Mh0hvKfTohTc/7pkUk=";
+    hash = "sha256-V5/4kLdb3Apnnq91HQ3eApl1R2+pqeWhWi5Y0ULqJrI=";
   };
 
-  patches = [ ./remove-opentracing.patch ];
-
-  pythonRelaxDeps = [ "graphql-core" ];
-
   build-system = [ hatchling ];
 
   dependencies = [
@@ -43,6 +40,7 @@ buildPythonPackage (finalAttrs: {
   nativeCheckInputs = [
     freezegun
     httpx
+    opentelemetry-api
     pytest-asyncio
     pytest-mock
     pytestCheckHook
@@ -53,29 +51,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "ariadne" ];
 
-  pytestFlags = [ "--snapshot-update" ];
-
-  disabledTests = [
-    # TypeError: TestClient.request() got an unexpected keyword argument 'content'
-    "test_attempt_parse_request_missing_content_type_raises_bad_request_error"
-    "test_attempt_parse_non_json_request_raises_bad_request_error"
-    "test_attempt_parse_non_json_request_body_raises_bad_request_error"
-    # opentracing
-    "test_query_is_executed_for_multipart_form_request_with_file"
-    "test_query_is_executed_for_multipart_request_with_large_file_with_tracing"
-    # AssertionError:  assert not [GraphQLError(...
-    "test_enum_with_int_values_from_dict"
-    "test_enum_with_int_enum_values"
-    "test_enum_with_str_enum_values"
-  ];
-
   disabledTestPaths = [
     # missing graphql-sync-dataloader test dep
     "tests/test_dataloaders.py"
     "tests/wsgi/test_configuration.py"
-    # both include opentracing module, which has been removed from nixpkgs
-    "tests/tracing/test_opentracing.py"
-    "tests/tracing/test_opentelemetry.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/ariadne/remove-opentracing.patch b/pkgs/development/python-modules/ariadne/remove-opentracing.patch
deleted file mode 100644
index eecbfafea9b9..000000000000
--- a/pkgs/development/python-modules/ariadne/remove-opentracing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/asgi/conftest.py b/tests/asgi/conftest.py
-index a703466..223586e 100644
---- a/tests/asgi/conftest.py
-+++ b/tests/asgi/conftest.py
-@@ -8,7 +8,6 @@ from ariadne.asgi.handlers import (
-     GraphQLTransportWSHandler,
-     GraphQLWSHandler,
- )
--from ariadne.contrib.tracing.opentracing import opentracing_extension
- 
- 
- @pytest.fixture

From 1cdd299bcdc6c211ed07ba6024b57a5eff410e66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 01:59:57 +0000
Subject: [PATCH 192/316] feishu-cli: 1.18.1 -> 1.21.0

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

diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix
index 3c574c001cfd..ef26179f3473 100644
--- a/pkgs/by-name/fe/feishu-cli/package.nix
+++ b/pkgs/by-name/fe/feishu-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "feishu-cli";
-  version = "1.18.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "riba2534";
     repo = "feishu-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LYhBwXkkYtc9uNXOMn/lRiCInSSy0tCf0vGsuFDuJJI=";
+    hash = "sha256-4+YEU0gRL3WF19a949QweVIdtXt8BWMummjK9ypBHXQ=";
   };
 
   vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";

From 0b70e2538078f56aa0607ee451db5d4a986fbc2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:06:09 +0000
Subject: [PATCH 193/316] modrinth-app-unwrapped: 0.12.6 -> 0.13.3

---
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 0f50b306728b..e34f51d94071 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -31,13 +31,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.12.6";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qVFDCn+8dtiIULNIq37wIrqaUNvNIoXoHl8QhUTyz48=";
+    hash = "sha256-vBBa2T5+JYvfO9eibJtcpq9y/GMh2PbO0ZBdkah9gms=";
   };
 
   patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-PDsq5XEU+ZfyGzwtwxQ3i2TURjhies/Up3SVysOprZ0=";
+  cargoHash = "sha256-dbndaNIZzGX4QjGTJbDsKOReB5OeiBmQr8XNzfWPe/o=";
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
     data = ./deps.json;
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-JD+mzSHMVLGnkc5Jrxy+mtZ8W82E0pQhglsC3NmfszQ=";
+    hash = "sha256-yF8sHG2+08JmtrKVLT0/gUPFJGgGWFMvHbi+uen2uwU=";
   };
 
   nativeBuildInputs = [

From 89325421ce6564b52e91417de2b0dde8f5f2a16f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:13:52 +0000
Subject: [PATCH 194/316] sniffglue: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix
index 8d60de0c4f02..3ecbc4d3ea63 100644
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sniffglue";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "sniffglue";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4=";
+    hash = "sha256-i4qTqFCoQ3gXTGQ6PD4R2YhRfWztw8cd6XuZuKRlS+U=";
   };
 
-  cargoHash = "sha256-4aOp9z1xAZ4+GfvcP4rwiS35BfNBnftNhK/oJDixa8w=";
+  cargoHash = "sha256-aZQ7Nq44ACAx6M3XoJZiUw9Yfm4VlJA9zBnPpgV0q4A=";
 
   nativeBuildInputs = [ pkg-config ];
 

From ec73d9b5c9192d11e2959b199836ee65a0e39609 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:19:41 +0000
Subject: [PATCH 195/316] tail-tray: 0.2.30 -> 0.2.31

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

diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix
index 76e5e8211c58..8948bc3fb8dd 100644
--- a/pkgs/by-name/ta/tail-tray/package.nix
+++ b/pkgs/by-name/ta/tail-tray/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tail-tray";
-  version = "0.2.30";
+  version = "0.2.31";
 
   src = fetchFromGitHub {
     owner = "SneWs";
     repo = "tail-tray";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MqofvOaqpQdUbYsxvnu/ZJJswa2bwLMKqJZtOCulbys=";
+    hash = "sha256-tQ8eXbtZkoMxuh099RX9gfCbxLcWQtJ+nzVPsPC6S5E=";
   };
 
   nativeBuildInputs = with kdePackages; [

From c0f4d49389267d273026fd8e39c9f92abf485a7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:27:04 +0000
Subject: [PATCH 196/316] python3Packages.zodb: 6.2 -> 6.3

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

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 3f296d981644..a5057f5b0245 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "zodb";
-  version = "6.2";
+  version = "6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
     tag = finalAttrs.version;
-    hash = "sha256-R6qf/9Sr70OsZzes+haT/J6RIz6Wlof/l6rQRl3snHI=";
+    hash = "sha256-XeLCzX6qBBAO2HgEtc2+/2z6DRn0UQjI036y+DbcKmQ=";
   };
 
   postPatch = ''

From a725705aba4ad100f2956540fd683e3d17bcb9f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:46:16 +0000
Subject: [PATCH 197/316] terraform-providers.hashicorp_azurerm: 4.68.0 ->
 4.69.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 293093b67996..676ad9ef78eb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -526,11 +526,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-22ZxBz5ZKJzgG/HMv6kce5NosPtmYPk46R7pu3Ss4OA=",
+    "hash": "sha256-dLapX7pWRKR90D19e7DZZki+VTgKLP2n9ADww2CIQg8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.68.0",
+    "rev": "v4.69.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 0ead5ddc2a79585e21629829b55d8a521dc233b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 03:01:36 +0000
Subject: [PATCH 198/316] libretro.snes9x: 0-unstable-2026-04-07 ->
 0-unstable-2026-04-14

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index 1bfe3e8f05e6..b330ce86097d 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2026-04-07";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "cc2b4e185a66778af6a062d0d5502e3ad92171c1";
-    hash = "sha256-OZGvThUfKH5Zt71khrIqR1+wB2tup5Iq6eRAOQcMB8M=";
+    rev = "121bb374d0d9a5ba2dd73c7b14a58c95c236a9bf";
+    hash = "sha256-8/Xe8T2+FP/l07AsW19arreXvygZhwTvIBypyvRBfnk=";
   };
 
   makefile = "Makefile";

From 6f0b67618befb38a20db9806e4bda68d7faf790a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 03:32:46 +0000
Subject: [PATCH 199/316] pat: 0.19.2 -> 1.0.0

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

diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix
index 9ae09c2ea019..f52534b444fe 100644
--- a/pkgs/by-name/pa/pat/package.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pat";
-  version = "0.19.2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "la5nta";
     repo = "pat";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-a/tWKo65szgu8zTsy6xVh7DXojxA9X8jUIVHi900iWE=";
+    hash = "sha256-AYaHslPYNSl/s0d7gBxmC7IRvDGEezxzbABJSgRFuPg=";
   };
 
-  vendorHash = "sha256-mneQyYZ7B0euRciFQru6S7F0IKXTxIceiF5JL18W2C8=";
+  vendorHash = "sha256-HkCXbJJFOlcp0Q9XcM1HC64EDWe/rn/nMpdpNOpgYFM=";
 
   ldflags = [
     "-s"

From a6522fa0256eaac5c508e7faa26b6016afd3dfda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 03:55:00 +0000
Subject: [PATCH 200/316] di-tui: 1.13.2 -> 1.13.3

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

diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index 3d7fdcc330e8..51070f8a6b7e 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "di-tui";
-  version = "1.13.2";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "acaloiaro";
     repo = "di-tui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8aNwEDxaNUS909gRZ1PGEIKHIK8NmlxM6zwvc2xBlzc=";
+    hash = "sha256-rT9iH9kkkWtg4H7YJUD2ElvWLUIzFHGSlH31A68pDDo=";
   };
 
   vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";

From 96810d132dc8b917746cb80fee3f3175277b15c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 04:13:38 +0000
Subject: [PATCH 201/316] plasma-panel-colorizer: 6.10.0 -> 7.0.1

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

diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index ee4717f4e031..8831fbdb1773 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "6.10.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s5KdQLBjy7RlgUwZScw9b6GLPsMBZzeV/kETtGdkNNE=";
+    hash = "sha256-T2LodP2E5R1NtuTNPxzUNenbs6P3Ur1kbEIHGRbzah0=";
   };
 
   nativeBuildInputs = [

From 63b3ce97ac8966f1766b62875b75f5bfdf98b43a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 04:26:52 +0000
Subject: [PATCH 202/316] python3Packages.langsmith: 0.7.30 -> 0.7.32

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

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 88ca442fc4ce..14bdf2155b4b 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langsmith";
-  version = "0.7.30";
+  version = "0.7.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JxbX7s1L1Zz3D+Te1EuiFt9y9YQSYM1Ta6LHt7KEGYY=";
+    hash = "sha256-OFsxQfEIQ0Z82MqWqn8U5kphSk2G89bEfyyXWF7nc84=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";

From d78ec4a36b0c903aed0e90220e61e2a3d3c02b58 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 19 Apr 2026 11:17:38 -0700
Subject: [PATCH 203/316] python3Packages.sentry-sdk: fix build on
 x86_64-darwin

---
 pkgs/development/python-modules/sentry-sdk/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 6e5d7602a967..24c66a961416 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   setuptools,
@@ -215,7 +216,13 @@ buildPythonPackage (finalAttrs: {
     # KeyError: 'sentry.release'
     "test_logs_attributes"
     "test_logger_with_all_attributes"
-  ];
+  ]
+  ++
+    lib.optionals (pythonAtLeast "3.14" && stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin)
+      [
+        # profiler_id not populated on darwin
+        "test_segment_span_has_profiler_id"
+      ];
 
   pythonImportsCheck = [ "sentry_sdk" ];
 

From 2f10259346ea917fc0ecd48105cb26cf0573c065 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:12:57 +0000
Subject: [PATCH 204/316] python3Packages.miniaudio: 1.61 -> 1.70

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

diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix
index ab73bccb8a68..da1056999e26 100644
--- a/pkgs/development/python-modules/miniaudio/default.nix
+++ b/pkgs/development/python-modules/miniaudio/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "miniaudio";
-  version = "1.61";
+  version = "1.70";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "irmen";
     repo = "pyminiaudio";
     tag = "v${version}";
-    hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8=";
+    hash = "sha256-7i1ORJJwdd/an5IsW/xO1puI/LJJ5WDEdaE8DU4/laQ=";
   };
 
   # TODO: Properly unvendor miniaudio c library

From efd9b37764d9c70d8c564355e1340dc335c571ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:18:21 +0000
Subject: [PATCH 205/316] longcat: 0.0.16 -> 0.0.17

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

diff --git a/pkgs/by-name/lo/longcat/package.nix b/pkgs/by-name/lo/longcat/package.nix
index 6588dad4481a..08d88538db00 100644
--- a/pkgs/by-name/lo/longcat/package.nix
+++ b/pkgs/by-name/lo/longcat/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.0.16";
+  version = "0.0.17";
 in
 buildGoModule {
   pname = "longcat";
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "mattn";
     repo = "longcat";
     tag = "v${version}";
-    hash = "sha256-lI+gykqXWI32TEtvdj9+Lq6iSx7I1iSzP1cYROIZLGM=";
+    hash = "sha256-77pYs1IZiUlUGricE4K/zA/vKiihUZnrpyNPEhZjMas=";
   };
 
   vendorHash = "sha256-VcNhzQyhd7gDvlrz7Lh2QRUkMjZj40s2hanNP6gsnMs=";

From 6acc74dd119455324d93a042b66a04063d9bf293 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:27:30 +0000
Subject: [PATCH 206/316] bento: 1.16.2 -> 1.17.0

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

diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 6da5b160aed2..75c2c05f3fdb 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "bento";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SNX80JTX4jqbcCQWP+HlQaXTkODOYzbDN1KQ4iOZqYs=";
+    hash = "sha256-VfXXGtcn4bUTtIL39nusHciw3Rv2A4xL6s1fGnmBTZ0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-N5CRU4Mv9e8kHXUXP95cNe02DkoEhJWcypF4vkEaMBA=";
+  vendorHash = "sha256-eVZd24c3imolyrt97gNrm1ro8VBMYH4fbzTzzSk4iEI=";
 
   subPackages = [
     "cmd/bento"

From 0409034f99378621a3df59af7a7b77df79ddac80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:41:22 +0000
Subject: [PATCH 207/316] vscode-extensions.julialang.language-julia: 1.189.2
 -> 1.209.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..aae7e525622b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2648,8 +2648,8 @@ let
         mktplcRef = {
           name = "language-julia";
           publisher = "julialang";
-          version = "1.189.2";
-          hash = "sha256-ydnE34xD2u5cwPOJezXtSbC/JXrGz4j1QL26YaWjfoU=";
+          version = "1.209.2";
+          hash = "sha256-uS0KYSqJJ1IXEcDy1Y3Fl0GHpEpq6eskgBCoBZqYuUo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog";

From f476eca96e70586def442e0246dbce3260235119 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:43:00 +0000
Subject: [PATCH 208/316] python3Packages.mercadopago: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/mercadopago/default.nix b/pkgs/development/python-modules/mercadopago/default.nix
index d18984a120e4..8767de9a4a80 100644
--- a/pkgs/development/python-modules/mercadopago/default.nix
+++ b/pkgs/development/python-modules/mercadopago/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mercadopago";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mercadopago";
     repo = "sdk-python";
     tag = version;
-    hash = "sha256-xeOJk9/5DrykOxWTbAsIbdCu+nwUUIuuKJQm55SErEI=";
+    hash = "sha256-AYgYGY55hhvVY1lB6anJvjRquDRiNoDnpOFTuVdQniM=";
   };
 
   build-system = [

From 0411b7acfe1f200222aa5053c15f3d86933f7eff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 05:49:57 +0000
Subject: [PATCH 209/316] rclone: 1.73.4 -> 1.73.5

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

diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index 55222d5e5d01..156c8dd63a10 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -17,7 +17,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "rclone";
-  version = "1.73.4";
+  version = "1.73.5";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     owner = "rclone";
     repo = "rclone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A97O2N21MdGDdDXa8TLCVlKy9TIRPrEQ43mzQOtfBO8=";
+    hash = "sha256-9oWxL6VHPOl0IJgc7uBWfDkJlUBMvqsEQR8kVH37DZo=";
   };
 
   vendorHash = "sha256-ZEkZbP2r9PFAURkJNR1829VgaL1GXq72mt5Hnz5++kY=";

From 4859028fb8c06b11e85017551912746345d98ef2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 06:07:00 +0000
Subject: [PATCH 210/316] nushell-plugin-hcl: 0.111.0 -> 0.112.2

---
 pkgs/by-name/nu/nushell-plugin-hcl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix
index d72204771248..1f7c69560cc5 100644
--- a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_hcl";
-  version = "0.111.0";
+  version = "0.112.2";
 
   src = fetchFromGitHub {
     owner = "Yethal";
     repo = "nu_plugin_hcl";
     tag = finalAttrs.version;
-    hash = "sha256-OeMDlzioXt4Hn3VUP7YaMHF0c8BhRDrHdrQRC595Ypc=";
+    hash = "sha256-yarqYNv/J7q5061MrS+kCiDAhi34x5wikX2qfLkd1T8=";
   };
 
-  cargoHash = "sha256-8ycqhuVQGyT4DabOLJIsSXY324h91zH/nUw/2XrAxwc=";
+  cargoHash = "sha256-8OosaIX7tgKX2M2H4Pn8hVJJtT4bat1ByFjnFAtoI5w=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From aecc1b73b4607e654ea6a531c9a2f96509aa03c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 06:28:31 +0000
Subject: [PATCH 211/316] libretro.pcsx-rearmed: 0-unstable-2026-04-12 ->
 0-unstable-2026-04-15

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

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index 5f359b4f5a8e..fea158277b70 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-04-12";
+  version = "0-unstable-2026-04-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "13f09ce0e3eb375e02879c51926d2b7c54e5f86b";
-    hash = "sha256-WjdliWglIYGI1X9jGq5LqCBLijlR56TOwiVmJjCTi8M=";
+    rev = "00512d47f9d4d220efa4f2418b4a5896f9cd2e75";
+    hash = "sha256-ERllT1RkoLMafnHx2HSHdURoWdnF8fJlZ80pfiw18gQ=";
   };
 
   dontConfigure = true;

From d70ad79e07e5e2ff2b0484e9cb117baf241f7434 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 06:33:54 +0000
Subject: [PATCH 212/316] clash-meta: 1.19.23 -> 1.19.24

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

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index dd239f3e18f8..0de5dfb4b6d3 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.23";
+  version = "1.19.24";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-0KaTf/FXlLBxbq6ViNkD4uSIKJ7pNxEBMFIYL983hAY=";
+    hash = "sha256-RQ6ZnOkIJyIA7n/AhHxOEtWcoXbyusc0GwIHr4VKUxM=";
   };
 
-  vendorHash = "sha256-4xu/ZcoFCpO226tVfhVwkXaTEIyblFjKezX/haHjyNE=";
+  vendorHash = "sha256-wAd5VKpQT9aE/S3J/6gLlkYs56TqR3b+H0s+peOQ3R4=";
 
   excludedPackages = [ "./test" ];
 

From 18eedbf9bf47d0338a760b63fc48e0bb512cd78f Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Mon, 20 Apr 2026 09:24:13 +0200
Subject: [PATCH 213/316] gickup: 0.10.39 -> 0.10.40

https://github.com/cooperspencer/gickup/releases/tag/v0.10.40
---
 pkgs/by-name/gi/gickup/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix
index d41181b18ee1..96d93a8ec284 100644
--- a/pkgs/by-name/gi/gickup/package.nix
+++ b/pkgs/by-name/gi/gickup/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gickup";
-  version = "0.10.39";
+  version = "0.10.40";
 
   src = fetchFromGitHub {
     owner = "cooperspencer";
     repo = "gickup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Aalt/oiNzV2a8Ix/ruL4r3q0W1EY1UTe9IVPWNL+lLA=";
+    hash = "sha256-/hdCgo09sMbwbF3E5vOEuyYXF/qm0H/79cDuQOlFy/Y=";
   };
 
-  vendorHash = "sha256-Xtreh7nHovBYh0PnFYn2VuYGN8GQSmy6EPnZnHSdt/o=";
+  vendorHash = "sha256-9t+rjK385Co6RKeihxJprGJz0SjzKFSKNix2Sq0ZlSg=";
 
   ldflags = [ "-X main.version=${finalAttrs.version}" ];
 

From b51ae661d862d6b7cbe0bc58917f44cc67da8143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 07:28:09 +0000
Subject: [PATCH 214/316] biome: 2.4.11 -> 2.4.12

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

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 80ca96e0666f..723858e3de4b 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.4.11";
+  version = "2.4.12";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-EPrbr0FOYlP+HKa9YkNi4cw2oisoHRkQAahMIoq9QIo=";
+    hash = "sha256-PVax57P496gDksvyGskW3MeR9YDZFE0E8yiv2zW6L/o=";
   };
 
-  cargoHash = "sha256-SxHTeZ3snOeBsYmjN4to9UoGVnH0mSXtWtAOv85Ztxs=";
+  cargoHash = "sha256-638M2/qRXTZSD4/2/PWkfo5DbsLzWlhwwSBGlkUaLBc=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c532e06d496da4ee447dc2362be5c2d768780a50 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2026 09:30:52 +0200
Subject: [PATCH 215/316] wasm-bindgen-cli_0_2_118: init

---
 .../wa/wasm-bindgen-cli_0_2_118/package.nix   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_118/package.nix

diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_118/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_118/package.nix
new file mode 100644
index 000000000000..fecd0e919564
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_118/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.118";
+    hash = "sha256-ve783oYH0TGv8Z8lIPdGjItzeLDQLOT5uv/jbFOlZpI=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-EYDfuBlH3zmTxACBL+sjicRna84CvoesKSQVcYiG9P0=";
+  };
+}

From a29edb93624a8e63fe7124088a65bf8f234a962d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2026 09:31:19 +0200
Subject: [PATCH 216/316] dioxus-cli: use wasm-bindgen-cli_0_2_118

Else `dx serve` on a new project complains about wasm-bindgen-cli not
having the correct version.
---
 pkgs/by-name/di/dioxus-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 95acb9ec4a4b..7781c2c965ef 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -8,7 +8,7 @@
   rustfmt,
   makeWrapper,
   esbuild,
-  wasm-bindgen-cli_0_2_114,
+  wasm-bindgen-cli_0_2_118,
   testers,
   dioxus-cli,
   withTelemetry ? false,
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --suffix PATH : ${
         lib.makeBinPath [
           esbuild
-          wasm-bindgen-cli_0_2_114
+          wasm-bindgen-cli_0_2_118
         ]
       }
   '';

From 50162b71f42d9ce8cbe2240109f9d3f2abe936bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 07:38:12 +0000
Subject: [PATCH 217/316] krelay: 0.1.3 -> 0.2.0

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

diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix
index 6b3a0fcb2c4d..3809394bcd40 100644
--- a/pkgs/by-name/kr/krelay/package.nix
+++ b/pkgs/by-name/kr/krelay/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "krelay";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "knight42";
     repo = "krelay";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v7yX5wDf3d07TiWe+9iTkGhc8LqfU1hUkxuf5ZBVcYE=";
+    hash = "sha256-EFdirFxBsAmXPrk9wEz6x+1T90wDrWnXuxOz2+dNpY0=";
   };
 
-  vendorHash = "sha256-9bOU9Zqqb4tdQCIB3UkTdAcD4cn6+7C35gOCywv1/Os=";
+  vendorHash = "sha256-IooNsDlXcZt3NLj8CLh1XgxduqalAizSXI6/a71nNlk=";
 
   subPackages = [ "cmd/client" ];
 

From d0fa45b6a91173127d4c506c9385b3fbf1a9bbfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 07:39:13 +0000
Subject: [PATCH 218/316] litmusctl: 1.24.0 -> 1.25.0

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

diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 92a6b10883fa..63179580d54f 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "litmusctl";
-  version = "1.24.0";
+  version = "1.25.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${finalAttrs.version}";
-    hash = "sha256-9Y0WyENvM1NDDXgerhjiIzY5I0Y0rowIbwxtIFgs6+s=";
+    hash = "sha256-vHvTp6qOFblGbGatQ2YUJQIsJQgFzB/bbnTpMMzE4NY=";
   };
 
   vendorHash = "sha256-Lkvc8dBr/nvKczx83/KXKLe5FskGpI/17GIrl2y/E1I=";

From bef35545ea63cab06eecd32785267f825e3ec9d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 07:51:34 +0000
Subject: [PATCH 219/316] kubelogin-oidc: 1.36.0 -> 1.36.1

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

diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index af31b75b4c7f..e590f411d56b 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubelogin";
-  version = "1.36.0";
+  version = "1.36.1";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v6kNz75+xRQHfTfBKpKaNZodQzZNmJiF+WX0wJfGZ2M=";
+    hash = "sha256-leM2C6Ba2H9AU916NAVKEk6zoAWCIn43URQ/SEA8Xwc=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=v${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-f9Umpdlb6m38J05CanNJktS1T31SBSy1T1rOCzBUYkQ=";
+  vendorHash = "sha256-vAbPLlQEku9KySHpdTvQHYHtxyi7/mUvytuyrP9wkHE=";
 
   # test all packages
   preCheck = ''

From 26e2a894dcbe4e61811fe6548cdf07a047919cd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:06:32 +0000
Subject: [PATCH 220/316] clac: 0.3.4 -> 0.3.5

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

diff --git a/pkgs/by-name/cl/clac/package.nix b/pkgs/by-name/cl/clac/package.nix
index 3f0402b4edb6..bb87966b3398 100644
--- a/pkgs/by-name/cl/clac/package.nix
+++ b/pkgs/by-name/cl/clac/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clac";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "soveran";
     repo = "clac";
     tag = finalAttrs.version;
-    hash = "sha256-DcW35jKIZQqkNa5Y6am2e5/TAEg3Fo2n+fHG3nOpNzM=";
+    hash = "sha256-o/KYsiQDRva2mercTz1dmdcuXWCv7x8fy4LvPgk9Qn4=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 724c1aa4e08a6fc29f16232e8be353b96fb6cb55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:06:38 +0000
Subject: [PATCH 221/316] python3Packages.elevenlabs: 2.42.0 -> 2.43.0

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

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index b31dab477a32..2e514cd135f1 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.42.0";
+  version = "2.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HLKaT+781V889MO471T1Hj+ED7k3SGPtwt9NIA/bmWQ=";
+    hash = "sha256-w8IvjwC1X81BhPgTcHWx/vDL9M/ZoHUNsvTySmN0qW0=";
   };
 
   build-system = [ poetry-core ];

From fcd7490e8607c646aa1ebb967c3ee64b22306fd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:10:13 +0000
Subject: [PATCH 222/316] monkeys-audio: 12.63 -> 12.67

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

diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix
index a7ca84f6fb29..7876de1b7ad9 100644
--- a/pkgs/by-name/mo/monkeys-audio/package.nix
+++ b/pkgs/by-name/mo/monkeys-audio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "12.63";
+  version = "12.67";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-6+KptHteX8maGCjZhf9A49Ri2zoO9mFvc3m4Nr8tGwA=";
+    hash = "sha256-36iH2iIvR8CVA8uvldIGiPxL5HkNUK94PpCzvffWx6o=";
     stripRoot = false;
   };
 

From 67a526e1004dbd67ec38df2f0fe9d1d5ae23c2e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:10:56 +0000
Subject: [PATCH 223/316] typos: 1.45.0 -> 1.45.1

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

diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 19f5d1b6c297..629b7bda2e2e 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typos";
-  version = "1.45.0";
+  version = "1.45.1";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sgu6zCWwdqZW+HW9i/rujViL/jvDTzdkEm257OMQarg=";
+    hash = "sha256-v051wBxAgTlsFOAlysRlUOz/VoSSxbm3rqRJBxLOPuI=";
   };
 
-  cargoHash = "sha256-NTbmLAUSz3CjQtf0s5Hu3OFvGw6D8jw0gmIt4kaQbwM=";
+  cargoHash = "sha256-S7koGmH6C8wigRD+/ldDltTziHQ3uadHGfeI+Vk/Wak=";
 
   passthru.updateScript = nix-update-script { };
 

From 754d31686f094fdd318c4eef48faffe0569ab556 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:17:25 +0000
Subject: [PATCH 224/316] stackit-cli: 0.59.0 -> 0.60.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index b92f127c1214..592e2578a215 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "stackit-cli";
-  version = "0.59.0";
+  version = "0.60.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OOvcdkvNur+pLEHsoGROCOuD/oydZqbhMPUDUSDnLes=";
+    hash = "sha256-PS5FJUA3+3gBJ7tY/Dl8HUz78GQEl3wS9BYe7MRIxoE=";
   };
 
   vendorHash = "sha256-HZ5k1AIuSsAdVIHMzo3awguw+AlctLMicLRzzGgM7xA=";

From faff98f55fb42ac97f8ffd9f76cb5972a63192e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:18:07 +0000
Subject: [PATCH 225/316] sqlc: 1.30.0 -> 1.31.0

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

diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
index 7b655ebcda11..33f43cbebdaa 100644
--- a/pkgs/by-name/sq/sqlc/package.nix
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqlc";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "sqlc-dev";
     repo = "sqlc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ns0FIGu+aOuRFBYHrAqWUiYCwHE5XQqlR3AFKy5lq4E=";
+    hash = "sha256-1HQXj3rmfPyOw3Cex3jRByEwzXhcYpWpj8w4Z2Cylp8=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-jivqXwuq6wbNQFW8BlBZIKBLpIotA2MMR5iywODycpY=";
+  vendorHash = "sha256-SVc7XZERh47hhfTr9bExjZcZrNz0FO/OVEQYbPVqSWM=";
 
   subPackages = [ "cmd/sqlc" ];
 

From 7cd8d0cfe5432b3b2d4e78ab9eddd7db21e10cc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:19:56 +0000
Subject: [PATCH 226/316] sqldef: 3.11.0 -> 3.11.1

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

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index 5cc99147c274..fdc191b938a8 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqldef";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-//wAzWGgNIYp/uajrhX2GexIsdYRjRAOPcHXZuSdj+E=";
+    hash = "sha256-JUZwBy9aP649HSMLFIB7xrXlqc78JM3B+Ejci1pu+4E=";
   };
 
   proxyVendor = true;

From c97a402a3b20a874789037f21daa0f8b5f24a16b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 08:32:26 +0000
Subject: [PATCH 227/316] libretro.stella: 0-unstable-2026-04-12 ->
 0-unstable-2026-04-19

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index c7029cfd8c5b..e58ec0b77599 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-04-12";
+  version = "0-unstable-2026-04-19";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "7d9148f97c9f4ba8903ba3e19cbfb418c779bbb5";
-    hash = "sha256-l1PdtMtYmnYzUyEoAuZ2Wh9g85kUFHTfq6iBJOZ5Cfc=";
+    rev = "8b7bc991d2500cbf2e861c25f96ff81e0d13f273";
+    hash = "sha256-jeu/7hHuPfSoJg2/6UxUqHWOGMSe0vX6cgWLmVYHABQ=";
   };
 
   makefile = "Makefile";

From 76ac4c0d624c844ebaf7b9db912ba7d87011930a Mon Sep 17 00:00:00 2001
From: Christoph Honal <christoph.honal@web.de>
Date: Thu, 16 Apr 2026 20:52:04 +0200
Subject: [PATCH 228/316] easylpac: init at 0.8.0.2

---
 pkgs/by-name/ea/easylpac/package.nix | 84 ++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/by-name/ea/easylpac/package.nix

diff --git a/pkgs/by-name/ea/easylpac/package.nix b/pkgs/by-name/ea/easylpac/package.nix
new file mode 100644
index 000000000000..da85d65a62f2
--- /dev/null
+++ b/pkgs/by-name/ea/easylpac/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook3,
+  makeDesktopItem,
+  copyDesktopItems,
+  gtk3,
+  libglvnd,
+  libxxf86vm,
+  libxrandr,
+  libxi,
+  libxinerama,
+  libxcursor,
+  libx11,
+  libxext,
+  lpac,
+}:
+
+buildGoModule rec {
+  pname = "easylpac";
+  version = "0.8.0.2";
+
+  src = fetchFromGitHub {
+    owner = "creamlike1024";
+    repo = "EasyLPAC";
+    tag = version;
+    hash = "sha256-GxcaMyEaPIGf+/wzmmycmFssTkP5Praj4GCYbxbJU28=";
+  };
+
+  vendorHash = "sha256-52I8hlnoHPhygwr0dxDP50X2A7Gsh0v/0SGQFH3FG/8=";
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    libglvnd
+    libxxf86vm
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
+  ];
+
+  postInstall = ''
+    install -Dm644 assets/icon64.png "$out/share/icons/hicolor/64x64/apps/EasyLPAC.png"
+    install -Dm644 assets/icon128.png "$out/share/icons/hicolor/128x128/apps/EasyLPAC.png"
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${lib.makeBinPath [ lpac ]}
+    )
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "EasyLPAC";
+      exec = "EasyLPAC";
+      icon = "EasyLPAC";
+      desktopName = "EasyLPAC";
+      comment = "GUI frontend for lpac, a C-based eUICC LPA";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "GUI frontend for lpac, a C-based eUICC LPA";
+    homepage = "https://github.com/creamlike1024/EasyLPAC";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ stargate01 ];
+    mainProgram = "EasyLPAC";
+    platforms = lib.platforms.linux;
+  };
+}

From 3890901e29618ea881ce2940a62d8d6336627c74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 09:01:25 +0000
Subject: [PATCH 229/316] python3Packages.llama-index-workflows: 2.17.3 ->
 2.19.0

---
 .../python-modules/llama-index-workflows/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix
index e4e58ed37177..756101460a48 100644
--- a/pkgs/development/python-modules/llama-index-workflows/default.nix
+++ b/pkgs/development/python-modules/llama-index-workflows/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-workflows";
-  version = "2.17.3";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_workflows";
     inherit (finalAttrs) version;
-    hash = "sha256-hfbc2/IUcAqwdB3DIlrU6q8ckP2fDggliKpwxHNbJsM=";
+    hash = "sha256-GXuiE9KDdRaQL4V1hYkatWsUI+9P1yh/Xn8z+i8hVXU=";
   };
 
   postPatch = ''

From 7ceb0647552ac0dcf36e5d13093ed72087719816 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 20 Apr 2026 12:19:34 +0300
Subject: [PATCH 230/316] qui: 1.16.1 -> 1.17.0

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

diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix
index b7d475e5da1d..80b4f0a84eb2 100644
--- a/pkgs/by-name/qu/qui/package.nix
+++ b/pkgs/by-name/qu/qui/package.nix
@@ -14,12 +14,12 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "qui";
-  version = "1.16.1";
+  version = "1.17.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "qui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yqk5qOSXXL710VjwLlIdnHcp6TGqiN1G7r+g2jLrcdk=";
+    hash = "sha256-Bp3kih7x0NZTEylk9/Ul10+RN51fCs90ZmWrJtcwH40=";
   };
 
   qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
@@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: {
         ;
       pnpm = pnpm_9;
       fetcherVersion = 3;
-      hash = "sha256-CgkIKLlckf5fhvZuBrTr+fI7CDyvuXQoqfyC2jQ3dnk=";
+      hash = "sha256-Ps/m0sr2xJOTkKOUi6G+iHY7Ork9crepP5kuz0xh/aQ=";
     };
 
     postBuild = ''

From 1f58f0fc4966e8f4422ff01db923ea999a9eaa10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 09:37:07 +0000
Subject: [PATCH 231/316] nu_scripts: 0-unstable-2026-04-11 ->
 0-unstable-2026-04-18

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 70c867ee72e7..4dc9ff7a40bc 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-04-11";
+  version = "0-unstable-2026-04-18";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "341154f469b0fbb5bc5b69e591ba97ebf0e58fdb";
-    hash = "sha256-94u6d6WyyyamUn4a4p8O9Ujl9R56p1JxthuS03B4auw=";
+    rev = "c5387bd60ca63d26885ee73ceb8a84160bc6ca6b";
+    hash = "sha256-QPKgVj5tWwgwspCQYwjPBJZLTHm2e3AuneOK+hI6qUg=";
   };
 
   installPhase = ''

From 34b030e61ca047d5b2641277ea4b58c49c6e3dc4 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 30 Mar 2026 13:28:43 +0530
Subject: [PATCH 232/316] python3Packages.cryptodatahub: 1.0.2 -> 1.1.0

use finalAttrs
move to pytestCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../python-modules/cryptodatahub/default.nix  | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix
index c793dbd53b83..a07509e65f98 100644
--- a/pkgs/development/python-modules/cryptodatahub/default.nix
+++ b/pkgs/development/python-modules/cryptodatahub/default.nix
@@ -6,23 +6,23 @@
   buildPythonPackage,
   fetchFromGitLab,
   pyfakefs,
+  pytestCheckHook,
   python-dateutil,
   setuptools,
   setuptools-scm,
-  unittestCheckHook,
   urllib3,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cryptodatahub";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "coroner";
     repo = "cryptodatahub";
-    tag = "v${version}";
-    hash = "sha256-DQspaa9GsnRjETKUca2i91iBPbT4qATmKiL8M0nBP/A=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Tz2VbWS5/sGjRsOKR7eWpWAJVNv1QMSjkepI7fVZq6w=";
   };
 
   build-system = [
@@ -40,23 +40,31 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     beautifulsoup4
     pyfakefs
-    unittestCheckHook
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "cryptodatahub" ];
 
-  preCheck = ''
+  disabledTests = [
+    # fails due to certificate expiry
+    # see https://gitlab.com/coroner/cryptodatahub/-/work_items/38
+    "test_validity"
+    # pytest incorrectly collects abstract base classes
+    "TestClasses"
+  ];
+
+  disabledTestPaths = [
     # failing tests
-    rm test/updaters/test_common.py
+    "test/updaters/test_common.py"
     # Tests require network access
-    rm test/common/test_utils.py
-  '';
+    "test/common/test_utils.py"
+  ];
 
   meta = {
     description = "Repository of cryptography-related data";
     homepage = "https://gitlab.com/coroner/cryptodatahub";
-    changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.mpl20;
     teams = with lib.teams; [ ngi ];
   };
-}
+})

From a01da3a1aa65151d1df24ce46e81fc2cc6e9bea8 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 30 Mar 2026 14:08:03 +0530
Subject: [PATCH 233/316] python3Packages.cryptoparser: 1.0.2 -> 1.1.0

use finalAttrs
move to pytestCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../python-modules/cryptoparser/default.nix   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix
index 7cd535eea98f..6c814655ae8f 100644
--- a/pkgs/development/python-modules/cryptoparser/default.nix
+++ b/pkgs/development/python-modules/cryptoparser/default.nix
@@ -9,20 +9,20 @@
   pyfakefs,
   setuptools,
   setuptools-scm,
-  unittestCheckHook,
+  pytestCheckHook,
   urllib3,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cryptoparser";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "coroner";
     repo = "cryptoparser";
-    tag = "v${version}";
-    hash = "sha256-CsG4hfA3pfE7FwxNfaUTLMS8RV0tv1czoHdIlolUX34=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Zd305BFM3G8LMQqDwtbwRPy6ooNXJ61UzWBwVewh0F4=";
   };
 
   patches = [
@@ -48,7 +48,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pyfakefs
-    unittestCheckHook
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # pytest incorrectly collects abstract base classes
+    "TestCasesBasesHttpHeader"
   ];
 
   postInstall = ''
@@ -60,9 +65,8 @@ buildPythonPackage rec {
   meta = {
     description = "Security protocol parser and generator";
     homepage = "https://gitlab.com/coroner/cryptoparser";
-    changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = [ ];
     teams = with lib.teams; [ ngi ];
   };
-}
+})

From 25c45943c6c66de308fa2abb62e02eb3043e0086 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 30 Mar 2026 14:08:23 +0530
Subject: [PATCH 234/316] python3Packages.cryptolyzer: 1.0.2 -> 1.1.0

use finalAttrs
use fetchFromGitLab

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../python-modules/cryptolyzer/default.nix    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix
index 8531c4d74931..e8cc54e9632d 100644
--- a/pkgs/development/python-modules/cryptolyzer/default.nix
+++ b/pkgs/development/python-modules/cryptolyzer/default.nix
@@ -7,7 +7,7 @@
   colorama,
   cryptoparser,
   dnspython,
-  fetchPypi,
+  fetchFromGitLab,
   pathlib2,
   pyfakefs,
   python-dateutil,
@@ -17,14 +17,16 @@
   urllib3,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cryptolyzer";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-c/cBOrvqyvdGfDKPRUhIu9FqtQUERb/fJBGmncZpbSM=";
+  src = fetchFromGitLab {
+    owner = "coroner";
+    repo = "cryptolyzer";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-z9RuboCWHEqw4aFfQTjWly/UP9Yed0R+VdMLVXxdBmc=";
   };
 
   patches = [
@@ -69,10 +71,9 @@ buildPythonPackage rec {
   meta = {
     description = "Cryptographic protocol analyzer";
     homepage = "https://gitlab.com/coroner/cryptolyzer";
-    changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${version}/CHANGELOG.md";
+    changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     mainProgram = "cryptolyze";
-    maintainers = [ ];
     teams = with lib.teams; [ ngi ];
   };
-}
+})

From 45e3996b16cbb4ffca57648d517b918d93593de1 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 21 Nov 2025 11:14:19 +0000
Subject: [PATCH 235/316] pkgsCross.wasi32.buildPackages.rustc: fix build

Fixes #463589
---
 pkgs/by-name/wa/wasilibc/package.nix      | 4 ++++
 pkgs/development/compilers/rust/rustc.nix | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 884de0d7ed7b..14d1e05c1411 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -58,6 +58,10 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
 
   preFixup = ''
     ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports
+    ln -s $out/lib $out/lib/${stdenvNoLibc.system}
+  ''
+  + lib.optionalString (stdenvNoLibc.system != stdenvNoLibc.targetPlatform.rust.rustcTargetSpec) ''
+    ln -s $out/lib $out/lib/${stdenvNoLibc.targetPlatform.rust.rustcTargetSpec}
   '';
 
   passthru.tests = {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index ff2d0782ce61..63276323d2ef 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -260,6 +260,9 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optionals stdenv.targetPlatform.isMusl [
       "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
     ]
+    ++ optionals stdenv.targetPlatform.isWasi [
+      "${setTarget}.wasi-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
+    ]
     ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [
       "--disable-docs"
     ]

From d66c6c9d8fe53ad99ca14691520d624d07f5a78a Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Sun, 15 Mar 2026 12:44:05 +0000
Subject: [PATCH 236/316] wasilibc: explicitly set TARGET_TRIPLE

While this is no-op for wasm32-wasip1, this change future-proofs
wasilibc for when nixpkgs supports wasm32-wasip2 and wasm32-wasip3.
---
 pkgs/by-name/wa/wasilibc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 14d1e05c1411..1745a80f2916 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -47,6 +47,7 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
       "SYSROOT_LIB:=$SYSROOT_LIB"
       "SYSROOT_INC:=$SYSROOT_INC"
       "SYSROOT_SHARE:=$SYSROOT_SHARE"
+      "TARGET_TRIPLE:=${stdenvNoLibc.system}"
       ${lib.strings.optionalString enablePosixThreads "THREAD_MODEL:=posix"}
     )
   '';

From 72b5a1c0e616b4c440935b7e6843765a8411bb86 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sat, 28 Feb 2026 23:04:29 +0100
Subject: [PATCH 237/316] doc: add wasip1 rust package example

---
 doc/languages-frameworks/rust.section.md | 29 ++++++++++++++++++++++++
 doc/redirects.json                       |  3 +++
 2 files changed, 32 insertions(+)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 04b43b5c272f..533e8021940b 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -736,6 +736,35 @@ stdenv.mkDerivation (finalAttrs: {
 })
 ```
 
+### Compiling `wasm32-wasip1` package {#compiling-wasm32-wasip1-package}
+
+```nix
+pkgsCross.wasi32.callPackage (
+  {
+    fetchFromGitHub,
+    rustPlatform,
+    lld,
+  }:
+  rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "zellij-harpoon";
+    version = "0.3.0";
+
+    src = fetchFromGitHub {
+      owner = "Nacho114";
+      repo = "harpoon";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-JmYcbzxIF6qZs2/RKuspHqNpyDibGp9CVQJj47y/BOQ=";
+    };
+
+    cargoHash = "sha256-lsv5Wssakni18jif++fPo3Z5WyBtvPsGpWwG3abR7jQ=";
+
+    # these two lines are currently required
+    env.RUSTFLAGS = "-C linker=wasm-ld";
+    nativeBuildInputs = [ lld ];
+  })
+) { }
+```
+
 ## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo}
 
 ### Simple operation {#simple-operation}
diff --git a/doc/redirects.json b/doc/redirects.json
index 03285903666e..ccdf7f6870de 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -20,6 +20,9 @@
   "cmake-ctest-variables": [
     "index.html#cmake-ctest-variables"
   ],
+  "compiling-wasm32-wasip1-package": [
+    "index.html#compiling-wasm32-wasip1-package"
+  ],
   "coq-withPackages": [
     "index.html#coq-withPackages"
   ],

From 5ccff4887c57997784a94ca1aa4eedcaf8a67fd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 10:13:43 +0000
Subject: [PATCH 238/316] python3Packages.mlcroissant: 1.0.22 -> 1.1.0

---
 .../python-modules/mlcroissant/default.nix        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix
index b4512f183a16..04f1bdf2cd92 100644
--- a/pkgs/development/python-modules/mlcroissant/default.nix
+++ b/pkgs/development/python-modules/mlcroissant/default.nix
@@ -29,19 +29,20 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mlcroissant";
-  version = "1.0.22";
+  version = "1.1.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mlcommons";
     repo = "croissant";
-    tag = "v${version}";
-    hash = "sha256-uJOxKNrK3eN2wyPFEQr2J4+vZeSK1KPyFDag2jcyWZw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IaRlmNQjOSIT3/b6AM68eRmweZEI5yjo6I9ievQIIsE=";
   };
 
-  sourceRoot = "${src.name}/python/mlcroissant";
+  sourceRoot = "${finalAttrs.src.name}/python/mlcroissant";
 
   build-system = [
     setuptools
@@ -91,10 +92,10 @@ buildPythonPackage rec {
   meta = {
     description = "High-level format for machine learning datasets that brings together four rich layers";
     homepage = "https://github.com/mlcommons/croissant";
-    changelog = "https://github.com/mlcommons/croissant/releases/tag/${src.tag}";
+    changelog = "https://github.com/mlcommons/croissant/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     platforms = lib.platforms.all;
     mainProgram = "mlcroissant";
   };
-}
+})

From 1339fb9d7de2e2aa5b284b79e29955a171af5063 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Thu, 16 Apr 2026 20:49:48 +0200
Subject: [PATCH 239/316] garage_2: 2.2.0 -> 2.3.0

Changelog: https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v2.3.0

Co-authored-by: Adam C. Stephens <adam@valkor.net>
---
 pkgs/tools/filesystems/garage/default.nix | 29 +++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index cfa35fd8cdce..12ce3e3c5353 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -2,12 +2,15 @@
   lib,
   rustPlatform,
   fetchFromGitea,
+  fetchpatch2,
+  installShellFiles,
   openssl,
   pkg-config,
   protobuf,
   cacert,
   nix-update-script,
   nixosTests,
+  stdenv,
 }:
 let
   generic =
@@ -34,6 +37,7 @@ let
       inherit cargoHash cargoPatches;
 
       nativeBuildInputs = [
+        installShellFiles
         protobuf
         pkg-config
       ];
@@ -48,7 +52,7 @@ let
 
       env.OPENSSL_NO_VENDOR = true;
 
-      # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.2.0/nix/compile.nix#L71-L78
+      # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.3.0/nix/compile.nix#L71-L78
       # on version changes for checking if changes are required here
       buildFeatures = [
         "bundled-libs"
@@ -64,6 +68,16 @@ let
         "telemetry-otlp"
       ];
 
+      postInstall =
+        lib.optionalString
+          ((lib.versionAtLeast version "2.3.0") && (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
+          ''
+            installShellCompletion --cmd garage \
+              --bash <($out/bin/garage completions bash) \
+              --fish <($out/bin/garage completions fish) \
+              --zsh <($out/bin/garage completions zsh)
+          '';
+
       passthru = {
         tests = nixosTests."garage_${lib.versions.major version}";
         updateScript = nix-update-script {
@@ -99,9 +113,16 @@ rec {
   };
 
   garage_2 = generic {
-    version = "2.2.0";
-    hash = "sha256-UaWHZPV0/Jgeiwvvr9V9Gqthn5KXErLx8gL4JdBRDVs=";
-    cargoHash = "sha256-U6Wipvlw3XdKUBNZMznENJ9m+9fzP9Nb6217+Kytu7s=";
+    version = "2.3.0";
+    hash = "sha256-CqHcaVGgXL/jjqq7XN+kzEp6xoNgwBfGpMKYbTd78Ys=";
+    cargoHash = "sha256-ANh97G/2/KtCMN4gldteq6ROduk1AQJkI5zS9n97OJY=";
+    cargoPatches = [
+      (fetchpatch2 {
+        # fix: prevent depending on aws-lc via reqwest
+        url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/7c18abb664d891cdb696b478058b7506e3d53f44.patch";
+        hash = "sha256-f/+vDOC+kcmJVLtx1Y6OepoJBZhX30DULwSLnyQN5aI=";
+      })
+    ];
   };
 
   garage = garage_1;

From 35d0d3a84e206f66a69c1d02aa0e2be6c8805f93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 10:41:07 +0000
Subject: [PATCH 240/316] 
 home-assistant-custom-components.waste_collection_schedule: 2.19.0 -> 2.20.0

---
 .../custom-components/waste_collection_schedule/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 8d17ac71ae51..229812fc44f9 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.19.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = "v${version}";
-    hash = "sha256-RkCgyjGetUbGa7F1AWVaXJ/lWAWA1m4SSxNV94EQyuY=";
+    hash = "sha256-Dt1Ey2vIk5f6AEC9qepUb3S8+1rBwG5o6/6/pEoglcw=";
   };
 
   dependencies = [

From 66589e565c3f9a1dcbb7bf8f205ca6a27c2f56dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 10:50:35 +0000
Subject: [PATCH 241/316] aliyun-cli: 3.3.4 -> 3.3.8

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 506a242f6284..42dbd533885a 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.3.4";
+  version = "3.3.8";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ykq7UkpGy9w3VQ2LcGsdREN0na0F7Mj9RxVu8iLr96s=";
+    hash = "sha256-5RFGpfeW3nLubN920hrBVyEdJEPa/V3Dz2YdxCh9YLU=";
     fetchSubmodules = true;
   };
 

From 6edb60b622fd976de3535dce160ac4b4e272ee1c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Apr 2026 12:58:52 +0200
Subject: [PATCH 242/316] postfix-tlspol: 1.9.0 -> 1.9.1

https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.9.1
---
 pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 25641ba4ae7a..a7add39ead54 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "postfix-tlspol";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tYe5uPykTkw9XQHPdxa1nqdWgOtKKMdnis0m0SdlEPo=";
+    hash = "sha256-oS1U987pS365EQcf96w8RNGWGImFA/uRmv/Oh2HLyuo=";
   };
 
   vendorHash = null;

From f1cab92aa2d004a2e9f0423f8f1aa3191f738016 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 11:01:18 +0000
Subject: [PATCH 243/316] audiobookshelf: 2.33.1 -> 2.33.2

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

diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index f5715127d8fc..5291f1920343 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -15,10 +15,10 @@
 
 let
   source = {
-    version = "2.33.1";
-    hash = "sha256-O1AurSUq3MNcSchQlC/UfPO2KoB4dBBsONAQ2Bmxk9o=";
-    npmDepsHash = "sha256-NVHKPiT4GFiFVVyO7z/fZtU8Zf4o/LM1PmUs6zwzZF0=";
-    clientNpmDepsHash = "sha256-KWGnFeXxOVGqAruB9k/FqQfQNG6JrZFUQpo0Ls8jEYA=";
+    version = "2.33.2";
+    hash = "sha256-YsKUoJ0SlBO3fAbMvzaEEIgo90HclB+0iLVIH4LDmEY=";
+    npmDepsHash = "sha256-h/5brNurUEMHTSu2PGODhRtIenGzhsNM558i85Cs86w=";
+    clientNpmDepsHash = "sha256-EbXkHRjOE1A7Sk4MhbJFuBwG/VY+SHhHYjscsXkSMjU=";
   };
 
   src = fetchFromGitHub {

From be71d49f3b24a45f569583e208b9bc5f95d94782 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 20 Apr 2026 13:07:14 +0200
Subject: [PATCH 244/316] glauth: 2.4.0 -> 2.5.0

Release notes: https://github.com/glauth/glauth/releases/tag/GLAuth-v2.5.0
Git changelog: https://github.com/glauth/glauth/compare/v2.4.0...GLAuth-v2.5.0

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/gl/glauth/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index c08465882ecc..f78d7c78483c 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -7,22 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "glauth";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "glauth";
     repo = "glauth";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-UUTL+ZnHRSYuD/TUYpsuo+Nu90kpA8ZL4XaGz6in3ME=";
+    tag = "GLAuth-v${finalAttrs.version}";
+    hash = "sha256-9aymP2zhp2DaqqrC1tiTicqnzBvAHGdx4KHKXkYNNsg=";
   };
 
   vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg=";
 
-  postPatch = ''
-    substituteInPlace v2/internal/version/const.go \
-      --replace-fail '"v2.3.1"' '"v${finalAttrs.version}"'
-  '';
-
   # Builds without go workspace fail with mysterious errors
   overrideModAttrs = _: {
     buildPhase = ''

From 353c36fc4d855a7edbd144b62650e485a5b234f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 11:16:04 +0000
Subject: [PATCH 245/316] cpuinfo: 0-unstable-2026-03-12 ->
 0-unstable-2026-04-15

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

diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index 23ab29a16dfc..420c2fea9eae 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2026-03-12";
+  version = "0-unstable-2026-04-15";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "7607ca500436b37ad23fb8d18614bec7796b68a7";
-    hash = "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=";
+    rev = "d05fbcd57dc096718c4979e7c054e628f1f3520b";
+    hash = "sha256-GF88Y83G9hh3gze0n4wySH9ix3PSGhaZey3t2aej0BQ=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cpu-info";
     maintainers = with lib.maintainers; [ pawelchcki ];
     pkgConfigModules = [ "libcpuinfo" ];
-    # https://github.com/pytorch/cpuinfo/blob/7607ca500436b37ad23fb8d18614bec7796b68a7/CMakeLists.txt#L98
+    # https://github.com/pytorch/cpuinfo/blob/d05fbcd57dc096718c4979e7c054e628f1f3520b/CMakeLists.txt#L98
     platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
   };
 })

From 84ddd9dcabd2d689bc7c71e19c84b4cd84ae16ad Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 20 Apr 2026 12:34:38 +0100
Subject: [PATCH 246/316] postgresqlPackages.vectorchord: specify dual license

With compound licenses[1] recently merged, we can now properly represent
dual licensed packages without affecting its non-free status.

See https://github.com/NixOS/nixpkgs/pull/392710#discussion_r2010438719
[1]: https://github.com/NixOS/nixpkgs/pull/468378
---
 pkgs/servers/sql/postgresql/ext/vectorchord/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index fb67267ce725..c895d8ebe34e 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -92,7 +92,10 @@ buildPgrxExtension (finalAttrs: {
     changelog = "https://github.com/tensorchord/VectorChord/releases/tag/${finalAttrs.version}";
     description = "Scalable, fast, and disk-friendly vector search in Postgres, the successor of pgvecto.rs";
     homepage = "https://github.com/tensorchord/VectorChord";
-    license = lib.licenses.agpl3Only; # dual licensed with Elastic License v2 (ELv2)
+    license = lib.licenses.OR [
+      lib.licenses.agpl3Only
+      lib.licenses.elastic20
+    ];
     maintainers = with lib.maintainers; [
       diogotcorreia
     ];

From f8bcedf147612145acde72f5874f1f04e781263f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 20 Apr 2026 13:31:35 +0200
Subject: [PATCH 247/316] lib.licenses: add universalFOSSException-10

---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 56f29b690495..12301021e9c8 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -1495,6 +1495,11 @@ lib.mapAttrs mkLicense (
       fullName = "Unicode Terms of Use";
     };
 
+    universalFOSSException-10 = {
+      spdxId = "Universal-FOSS-exception-1.0";
+      fullName = "Universal FOSS Exception, Version 1.0";
+    };
+
     unlicense = {
       spdxId = "Unlicense";
       fullName = "The Unlicense";

From 3c563bf18b7b84a6086457fc301c308e5779ccca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Apr 2026 13:39:35 +0200
Subject: [PATCH 248/316] evcc: 0.305.0 -> 0.305.1

https://github.com/evcc-io/evcc/releases/tag/0.305.1
---
 pkgs/by-name/ev/evcc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index bb545b65795a..df22d30414b5 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "0.305.0";
+  version = "0.305.1";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-dkBYIgOEN0n8B4tluiOau436tXgZ1II6vIL61QfUyBg=";
+    hash = "sha256-XRaowjOErq+gAarBNcSydWbjuq4KUQkXb4YBbL7pCas=";
   };
 
   vendorHash = "sha256-dQwbg1gTpDVnNGAN3scvohfsy2LCe4v9eGtNBVdZ1Hs=";

From cda37cbc201887589d1c639189b5752ab428d19e Mon Sep 17 00:00:00 2001
From: Edward <9159652+winterec@users.noreply.github.com>
Date: Mon, 20 Apr 2026 20:00:52 +0800
Subject: [PATCH 249/316] edukai: use hash rather than sha256

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 pkgs/by-name/ed/edukai/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index 371f3f4d4970..87f7cdbd615b 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchzip {
     url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${finalAttrs.version}.zip";
-    sha256 = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
+    hash = "sha256-B4TwTPX1dsq6rB4YunY6q2yx2OJhNhmn3an/dJwDPJc=";
   };
 
   nativeBuildInputs = [ installFonts ];

From 25f11f8eeccdc0c09a42fabe1133f24649c9f1d9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 12:16:48 +0000
Subject: [PATCH 250/316] python3Packages.tensorflow-datasets: fix mlcroissant
 1.1.0 compatibility

---
 .../python-modules/tensorflow-datasets/default.nix     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 6de4478928a9..5dde0d7682e1 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -93,6 +93,16 @@ buildPythonPackage (finalAttrs: {
           "elif field.label == field.LABEL_REPEATED:" \
           "elif hasattr(field_value, 'extend'):"
     ''
+    # mlcroissant 1.1.0 requires leaf fields to define `source` or `value`
+    + ''
+      substituteInPlace tensorflow_datasets/core/utils/croissant_utils_test.py \
+        --replace-fail \
+          "references=mlc.Source(field='splits/name')," \
+          "references=mlc.Source(field='splits/name'), source=mlc.Source(field='splits/name')," \
+        --replace-fail \
+          "references=mlc.Source(field='labels/label')," \
+          "references=mlc.Source(field='labels/label'), source=mlc.Source(field='labels/label'),"
+    ''
     # TypeError: only 0-dimensional arrays can be converted to Python scalars
     + ''
       substituteInPlace tensorflow_datasets/datasets/smallnorb/smallnorb_dataset_builder.py \

From 1d3104f77bd1e14ee4fbdf7aea7676288f2f9bea Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 20 Apr 2026 14:36:13 +0200
Subject: [PATCH 251/316] python3Packages.pywinbox: unbreak on darwin

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

diff --git a/pkgs/development/python-modules/pywinbox/default.nix b/pkgs/development/python-modules/pywinbox/default.nix
index 9815316daf3a..63d18a832aa7 100644
--- a/pkgs/development/python-modules/pywinbox/default.nix
+++ b/pkgs/development/python-modules/pywinbox/default.nix
@@ -36,6 +36,12 @@ buildPythonPackage (finalAttrs: {
     pyobjc-framework-Cocoa
   ];
 
+  # It's called pyobjc-core instead of pyobjc in nixpkgs.
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace setup.py \
+      --replace-fail 'pyobjc' 'pyobjc-core'
+  '';
+
   # requires x session (use ewmhlib)
   pythonImportsCheck = [ ];
   doCheck = false;

From 2ff427cb7dab599d8fe544bcc4aadc7a2bbbac8b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 12 Apr 2026 09:46:13 +0000
Subject: [PATCH 252/316] python3Packages.cuda-pathfinder: 1.4.0 -> 1.5.3

Diff:
https://github.com/NVIDIA/cuda-python/compare/cuda-pathfinder-v1.4.0...cuda-pathfinder-v1.5.3

Changelog:
https://nvidia.github.io/cuda-python/cuda-pathfinder/1.5.2/release/1.5.3-notes.html
---
 pkgs/development/python-modules/cuda-pathfinder/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cuda-pathfinder/default.nix b/pkgs/development/python-modules/cuda-pathfinder/default.nix
index 1ca842a476d4..ded37abf88cd 100644
--- a/pkgs/development/python-modules/cuda-pathfinder/default.nix
+++ b/pkgs/development/python-modules/cuda-pathfinder/default.nix
@@ -14,14 +14,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cuda-pathfinder";
-  version = "1.4.0";
+  version = "1.5.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cuda-python";
     tag = "cuda-pathfinder-v${finalAttrs.version}";
-    hash = "sha256-Bsou6vLyMBNbVMPT4vtnWpoi05lXG6pjhuee6Hg/Mm8=";
+    hash = "sha256-Tj+0p+nIsOl2pMpKAUpdZ3nIcQ0kHWrPi6Qeu14oMRQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cuda_pathfinder";

From c29a1d038941d6395e4bce8da14a122705b737c6 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Wed, 1 Oct 2025 07:21:42 +0200
Subject: [PATCH 253/316] intel-llvm: init at unstable-2025-11-14

---
 .../by-name/in/intel-llvm/clang-tools-wrapper |  27 +
 pkgs/by-name/in/intel-llvm/clang-tools.nix    |  43 +
 .../in/intel-llvm/gnu-install-dirs.patch      | 746 ++++++++++++++++++
 pkgs/by-name/in/intel-llvm/package.nix        | 144 ++++
 .../sycl-jit-exclude-cmake-files.patch        |  17 +
 pkgs/by-name/in/intel-llvm/tests.nix          |  39 +
 .../by-name/in/intel-llvm/unified-runtime.nix | 185 +++++
 pkgs/by-name/in/intel-llvm/unwrapped.nix      | 323 ++++++++
 8 files changed, 1524 insertions(+)
 create mode 100755 pkgs/by-name/in/intel-llvm/clang-tools-wrapper
 create mode 100644 pkgs/by-name/in/intel-llvm/clang-tools.nix
 create mode 100644 pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
 create mode 100644 pkgs/by-name/in/intel-llvm/package.nix
 create mode 100644 pkgs/by-name/in/intel-llvm/sycl-jit-exclude-cmake-files.patch
 create mode 100644 pkgs/by-name/in/intel-llvm/tests.nix
 create mode 100644 pkgs/by-name/in/intel-llvm/unified-runtime.nix
 create mode 100644 pkgs/by-name/in/intel-llvm/unwrapped.nix

diff --git a/pkgs/by-name/in/intel-llvm/clang-tools-wrapper b/pkgs/by-name/in/intel-llvm/clang-tools-wrapper
new file mode 100755
index 000000000000..2cb84ece693b
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/clang-tools-wrapper
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+buildcpath() {
+  local path after
+  while (( $# )); do
+    case $1 in
+        -isystem|-cxx-isystem)
+            shift
+            path=$path${path:+':'}$1
+            ;;
+        -idirafter)
+            shift
+            after=$after${after:+':'}$1
+            ;;
+    esac
+    shift
+  done
+  echo $path${after:+':'}$after
+}
+
+export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
+                                               $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
+export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
+                                                                                      $(<@clang@/nix-support/libcxx-cxxflags) \
+                                                                                      $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
+
+exec -a "$0" @unwrapped@/bin/$(basename $0) "$@"
diff --git a/pkgs/by-name/in/intel-llvm/clang-tools.nix b/pkgs/by-name/in/intel-llvm/clang-tools.nix
new file mode 100644
index 000000000000..121650941208
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/clang-tools.nix
@@ -0,0 +1,43 @@
+# Wrapper for clang tools (clang-scan-deps, clang-check, etc.) that sets
+# CPATH and CPLUS_INCLUDE_PATH so they can find C/C++ standard library headers.
+#
+# This is needed because tools like clang-scan-deps are invoked directly by
+# build systems (e.g., CMake's C++20 module scanning) without going through
+# the cc-wrapper, so they don't get the flags that tell them where headers are.
+{
+  lib,
+  stdenv,
+  unwrapped,
+  wrapper,
+}:
+stdenv.mkDerivation {
+  pname = "intel-llvm-clang-tools";
+  version = unwrapped.version;
+
+  dontUnpack = true;
+
+  # These are used in substituteAll for the wrapper script
+  inherit unwrapped;
+  clang = wrapper;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+
+    substituteAll ${./clang-tools-wrapper} $out/bin/.clang-tool-wrapper
+    chmod +x $out/bin/.clang-tool-wrapper
+
+    for tool in clang-scan-deps clang-check clang-extdef-mapping clang-refactor clang-tidy; do
+      if [[ -e $unwrapped/bin/$tool ]]; then
+        ln -s $out/bin/.clang-tool-wrapper $out/bin/$tool
+      fi
+    done
+
+    runHook postInstall
+  '';
+
+  meta = unwrapped.meta // {
+    description = "Wrapped Intel LLVM clang tools with proper include paths";
+  };
+}
diff --git a/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch b/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
new file mode 100644
index 000000000000..9cbf85248120
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
@@ -0,0 +1,746 @@
+diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt
+index 5c7d51e1e398..9158552fa09b 100644
+--- a/bolt/CMakeLists.txt
++++ b/bolt/CMakeLists.txt
+@@ -55,9 +55,9 @@ if(BOLT_BUILT_STANDALONE)
+   include_directories(${LLVM_INCLUDE_DIRS})
+   link_directories("${LLVM_LIBRARY_DIR}")
+ 
+-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_BINDIR}" )
+-  set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}/${LLVM_LIBDIR_SUFFIX}" )
+-  set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}/${LLVM_LIBDIR_SUFFIX}")
++  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
++  set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}" )
++  set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
+ endif() # standalone
+ 
+ # Determine default set of targets to build -- the intersection of
+diff --git a/bolt/runtime/CMakeLists.txt b/bolt/runtime/CMakeLists.txt
+index 63f178bd263c..55c582313e47 100644
+--- a/bolt/runtime/CMakeLists.txt
++++ b/bolt/runtime/CMakeLists.txt
+@@ -64,8 +64,8 @@ target_include_directories(bolt_rt_instr PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ target_compile_options(bolt_rt_hugify PRIVATE ${BOLT_RT_FLAGS})
+ target_include_directories(bolt_rt_hugify PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-install(TARGETS bolt_rt_instr DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
+-install(TARGETS bolt_rt_hugify DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
++install(TARGETS bolt_rt_instr DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS bolt_rt_hugify DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   add_library(bolt_rt_instr_osx STATIC
+@@ -77,7 +77,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" AND CMAKE_SYSTEM_NAME STREQUAL "Da
+   target_compile_options(bolt_rt_instr_osx PRIVATE
+     -target x86_64-apple-darwin19.6.0
+     ${BOLT_RT_FLAGS})
+-  install(TARGETS bolt_rt_instr_osx DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
++  install(TARGETS bolt_rt_instr_osx DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+   if(NOT BOLT_BUILT_STANDALONE)
+     add_custom_command(TARGET bolt_rt_instr_osx POST_BUILD
+diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
+index c47c4ac3bb73..721eb2cfd302 100644
+--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
++++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
+@@ -152,7 +152,7 @@ endif()
+ # Set up RPATH for the target runtime/builtin libraries.
+ # See some details here: https://reviews.llvm.org/D91099
+ if (NOT DEFINED RUNTIMES_INSTALL_RPATH)
+-  set(RUNTIMES_INSTALL_RPATH                "\$ORIGIN/../lib;${CMAKE_INSTALL_PREFIX}/lib")
++  set(RUNTIMES_INSTALL_RPATH                "\$ORIGIN/../lib;${CMAKE_INSTALL_FULL_LIBDIR}")
+ endif()
+ 
+ set(LLVM_BUILTIN_TARGETS                    "${TOOLCHAIN_TARGET_TRIPLE}" CACHE STRING "")
+diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
+index 4059fc3e986c..2b2500ad655c 100644
+--- a/clang/cmake/modules/AddClang.cmake
++++ b/clang/cmake/modules/AddClang.cmake
+@@ -134,8 +134,8 @@ macro(add_clang_library name)
+         install(TARGETS ${lib}
+           COMPONENT ${lib}
+           ${export_to_clangtargets}
+-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ 
+         if (NOT LLVM_ENABLE_IDE)
+diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
+index 9273eb5ed977..8251d75bc52e 100644
+--- a/clang/tools/scan-build-py/CMakeLists.txt
++++ b/clang/tools/scan-build-py/CMakeLists.txt
+@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})
+                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
+   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
+   install(FILES lib/libscanbuild/${lib}
+-          DESTINATION lib/libscanbuild
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild
+           COMPONENT scan-build-py)
+ endforeach()
+ 
+@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})
+                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
+   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
+   install(FILES lib/libscanbuild/resources/${resource}
+-          DESTINATION lib/libscanbuild/resources
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources
+           COMPONENT scan-build-py)
+ endforeach()
+ 
+@@ -122,7 +122,7 @@ foreach(lib ${LibEar})
+                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
+   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
+   install(FILES lib/libear/${lib}
+-          DESTINATION lib/libear
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libear
+           COMPONENT scan-build-py)
+ endforeach()
+ 
+diff --git a/cmake/Modules/GNUInstallPackageDir.cmake b/cmake/Modules/GNUInstallPackageDir.cmake
+index e4a058e68f4f..e4e84b6fc057 100644
+--- a/cmake/Modules/GNUInstallPackageDir.cmake
++++ b/cmake/Modules/GNUInstallPackageDir.cmake
+@@ -29,5 +29,5 @@ macro(_GNUInstallPackageDir_cache_path var default description)
+   _GNUInstallPackageDir_cache_convert_to_path("${var}" "${description}")
+ endmacro()
+ 
+-_GNUInstallPackageDir_cache_path(CMAKE_INSTALL_PACKAGEDIR "lib${LLVM_LIBDIR_SUFFIX}/cmake"
++_GNUInstallPackageDir_cache_path(CMAKE_INSTALL_PACKAGEDIR "${CMAKE_INSTALL_LIBDIR}/cmake"
+   "Directories containing installed CMake modules (lib/cmake)")
+diff --git a/cmake/Modules/GetClangResourceDir.cmake b/cmake/Modules/GetClangResourceDir.cmake
+index 518220188f96..d8b046fdca4c 100644
+--- a/cmake/Modules/GetClangResourceDir.cmake
++++ b/cmake/Modules/GetClangResourceDir.cmake
+@@ -16,7 +16,7 @@ function(get_clang_resource_dir out_var)
+     if (NOT CLANG_VERSION_MAJOR)
+       string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
+     endif()
+-    set(ret_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR})
++    set(ret_dir ${CMAKE_INSTALL_LIBDIR}/clang/${CLANG_VERSION_MAJOR})
+   endif()
+ 
+   if(ARG_PREFIX)
+diff --git a/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
+index 20400014869e..a4fe2fafe616 100644
+--- a/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
++++ b/compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
+@@ -53,7 +53,7 @@ macro(archive_aix_libatomic name libname)
+     # setting _install_rpath on AIX for reference.
+     if(LLVM_LIBRARY_OUTPUT_INTDIR AND CMAKE_INSTALL_PREFIX)
+       set(output_dir "${LLVM_LIBRARY_OUTPUT_INTDIR}")
+-      set(install_dir "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}")
++      set(install_dir "${CMAKE_INSTALL_FULL_LIBDIR}")
+     else()
+       get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} output_dir)
+       get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir)
+diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
+index ca233103ccdb..3e4dd9a58c5f 100644
+--- a/flang/cmake/modules/AddFlang.cmake
++++ b/flang/cmake/modules/AddFlang.cmake
+@@ -81,8 +81,8 @@ function(add_flang_library name)
+       install(TARGETS ${name}
+         COMPONENT ${name}
+         ${export_to_flangtargets}
+-        LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+-        ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ 
+       if (NOT LLVM_ENABLE_IDE)
+diff --git a/libclc/libclc.pc.in b/libclc/libclc.pc.in
+index 3a9e58b3ef0c..60f8c0fdf75d 100644
+--- a/libclc/libclc.pc.in
++++ b/libclc/libclc.pc.in
+@@ -1,4 +1,4 @@
+-libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc
++libexecdir=@CMAKE_INSTALL_FULL_DATAROOTDIR@/clc
+ 
+ Name: libclc
+ Description: Library requirements of the OpenCL C programming language
+diff --git a/libcxx/test/configs/armv7m-picolibc-libc++.cfg.in b/libcxx/test/configs/armv7m-picolibc-libc++.cfg.in
+index f0782c28ce3e..32fc542db557 100644
+--- a/libcxx/test/configs/armv7m-picolibc-libc++.cfg.in
++++ b/libcxx/test/configs/armv7m-picolibc-libc++.cfg.in
+@@ -1,6 +1,6 @@
+ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
+ 
+-libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
++libc_linker_script = '@CMAKE_INSTALL_FULL_LIBDIR@/picolibcpp.ld'
+ 
+ config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))
+ 
+diff --git a/libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in b/libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in
+index e61efbb303fc..a73c58584567 100644
+--- a/libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in
++++ b/libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in
+@@ -1,6 +1,6 @@
+ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
+ 
+-libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
++libc_linker_script = '@CMAKE_INSTALL_FULL_LIBDIR@/picolibcpp.ld'
+ 
+ config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))
+ 
+diff --git a/libdevice/cmake/modules/SYCLLibdevice.cmake b/libdevice/cmake/modules/SYCLLibdevice.cmake
+index 21989df43c00..36aee071dd96 100644
+--- a/libdevice/cmake/modules/SYCLLibdevice.cmake
++++ b/libdevice/cmake/modules/SYCLLibdevice.cmake
+@@ -12,16 +12,16 @@ else()
+   set(obj-suffix o)
+   set(obj-new-offload-suffix new.o)
+   set(spv_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+-  set(install_dest_spv lib${LLVM_LIBDIR_SUFFIX})
++  set(install_dest_spv ${CMAKE_INSTALL_LIBDIR})
+   set(devicelib_host_static_obj libsycl-devicelib-host.a)
+   set(devicelib_host_static_obj-new-offload libsycl-devicelib-host.new.a)
+ endif()
+ set(spv-suffix spv)
+ set(bc-suffix bc)
+ set(bc_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+-set(install_dest_obj lib${LLVM_LIBDIR_SUFFIX})
+-set(install_dest_obj-new-offload lib${LLVM_LIBDIR_SUFFIX})
+-set(install_dest_bc lib${LLVM_LIBDIR_SUFFIX})
++set(install_dest_obj ${CMAKE_INSTALL_LIBDIR})
++set(install_dest_obj-new-offload ${CMAKE_INSTALL_LIBDIR})
++set(install_dest_bc ${CMAKE_INSTALL_LIBDIR})
+ 
+ string(CONCAT sycl_targets_opt
+   "-fsycl-targets="
+diff --git a/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in b/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
+index 6ffdd70c6177..fadb6b3cb02f 100644
+--- a/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
++++ b/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
+@@ -1,6 +1,6 @@
+ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
+ 
+-libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
++libc_linker_script = '@CMAKE_INSTALL_FULL_LIBDIR@/picolibcpp.ld'
+ 
+ config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))
+ 
+diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
+index 37f73afa915f..1f70cfe4fc05 100644
+--- a/lld/cmake/modules/AddLLD.cmake
++++ b/lld/cmake/modules/AddLLD.cmake
+@@ -17,8 +17,8 @@ macro(add_lld_library name)
+     install(TARGETS ${name}
+       COMPONENT ${name}
+       ${export_to_lldtargets}
+-      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+-      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ 
+     if (NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
+index 5d58abf237f5..fd2edc4e3a66 100644
+--- a/lldb/cmake/modules/AddLLDB.cmake
++++ b/lldb/cmake/modules/AddLLDB.cmake
+@@ -106,7 +106,7 @@ function(add_lldb_library name)
+   endif()
+ 
+   if(PARAM_SHARED)
+-    set(install_dest lib${LLVM_LIBDIR_SUFFIX})
++    set(install_dest ${CMAKE_INSTALL_LIBDIR})
+     if(PARAM_INSTALL_PREFIX)
+       set(install_dest ${PARAM_INSTALL_PREFIX})
+     endif()
+diff --git a/lldb/tools/intel-features/CMakeLists.txt b/lldb/tools/intel-features/CMakeLists.txt
+index 7d48491ec89a..cb5f751a80ca 100644
+--- a/lldb/tools/intel-features/CMakeLists.txt
++++ b/lldb/tools/intel-features/CMakeLists.txt
+@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
+   )
+ 
+ install(TARGETS lldbIntelFeatures
+-  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/llvm-spirv/LLVMSPIRVLib.pc.in b/llvm-spirv/LLVMSPIRVLib.pc.in
+index 814c59251611..7188084e8061 100644
+--- a/llvm-spirv/LLVMSPIRVLib.pc.in
++++ b/llvm-spirv/LLVMSPIRVLib.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib@LLVM_LIBDIR_SUFFIX@
+-includedir=${prefix}/include
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: LLVMSPIRVLib
+ Description: LLVM/SPIR-V bi-directional translator
+diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
+index 9bbd39abd558..78b8da693007 100644
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -1207,9 +1207,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT tf_xla_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMDevelopmentExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
+index 7d40d309d538..5844f0f2a2fa 100644
+--- a/llvm/cmake/modules/AddLLVM.cmake
++++ b/llvm/cmake/modules/AddLLVM.cmake
+@@ -974,8 +974,8 @@ macro(add_llvm_library name)
+       endif()
+       install(TARGETS ${name}
+               ${export_to_llvmexports}
+-              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+-              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
++              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${name}
++              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${name}
+               RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
+ 
+       if (NOT LLVM_ENABLE_IDE)
+@@ -2284,7 +2284,7 @@ function(llvm_install_library_symlink name dest type)
+     set(LLVM_LINK_OR_COPY copy)
+   endif()
+ 
+-  set(output_dir lib${LLVM_LIBDIR_SUFFIX})
++  set(output_dir ${CMAKE_INSTALL_LIBDIR})
+   if((WIN32 OR CYGWIN) AND "${type}" STREQUAL "SHARED")
+     set(output_dir "${CMAKE_INSTALL_BINDIR}")
+   endif()
+@@ -2566,10 +2566,10 @@ function(llvm_setup_rpath name)
+     # Since BUILD_SHARED_LIBS is only recommended for use by developers,
+     # hardcode the rpath to build/install lib dir first in this mode.
+     # FIXME: update this when there is better solution.
+-    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
++    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}" ${extra_libdir})
+   elseif(UNIX)
+-    set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+-    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
++    set(_build_rpath "${CMAKE_INSTALL_FULL_LIBDIR}" ${extra_libdir})
++    set(_install_rpath "${CMAKE_INSTALL_FULL_LIBDIR}")
+     if("${CMAKE_SYSTEM_NAME}" MATCHES "(FreeBSD|DragonFly)")
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-z,origin ")
+diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake
+index 2d9116b08a52..076649279eb2 100644
+--- a/llvm/cmake/modules/AddOCaml.cmake
++++ b/llvm/cmake/modules/AddOCaml.cmake
+@@ -147,9 +147,9 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   if( APPLE )
+-    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")
++    set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}")
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")
++    set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}")
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
+index ef4cfa3acdb5..2ab47d564f76 100644
+--- a/llvm/cmake/modules/CMakeLists.txt
++++ b/llvm/cmake/modules/CMakeLists.txt
+@@ -130,7 +130,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
+   )
+ list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)
+ 
+-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")
++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}")
+ set(LLVM_CONFIG_LIBRARY_DIRS
+   "${LLVM_CONFIG_LIBRARY_DIR}"
+   # FIXME: Should there be other entries here?
+diff --git a/llvm/include/llvm/SYCLLowerIR/CMakeLists.txt b/llvm/include/llvm/SYCLLowerIR/CMakeLists.txt
+index fee74421f102..99c7f2920a9b 100644
+--- a/llvm/include/llvm/SYCLLowerIR/CMakeLists.txt
++++ b/llvm/include/llvm/SYCLLowerIR/CMakeLists.txt
+@@ -8,5 +8,5 @@ tablegen(LLVM DeviceConfigFile.inc -gen-dynamic-tables)
+ add_public_tablegen_target(DeviceConfigFile)
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DeviceConfigFile.hpp"
+               "${CMAKE_CURRENT_BINARY_DIR}/DeviceConfigFile.inc"
+-        DESTINATION include/llvm/SYCLLowerIR
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/SYCLLowerIR
+         COMPONENT DeviceConfigFile)
+diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+index 8046bca2b1a4..997bd51e2b10 100644
+--- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
++++ b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+@@ -21,4 +21,4 @@ configure_file(
+   Interpreter.h
+   ${LLVM_BINARY_DIR}/include/llvm/ExecutionEngine/Interpreter/Interpreter.h)
+ 
+-install(FILES Interpreter.h DESTINATION include/llvm/ExecutionEngine/Interpreter)
++install(FILES Interpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm/ExecutionEngine/Interpreter)
+diff --git a/llvm/tools/llvm-config/BuildVariables.inc.in b/llvm/tools/llvm-config/BuildVariables.inc.in
+index e4e1d449bf4d..890e1f164d97 100644
+--- a/llvm/tools/llvm-config/BuildVariables.inc.in
++++ b/llvm/tools/llvm-config/BuildVariables.inc.in
+@@ -23,6 +23,7 @@
+ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
++#define LLVM_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@"
+ #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"
+ #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
+index 020b1b5e093d..bfb58ce73a2b 100644
+--- a/llvm/tools/llvm-config/llvm-config.cpp
++++ b/llvm/tools/llvm-config/llvm-config.cpp
+@@ -364,7 +364,7 @@ int main(int argc, char **argv) {
+       sys::path::make_absolute(ActivePrefix, Path);
+       ActiveBinDir = std::string(Path);
+     }
+-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
++    ActiveLibDir = LLVM_INSTALL_FULL_LIBDIR;
+     {
+       SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
+       sys::path::make_absolute(ActivePrefix, Path);
+diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake
+index 6589458ab789..9bff1af30631 100644
+--- a/mlir/cmake/modules/AddMLIR.cmake
++++ b/mlir/cmake/modules/AddMLIR.cmake
+@@ -638,13 +638,13 @@ function(add_mlir_library_install name)
+     install(TARGETS ${name}
+       COMPONENT ${name}
+       ${export_to_mlirtargets}
+-      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+-      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+       # Note that CMake will create a directory like:
+       #   objects-${CMAKE_BUILD_TYPE}/obj.LibName
+       # and put object files there.
+-      OBJECTS DESTINATION lib${LLVM_LIBDIR_SUFFIX}
++      OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     )
+ 
+     if (NOT LLVM_ENABLE_IDE)
+diff --git a/mlir/cmake/modules/AddMLIRPython.cmake b/mlir/cmake/modules/AddMLIRPython.cmake
+index fa6aec8a603a..4e1b61ff12fe 100644
+--- a/mlir/cmake/modules/AddMLIRPython.cmake
++++ b/mlir/cmake/modules/AddMLIRPython.cmake
+@@ -567,7 +567,7 @@ function(mlir_python_setup_extension_rpath target)
+     set_property(TARGET ${target} APPEND PROPERTY
+       BUILD_RPATH "${_real_lib_dir}")
+     set_property(TARGET ${target} APPEND PROPERTY
+-      INSTALL_RPATH "${_origin_prefix}/${ARG_RELATIVE_INSTALL_ROOT}/lib${LLVM_LIBDIR_SUFFIX}")
++      INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+   endif()
+ endfunction()
+ 
+diff --git a/offload/liboffload/CMakeLists.txt b/offload/liboffload/CMakeLists.txt
+index 62480dad1cac..d6f0a0282c47 100644
+--- a/offload/liboffload/CMakeLists.txt
++++ b/offload/liboffload/CMakeLists.txt
+@@ -45,5 +45,5 @@ set_target_properties(LLVMOffload PROPERTIES
+                       BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/..")
+ install(TARGETS LLVMOffload LIBRARY COMPONENT LLVMOffload DESTINATION "${OFFLOAD_INSTALL_LIBDIR}")
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadAPI.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadPrint.hpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadAPI.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/offload)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadPrint.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/offload)
+diff --git a/openmp/libompd/gdb-plugin/CMakeLists.txt b/openmp/libompd/gdb-plugin/CMakeLists.txt
+index 20cb4680e4cb..66a77274f9c8 100644
+--- a/openmp/libompd/gdb-plugin/CMakeLists.txt
++++ b/openmp/libompd/gdb-plugin/CMakeLists.txt
+@@ -36,5 +36,5 @@ target_link_libraries (ompdModule ${CMAKE_DL_LIBS})
+ set_target_properties (ompdModule PROPERTIES PREFIX "")
+ set_target_properties (ompdModule PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd/")
+ 
+-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd DESTINATION share/gdb/python/ PATTERN ompdModule.so PERMISSIONS OWNER_READ WORLD_READ GROUP_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gdb/python/ PATTERN ompdModule.so PERMISSIONS OWNER_READ WORLD_READ GROUP_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+ 
+diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake
+index 9bd7b0b0ea59..1232f5f0d748 100644
+--- a/polly/cmake/polly_macros.cmake
++++ b/polly/cmake/polly_macros.cmake
+@@ -46,8 +46,8 @@ macro(add_polly_library name)
+     install(TARGETS ${name}
+       COMPONENT ${name}
+       ${exports}
+-      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+-      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
++      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     add_llvm_install_targets(install-${name}
+       COMPONENT ${name})
+   endif()
+diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
+index cb2220e9fbc1..eec767d4f874 100644
+--- a/sycl/CMakeLists.txt
++++ b/sycl/CMakeLists.txt
+@@ -362,13 +362,13 @@ if (NOT WIN32)
+   install(FILES
+     "${CMAKE_CURRENT_SOURCE_DIR}/gdb/libsycl.so-gdb.py"
+     RENAME "libsycl.so.${SYCL_VERSION_STRING}-gdb.py"
+-    DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/"
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+     COMPONENT sycl-headers-extras)
+   if (SYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB)
+     install(FILES
+       "${CMAKE_CURRENT_SOURCE_DIR}/gdb/libsycl.so-gdb.py"
+       RENAME "libsycl-preview.so.${SYCL_VERSION_STRING}-gdb.py"
+-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/"
++      DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+       COMPONENT sycl-headers-extras)
+   endif()
+ endif()
+diff --git a/sycl/cmake/modules/BuildUnifiedRuntime.cmake b/sycl/cmake/modules/BuildUnifiedRuntime.cmake
+index 73e52e59f2be..aa0eac5c1dee 100644
+--- a/sycl/cmake/modules/BuildUnifiedRuntime.cmake
++++ b/sycl/cmake/modules/BuildUnifiedRuntime.cmake
+@@ -108,9 +108,9 @@ find_package(Threads REQUIRED)
+ if(TARGET UnifiedRuntimeLoader)
+   # Install the UR loader.
+   install(TARGETS ur_loader
+-    LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-runtime-loader
+-    ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-runtime-loader
+-    RUNTIME DESTINATION "bin" COMPONENT unified-runtime-loader
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT unified-runtime-loader
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT unified-runtime-loader
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT unified-runtime-loader
+   )
+ endif()
+ 
+@@ -120,8 +120,8 @@ function(add_sycl_ur_adapter NAME)
+   add_dependencies(UnifiedRuntimeAdapters ur_adapter_${NAME})
+ 
+   install(TARGETS ur_adapter_${NAME}
+-    LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT ur_adapter_${NAME}
+-    RUNTIME DESTINATION "bin" COMPONENT ur_adapter_${NAME})
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ur_adapter_${NAME}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ur_adapter_${NAME})
+ 
+   set(manifest_file
+     ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_ur_adapter_${NAME}.txt)
+@@ -274,24 +274,24 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+   # Add the debug UR runtime libraries to the parent install.
+   install(
+     FILES ${URD_INSTALL_DIR}/bin/ur_loaderd.dll
+-    DESTINATION "bin" COMPONENT unified-runtime-loader)
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT unified-runtime-loader)
+   foreach(adapter ${SYCL_ENABLE_BACKENDS})
+     install(
+       FILES ${URD_INSTALL_DIR}/bin/ur_adapter_${adapter}d.dll
+-      DESTINATION "bin" COMPONENT ur_adapter_${adapter})
++      DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ur_adapter_${adapter})
+     add_dependencies(install-sycl-ur-adapter-${adapter} unified-runtimed)
+   endforeach()
+   if(UMF_BUILD_SHARED_LIBRARY)
+     # Also install umfd.dll
+     install(
+       FILES ${URD_INSTALL_DIR}/bin/umfd.dll
+-      DESTINATION "bin" COMPONENT unified-memory-framework)
++      DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT unified-memory-framework)
+   endif()
+ endif()
+ 
+ if(TARGET umf)
+   install(TARGETS umf
+-    LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-memory-framework
+-    ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-memory-framework
+-    RUNTIME DESTINATION "bin" COMPONENT unified-memory-framework)
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT unified-memory-framework
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT unified-memory-framework
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT unified-memory-framework)
+ endif()
+diff --git a/sycl/cmake/modules/SYCLUtils.cmake b/sycl/cmake/modules/SYCLUtils.cmake
+index f469b2604760..a8728bdfb5b1 100644
+--- a/sycl/cmake/modules/SYCLUtils.cmake
++++ b/sycl/cmake/modules/SYCLUtils.cmake
+@@ -13,7 +13,7 @@ macro(add_stripped_pdb ARG_TARGET_NAME)
+     target_link_options(${ARG_TARGET_NAME}
+                         PRIVATE "LINKER:/PDBSTRIPPED:${ARG_TARGET_NAME}.stripped.pdb")
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${ARG_TARGET_NAME}.stripped.pdb"
+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++            DESTINATION ${CMAKE_INSTALL_BINDIR}
+             RENAME "${ARG_TARGET_NAME}.pdb"
+             COMPONENT ${ARG_TARGET_NAME}
+             OPTIONAL)
+diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt
+index be262a28d809..36da90e63179 100644
+--- a/sycl/source/CMakeLists.txt
++++ b/sycl/source/CMakeLists.txt
+@@ -191,7 +191,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
+         COMMENT "Creating version-agnostic copy of the import library.")
+       install(
+         FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ARG_IMPLIB_NAME}.lib
+-        DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sycl)
+     endif()
+   endif()
+ 
+@@ -430,6 +430,6 @@ if (WIN32)
+ endif()
+ 
+ install(TARGETS ${SYCL_RT_LIBS}
+-  ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
+-  LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
+-  RUNTIME DESTINATION "bin" COMPONENT sycl)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sycl
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sycl
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sycl)
+diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt
+index 4e7607e74931..d400c6b11d89 100644
+--- a/sycl/test/CMakeLists.txt
++++ b/sycl/test/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(LLVM_BUILD_BINARY_DIRS "${LLVM_BINARY_DIR}/bin/")
+ set(LLVM_BUILD_LIBRARY_DIRS "${LLVM_BINARY_DIR}/lib/")
+ 
+ set(RT_TEST_ARGS ${RT_TEST_ARGS} "-v")
+-set(DEPLOY_RT_TEST_ARGS ${DEPLOY_RT_TEST_ARGS} "-v -D SYCL_TOOLS_DIR=${CMAKE_INSTALL_PREFIX}/bin -D SYCL_LIBS_DIR=${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX} -D SYCL_INCLUDE=${CMAKE_INSTALL_PREFIX}/${SYCL_INCLUDE_DIR}")
++set(DEPLOY_RT_TEST_ARGS ${DEPLOY_RT_TEST_ARGS} "-v -D SYCL_TOOLS_DIR=${CMAKE_INSTALL_FULL_BINDIR} -D SYCL_LIBS_DIR=${CMAKE_INSTALL_FULL_LIBDIR} -D SYCL_INCLUDE=${CMAKE_INSTALL_PREFIX}/${SYCL_INCLUDE_DIR}")
+ 
+ find_package(Threads REQUIRED)
+ set(SYCL_THREADS_LIB ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/sycl/tools/sycl-ls/CMakeLists.txt b/sycl/tools/sycl-ls/CMakeLists.txt
+index a1cb33c6553b..7d93fbb79144 100644
+--- a/sycl/tools/sycl-ls/CMakeLists.txt
++++ b/sycl/tools/sycl-ls/CMakeLists.txt
+@@ -26,4 +26,4 @@ if (WIN32)
+   target_link_options(sycl-ls PRIVATE LINKER:/DEPENDENTLOADFLAG:0x900)
+ endif()
+ install(TARGETS sycl-ls
+-  RUNTIME DESTINATION "bin" COMPONENT sycl-ls)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT sycl-ls)
+diff --git a/sycl/tools/syclbin-dump/CMakeLists.txt b/sycl/tools/syclbin-dump/CMakeLists.txt
+index d1eb71823f64..9bf370bdcbe4 100644
+--- a/sycl/tools/syclbin-dump/CMakeLists.txt
++++ b/sycl/tools/syclbin-dump/CMakeLists.txt
+@@ -22,4 +22,4 @@ endif()
+ add_dependencies(sycl-toolchain syclbin-dump)
+ 
+ install(TARGETS syclbin-dump
+-  RUNTIME DESTINATION "bin" COMPONENT syclbin-dump)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT syclbin-dump)
+diff --git a/sycl/ur_win_proxy_loader/CMakeLists.txt b/sycl/ur_win_proxy_loader/CMakeLists.txt
+index 940fcd28299e..eac609967521 100644
+--- a/sycl/ur_win_proxy_loader/CMakeLists.txt
++++ b/sycl/ur_win_proxy_loader/CMakeLists.txt
+@@ -14,7 +14,7 @@ configure_file(../../llvm/resources/windows_version_resource.rc ${CMAKE_CURRENT_
+ add_library(ur_win_proxy_loader SHARED  ur_win_proxy_loader.cpp  ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
+ add_dependencies(ur_win_proxy_loader UnifiedRuntimeLoader)
+ install(TARGETS ur_win_proxy_loader
+-  RUNTIME DESTINATION "bin" COMPONENT ur_win_proxy_loader
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ur_win_proxy_loader
+ )
+ 
+ if (MSVC)
+@@ -65,5 +65,5 @@ if (MSVC)
+   target_link_options(ur_win_proxy_loaderd PRIVATE LINKER:/DEPENDENTLOADFLAG:0x2000)
+   target_link_options(ur_win_proxy_loader PRIVATE LINKER:/DEPENDENTLOADFLAG:0x2000)
+   install(TARGETS ur_win_proxy_loaderd
+-    RUNTIME DESTINATION "bin" COMPONENT ur_win_proxy_loader)
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ur_win_proxy_loader)
+ endif()
+diff --git a/unified-runtime/CMakeLists.txt b/unified-runtime/CMakeLists.txt
+index 9115f52617c4..d23fd880ab99 100644
+--- a/unified-runtime/CMakeLists.txt
++++ b/unified-runtime/CMakeLists.txt
+@@ -361,7 +361,7 @@ target_include_directories(ur_headers INTERFACE
+ # Add the include directory and the headers target to the install.
+ install(
+     DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
+-    DESTINATION include COMPONENT ur_headers)
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT ur_headers)
+ install(
+     TARGETS ur_headers
+     EXPORT ${PROJECT_NAME}-targets)
+@@ -384,7 +384,7 @@ install(
+     EXPORT ${PROJECT_NAME}-targets
+     FILE ${PROJECT_NAME}-targets.cmake
+     NAMESPACE ${PROJECT_NAME}::
+-    DESTINATION lib/cmake/${PROJECT_NAME})
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+ # Configure the package versions file for use in find_package when installed.
+ write_basic_package_version_file(
+@@ -395,14 +395,14 @@ write_basic_package_version_file(
+ configure_package_config_file(
+     ${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in
+     ${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.cmake
+-    INSTALL_DESTINATION lib/cmake/${PROJECT_NAME})
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+ # Add the package files to the install.
+ install(
+     FILES
+         ${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.cmake
+         ${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config-version.cmake
+-    DESTINATION lib/cmake/${PROJECT_NAME})
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+ set(API_JSON_FILE ${PROJECT_BINARY_DIR}/unified_runtime.json)
+ 
+diff --git a/unified-runtime/source/loader/libur_loader.pc.in b/unified-runtime/source/loader/libur_loader.pc.in
+index d79c3a9da8bd..6aac2abcd9ea 100644
+--- a/unified-runtime/source/loader/libur_loader.pc.in
++++ b/unified-runtime/source/loader/libur_loader.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/include
+-libdir=${prefix}/lib
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ 
+ 
+ Name: Unified Runtime Loader
+diff --git a/xpti/src/CMakeLists.txt b/xpti/src/CMakeLists.txt
+index 1d7e371e98a1..8d3e1a8b4ec3 100644
+--- a/xpti/src/CMakeLists.txt
++++ b/xpti/src/CMakeLists.txt
+@@ -11,9 +11,9 @@ macro(add_xpti_lib target_name)
+ 
+   # Set the location of the library installation
+   install(TARGETS ${target_name}
+-    RUNTIME DESTINATION bin COMPONENT xpti
+-    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xpti
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
+   )
+ endmacro()
+ 
+diff --git a/xptifw/CMakeLists.txt b/xptifw/CMakeLists.txt
+index 00a9c71ba289..dd590e688b8f 100644
+--- a/xptifw/CMakeLists.txt
++++ b/xptifw/CMakeLists.txt
+@@ -13,9 +13,9 @@ set(SAMPLES_DIR ${CMAKE_CURRENT_LIST_DIR}/samples)
+ if (NOT DEFINED XPTI_DIR) # don't overwrite if already set
+   if (NOT DEFINED XPTI_SOURCE_DIR)
+     # If XPTI_SOURCE_DIR is not provided then assume that xpti is in-tree and not external.
+-    set(XPTI_DIR ${CMAKE_CURRENT_LIST_DIR}/../xpti)
++    get_filename_component(XPTI_DIR ${CMAKE_CURRENT_LIST_DIR}/../xpti ABSOLUTE)
+   else()
+-    set(XPTI_DIR ${XPTI_SOURCE_DIR}/../xpti)
++    get_filename_component(XPTI_DIR ${XPTI_SOURCE_DIR}/../xpti ABSOLUTE)
+   endif()
+ endif()
+ 
+diff --git a/xptifw/src/CMakeLists.txt b/xptifw/src/CMakeLists.txt
+index 1026bc505f4e..5816b3a75cf5 100644
+--- a/xptifw/src/CMakeLists.txt
++++ b/xptifw/src/CMakeLists.txt
+@@ -81,9 +81,9 @@ function(add_xpti_library LIB_NAME)
+   # Set the location of the library installation
+   include(GNUInstallDirs)
+   install(TARGETS ${LIB_NAME}
+-    RUNTIME DESTINATION bin COMPONENT xptifw
+-    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xptifw
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
+   )
+ endfunction(add_xpti_library)
+ 
diff --git a/pkgs/by-name/in/intel-llvm/package.nix b/pkgs/by-name/in/intel-llvm/package.nix
new file mode 100644
index 000000000000..082c83ef4eb0
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/package.nix
@@ -0,0 +1,144 @@
+{
+  callPackage,
+  newScope,
+  wrapCCWith,
+  symlinkJoin,
+  overrideCC,
+  lib,
+  fetchFromGitHub,
+}:
+let
+  # This derivation uses makeScope to help with overriding.
+  #
+  # To override the source and other basics:
+  #  pkgs.intel-llvm.overrideScope (final: prev: {
+  #    version = ..;
+  #    src = ..;
+  #    # If setting src, you'll probably also want to set this.
+  #    commitDate = ..;
+  #  })
+  #
+  # To override something inside unified-runtime:
+  #  pkgs.intel-llvm.overrideScope (final: prev: {
+  #    make-unified-runtime = args: (prev.make-unified-runtime args)
+  #      .override { .. }
+  #      .overrideAttrs { .. }
+  #  })
+  scope = lib.makeScope newScope (self: {
+    # == Parameters for overriding ==
+
+    llvmMajorVersion = "22";
+
+    version = "unstable-2025-11-14";
+
+    src = fetchFromGitHub {
+      owner = "intel";
+      repo = "llvm";
+      # Latest commit which doesn't require dependency versions newer than
+      # what's available in nixpkgs as of 2026-01-13.
+      # Commits after require newer level-zero and pre-release unified memory framework.
+      rev = "ab3dc98de0fd1ada9df12b138de1e1f8b715cc27";
+      hash = "sha256-oHk8kQVNsyC9vrOsDqVoFLYl2yMMaTgpQnAW9iHZLfE=";
+    };
+
+    # If you override src, you'll probably also want to override this,
+    # as some packages check for this date to decide what features the compiler supports
+    commitDate = "20251114";
+
+    vc-intrinsics-src = fetchFromGitHub {
+      owner = "intel";
+      repo = "vc-intrinsics";
+      # See llvm/lib/SYCLLowerIR/CMakeLists.txt:17
+      rev = "60cea7590bd022d95f5cf336ee765033bd114d69";
+      sha256 = "sha256-1K16UEa6DHoP2ukSx58OXJdtDWyUyHkq5Gd2DUj1644=";
+    };
+
+    # ===============================
+
+    make-unified-runtime =
+      {
+        levelZeroSupport,
+        cudaSupport,
+        rocmSupport,
+        rocmGpuTargets,
+        nativeCpuSupport,
+      }:
+      callPackage ./unified-runtime.nix {
+        intel-llvm-src = self.src;
+        inherit
+          levelZeroSupport
+          cudaSupport
+          rocmSupport
+          rocmGpuTargets
+          nativeCpuSupport
+          ;
+        # This could theoretically be disabled if you for some reason
+        # didn't want to build the backend, however OpenCL will get
+        # pulled in as a dependency either way so there is little point.
+        openclSupport = true;
+      };
+
+    unwrapped = callPackage ./unwrapped.nix {
+      inherit (self)
+        llvmMajorVersion
+        src
+        version
+        commitDate
+        vc-intrinsics-src
+        make-unified-runtime
+        ;
+    };
+
+    wrapper =
+      (wrapCCWith {
+        cc = self.unwrapped;
+        # This is needed for tools like clang-scan-deps to find headers.
+        # The build commands here are the same as the vanilla LLVM derivation.
+        extraBuildCommands = ''
+          rsrc="$out/resource-root"
+          mkdir "$rsrc"
+          echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+          ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/include" "$rsrc"
+        '';
+      }).overrideAttrs
+        (old: {
+          # OpenCL needs to be passed through
+          propagatedBuildInputs = old.propagatedBuildInputs ++ self.unwrapped.propagatedBuildInputs;
+        });
+
+    clang-tools-wrapper = callPackage ./clang-tools.nix {
+      inherit (self) unwrapped wrapper;
+    };
+
+    # We merge everything into one by default to avoid issues with path-lookup.
+    # intel-llvm provides the SYCL library, so unlike regular LLVM libraries,
+    # its libraries are equally important as the compiler itself.
+    # Splitting is nonetheless important, as otherwise the binaries go over the Hydra limit.
+    merged = symlinkJoin {
+      inherit (self.unwrapped) pname version meta;
+
+      strictDeps = true;
+      __structuredAttrs = true;
+
+      paths = with self; [
+        # Order is important, we want files from the wrappers to take precedence
+        wrapper
+        clang-tools-wrapper
+
+        unwrapped.out
+        unwrapped.dev
+        unwrapped.lib
+      ];
+
+      passthru = self.unwrapped.passthru // {
+        inherit (self) stdenv;
+        unwrapped = self.unwrapped;
+        tests = callPackage ./tests.nix { inherit (self) stdenv; };
+
+        overrideScope = newF: (self.overrideScope newF).merged;
+      };
+    };
+    stdenv = overrideCC self.unwrapped.baseLlvm.stdenv self.merged;
+  });
+in
+scope.merged
diff --git a/pkgs/by-name/in/intel-llvm/sycl-jit-exclude-cmake-files.patch b/pkgs/by-name/in/intel-llvm/sycl-jit-exclude-cmake-files.patch
new file mode 100644
index 000000000000..8e00244b063e
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/sycl-jit-exclude-cmake-files.patch
@@ -0,0 +1,17 @@
+diff --git a/sycl-jit/jit-compiler/utils/generate.py b/sycl-jit/jit-compiler/utils/generate.py
+index 449723b8fa26..ecba44efe071 100644
+--- a/sycl-jit/jit-compiler/utils/generate.py
++++ b/sycl-jit/jit-compiler/utils/generate.py
+@@ -49,6 +49,12 @@ const resource_file ToolchainFiles[] = {"""
+         def process_dir(dir):
+             for root, _, files in os.walk(dir):
+                 for file in files:
++                    # Skip CMake files, because they contain absolute install paths, causing cyclic dependencies.
++                    # They aren't ever used as it seems, so excluding them won't break anything.
++                    if file in ['CMakeLists.txt', 'cmake_install.cmake'] or file.endswith('.cmake'):
++                        print(f"[nix-compat patch] Skipping embedding of sycl-jit CMake file: {os.path.join(root, file)}")
++                        continue
++
+                     file_path = os.path.join(root, file)
+                     process_file(file_path)
+ 
diff --git a/pkgs/by-name/in/intel-llvm/tests.nix b/pkgs/by-name/in/intel-llvm/tests.nix
new file mode 100644
index 000000000000..aa5a50ea1b7f
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/tests.nix
@@ -0,0 +1,39 @@
+{
+  stdenv,
+  writeTextFile,
+}:
+{
+  sycl-compile = stdenv.mkDerivation {
+    name = "intel-llvm-test-sycl-compile";
+
+    src = writeTextFile {
+      name = "test.cpp";
+      text = ''
+        #include <sycl/sycl.hpp>
+        #include <iostream>
+
+        int main() {
+          sycl::queue q;
+          std::cout << "SYCL queue created successfully" << std::endl;
+          return 0;
+        }
+      '';
+    };
+
+    dontUnpack = true;
+
+    buildPhase = ''
+      echo "Checking if a basic SYCL program can compile..."
+      clang++ -fsycl $src -o test
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp test $out/bin/sycl-test
+    '';
+
+    meta = {
+      description = "Test that intel-llvm can compile a basic SYCL program";
+    };
+  };
+}
diff --git a/pkgs/by-name/in/intel-llvm/unified-runtime.nix b/pkgs/by-name/in/intel-llvm/unified-runtime.nix
new file mode 100644
index 000000000000..78d673ca8094
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/unified-runtime.nix
@@ -0,0 +1,185 @@
+{
+  stdenv,
+  lib,
+  cmake,
+  ninja,
+  unified-memory-framework,
+  zlib,
+  libbacktrace,
+  hwloc,
+  python3,
+  symlinkJoin,
+  level-zero,
+  intel-compute-runtime,
+  opencl-headers,
+  ocl-icd,
+  hdrhistogram_c,
+  gtest,
+  pkg-config,
+  lit,
+  filecheck,
+  rocmPackages ? { },
+  rocmGpuTargets ? lib.optionalString (rocmPackages ? clr.gpuTargets) (
+    builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets
+  ),
+  cudaPackages ? { },
+  intel-llvm-src,
+  levelZeroSupport,
+  openclSupport,
+  cudaSupport,
+  rocmSupport,
+  nativeCpuSupport,
+}:
+let
+  rocmtoolkit_joined = symlinkJoin {
+    name = "rocm-merged";
+
+    paths = with rocmPackages; [
+      clr
+      rocm-comgr
+      hsakmt
+    ];
+  };
+
+  cudatoolkit_joined = symlinkJoin {
+    name = "cuda-merged";
+
+    paths = with cudaPackages; [
+      cuda_cudart
+      cuda_nvcc
+      cuda_nvml_dev.include
+      cuda_nvml_dev.stubs
+      cuda_cupti.include
+      cuda_cupti.lib
+    ];
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  name = "unified-runtime";
+  version = "0.12.0";
+
+  src = intel-llvm-src;
+  sourceRoot = "source/unified-runtime";
+
+  doCheck = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+    pkg-config
+  ];
+
+  buildInputs = [
+    (unified-memory-framework.override { useJemalloc = false; })
+    zlib
+    libbacktrace
+    hwloc
+    hdrhistogram_c
+  ]
+  ++ lib.optionals openclSupport [
+    opencl-headers
+    ocl-icd
+  ]
+  ++ lib.optionals rocmSupport [
+    rocmtoolkit_joined
+  ]
+  ++ lib.optionals cudaSupport [
+    cudatoolkit_joined
+  ]
+  ++ lib.optionals levelZeroSupport [
+    level-zero
+    intel-compute-runtime
+  ];
+
+  nativeCheckInputs = [
+    gtest
+    lit
+    filecheck
+  ];
+
+  postPatch = ''
+    # `NO_CMAKE_PACKAGE_REGISTRY` prevents it from finding OpenCL, so we unset it
+    # Note that this cmake file is imported in various places, not just unified-runtime
+    # See also: https://github.com/intel/llvm/issues/19635#issuecomment-3247008981
+    substituteInPlace cmake/FetchOpenCL.cmake \
+        --replace-fail "NO_CMAKE_PACKAGE_REGISTRY" ""
+  ''
+  + lib.optionalString finalAttrs.doCheck ''
+    # These tests don't run without setting UR_DPCXX,
+    # however they aren't properly excluded, causing lit to fail.
+    rm test/adapters/hip/lit.cfg.py
+    rm test/adapters/cuda/lit.cfg.py
+
+    # Exclude tests that don't play well with the sandbox
+    cat >> test/lit.cfg.py <<'EOF'
+    # Conformance tests need to have an adapter to run on.
+    # Within the sandbox, the only possible option is the CPU adapter.
+    # If we don't have that, much of the conformance suite will fail, so we exclude it entirely.
+    ${lib.optionalString (!nativeCpuSupport) "config.excludes.add('conformance')"}
+
+    config.excludes.add('asan.cpp')
+    config.excludes.add('loader_lifetime.test')
+    EOF
+  '';
+
+  preCheck = lib.optionalString levelZeroSupport ''
+    export LD_LIBRARY_PATH="${intel-compute-runtime.drivers}/lib''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    (lib.cmakeBool "FETCHCONTENT_QUIET" false)
+
+    (lib.cmakeBool "UR_ENABLE_LATENCY_HISTOGRAM" true)
+
+    (lib.cmakeBool "UR_BUILD_TESTS" finalAttrs.doCheck)
+    # The test hello_world.test depends on the hello_world example, so build examples when testing
+    (lib.cmakeBool "UR_BUILD_EXAMPLES" finalAttrs.doCheck)
+
+    (lib.cmakeBool "UR_BUILD_ADAPTER_L0" levelZeroSupport)
+    (lib.cmakeBool "UR_BUILD_ADAPTER_L0_V2" levelZeroSupport)
+    (lib.cmakeBool "UR_BUILD_ADAPTER_OPENCL" openclSupport)
+    (lib.cmakeBool "UR_BUILD_ADAPTER_CUDA" cudaSupport)
+    (lib.cmakeBool "UR_BUILD_ADAPTER_HIP" rocmSupport)
+    (lib.cmakeBool "UR_BUILD_ADAPTER_NATIVE_CPU" nativeCpuSupport)
+
+    # In the sandbox we only have native_cpu available,
+    # so we won't be able to test on any other backend.
+    (lib.cmakeFeature "UR_CONFORMANCE_SELECTOR" "native_cpu:*")
+  ]
+  ++ lib.optionals rocmSupport [
+    (lib.cmakeFeature "UR_HIP_ROCM_DIR" "${rocmtoolkit_joined}")
+    (lib.cmakeFeature "GPU_TARGETS" rocmGpuTargets)
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.cmakeFeature "CUDAToolkit_ROOT" "${cudatoolkit_joined}")
+    (lib.cmakeFeature "CUDAToolkit_CUPTI_INCLUDE_DIR" "${cudatoolkit_joined}/include")
+    (lib.cmakeFeature "CUDA_cupti_LIBRARY" "${cudatoolkit_joined}/lib/libcupti.so")
+  ];
+
+  passthru.backends =
+    lib.optionals levelZeroSupport [
+      "level_zero"
+      "level_zero_v2"
+    ]
+    ++ lib.optional cudaSupport "cuda"
+    ++ lib.optional rocmSupport "hip"
+    ++ lib.optional nativeCpuSupport "native_cpu"
+    ++ lib.optional openclSupport "opencl";
+
+  meta = {
+    description = "Intel LLVM-based compiler with SYCL support";
+    longDescription = ''
+      Intel's LLVM-based compiler toolchain with Data Parallel C++ (DPC++)
+      and SYCL support for heterogeneous computing across CPUs, GPUs, and FPGAs.
+    '';
+    homepage = "https://github.com/intel/llvm";
+    license = with lib.licenses; [
+      asl20
+      llvm-exception
+    ];
+    maintainers = with lib.maintainers; [ blenderfreaky ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/by-name/in/intel-llvm/unwrapped.nix b/pkgs/by-name/in/intel-llvm/unwrapped.nix
new file mode 100644
index 000000000000..e8f2094489d6
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/unwrapped.nix
@@ -0,0 +1,323 @@
+{
+  # Parameters for overriding
+  src,
+  version,
+  commitDate,
+  llvmMajorVersion,
+  vc-intrinsics-src,
+  make-unified-runtime,
+  # Regular dependencies
+  lib,
+  stdenv,
+  cmake,
+  ninja,
+  python3,
+  pkg-config,
+  zstd,
+  hwloc,
+  emhash,
+  level-zero,
+  opencl-headers,
+  libxml2,
+  libedit,
+  llvmPackages_22,
+  parallel-hashmap,
+  spirv-headers,
+  spirv-tools,
+  zlib,
+  wrapCC,
+  graphviz-nox,
+  rocmPackages ? { },
+  rocmGpuTargets ? lib.optionalString (rocmPackages ? clr.gpuTargets) (
+    builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets
+  ),
+  config,
+  cudaSupport ? config.cudaSupport,
+  rocmSupport ? config.rocmSupport,
+  # TODO: Should there be a flag like config.levelZeroSupport?
+  # NOTE: Level Zero does not always fail gracefully, so when not explicitly set by the user,
+  #       and other acceleration is already selected, disable it by default.
+  levelZeroSupport ? !(cudaSupport || rocmSupport),
+  nativeCpuSupport ? true,
+  enableManpages ? true,
+}:
+let
+  # See the postPatch phase for details on why this is used
+  ccWrapperStub = wrapCC (
+    stdenv.mkDerivation {
+      name = "ccWrapperStub";
+      dontUnpack = true;
+      installPhase = ''
+        mkdir -p $out/bin
+        cat > $out/bin/clang-${llvmMajorVersion} <<'EOF'
+        #!/bin/sh
+        exec "$NIX_BUILD_TOP/source/build/bin/clang-${llvmMajorVersion}" "$@"
+        EOF
+        chmod +x $out/bin/clang-${llvmMajorVersion}
+        cp $out/bin/clang-${llvmMajorVersion} $out/bin/clang
+        cp $out/bin/clang-${llvmMajorVersion} $out/bin/clang++
+      '';
+      passthru.isClang = true;
+    }
+  );
+
+  # We use the in-tree unified-runtime, but we need all the same flags as the out-of-tree version.
+  # Rather than duplicating the flags, we import them from unified-runtime.nix.
+  #
+  # This also lets us quickly test unified-runtime in isolation for debugging backend issues.
+  # If the build LLVM fails due to issues with finding level-zero/ROCm/etc.,
+  # it's a lot quicker to just rebuild unified-runtime instead of all of LLVM.
+  #
+  # As unified-runtime is the interface between LLVM and the backends,
+  # that is where most failures relating to backends should happen in.
+  unified-runtime = make-unified-runtime {
+    inherit
+      levelZeroSupport
+      cudaSupport
+      rocmSupport
+      rocmGpuTargets
+      nativeCpuSupport
+      ;
+  };
+in
+# Tip: This build plays nice with ccacheStdenv.
+#      Replace stdenv here to make debugging less tedious.
+stdenv.mkDerivation (finalAttrs: {
+  pname = "intel-llvm";
+
+  inherit src version commitDate;
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+    "python"
+    # Not adding (conditionally) a "man" output here to avoid complexity in the
+    # wrapper, that is not worth it for a few kb.
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+    llvmPackages_22.bintools # For lld
+    pkg-config
+    zlib
+  ]
+  ++ lib.optionals enableManpages [
+    python3.pkgs.sphinx
+    python3.pkgs.myst-parser
+    graphviz-nox
+  ];
+
+  buildInputs = [
+    spirv-tools
+    libxml2
+    hwloc
+    emhash
+    parallel-hashmap
+    # Static ZSTD is required by sycl, see sycl/source/CMakeLists.txt:163
+    # Intels CMake/build system also enabled `LLVM_USE_STATIC_ZSTD` by default,
+    # so at no point does it link to a non-static ZSTD library.
+    # This may be related to the fork not supporting building shared libraries;
+    #  https://github.com/intel/llvm/issues/19060
+    (zstd.override { static = true; })
+  ]
+  ++ unified-runtime.buildInputs;
+
+  propagatedBuildInputs = [
+    zlib
+    libedit
+    opencl-headers
+  ];
+
+  cmakeBuildType = "Release";
+
+  patches = [
+    # Fix paths so the output can be split properly
+    ./gnu-install-dirs.patch
+    # sycl-jit bundles several files, among which are CMake files.
+    # The CMake files are bundled, yet not actually used.
+    # As the CMake files in question contain absolute install paths,
+    # they cause cycles in the outputs and break the build,
+    # so we simply exclude them.
+    ./sycl-jit-exclude-cmake-files.patch
+  ];
+
+  postPatch = ''
+    # Parts of libdevice are built using the freshly-built compiler.
+    # As it tries to link to system libraries, we need to wrap it with the
+    # usual nix cc-wrapper.
+    # Since the compiler to be wrapped is not available at this point,
+    # we use a stub that points to where it will be later on
+    # in `$NIX_BUILD_TOP/source/build/bin/clang-${llvmMajorVersion}`
+    substituteInPlace libdevice/cmake/modules/SYCLLibdevice.cmake \
+      --replace-fail "\''${clang_exe}" "${ccWrapperStub}/bin/clang++"
+
+    # When running without this, their CMake code copies files from the Nix store.
+    # As the Nix store is read-only and COPY copies permissions by default,
+    # this will lead to the copied files also being read-only.
+    # As CMake at a later point wants to write into copied folders, this causes
+    # the build to fail with a (rather cryptic) permission error.
+    # By setting NO_SOURCE_PERMISSIONS we side-step this issue.
+    # Note in case of future build failures: if there are executables in any of the copied folders,
+    # we may need to add special handling to set the executable permissions.
+    # See also: https://github.com/intel/llvm/issues/19635#issuecomment-3134830708
+    sed -i '/file(COPY / { /NO_SOURCE_PERMISSIONS/! s/)\s*$/ NO_SOURCE_PERMISSIONS)/ }' \
+      unified-runtime/cmake/FetchLevelZero.cmake \
+      sycl/CMakeLists.txt \
+      sycl/cmake/modules/FetchEmhash.cmake
+
+    # `NO_CMAKE_PACKAGE_REGISTRY` prevents it from finding OpenCL, so we unset it
+    # Note that this cmake file is imported in various places, not just unified-runtime
+    # See also: https://github.com/intel/llvm/issues/19635#issuecomment-3247008981
+    substituteInPlace unified-runtime/cmake/FetchOpenCL.cmake \
+        --replace-fail "NO_CMAKE_PACKAGE_REGISTRY" ""
+  '';
+
+  preConfigure = ''
+    flags=$(python buildbot/configure.py \
+        --print-cmake-flags \
+        -t Release \
+        --docs \
+        --cmake-gen Ninja \
+        ${lib.optionalString cudaSupport "--cuda"} \
+        ${lib.optionalString rocmSupport "--hip"} \
+        ${lib.optionalString nativeCpuSupport "--native_cpu"} \
+        --use-lld \
+        ${lib.optionalString levelZeroSupport "--l0-headers ${lib.getInclude level-zero}/include/level_zero"} \
+        ${lib.optionalString levelZeroSupport "--l0-loader ${lib.getLib level-zero}/lib/libze_loader.so"} \
+    )
+
+    # We eval because flags is separated as shell-escaped strings.
+    # We can't just split by space because it may contain escaped spaces,
+    # so we just let bash handle it.
+    # NOTE: We prepend, so that flags we set manually override what the build script does.
+    eval "prependToVar cmakeFlags $flags"
+
+    # Remove the install prefix flag
+    cmakeFlags=(''${cmakeFlags[@]/-DCMAKE_INSTALL_PREFIX=$NIX_BUILD_TOP\/source\/build\/install})
+  '';
+
+  cmakeDir = "llvm";
+
+  cmakeFlags = [
+    (lib.cmakeBool "LLVM_INSTALL_UTILS" true)
+
+    (lib.cmakeBool "LLVM_BUILD_TESTS" false)
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+    (lib.cmakeBool "MLIR_INCLUDE_TESTS" false)
+    (lib.cmakeBool "SYCL_INCLUDE_TESTS" false)
+
+    (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON")
+    (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON")
+    (lib.cmakeBool "LLVM_ENABLE_THREADS" true)
+
+    # Intels LLVM fork does not support building shared libraries,
+    # see https://github.com/intel/llvm/issues/19060
+    (lib.cmakeBool "BUILD_SHARED_LIBS" false)
+    (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" false)
+    (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" false)
+
+    # See https://github.com/intel/llvm/issues/19692
+    (lib.cmakeFeature "SYCL_COMPILER_VERSION" commitDate)
+
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+    (lib.cmakeBool "FETCHCONTENT_QUIET" false)
+
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_VC-INTRINSICS" "${vc-intrinsics-src}")
+    (lib.cmakeFeature "LLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR" "${spirv-headers.src}")
+
+    # Ideally, we'd set this to "${placeholder "lib"}/lib/clang/${clangMajorVersion}",
+    # however this breaks the libdevice build.
+    # Instead, we just deal with it in postInstall
+    (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../lib/clang/${llvmMajorVersion}")
+    (lib.cmakeFeature "LLVM_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/llvm")
+
+    (lib.cmakeBool "LLVM_INCLUDE_DOCS" enableManpages)
+    (lib.cmakeBool "MLIR_INCLUDE_DOCS" enableManpages)
+    (lib.cmakeBool "LLVM_BUILD_DOCS" enableManpages)
+    (lib.cmakeBool "LLVM_ENABLE_SPHINX" enableManpages)
+    (lib.cmakeBool "SPHINX_OUTPUT_MAN" enableManpages)
+
+    # The buildbot script always enables level-zero no matter what.
+    # To allow disabling level-zero, we override its flag here,
+    # so it gets excluded when not enabled.
+    (lib.cmakeFeature "SYCL_ENABLE_BACKENDS" (
+      lib.strings.concatStringsSep ";" unified-runtime.backends
+    ))
+  ]
+  ++ unified-runtime.cmakeFlags;
+
+  # This hardening option causes compilation errors when compiling for amdgcn, spirv and others
+  # Must be disabled during intel-llvm's own build (especially for libdevice)
+  hardeningDisable = [ "zerocallusedregs" ];
+
+  requiredSystemFeatures = [ "big-parallel" ];
+  enableParallelBuilding = true;
+
+  # The vast majority of tests work, however many of the more relevant
+  # ones struggle due to the lack of wrapping, causing it to
+  # not discover the standard library.
+  # If the wrapper is used instead however, other tests will fail
+  # that test CLI edge cases, and with the wrapper,
+  # those will differ compared to the vanilla build,
+  # making the tests fail.
+  doCheck = false;
+
+  # Copied from the regular LLVM derivation:
+  #  pkgs/development/compilers/llvm/common/llvm/default.nix
+  postInstall = ''
+    mkdir -p $python/share
+    mv $out/share/opt-viewer $python/share/opt-viewer
+
+    # If this stays in $out/bin, it'll create a circular reference
+    moveToOutput "bin/llvm-config*" "$dev"
+
+    substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${lib.toLower finalAttrs.finalPackage.cmakeBuildType}.cmake" \
+      --replace-fail "$out/bin/llvm-config" "$dev/bin/llvm-config"
+    substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \
+      --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'
+
+    # As explained above, this lands in $out, but we want it in $lib and we need to fix it by hand.
+    moveToOutput "lib/clang/${llvmMajorVersion}" "$lib"
+    substituteInPlace "$dev/include/clang/Config/config.h" \
+      --replace-fail "../lib/clang/${llvmMajorVersion}" "$lib/lib/clang/${llvmMajorVersion}"
+  '';
+
+  passthru = {
+    isClang = true;
+
+    inherit unified-runtime;
+
+    # This is for easily referencing version-compatible LLVM libraries
+    # and tools that aren't built in this derivation,
+    # as well as nix tooling, such as the stdenv.
+    baseLlvm = llvmPackages_22;
+
+    inherit llvmMajorVersion;
+
+    # This hardening option causes compilation errors when compiling for amdgcn, spirv and others
+    hardeningUnsupportedFlags = [ "zerocallusedregs" ];
+  };
+
+  meta = {
+    description = "Intel LLVM-based compiler with SYCL support";
+    longDescription = ''
+      Intel's LLVM-based compiler toolchain with Data Parallel C++ (DPC++)
+      and SYCL support for heterogeneous computing across CPUs, GPUs, and FPGAs.
+    '';
+    homepage = "https://github.com/intel/llvm";
+    mainProgram = "clang";
+    license = with lib.licenses; [
+      ncsa
+      asl20
+      llvm-exception
+    ];
+    maintainers = with lib.maintainers; [ kilyanni ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From 77f6a794fd58d99797205868c2476d6de83c46fd Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Wed, 28 Jan 2026 17:18:19 +0100
Subject: [PATCH 254/316] unified-memory-framework: fixup static linking

---
 .../un/unified-memory-framework/package.nix       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/un/unified-memory-framework/package.nix b/pkgs/by-name/un/unified-memory-framework/package.nix
index 648c5ea22d55..d5c3bfcb3af7 100644
--- a/pkgs/by-name/un/unified-memory-framework/package.nix
+++ b/pkgs/by-name/un/unified-memory-framework/package.nix
@@ -43,9 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     onetbb
     level-zero
   ]
-  ++ lib.optionals useJemalloc [
-    hwloc
-  ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
   ]
@@ -55,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
     gbenchmark
   ];
 
+  propagatedBuildInputs = [
+    hwloc
+  ];
+
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "unified-memory-framework";
@@ -72,6 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
     # causing the package to link to /build
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${jemalloc_targ_BINARY_DIR}" "$out/jemalloc"
+
+    # $<BUILD_INTERFACE:hwloc> only links hwloc at build time, so the installed
+    # cmake targets omit it. Downstream static consumers (e.g. UR adapters in
+    # intel-llvm) then fail to link. Export hwloc unconditionally instead.
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail \
+        'set(UMF_LIBS umf_utils umf_ba umf_coarse $<BUILD_INTERFACE:''${UMF_HWLOC_NAME}>)' \
+        'set(UMF_LIBS umf_utils umf_ba umf_coarse ''${UMF_HWLOC_NAME})'
   '';
 
   # If included, jemalloc needs to be vendored, as they don't support using a pre-built version

From d10747142f5db42bb826b6e416544470d1ce7db3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 13:59:11 +0000
Subject: [PATCH 255/316] spacectl: 1.20.1 -> 1.21.0

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

diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 7a0659185d20..ac63cfddcdf1 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "spacectl";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/eetv0AS5fdeYRoOEWhKL31Nud18w3rdx33ce/70SYs=";
+    hash = "sha256-GW8jeET8MBvyFbGZWblU2mj9kWSK9cfhdYj+UXxbt5s=";
   };
 
-  vendorHash = "sha256-d3GO1P2miqDLlnonjGl+OSy+AQbQIIBfEw4Nkroqnrc=";
+  vendorHash = "sha256-wc6pRnCdIL7Se98eDfyU5OMOghJ2VrR1POM7lHo3Af8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From da8439fa9143322600e1bf283250461c38ad65ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 14:25:02 +0000
Subject: [PATCH 256/316] mprisence: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix
index 8fa22f2fd4fb..cfacecc7c0d8 100644
--- a/pkgs/by-name/mp/mprisence/package.nix
+++ b/pkgs/by-name/mp/mprisence/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mprisence";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "lazykern";
     repo = "mprisence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0DJfYU71VFA5+jEz5Wq0HEyk5KFXv7tOgxpfTWMWemc=";
+    hash = "sha256-uZBJMK+naX4ilos3xO1ZMcU/MflshOYIruAljzWiD3Q=";
   };
 
-  cargoHash = "sha256-OoZq7vm4tnxysur69Yv+jvudab2gh8r5WnO2taF9U8A=";
+  cargoHash = "sha256-bsKDo3gndqm7Z0j+6K2H9kWUAYOGna6Bk++yfr59HU4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 3ed2bc9727caa2382b4be96ff6525c6d5239dc0e Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 9 Apr 2026 21:32:27 +0200
Subject: [PATCH 257/316] percona-server_8_0: drop as it's EOL soon

It reaches it's EOL before the NixOS 26.05 release, so drop as release
preperation.
---
 doc/release-notes/rl-2605.section.md        |   2 +
 nixos/tests/mysql/common.nix                |   2 +-
 pkgs/servers/sql/percona-server/8_0.nix     | 216 --------------------
 pkgs/servers/sql/percona-server/default.nix |   8 -
 pkgs/top-level/aliases.nix                  |   1 +
 pkgs/top-level/all-packages.nix             |   1 -
 6 files changed, 4 insertions(+), 226 deletions(-)
 delete mode 100644 pkgs/servers/sql/percona-server/8_0.nix

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 74248d2317f6..2288cf3326ec 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -174,6 +174,8 @@
 
 - `vicinae` has been updated to v0.20. This includes, among several other breaking changes, a complete overhaul of the configuration system. For update instructions, see the [upstream configuration documentation](https://docs.vicinae.com/config#migration-from-v0-16-x-to-v0-17-x).
 
+- `percona-server_8_4` has been removed. Please update to `percona-server_8_0`, `mysql84` or `mariadb`.
+
 - The `man-pages` package's outputs have been split. The manual pages are installed into the `man` output, which is installed by default. Binaries (including `diffman-git`, `mansect`, `pdfman`, and `sortman`) are installed into the `out` output, which is not installed by default.
 
 - All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.
diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix
index 04be129482fe..c4f14a6dc50d 100644
--- a/nixos/tests/mysql/common.nix
+++ b/nixos/tests/mysql/common.nix
@@ -7,7 +7,7 @@
     inherit (pkgs) mysql84;
   };
   perconaPackages = {
-    inherit (pkgs) percona-server_8_0 percona-server_8_4;
+    inherit (pkgs) percona-server_8_4;
   };
   mkTestName =
     pkg: "mariadb_${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor pkg.version)}";
diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
deleted file mode 100644
index d174dea84b5e..000000000000
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  gitUpdater,
-  bison,
-  cmake,
-  pkg-config,
-  boost,
-  icu,
-  libedit,
-  libevent,
-  lz4,
-  ncurses,
-  openssl,
-  perl,
-  protobuf,
-  re2,
-  readline,
-  zlib,
-  zstd,
-  libfido2,
-  numactl,
-  cctools,
-  developer_cmds,
-  libtirpc,
-  rpcsvc-proto,
-  curl,
-  DarwinTools,
-  nixosTests,
-  coreutils,
-  procps,
-  gnused,
-  gnugrep,
-  hostname,
-  makeWrapper,
-  # Percona-specific deps
-  cyrus_sasl,
-  gnumake,
-  openldap,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "percona-server";
-  version = "8.0.45-36";
-
-  src = fetchurl {
-    url = "https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-E3zbJKH1uK+9H+84RXuY6tjXPjzHPCKjxvrMlKs4cd4=";
-  };
-
-  nativeBuildInputs = [
-    bison
-    cmake
-    pkg-config
-    makeWrapper
-    # required for scripts/CMakeLists.txt
-    coreutils
-    gnugrep
-    procps
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
-
-  patches = [
-    # fixes using -DWITH_SSL=system with CMAKE_PREFIX_PATH on darwin
-    # https://github.com/Homebrew/homebrew-core/pull/204799
-    (fetchpatch {
-      name = "fix-system-ssl-darwin.patch";
-      url = "https://github.com/percona/percona-server/pull/5537/commits/a693e5d67abf6f27f5284c86361604babec529c6.patch";
-      hash = "sha256-fFBy3AYTMLvHvbsh0g0UvuPkmVMKZzxPsxeBKbsN8Ho=";
-    })
-    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
-    ./coredumper-explicitly-import-unistd.patch # fix build on aarch64-linux
-  ];
-
-  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
-  postPatch = ''
-    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
-    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
-    # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
-    patchShebangs storage/rocksdb/get_rocksdb_files.sh
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
-  '';
-
-  buildInputs = [
-    boost
-    (curl.override { inherit openssl; })
-    icu
-    libedit
-    libevent
-    lz4
-    ncurses
-    openssl
-    protobuf
-    re2
-    readline
-    zlib
-    zstd
-    libfido2
-    openldap
-    perl
-    cyrus_sasl
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    numactl
-    libtirpc
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    developer_cmds
-    DarwinTools
-  ];
-
-  outputs = [
-    "out"
-    "static"
-  ];
-
-  cmakeFlags = [
-    # Percona-specific flags.
-    "-DPORTABLE=1"
-    "-DWITH_LDAP=system"
-    "-DROCKSDB_DISABLE_AVX2=1"
-    "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
-
-    # Flags taken from mysql package.
-    "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
-    "-DWITH_ROUTER=OFF" # It may be packaged separately.
-    "-DWITH_SYSTEM_LIBS=ON"
-    "-DWITH_UNIT_TESTS=OFF"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-    "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_INFODIR=share/mysql/docs"
-    "-DINSTALL_MANDIR=share/man"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/mysql"
-    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_MYSQLTESTDIR="
-    "-DINSTALL_DOCDIR=share/mysql/docs"
-    "-DINSTALL_SHAREDIR=share/mysql"
-  ];
-
-  postInstall = ''
-    moveToOutput "lib/*.a" $static
-    so=${stdenv.hostPlatform.extensions.sharedLibrary}
-    ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so
-
-    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        procps
-        gnugrep
-        gnused
-        hostname
-      ]
-    }
-    wrapProgram $out/bin/mysql_config --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        gnused
-      ]
-    }
-    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        gnugrep
-      ]
-    }
-    wrapProgram $out/bin/ps-admin --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        gnugrep
-      ]
-    }
-    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
-      lib.makeBinPath [
-        coreutils
-        gnugrep
-      ]
-    }
-  '';
-
-  passthru = {
-    client = finalAttrs.finalPackage;
-    connector-c = finalAttrs.finalPackage;
-    server = finalAttrs.finalPackage;
-    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests.percona-server =
-      nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}";
-    updateScript = gitUpdater {
-      url = "https://github.com/percona/percona-server";
-      rev-prefix = "Percona-Server-";
-      allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+";
-    };
-  };
-
-  meta = {
-    homepage = "https://www.percona.com/software/mysql-database/percona-server";
-    description = ''
-      A free, fully compatible, enhanced, open source drop-in replacement for
-      MySQL® that provides superior performance, scalability and instrumentation.
-      Long-term support release.
-    '';
-    license = lib.licenses.gpl2Only;
-    maintainers = [
-      lib.maintainers.leona
-      lib.maintainers.osnyx
-    ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix
index 50255a8f5397..4c97cbc977cc 100644
--- a/pkgs/servers/sql/percona-server/default.nix
+++ b/pkgs/servers/sql/percona-server/default.nix
@@ -1,12 +1,4 @@
 pkgs: {
-  # old lts
-  percona-server_8_0 = pkgs.callPackage ./8_0.nix {
-    inherit (pkgs.darwin) developer_cmds DarwinTools;
-    boost = pkgs.boost177; # Configure checks for specific version.
-    icu = pkgs.icu69;
-    # newer versions cause linking failures against `libabsl_spinlock_wait`
-    protobuf = pkgs.protobuf_21;
-  };
   percona-server_8_4 = pkgs.callPackage ./8_4.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 86ff9d86da7a..cf98ae37ccc7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1585,6 +1585,7 @@ mapAliases {
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
   percona-server_lts = throw "'percona-server_lts' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
+  percona-server_8_0 = throw "'percona-server_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-server_8_4'"; # Added 2026-04-09
   percona-xtrabackup_innovation = throw "'percona-xtrabackup_innovation' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e6cc40f54d9..48c0acb01b13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3128,7 +3128,6 @@ with pkgs;
   patchutils_0_4_2 = callPackage ../tools/text/patchutils/0.4.2.nix { };
 
   inherit (import ../servers/sql/percona-server pkgs)
-    percona-server_8_0
     percona-server_8_4
     percona-server
     ;

From 1de69f5ef78f97b1d678078c0972cc02403e4ccb Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 9 Apr 2026 21:32:27 +0200
Subject: [PATCH 258/316] percona-xtrabackup_8_0: drop as it's EOL soon

It reaches it's EOL before the NixOS 26.05 release, so drop as release
preperation.
---
 pkgs/tools/backup/percona-xtrabackup/8_0.nix     | 16 ----------------
 pkgs/tools/backup/percona-xtrabackup/default.nix |  3 ---
 pkgs/top-level/aliases.nix                       |  3 ++-
 pkgs/top-level/all-packages.nix                  |  1 -
 4 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/backup/percona-xtrabackup/8_0.nix

diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
deleted file mode 100644
index 5136aed309df..000000000000
--- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ callPackage, ... }@args:
-
-callPackage ./generic.nix (
-  args
-  // {
-    version = "8.0.35-34";
-    hash = "sha256-DqjDBLSQqlWazWJjdb+n7RwqSe/OMlZI2ca/JNTX2W8=";
-
-    # includes https://github.com/Percona-Lab/libkmip.git
-    fetchSubmodules = true;
-
-    extraPatches = [
-      ./abi-check.patch
-    ];
-  }
-)
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 9fd2e627c17e..59c66c979333 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -1,7 +1,4 @@
 pkgs: {
-  percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix {
-    boost = pkgs.boost177;
-  };
   percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { };
   percona-xtrabackup = pkgs.percona-xtrabackup_8_4;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cf98ae37ccc7..a34be7c1d642 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1583,9 +1583,10 @@ mapAliases {
   pell = throw "'pell' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  percona-server_8_0 = throw "'percona-server_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-server_8_4'"; # Added 2026-04-09
   percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
   percona-server_lts = throw "'percona-server_lts' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
-  percona-server_8_0 = throw "'percona-server_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-server_8_4'"; # Added 2026-04-09
+  percona-xtrabackup_8_0 = throw "'percona-xtrabackup_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-xtrabackup_8_4'"; # Added 2026-04-09
   percona-xtrabackup_innovation = throw "'percona-xtrabackup_innovation' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48c0acb01b13..36a404c33690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3132,7 +3132,6 @@ with pkgs;
     percona-server
     ;
   inherit (import ../tools/backup/percona-xtrabackup pkgs)
-    percona-xtrabackup_8_0
     percona-xtrabackup_8_4
     percona-xtrabackup
     ;

From 6481a63c1309282a242db76712b4e2570c565764 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Mon, 20 Apr 2026 08:38:24 +0200
Subject: [PATCH 259/316] boost177: drop

only consumer inside nixpkgs was dropped.
---
 pkgs/development/libraries/boost/1.77.nix    | 19 -------------------
 pkgs/development/libraries/boost/default.nix |  1 -
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  1 -
 4 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/boost/1.77.nix

diff --git a/pkgs/development/libraries/boost/1.77.nix b/pkgs/development/libraries/boost/1.77.nix
deleted file mode 100644
index 998107521e22..000000000000
--- a/pkgs/development/libraries/boost/1.77.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ callPackage, fetchurl, ... }@args:
-
-callPackage ./generic.nix (
-  args
-  // rec {
-    version = "1.77.0";
-
-    src = fetchurl {
-      urls = [
-        "mirror://sourceforge/boost/boost_${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.bz2"
-        "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${
-          builtins.replaceStrings [ "." ] [ "_" ] version
-        }.tar.bz2"
-      ];
-      # SHA256 from http://www.boost.org/users/history/version_1_77_0.html
-      sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ=";
-    };
-  }
-)
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 87449ec03aa0..930cfab4e8bf 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -20,7 +20,6 @@ let
     );
 in
 {
-  boost177 = makeBoost ./1.77.nix;
   boost178 = makeBoost ./1.78.nix;
   boost179 = makeBoost ./1.79.nix;
   boost180 = makeBoost ./1.80.nix;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a34be7c1d642..f5c142c04ce3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -396,6 +396,7 @@ mapAliases {
   blueberry = throw "'blueberry' has been removed as it is unmaintained upstream. Consider using blueman instead"; # Added 2026-03-09
   bmap-tools = throw "'bmap-tools' has been renamed to/replaced by 'bmaptool'"; # Converted to throw 2025-10-27
   bob = throw "'bob' has been removed as it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-12-29
+  boost177 = throw "Boost 1.77 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   brasero-original = throw "'brasero-original' has been renamed to/replaced by 'brasero-unwrapped'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36a404c33690..b1210f0b5b75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6099,7 +6099,6 @@ with pkgs;
       callPackage ../os-specific/linux/bionic-prebuilt { };
 
   inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
-    boost177
     boost178
     boost179
     boost180

From 39cbac3b25dcbd762b7d630a2f9aad4c73449ebe Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Mon, 20 Apr 2026 08:38:24 +0200
Subject: [PATCH 260/316] icu69: drop

only consumer inside nixpkgs was dropped.
---
 pkgs/development/libraries/icu/default.nix | 4 ----
 pkgs/top-level/aliases.nix                 | 1 +
 pkgs/top-level/all-packages.nix            | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index a330d11e7855..e2cc58b95a9c 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -59,10 +59,6 @@ in
     version = "70.1";
     hash = "sha256-jSBUKMF78Tu1NTAGae0oszihV7HAGuZtMdDT4tR8P9U=";
   };
-  icu69 = make-icu {
-    version = "69.1";
-    hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U=";
-  };
   icu67 = make-icu {
     version = "67.1";
     hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f5c142c04ce3..1effacd9bfce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -927,6 +927,7 @@ mapAliases {
   i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
   i3lock-pixeled = throw "'i3lock-pixeled' has been unmaintained for several years now."; # Converted to throw 2026-01-24
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
+  icu69 = throw "ICU 69 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20
   igvm-tooling = throw "'igvm-tooling' has been removed as it is poorly maintained upstream and a dependency has been marked insecure."; # Added 2025-09-03
   ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   imagemagick6 = throw "'imagemagick6' was removed because it is outdated. Use 'imagemagick' instead."; # added 2026-02-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1210f0b5b75..5851bf04a461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6521,7 +6521,6 @@ with pkgs;
     icu64
     icu66
     icu67
-    icu69
     icu70
     icu71
     icu72

From c4e3f82cdbacd01de0666bd1ba0e020e4fb65bc0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 20 Apr 2026 09:47:55 -0500
Subject: [PATCH 261/316] yabai: 7.1.22 -> 7.1.23

Changelog: https://github.com/asmvik/yabai/blob/v7.1.23/CHANGELOG.md
---
 pkgs/by-name/ya/yabai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index d487204df8bd..3aab225ba089 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "yabai";
-  version = "7.1.22";
+  version = "7.1.23";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
       # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
       "aarch64-darwin" = fetchzip {
         url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
-        hash = "sha256-a7ieZhQvt7YyLdBNYg0HhSl2BQRG+WdM2DYntNRLgyU=";
+        hash = "sha256-p8LHuAhmkKNPkRNIw4NHpAA+/oQPMI34H21mlUiwK+M=";
       };
       "x86_64-darwin" = fetchFromGitHub {
         owner = "asmvik";
         repo = "yabai";
         rev = "v${finalAttrs.version}";
-        hash = "sha256-T3sZhJpoZJKQhZpGDyEhpw+dMXoaFO9PEd0g0jDcihc=";
+        hash = "sha256-6fvjwn2MBJ8LKShR3evLyS3BfoJ4yYtnaCif7c9faxc=";
       };
     };
 

From 0ef04bb0c1cb484237120d01d89245a15a51089d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 14:48:43 +0000
Subject: [PATCH 262/316] docker-credential-helpers: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix
index a8c135d0e815..cb4f7b70fbf0 100644
--- a/pkgs/by-name/do/docker-credential-helpers/package.nix
+++ b/pkgs/by-name/do/docker-credential-helpers/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "docker-credential-helpers";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-credential-helpers";
     rev = "v${version}";
-    sha256 = "sha256-iZETkZK7gY5dQOT4AN341wfzeaol9HT4kr/G4o2oWzw=";
+    sha256 = "sha256-OM5NU0I3272KaCHv8ZtkbkB86d6mo/Ym1QXMGmCisVc=";
   };
 
   vendorHash = null;

From 6712410ad7c750a95ec7abda1ae2cbbf5183b265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 14:49:58 +0000
Subject: [PATCH 263/316] drone-oss: 2.28.1 -> 2.28.2

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

diff --git a/pkgs/by-name/dr/drone/package.nix b/pkgs/by-name/dr/drone/package.nix
index 289b868acd76..8441cc9548a4 100644
--- a/pkgs/by-name/dr/drone/package.nix
+++ b/pkgs/by-name/dr/drone/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
-  version = "2.28.1";
+  version = "2.28.2";
 
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg=";
+    hash = "sha256-jKM+jET6dsMe5+QRDKIHA40OOHb/nZmli3owaDB7IvU=";
   };
 
-  vendorHash = "sha256-6a4Xdp8lcPq+GPewQmEPzr9hXjSrqHR7kqw7pqHzjXE=";
+  vendorHash = "sha256-BHfuQ4bloqvdqHK4HSlzHVd9r0yhGkWqLY0XZazwiZQ=";
 
   tags = lib.optionals (!enableUnfree) [
     "oss"

From 802286e018b7e60e81c1ffc9df699f5598946b78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 14:54:44 +0000
Subject: [PATCH 264/316] coc-rust-analyzer: 0-unstable-2026-04-09 ->
 0-unstable-2026-04-14

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

diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
index 38154824f603..3f1a1d4e7c9c 100644
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage {
   pname = "coc-rust-analyzer";
-  version = "0-unstable-2026-04-09";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-rust-analyzer";
-    rev = "561aea31f1e263c8386ab7e09b7ffa95e64cd351";
-    hash = "sha256-Ee/5nkPdQBXwt5jQOMN+2/nHRwk33HigeY/L0NpTLAY=";
+    rev = "3a82969c169b9d71b51e74fe8841d1f04326725d";
+    hash = "sha256-8/wgdlM4US5R6xOYFD4uP6gEeRfJsjDwwCz3BIUpoFI=";
   };
 
   npmDepsHash = "sha256-+3eXdiM0Nll7V6EnDXq88rBjRkPN6GLFASdJ3fMXbq4=";

From 510b5c4a43e7f0c46e17dc9571738720bb98b92e Mon Sep 17 00:00:00 2001
From: Karun Sandhu <karun@sndh.dev>
Date: Mon, 20 Apr 2026 16:26:05 +0200
Subject: [PATCH 265/316] planify: 4.18.3 -> 4.19.0

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

diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index 670ce2d72ec9..e0828ef3143c 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -24,18 +24,17 @@
   libsoup_3,
   libspelling,
   sqlite,
-  webkitgtk_6_0,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "planify";
-  version = "4.18.3";
+  version = "4.19.0";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VCLXQnB3JhhK3UvnGTfR+mZ/AYGQ2YNxa6hD4QCUfjM=";
+    hash = "sha256-swZ8kpfDLxe48PqHLiCjxYbsS7RILCPTPHybtrJi0rA=";
   };
 
   nativeBuildInputs = [
@@ -66,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup_3
     libspelling
     sqlite
-    webkitgtk_6_0
   ];
 
   meta = {

From fe39c02847bdec757f4c8fa2e37e3fb1dfd154f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 15:03:11 +0000
Subject: [PATCH 266/316] clightning: 25.12.1 -> 26.04

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

diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index 2ad63012eca3..b99d50a2d6b9 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clightning";
-  version = "25.12.1";
+  version = "26.04";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${finalAttrs.version}/clightning-v${finalAttrs.version}.zip";
-    hash = "sha256-50rcNH9dXeRezJ3nEW/cRK5uE+IpGoHAzkU3C7p44KY=";
+    hash = "sha256-6dxnhLkXIrfxqXi+UoBKsJw1YFIanOVGBYizJB0X3oU=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

From 12ae701bbfe257ee2d042e99c4e9b6674bdde91d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 15:27:54 +0000
Subject: [PATCH 267/316] _1password-cli: 2.33.1 -> 2.34.0

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

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index deb4e6b7424c..c8f0e8f9552b 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -24,13 +24,13 @@ let
     if extension == "zip" then fetchzip args else fetchurl args;
 
   pname = "1password-cli";
-  version = "2.33.1";
+  version = "2.34.0";
   sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-rBXJ5BT/1TFySOgC1wpgOz4tcOF9flHplfonYGOA9Ac=" "zip";
-    i686-linux = fetch "linux_386" "sha256-2Hh+ML+hewwZATrh01kPXoNBdYWN3dI2ZqfLBiH/gK8=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-ge+4thdTnymQYFQ2G9qwh9i3zsY13W1M5za1CXybUqI=" "zip";
+    aarch64-linux = fetch "linux_arm64" "sha256-LuOI9r1VRnL9IGsK4vy4ENOS64xdpIZ+ZskIkUJ0s34=" "zip";
+    i686-linux = fetch "linux_386" "sha256-VvqEyDHEIY3BsgubiJKXql1WEnwXHkSHpFvCcKBIeYw=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-sbydXPoT0Vo3r2gyZBdl4OMtOejbhvra5JM4wB6Ex5s=" "zip";
     aarch64-darwin =
-      fetch "apple_universal" "sha256-+3NI4BIazI21m6teLBvKalCTN8cx6RhFqwXnkNK6tjQ="
+      fetch "apple_universal" "sha256-9h+Z7INYcJcWeVQ9QnXKjtT5QyV2J+dP857qSOpBAy8="
         "pkg";
     x86_64-darwin = aarch64-darwin;
   };

From e4dfb4751fa166909f967d0255e90f2ff1602d9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 15:43:42 +0000
Subject: [PATCH 268/316] boulder: 0.20260331.0 -> 0.20260413.0

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

diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix
index 1a26b442a091..404168f329a6 100644
--- a/pkgs/by-name/bo/boulder/package.nix
+++ b/pkgs/by-name/bo/boulder/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "boulder";
-  version = "0.20260331.0";
+  version = "0.20260413.0";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
       find $out -name .git -print0 | xargs -0 rm -rf
       popd
     '';
-    hash = "sha256-2kYZp/cU9OuXmy8EDoX7htqlM7NpAl45Nf2S5MTVn6Y=";
+    hash = "sha256-8saRz7g0KsXNr5oR4a2qd4kKDR686J0TIFMzsX/zlV0=";
   };
 
   vendorHash = null;

From e3eb9392aa94f408080a00f90553df4887c94ceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 15:53:10 +0000
Subject: [PATCH 269/316] home-assistant-custom-components.gtfs-realtime: 0.4.6
 -> 0.4.7

---
 .../custom-components/gtfs-realtime/package.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/gtfs-realtime/package.nix b/pkgs/servers/home-assistant/custom-components/gtfs-realtime/package.nix
index 7296f5fddc60..95723865bbf0 100644
--- a/pkgs/servers/home-assistant/custom-components/gtfs-realtime/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/gtfs-realtime/package.nix
@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
   owner = "bcpearce";
   domain = "gtfs_realtime";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "bcpearce";
     repo = "homeassistant-gtfs-realtime";
     tag = version;
-    hash = "sha256-gsrEbcoFdbDkXR0qvrqkDXymXcyzLr48YcL87wfOAjU=";
+    hash = "sha256-swqq2KY12EuDUnhnZ0zU8uIla7jvKLzvySnXU+vg/Jg=";
   };
 
   dependencies = [ gtfs-station-stop ];

From 1ac8d551a9e9e5bfa3b04c26b68311fd2435e6b5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 20 Apr 2026 18:57:32 +0300
Subject: [PATCH 270/316] steam: copy ldconfig instead of symlinking

Somehow this unconfuses srt-runtime-tools enough for it to actually work
consistently. Fixes #505824.
---
 pkgs/by-name/st/steam/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 910e4b5aadde..530a0db2fe39 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -56,12 +56,6 @@ let
             xz
             zenity
 
-            # Steam expects it to be /sbin specifically
-            (pkgs.runCommand "sbin-ldconfig" { } ''
-              mkdir -p $out/sbin
-              ln -s /bin/ldconfig $out/sbin/ldconfig
-            '')
-
             # crashes on startup if it can't find libx11 locale files
             (pkgs.runCommand "xorg-locale" { } ''
               mkdir -p $out
@@ -133,6 +127,13 @@ let
 
         inherit extraPreBwrapCmds;
 
+        # Steam expects /sbin/ldconfig to exist, and since SinceRT3
+        # symlinking it results in a symlink loop in nested containers.
+        # Thus, just copy it.
+        extraBuildCommands = ''
+          cp -f $out/usr/{bin,sbin}/ldconfig
+        '';
+
         extraBwrapArgs = [
           # Steam will dump crash reports here, make those more accessible
           "--bind-try /tmp/dumps /tmp/dumps"

From d74870c822ce236aa390d29e89d796d777c0be7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 16:03:03 +0000
Subject: [PATCH 271/316] models-dev: 0-unstable-2026-04-11 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 1199b9c52e32..b8d5451e1ae7 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -9,12 +9,12 @@
 }:
 let
   pname = "models-dev";
-  version = "0-unstable-2026-04-11";
+  version = "0-unstable-2026-04-20";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "f07262370fe55447966ec90eb9b45f93239e5b88";
-    hash = "sha256-noDM0g7YfAXJ7SpqtW9hT56ZpAXMjMTgQ6SzU+b7UZY=";
+    rev = "2ccecb60118eb569f15da8421944c92b01eae361";
+    hash = "sha256-zQ384Ik3xVtCDpRoFh8WQXQiXo5a3Mlq80gYzD2iMOg=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -58,7 +58,7 @@ let
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-E78Hb4ByMfYL/IZG911dX6XRRKNJ0UbQUWMSv0dclFo=";
+    outputHash = "sha256-O2e9O2qu3QS/8MBdZtUNlE8fm4BumFtHMjUt7AYzzks=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From f73b91b6eb429e63a2e9878597cdfc358c8720f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 16:06:13 +0000
Subject: [PATCH 272/316] serverpod_cli: 3.4.6 -> 3.4.7

---
 pkgs/by-name/se/serverpod_cli/package.nix     |  4 +--
 .../se/serverpod_cli/pubspec.lock.json        | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix
index 3d0ec9726d21..a3c51d338071 100644
--- a/pkgs/by-name/se/serverpod_cli/package.nix
+++ b/pkgs/by-name/se/serverpod_cli/package.nix
@@ -8,14 +8,14 @@
 }:
 buildDartApplication rec {
   pname = "serverpod_cli";
-  version = "3.4.6";
+  version = "3.4.7";
 
   # Fetch the whole monorepo
   src = fetchFromGitHub {
     owner = "serverpod";
     repo = "serverpod";
     tag = version;
-    hash = "sha256-VWwyCNBc3AZ+RvDWVOneazNtbm2DUJCfc5VZNmLQUBg=";
+    hash = "sha256-Axp8dmrAtcaiWAKB3H7e/ybUAIPx3++EVxRpwhGy/1U=";
   };
 
   sourceRoot = "${src.name}/tools/serverpod_cli";
diff --git a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json
index 9935a4146db8..4d7a8f074a65 100644
--- a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json
+++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json
@@ -194,11 +194,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_mappable",
-        "sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
+        "sha256": "960746478faaa68ed6b9d3c6fd03c87c7b8614e6c33e75fe1b0c6d7a60adcf29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.7.0"
+      "version": "4.8.0"
     },
     "dart_style": {
       "dependency": "direct main",
@@ -514,51 +514,51 @@
       "dependency": "transitive",
       "description": {
         "name": "serverpod_client",
-        "sha256": "3b6c6b2d0acc064df75225436f9bdf97f9af17547b58024b231e44195e1f7f2a",
+        "sha256": "215f3d535f4e6beb2e8d1a7fcc467709d0d65454ae4bf33661d7f2b63f965bf3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.6"
+      "version": "3.4.7"
     },
     "serverpod_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "serverpod_lints",
-        "sha256": "f033e4234d74558150cc683db4065fedb5a14d9452353155cf593d98ef59d85e",
+        "sha256": "d7f2e10538dda09bd3cf3f770b5201dac5aec9d59c3bc0f859d16a8c5ac0c324",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.6"
+      "version": "3.4.7"
     },
     "serverpod_serialization": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_serialization",
-        "sha256": "8e6a5421c0ecea309938b76a20228a421d8b3f96bb3e9c227be1ccac1fe0fb33",
+        "sha256": "2ddb7e6eda049925c8114f25ad58ed5bee86ebff020b146d5c9c35e153a8a925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.6"
+      "version": "3.4.7"
     },
     "serverpod_service_client": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_service_client",
-        "sha256": "2934809a7205cf3d4990adccb2966a8bcf42024304adb908bf9e527236ca51c7",
+        "sha256": "e8aa179181262cf3352748941d70952b366edd60697f30ce03c7f43cd7cb50f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.6"
+      "version": "3.4.7"
     },
     "serverpod_shared": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_shared",
-        "sha256": "27b807dc27a41c10ddf57fd977fcc22245b6d46b8f24190efaf7260c270b860a",
+        "sha256": "7b9720d2e0419cf9c79c1b246f9d799729246fbda5d225eaaf95051647a74764",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.6"
+      "version": "3.4.7"
     },
     "shelf": {
       "dependency": "transitive",
@@ -754,11 +754,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.1.0"
     },
     "watcher": {
       "dependency": "direct main",

From 581d67e35941ef3d07f628cd83c040e32a4c1fcb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 16:04:36 +0000
Subject: [PATCH 273/316] python3Packages.tensordict: 0.12.1 -> 0.12.2

Diff: https://github.com/pytorch/tensordict/compare/v0.12.1...v0.12.2

Changelog: https://github.com/pytorch/tensordict/releases/tag/v0.12.2
---
 pkgs/development/python-modules/tensordict/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix
index 5252afdddfcd..b2b4efbd8d5c 100644
--- a/pkgs/development/python-modules/tensordict/default.nix
+++ b/pkgs/development/python-modules/tensordict/default.nix
@@ -29,14 +29,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tensordict";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "tensordict";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3N2qj8aoUFQgQlYKEqUCKpMXwfn9XvdxLcB3wT3WOqY=";
+    hash = "sha256-H01/z0bVjD4ORBQpNIomN8EvAuAVWsh4kHnW4RDFGTY=";
   };
 
   postPatch = ''

From a3227c86cadc313f5f8d73cb6cf7964213288c85 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 20 Apr 2026 19:09:20 +0300
Subject: [PATCH 274/316] livekit: 1.10.1 -> 1.11.0

Diff: https://github.com/livekit/livekit/compare/v1.10.1...v1.11.0
---
 pkgs/by-name/li/livekit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 668cd40a68c7..51f8ff662532 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-D1OQUWaDnB4tBy5Rf5hnuqT8CHGnLZKKdpoe+Oe1LpM=";
+    hash = "sha256-9YWZIZXXphsyYXaBFSUHNyulcBmob7vExkI+LM4DeFY=";
   };
 
-  vendorHash = "sha256-LoJNJZPeS3vZlfFYBJ03XzooVFzSMGgmgbQ8yAq5BhA=";
+  vendorHash = "sha256-Fa2GHoXP8jm5aiPXLz9newQR/KAoUgJ3Pv/Bw2IYsrA=";
 
   subPackages = [ "cmd/server" ];
 

From e4721b6ab64a142731c5dbfac98504a1fc0fb7e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 16:20:48 +0000
Subject: [PATCH 275/316] libretro.beetle-pce-fast: 0-unstable-2026-04-03 ->
 0-unstable-2026-04-17

---
 .../emulators/libretro/cores/beetle-pce-fast.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 20af0a29d446..f478d1532d4c 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "15f6b56912df40593261b369d8c7f45911c9e11d";
-    hash = "sha256-w74AV9OLEht3nMDfT9OuDN3jEpfxGsKHLyJ14lhwEZc=";
+    rev = "906b6465f1d4da2d04d8735b0d24ca0af0533590";
+    hash = "sha256-xg+irszrpUu689MyP2iJDl9a/YHR4RRqLJmRdu6/4Nw=";
   };
 
   makefile = "Makefile";

From f01f0cf936edd39610a4b57f33088facd963502a Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Mon, 20 Apr 2026 16:03:48 +0200
Subject: [PATCH 276/316] source2viewer-cli: init at 19.1

---
 pkgs/by-name/so/source2viewer-cli/deps.json   | 102 ++++++++++++++++++
 pkgs/by-name/so/source2viewer-cli/package.nix |  43 ++++++++
 pkgs/by-name/so/source2viewer-cli/update.sh   |  21 ++++
 3 files changed, 166 insertions(+)
 create mode 100644 pkgs/by-name/so/source2viewer-cli/deps.json
 create mode 100644 pkgs/by-name/so/source2viewer-cli/package.nix
 create mode 100755 pkgs/by-name/so/source2viewer-cli/update.sh

diff --git a/pkgs/by-name/so/source2viewer-cli/deps.json b/pkgs/by-name/so/source2viewer-cli/deps.json
new file mode 100644
index 000000000000..6d91035bd346
--- /dev/null
+++ b/pkgs/by-name/so/source2viewer-cli/deps.json
@@ -0,0 +1,102 @@
+[
+  {
+    "pname": "Blake3",
+    "version": "2.0.0",
+    "hash": "sha256-WN+SuzMiv8UfT3r0r124wcbs/8OOixjpZkYwdTfeHvc="
+  },
+  {
+    "pname": "ConsoleAppFramework",
+    "version": "5.7.13",
+    "hash": "sha256-ZI9IqVb5EjVbvItoqYj4PBaxWqUZ3LCmPXvTnJh3Yfg="
+  },
+  {
+    "pname": "K4os.Compression.LZ4",
+    "version": "1.3.8",
+    "hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA="
+  },
+  {
+    "pname": "KeyValues2",
+    "version": "0.8.0",
+    "hash": "sha256-aE0bZIn1mFlUVUYJBQf8VdlOTmbeaawLoLLjuxZE7G8="
+  },
+  {
+    "pname": "SharpGLTF.Core",
+    "version": "1.0.6",
+    "hash": "sha256-aG6/X5cLoKRBxyvXl/4iX6kWAba7LuMgG86M4CsOVlA="
+  },
+  {
+    "pname": "SharpGLTF.Runtime",
+    "version": "1.0.6",
+    "hash": "sha256-rcvhtFPFQUH1rVt1NW10PFRTJFGeAe5PQU6Mrtz1txg="
+  },
+  {
+    "pname": "SharpGLTF.Toolkit",
+    "version": "1.0.6",
+    "hash": "sha256-cNoihUH9VjaNz2WTSJnO8s0jaPd+aIX3c6YkIDf7tnw="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.119.2",
+    "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
+    "version": "3.119.2",
+    "hash": "sha256-79BCLZAYjfHP1DZKgB+hsyyBlhnyZQPi+Swvs0RYnng="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.119.2",
+    "hash": "sha256-KEeGqSiyAiMbzLgH/0JkwUz/pWcL49gYB1T1YLkMPaI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.119.2",
+    "hash": "sha256-CI6dg+MlxX8t+vbnkxtd5QE3xalMKkA8LUSudxg7TNU="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "10.0.5",
+    "hash": "sha256-iZrjJEZU+GnKBWYLi0+NUc+yYKrCSQkaLmQrGDQyyeE="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "9.0.11",
+    "hash": "sha256-TlrAIz1kWyCBCpEZzcvR9Bir1NMJUqKxXtbgjPjPFYs="
+  },
+  {
+    "pname": "TinyBCSharp",
+    "version": "0.1.2",
+    "hash": "sha256-iDoc6eebSXFYN2mzjdKI3yOlRsD3VMFS5MLx1RNE5UQ="
+  },
+  {
+    "pname": "TinyEXR.NET",
+    "version": "0.3.11",
+    "hash": "sha256-/FRb3ZKlACiSM+q8Fj5zEvVMyNmOaO1O/w2c/NULBgA="
+  },
+  {
+    "pname": "ValveKeyValue",
+    "version": "0.70.0.499",
+    "hash": "sha256-HMMO3hXpCK7D+xXJ6RfA/sPPmjDubbZN4fWdv7kTBhg="
+  },
+  {
+    "pname": "ValvePak",
+    "version": "4.0.0.142",
+    "hash": "sha256-NjrVgZgXIQOZ2lHrnN1cLlZprsL5PstiqQ9hwUsgC00="
+  },
+  {
+    "pname": "Vortice.SPIRV",
+    "version": "1.0.5",
+    "hash": "sha256-CMq4YA1ZM5M5t9IKOS8CPM+/W8HGnjA93YiuIvuHRZA="
+  },
+  {
+    "pname": "Vortice.SpirvCross",
+    "version": "1.5.4",
+    "hash": "sha256-T+tgMCiRm9wnbd4qkmjHip7jErEWOnXOju5A3EV8dGk="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.7",
+    "hash": "sha256-WsuDTZOv3TgiE8NV/TXbKRMHBsZKgWB8iDdKKr9OvAo="
+  }
+]
diff --git a/pkgs/by-name/so/source2viewer-cli/package.nix b/pkgs/by-name/so/source2viewer-cli/package.nix
new file mode 100644
index 000000000000..81fac4ad390f
--- /dev/null
+++ b/pkgs/by-name/so/source2viewer-cli/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildDotnetModule (finalAttrs: {
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  pname = "source2viewer-cli";
+  version = "19.1";
+
+  src = fetchFromGitHub {
+    owner = "ValveResourceFormat";
+    repo = "ValveResourceFormat";
+    tag = finalAttrs.version;
+    hash = "sha256-eH/qAnStEjin/OM83JT1BfvWqwhjR0OoukIbAgxBNZU=";
+  };
+
+  projectFile = "CLI/CLI.csproj";
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
+  nugetDeps = ./deps.json;
+
+  executables = [ "Source2Viewer-CLI" ];
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Parser, decompiler, and exporter for Valve's Source 2 resource file format (VRF)";
+    homepage = "https://github.com/ValveResourceFormat/ValveResourceFormat";
+    changelog = "https://github.com/ValveResourceFormat/ValveResourceFormat/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    license = lib.licenses.mit;
+    mainProgram = "Source2Viewer-CLI";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ cr0n ];
+  };
+})
diff --git a/pkgs/by-name/so/source2viewer-cli/update.sh b/pkgs/by-name/so/source2viewer-cli/update.sh
new file mode 100755
index 000000000000..79954c1cb99c
--- /dev/null
+++ b/pkgs/by-name/so/source2viewer-cli/update.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+set -eu -o pipefail
+
+pkg_file="$(dirname "${BASH_SOURCE[0]}")/package.nix"
+
+new_version=$(
+    curl -s "https://api.github.com/repos/ValveResourceFormat/ValveResourceFormat/releases/latest" \
+       | jq -r '.tag_name'
+)
+
+old_version=$(sed -nE 's/^\s*version = "([^"]+)";/\1/p' $pkg_file)
+
+if [[ $new_version == $old_version ]]; then
+    echo "latest version, no update required"
+    exit 0
+fi
+
+[[ $new_version =~ ^[0-9]+\.[0-9]+$ ]] \
+    && update-source-version source2viewer-cli "$new_version" \
+    && $(nix-build -A source2viewer-cli.fetch-deps --no-out-link)

From a68c7d3b56a75a8d1f81696caaeac1f45f6a3757 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 17:02:49 +0000
Subject: [PATCH 277/316] python3Packages.nibe: 2.22.0 -> 2.23.0

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

diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index 6dbb5898aebf..109a05ac1b51 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nibe";
-  version = "2.22.0";
+  version = "2.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "nibe";
     tag = finalAttrs.version;
-    hash = "sha256-mbLasfHPPrZvL+PheMutqvIiyQQoew7dGIPGekuk0Oo=";
+    hash = "sha256-jBLsddnhUKdIntKmux6N/J07fnoVCBq0IbWyiWGKvlw=";
   };
 
   pythonRelaxDeps = [ "async-modbus" ];

From c1ab234c09d2c62d47f40b721f1b62f4a5e81fc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 17:13:00 +0000
Subject: [PATCH 278/316] cosmic-ext-applet-sysinfo: 0-unstable-2026-03-26 ->
 0-unstable-2026-04-16

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

diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
index 528b8fc82058..640e66019f9b 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-sysinfo";
-  version = "0-unstable-2026-03-26";
+  version = "0-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "cosmic-ext-applet-sysinfo";
-    rev = "a01f7d1217de6dcc961f258bef5ff2eb54fa84f3";
-    hash = "sha256-BtCArWWC5WbObpNp2OBxfn9Au+3SS+Gj/JBptDs8qbk=";
+    rev = "3a22684788b839ead634b8abb6ab2296296dba9d";
+    hash = "sha256-7gqf1m7jlsuzadsELDJL7XwYlpdmEhHYG5FEFsI3HRU=";
   };
 
   cargoHash = "sha256-vD90KMBI1bQTwazVnEMFo3eKXmLLI9QswdIwz+XoDho=";

From 5bbeffabf8c9011d189dd8c4ae2b9475d54ae28c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 17:07:16 +0000
Subject: [PATCH 279/316] python3Packages.textual-image: 0.11.0 -> 0.12.0

Diff: https://github.com/lnqs/textual-image/compare/v0.11.0...v0.12.0

Changelog: https://github.com/lnqs/textual-image/blob/v0.12.0/CHANGELOG.md
---
 .../python-modules/textual-image/default.nix  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
index 01b11583d3e6..a4f3bb38a68d 100644
--- a/pkgs/development/python-modules/textual-image/default.nix
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -1,24 +1,32 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   rich,
   pillow,
+
+  # tests
   pytestCheckHook,
   syrupy,
-  setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "textual-image";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "lnqs";
     repo = "textual-image";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nWP4pxFcsjDA/SIrKXHjufiQaxHGgPpC1ZIti+TW+f0=";
+    hash = "sha256-W0f9ZnSZ58XqiPnr9SZEv22EE4yCsvXcgNA8eJebJQo=";
   };
 
   build-system = [ setuptools ];
@@ -28,14 +36,17 @@ buildPythonPackage (finalAttrs: {
     rich
   ];
 
+  pythonImportsCheck = [ "textual_image" ];
+
   nativeCheckInputs = [
     pytestCheckHook
     syrupy
   ];
 
-  pythonImportsCheck = [ "textual_image" ];
-
-  doCheck = true;
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: assert [+ received] == [- snapshot]
+    "test_render"
+  ];
 
   meta = {
     description = "Render images in the terminal with Textual and rich";

From eaf2f659c13491574ba8c31c32b32779863ebb3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 17:29:28 +0000
Subject: [PATCH 280/316] vscode-extensions.jdinhlife.gruvbox: 1.29.0 -> 1.29.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..1494268e9666 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2486,8 +2486,8 @@ let
         mktplcRef = {
           name = "gruvbox";
           publisher = "jdinhlife";
-          version = "1.29.0";
-          hash = "sha256-LDbeCwuUxvyuacuvikZbV25iEtXWPRJ/ihnqpuM8Ky4=";
+          version = "1.29.1";
+          hash = "sha256-FGZx/R3hLgYlC2BdQkcJ+puQtgNYm2iPbJJJmjEzLS0=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog";

From 0b9b026f196d0443980fe4bf838ce9a84390391c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 17:29:45 +0000
Subject: [PATCH 281/316] terraform-providers.ibm-cloud_ibm: 2.0.0 -> 2.0.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 676ad9ef78eb..d0df7d173103 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -724,13 +724,13 @@
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-0zJuYzNU4Q6RSzl6qNglRiJ4fcj9QA3wF/9UPBRx49c=",
+    "hash": "sha256-FeH8XVy+xTal2bbylEfvVqqqoURvuNKNzcK1fv+Ng50=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v2.0.0",
+    "rev": "v2.0.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-0J10Nz6o12NuUJBkluiHWb8BElfuuz1wEKEQUb6epo0="
+    "vendorHash": "sha256-HDZiRZoq3/2E8aK/whBBeLVPcWYXYZqTNPa4DvNG2aQ="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

From 5fadc89f02c483eb2ca1fa69d7e6f9fd276f4855 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 20 Apr 2026 00:41:44 -0700
Subject: [PATCH 282/316] treewide: remove empty buildInputs assignments

---
 pkgs/applications/editors/neovim/tests/default.nix     | 1 -
 pkgs/build-support/rust/hooks/default.nix              | 1 -
 pkgs/by-name/im/immer/package.nix                      | 1 -
 pkgs/development/interpreters/lua-5/hooks/default.nix  | 1 -
 pkgs/development/interpreters/python/hooks/default.nix | 3 ---
 pkgs/development/libraries/qt-5/modules/qtspeech.nix   | 1 -
 pkgs/development/ocaml-modules/camlgpc/default.nix     | 2 --
 pkgs/development/ocaml-modules/curl/default.nix        | 1 -
 pkgs/development/ocaml-modules/curl/lwt.nix            | 1 -
 pkgs/development/ocaml-modules/dates_calc/default.nix  | 2 --
 pkgs/development/python-modules/simplenote/default.nix | 2 --
 pkgs/development/tools/misc/patchelf/unstable.nix      | 1 -
 12 files changed, 17 deletions(-)

diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 5945a5826359..e4c429c759c2 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -91,7 +91,6 @@ let
     neovim-drv: buildCommand:
     runCommandLocal "test-${neovim-drv.name}"
       {
-        nativeBuildInputs = [ ];
         meta.platforms = neovim-drv.meta.platforms;
       }
       (
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index 768ad37e2265..c122efe78fcc 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -75,7 +75,6 @@
 
   cargoSetupHook = makeSetupHook {
     name = "cargo-setup-hook.sh";
-    propagatedBuildInputs = [ ];
     substitutions = {
       defaultConfig = ../fetchcargo-default-config.toml;
 
diff --git a/pkgs/by-name/im/immer/package.nix b/pkgs/by-name/im/immer/package.nix
index e6286f24d358..f3359c9f2bd8 100644
--- a/pkgs/by-name/im/immer/package.nix
+++ b/pkgs/by-name/im/immer/package.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   # immer is a header only library
   dontBuild = true;
-  buildInputs = [ ];
   dontUseCmakeBuildDir = true;
 
   doCheck = false;
diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix
index 318564ba52b1..b92db70413fa 100644
--- a/pkgs/development/interpreters/lua-5/hooks/default.nix
+++ b/pkgs/development/interpreters/lua-5/hooks/default.nix
@@ -34,6 +34,5 @@ in
   # we move the files around ourselves
   luarocksMoveDataFolder = makeSetupHook {
     name = "luarocks-move-rock";
-    propagatedBuildInputs = [ ];
   } ./luarocks-move-data.sh;
 }
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index 079ec557d102..1006172c9945 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -40,7 +40,6 @@ in
     { makePythonHook }:
     makePythonHook {
       name = "conda-unpack-hook";
-      propagatedBuildInputs = [ ];
     } ./conda-unpack-hook.sh
   ) { };
 
@@ -48,7 +47,6 @@ in
     { makePythonHook }:
     makePythonHook {
       name = "egg-build-hook.sh";
-      propagatedBuildInputs = [ ];
     } ./egg-build-hook.sh
   ) { };
 
@@ -67,7 +65,6 @@ in
     { makePythonHook }:
     makePythonHook {
       name = "egg-unpack-hook.sh";
-      propagatedBuildInputs = [ ];
     } ./egg-unpack-hook.sh
   ) { };
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix
index a0b3f4ab201c..6678b9f7a2ca 100644
--- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix
@@ -8,7 +8,6 @@
 
 qtModule {
   pname = "qtspeech";
-  propagatedBuildInputs = [ ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ speechd-minimal ];
   nativeBuildInputs = [ pkg-config ];
   outputs = [
diff --git a/pkgs/development/ocaml-modules/camlgpc/default.nix b/pkgs/development/ocaml-modules/camlgpc/default.nix
index 4b201aab71c8..51a0448360a5 100644
--- a/pkgs/development/ocaml-modules/camlgpc/default.nix
+++ b/pkgs/development/ocaml-modules/camlgpc/default.nix
@@ -24,9 +24,7 @@ buildDunePackage {
       hash = "sha256-znm+mX60RwYNCYXwm9HYCO8BRbzUM0Bm6dI1f1FzncA=";
     })
   ];
-  propagatedBuildInputs = [ ];
   doCheck = true;
-  checkInputs = [ ];
   meta = {
     description = "OCaml interface to Alan Murta's General Polygon Clipper";
     homepage = "https://github.com/johnwhitington/camlgpc";
diff --git a/pkgs/development/ocaml-modules/curl/default.nix b/pkgs/development/ocaml-modules/curl/default.nix
index 4750685328b7..0be382e4f9a6 100644
--- a/pkgs/development/ocaml-modules/curl/default.nix
+++ b/pkgs/development/ocaml-modules/curl/default.nix
@@ -22,7 +22,6 @@ buildDunePackage (finalAttrs: {
     curl
   ];
 
-  checkInputs = [ ];
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/curl/lwt.nix b/pkgs/development/ocaml-modules/curl/lwt.nix
index 2bed9772d809..a7c4c2033025 100644
--- a/pkgs/development/ocaml-modules/curl/lwt.nix
+++ b/pkgs/development/ocaml-modules/curl/lwt.nix
@@ -14,7 +14,6 @@ buildDunePackage (finalAttrs: {
     lwt
   ];
 
-  checkInputs = [ ];
   doCheck = true;
 
   meta = curl.meta // {
diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix
index dd9a956fcfb3..d52acc74f63d 100644
--- a/pkgs/development/ocaml-modules/dates_calc/default.nix
+++ b/pkgs/development/ocaml-modules/dates_calc/default.nix
@@ -20,8 +20,6 @@ buildDunePackage (finalAttrs: {
     sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw=";
   };
 
-  propagatedBuildInputs = [ ];
-
   doCheck = true;
   checkInputs = [
     alcotest
diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix
index e930779bb7b5..b9a725812e8c 100644
--- a/pkgs/development/python-modules/simplenote/default.nix
+++ b/pkgs/development/python-modules/simplenote/default.nix
@@ -16,8 +16,6 @@ buildPythonPackage rec {
     sha256 = "1grvvgzdybhxjydalnsgh2aaz3f48idv5lqs48gr0cn7n18xwhd5";
   };
 
-  propagatedBuildInputs = [ ];
-
   meta = {
     description = "Python library for the simplenote.com web service";
     homepage = "http://readthedocs.org/docs/simplenotepy/en/latest/api.html";
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 2ce9d985b7bb..3c74709b71a2 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation {
   setupHook = [ ./setup-hook.sh ];
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 

From 32d5be9a3f6a0502e6bbc9d2c6e73539fe288bb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 17:48:34 +0000
Subject: [PATCH 283/316] libretro.desmume: 0-unstable-2024-10-21 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/applications/emulators/libretro/cores/desmume.nix
index 7aa0fc0054cf..a53dbfe8270f 100644
--- a/pkgs/applications/emulators/libretro/cores/desmume.nix
+++ b/pkgs/applications/emulators/libretro/cores/desmume.nix
@@ -10,13 +10,13 @@
 }:
 mkLibretroCore {
   core = "desmume";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "desmume";
-    rev = "7f05a8d447b00acd9e0798aee97b4f72eb505ef9";
-    hash = "sha256-BttWMunVbfPOTGx+DV+3QyOwW+55tgXKVIn99DZhbBI=";
+    rev = "a4db60dc63f36134ffebfe524b56e87a0b05f20f";
+    hash = "sha256-v9jppfo85wR4KrblE9HtI/psQiQafn4OIXmDofxqOfc=";
   };
 
   extraBuildInputs = [

From bf742d7ec94fb7fb51410cdad54e8e9ac4b780c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 18:06:56 +0000
Subject: [PATCH 284/316] cantus: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix
index 50d7fcff569f..1850cd0f684c 100644
--- a/pkgs/by-name/ca/cantus/package.nix
+++ b/pkgs/by-name/ca/cantus/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cantus";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = finalAttrs.version;
-    hash = "sha256-C/djQKG25azM/Vfw6UurPhgIyHGhWcMwM8FXQt+alko=";
+    hash = "sha256-pnc/fjmi932tZQsAfvvAoZ1PXEP8gckGuauR+5btei8=";
   };
 
-  cargoHash = "sha256-qg7YeIJVDzrAmUNUjfIB7eoZYUTMNu69L7dlZ6D9nLU=";
+  cargoHash = "sha256-sDZF5cWlhsBblAe0sreGbfgXKIip5raM0r9ZeJrLrLQ=";
 
   nativeBuildInputs = [
     pkg-config

From 9c3ef5e1289592bdbcc581c54378f86da531e30a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 18:09:25 +0000
Subject: [PATCH 285/316] flyctl: 0.4.33 -> 0.4.36

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

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 7815e93ae602..693b37b9b691 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.4.33";
+  version = "0.4.36";
 
   src = fetchFromGitHub {
     owner = "superfly";
@@ -22,11 +22,11 @@ buildGoModule rec {
       cd "$out"
       git rev-parse HEAD > COMMIT
     '';
-    hash = "sha256-d6GcWiEf/Ir8Uut+xEQagOCcEjOoIxGPvvYC2fqzQPo=";
+    hash = "sha256-WMENTGVwMICIrgMbl31cEaBpznyv3+XFtAhP8AajWyo=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-YO1/E1ys2rt/7nswYsuwynlACH3XsKtsrVRqzoJlny0=";
+  vendorHash = "sha256-qGG+xOBe8JLt+F4iTNMEC1XTs5H/rfLtUZO7QXYAaZg=";
 
   subPackages = [ "." ];
 

From 34d2056ff55d49ced8eab21d0d2ba1f2d00bc57d Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 20 Apr 2026 19:20:25 +0100
Subject: [PATCH 286/316] buf: 1.67.0 -> 1.68.2

Diff: https://github.com/bufbuild/buf/compare/v1.67.0...v1.68.2

Changelog: https://github.com/bufbuild/buf/releases/tag/v1.68.2
---
 pkgs/by-name/bu/buf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index ce99ba79142d..e0a630825c2c 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.67.0";
+  version = "1.68.2";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lipptVcjSRYh1EP1hOQwnJrnZScrua/ViXw8eBAvzio=";
+    hash = "sha256-h09Q8/K8SX3B13NZlU8VJLHmkpaUhL0UKG0gwIhnUHg=";
   };
 
-  vendorHash = "sha256-stzZSzM8volS26qLsDll1errJe+cwpmIHnzlMEJCv8I=";
+  vendorHash = "sha256-3WasjCKLf8P5szPa2Rdb0qWqgPAP67x0AZA1pF5qCUU=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

From d344b1fd7e51eba220cf967af23b1fa22ebae3a6 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Mon, 20 Apr 2026 20:36:04 +0200
Subject: [PATCH 287/316] kdePackages.dolphin: set meta.mainProgram to dolphin

---
 pkgs/kde/gear/dolphin/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix
index 1ed6a97e44b3..871b5126da12 100644
--- a/pkgs/kde/gear/dolphin/default.nix
+++ b/pkgs/kde/gear/dolphin/default.nix
@@ -6,4 +6,6 @@ mkKdeDerivation {
   pname = "dolphin";
 
   extraBuildInputs = [ qtmultimedia ];
+
+  meta.mainProgram = "dolphin";
 }

From f289a13fd78df51c0e184afd1ae4303b82c4d4d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 18:40:35 +0000
Subject: [PATCH 288/316] dotenvx: 1.61.0 -> 1.61.1

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

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 04dab004f602..42787161ed45 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.61.0";
+  version = "1.61.1";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-Ph/L+OOoO3UMc8FmZSNSLNqyMSAnxyXL+jFV3WkAfMw=";
+    hash = "sha256-ZNGHtscG3JSxHyKfn6d39SamPwkOXkb3xPNgyeo9JmU=";
   };
 
-  npmDepsHash = "sha256-7Ei3roqBrwtdko6qdD88ljRw3MzkgonMyT7fFQDdSpo=";
+  npmDepsHash = "sha256-csxBcYg0iT0iPsRloLwicVqe2Fg+TprG1eZkg6gHSWs=";
 
   dontNpmBuild = true;
 

From 844db9c50e77c1d3e62c4ef52aab36a6877dc8e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:03:01 +0000
Subject: [PATCH 289/316] railway-wallet: 5.24.18 -> 5.24.21

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

diff --git a/pkgs/by-name/ra/railway-wallet/package.nix b/pkgs/by-name/ra/railway-wallet/package.nix
index 0cf4239785f0..7d7b5db66d0b 100644
--- a/pkgs/by-name/ra/railway-wallet/package.nix
+++ b/pkgs/by-name/ra/railway-wallet/package.nix
@@ -5,11 +5,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "railway-wallet";
-  version = "5.24.18";
+  version = "5.24.21";
 
   src = fetchurl {
     url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway.linux.x86_64.AppImage";
-    hash = "sha256-MpM7PtuxjJeUYtdBFRie/KmUqv+za5Acnx9k82PtxaM=";
+    hash = "sha256-21Z9ulzYGIjntAHuA3t7Bl5yIqM7y39jALM4tDBa0Qw=";
   };
 
   meta = {

From ace0d4659fc2847ea1ffee0675f8522c9df7d5b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:05:19 +0000
Subject: [PATCH 290/316] sendme: 0.32.0 -> 0.33.0

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

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index be32ce877082..23def3c74b66 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sendme";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Yi0GM9gNQ1lEuuwS49asbhA1b2iUfBDnT06sPX7UuKM=";
+    hash = "sha256-Y7aaBm6KG+b8eEr2W8jmN2Ws3y0Dzkk848af3yse1/8=";
   };
 
-  cargoHash = "sha256-Nkr/8KoNZCTPWcpnqdfB+D3VpL4ABRlvi5nxhMuCw1U=";
+  cargoHash = "sha256-J4ctZ1a7pSKVTi1BAHRZMNLrfrODWKDrgsBRZN/24DM=";
 
   # The tests require contacting external servers.
   doCheck = false;

From 4c66d6c50b198f2e0c1723a43c4ad3152b99075a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:07:17 +0000
Subject: [PATCH 291/316] protoc-gen-connect-go: 1.19.1 -> 1.19.2

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

diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index d3697ac75b90..bcea617bf84f 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "protoc-gen-connect-go";
-  version = "1.19.1";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VW7FHZk7FAux2Jn03gGm9gdkjCzvofC/ukXOWaplWBo=";
+    hash = "sha256-tPaP3y6FlN4QrLJeqdrpMvfYXXb0CwTnbAZqD1oWcO0=";
   };
 
   vendorHash = "sha256-oAcAE9t4mz0HrkqO8lh5Ex2nakKj5FKy2lKTP8X/9Gg=";

From c8e3eb093ee34e47e269fec845c930f6d94d9d88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:17:15 +0000
Subject: [PATCH 292/316] pvz-portable-unwrapped: 0.1.20 -> 0.1.21

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

diff --git a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
index fb0d219f7bea..1b889af2b0f5 100644
--- a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
+++ b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pvz-portable-unwrapped";
-  version = "0.1.20";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "wszqkzqk";
     repo = "PvZ-Portable";
     tag = finalAttrs.version;
-    hash = "sha256-8E23G3x97E/J0MNomi5vvrua9+S2zzoTOtyVp4YsqO8=";
+    hash = "sha256-4CtO62cwNzQ32DE70F8kKFHy7tOsRLpDsgyrBS00C/g=";
   };
 
   nativeBuildInputs = [

From 06e0e2936229d9def5e6326ff9e0a6db94345371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:44:56 +0000
Subject: [PATCH 293/316] libargs: 6.4.8 -> 6.4.9

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

diff --git a/pkgs/by-name/li/libargs/package.nix b/pkgs/by-name/li/libargs/package.nix
index bd068e1396f5..52132ecae765 100644
--- a/pkgs/by-name/li/libargs/package.nix
+++ b/pkgs/by-name/li/libargs/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "args";
-  version = "6.4.8";
+  version = "6.4.9";
 
   src = fetchFromGitHub {
     owner = "Taywee";
     repo = "args";
     rev = finalAttrs.version;
-    sha256 = "sha256-FUM2QXKveESKTL4svgCw/SpwHypsF7DCW+RMoTBnh3c=";
+    sha256 = "sha256-+RzPVWFhA7tsiw04/i9OxqmoHVF5Whr9FC1isV8RrE0=";
   };
 
   nativeBuildInputs = [ cmake ];

From fd65fa0e62d3098ea18e836a077351995d5f75fe Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 20 Apr 2026 11:45:53 -0700
Subject: [PATCH 294/316] codex: build only codex and disable LTO to halve
 build time

---
 pkgs/by-name/co/codex/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 8f470f5f72c8..abb341eb56ef 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -38,6 +38,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-zpQ0vg9XuarLfdZYiRIhcwLHUOdunNbOb5xLW3MPzp8=";
 
+  # Match upstream's release build (codex only, no fat LTO) to cut build time.
+  cargoBuildFlags = [
+    "--package"
+    "codex-cli"
+    "--config"
+    ''profile.release.lto="off"''
+  ];
+  cargoCheckFlags = [
+    "--package"
+    "codex-cli"
+  ];
+
   postPatch = ''
     # webrtc-sys asks rustc to link libwebrtc statically by default,
     # but nixpkgs provides libwebrtc as a shared library.

From 788256d591bb2d04efe5dd78dd62edc1a1f56eb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 19:59:02 +0000
Subject: [PATCH 295/316] goeland: 0.23.0 -> 0.24.0

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

diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index d1d16d4a4835..993f05f184de 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "goeland";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-s1h7kZGnDrF9gd9MP+TTsvtUj9goMVjlOB4AhCXuUXc=";
+    sha256 = "sha256-pUwGdL17/VS9difji4/B1QzG7l6K4igeRxISDKVToE8=";
   };
 
-  vendorHash = "sha256-gz1NoEaPfRTyDDDgvWbpnwIpYS1jJRnOPNibVrXqgG0=";
+  vendorHash = "sha256-s20LCVih71TR5IYQ26bpF+q4eonpBlGXayCzcFLlb8Y=";
 
   ldflags = [
     "-s"

From 752b27da04c5a286992f7e3279675275519ccd28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:02:04 +0000
Subject: [PATCH 296/316] cura-appimage: 5.12.0 -> 5.12.1

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

diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index f960de0d712f..9ec1936f91c4 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.12.0";
+  version = "5.12.1";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-0eO7g061SBr78rn+oLqxo9TWyYAFjAy2pjteIjAzaAI=";
+    hash = "sha256-GBQvMZRaOqbOmBOOaIfduWKkwHbyZosr6AaFMty0Jfo=";
   };
 
   appimageContents = appimageTools.extract {

From 84159b6865845bae7fcd4ac50456de51468589f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:07:56 +0000
Subject: [PATCH 297/316] geesefs: 0.43.5 -> 0.43.6

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

diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index 7389219a2c5f..62978d43a17a 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.43.5";
+  version = "0.43.6";
 in
 buildGoModule {
   pname = "geesefs";
@@ -15,12 +15,12 @@ buildGoModule {
     owner = "yandex-cloud";
     repo = "geesefs";
     rev = "v${version}";
-    hash = "sha256-cfeL7fnxS+UFUlRVLiO09GHuEOvkiH5PkKcoH+jNRhY=";
+    hash = "sha256-FZIq58Liew5v7SGnLWmFj7nB822FAgFyCVLE9+oN9BA=";
   };
 
   # hashes differ per architecture otherwise.
   proxyVendor = true;
-  vendorHash = "sha256-p+shpYrPxYLXpW6A4a/5qM90KH+pcMCqZOPoYTE77f0=";
+  vendorHash = "sha256-mvzt/pk+S7DRcU6T3fBBQw1uvluO/tfeFmONucMv7t8=";
 
   subPackages = [ "." ];
 

From 1edb73a7fe0f0a659c07264e1baec940237977cc Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Mon, 20 Apr 2026 21:08:52 +0200
Subject: [PATCH 298/316] ci/parse: Fail on warning

Lix simply emits all warnings to stderr. All warnings it emits are
deprecation warnings which we would like to turn into hard errors in the
future, but are still too widespread in use, including in Nixpkgs. If we
don't hard-error on these too, then regressions will continue being
introduced and we will never be able to turn these into hard errors.
---
 ci/parse.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ci/parse.nix b/ci/parse.nix
index 14fd1e719547..8c9a84b446b1 100644
--- a/ci/parse.nix
+++ b/ci/parse.nix
@@ -28,7 +28,14 @@ runCommand "nix-parse-${nix.name}"
     # the other CI jobs will report in more detail. This job is about checking parsing
     # across different implementations / versions, not about providing the best DX.
     # Returning all parse errors requires significantly more resources.
-    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null
+
+    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse 2>&1 >/dev/null | {
+      # Also fail on (deprecation) warnings printed to stderr.
+      if grep "warning"; then
+        echo "Failing due to warnings in stderr" >&2
+        exit 1
+      fi
+    }
 
     touch $out
   ''

From 2454755d51ad5a463755265284da4baf4a5087be Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Mon, 20 Apr 2026 21:24:26 +0200
Subject: [PATCH 299/316] ci/parse: Test latest Lix

Somehow this was forgotten to add
---
 ci/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 540a0faea0ab..2be2a17c6f2c 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -184,9 +184,10 @@ rec {
     nix = pkgs.nixVersions.latest;
   };
   parse = pkgs.lib.recurseIntoAttrs {
-    latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
-    lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
+    nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };
+    lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
+    lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; };
   };
   shell = import ../shell.nix { inherit nixpkgs system; };
   tarball = import ../pkgs/top-level/make-tarball.nix {

From 8dad9ee5242b96559efb8e62712e4cf187817da1 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 10 Apr 2026 21:09:52 -0700
Subject: [PATCH 300/316] miranda: use gcc14Stdenv to fix build

---
 pkgs/by-name/mi/miranda/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/mi/miranda/package.nix b/pkgs/by-name/mi/miranda/package.nix
index 5fbf4c84ad91..84f607e68fac 100644
--- a/pkgs/by-name/mi/miranda/package.nix
+++ b/pkgs/by-name/mi/miranda/package.nix
@@ -1,11 +1,11 @@
 {
-  stdenv,
+  gcc14Stdenv,
   lib,
   fetchzip,
   fetchpatch,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "miranda";
   version = "2.066";
 
@@ -62,17 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
   # Workaround build failure on -fno-common toolchains like upstream
   # gcc-10. Otherwise build fails as:
   #   ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here
-  env.NIX_CFLAGS_COMPILE = toString (
-    [
-      "-fcommon"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "-Wno-error=int-conversion"
-    ]
-  );
+  env.NIX_CFLAGS_COMPILE = "-fcommon";
 
   makeFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
+    "CC=${gcc14Stdenv.cc.targetPrefix}cc"
     "CFLAGS=-O2"
     "PREFIX=${placeholder "out"}"
   ];
@@ -81,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs quotehostinfo
-    substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip'
+    substituteInPlace Makefile --replace strip '${gcc14Stdenv.cc.targetPrefix}strip'
   '';
 
   meta = {

From 1bf9f8675a74cc1836421849c9b1818aa2c70469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:25:16 +0000
Subject: [PATCH 301/316] wesnoth-devel: 1.19.22 -> 1.19.23

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

diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix
index c8204e765424..36575f71fc1d 100644
--- a/pkgs/by-name/we/wesnoth/package.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -39,7 +39,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wesnoth${suffix}";
-  version = if enableDevel then "1.19.22" else "1.18.7";
+  version = if enableDevel then "1.19.23" else "1.18.7";
 
   src = fetchFromGitHub {
     owner = "wesnoth";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     tag = finalAttrs.version;
     hash =
       if enableDevel then
-        "sha256-bqISxp20uiaqGwPshwe/xYwTnKC6K/FNYLE618L2IC4="
+        "sha256-iqL7sXcvAeyewB0nSFvXETgODaHtB2IaP26Yx1x1i6I="
       else
         "sha256-fODkyn4tyWL3PUVjXS4d7OW7VnQSL+fPaytvS8iigXg=";
   };

From 5b7c8c3c343fcc9f4a353b71244467541dce41a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:26:02 +0000
Subject: [PATCH 302/316] 
 vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.22 -> 0.8.24

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c635a23d8ec9..d65862efd852 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4218,8 +4218,8 @@ let
         mktplcRef = {
           publisher = "shd101wyy";
           name = "markdown-preview-enhanced";
-          version = "0.8.22";
-          hash = "sha256-3yABYp50iyk6nJO6xXmyhWLgMtA+fuqiEq6uFOJhWdU=";
+          version = "0.8.24";
+          hash = "sha256-SKDg0AVzlDFPq3ZHE65vX6OUPWeZGTJb5DaVs/y14UY=";
         };
         meta = {
           description = "Provides a live preview of markdown using either markdown-it or pandoc";

From b8084f36a6d679ec626817b12a152ff051a7ad89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:39:26 +0000
Subject: [PATCH 303/316] decktape: 3.16.0 -> 3.16.1

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

diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix
index d81746b58333..212229e300b1 100644
--- a/pkgs/by-name/de/decktape/package.nix
+++ b/pkgs/by-name/de/decktape/package.nix
@@ -6,16 +6,16 @@
 }:
 buildNpmPackage rec {
   pname = "decktape";
-  version = "3.16.0";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "astefanutti";
     repo = "decktape";
     rev = "v${version}";
-    hash = "sha256-hriWwH7/YKCwdDhXwqoOmjOJX3Dk4aKMnCBJKepUTzg=";
+    hash = "sha256-ZsNSQlkzIlawQ9FWG9kjz3bDJAx3X5YHv7LESI0tmpc=";
   };
 
-  npmDepsHash = "sha256-wnT6kRiYanwi8G9ZtBmqxAFctJEyyi0XlwaOXTjvlA8=";
+  npmDepsHash = "sha256-B84p4VBaQMZlhwiwXdF9Ijwpn3MisMlOXWc0E+5R5l8=";
   npmPackFlags = [ "--ignore-scripts" ];
 
   dontNpmBuild = true;

From 6aae5e74f82931c3e7392bcf7b1ae482954bdb2f Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Mon, 20 Apr 2026 20:55:29 +0200
Subject: [PATCH 304/316] ueransim: 3.2.6 -> 3.2.8

---
 pkgs/by-name/ue/ueransim/package.nix | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ue/ueransim/package.nix b/pkgs/by-name/ue/ueransim/package.nix
index d57896a7c0f8..54134d920615 100644
--- a/pkgs/by-name/ue/ueransim/package.nix
+++ b/pkgs/by-name/ue/ueransim/package.nix
@@ -7,30 +7,20 @@
   fetchpatch,
   lksctp-tools,
   iproute2,
-  unstableGitUpdater,
+  nix-update-script,
   makeWrapper,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ueransim";
-  version = "3.2.6-unstable-2024-08-27";
+  version = "3.2.8";
 
   src = fetchFromGitHub {
     owner = "aligungr";
     repo = "ueransim";
-    rev = "528061fe10389876da58d3bd15e8cba6d7c152a9";
-    hash = "sha256-8OxJzEcpFT6e/nQw1VK9kBdw9ulXedCpUEaBxIAN9cA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dnFGPEgnmbx+ehfeas1Imv8G7s8snd7P2h70E3PtmuY=";
   };
 
-  patches = [
-    # Fix gcc-15 build failure:
-    #   https://github.com/aligungr/UERANSIM/pull/777
-    (fetchpatch {
-      name = "gcc-15.patch";
-      url = "https://github.com/aligungr/UERANSIM/commit/8ffce535a11b63f688552c5c81f7d3ac793f47de.patch";
-      hash = "sha256-w2T7PTR/ELNf9sre/GoHqZQb9A8k54cTKoce/RZ7XCU=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -63,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Open source 5G UE and RAN (gNodeB) implementation";

From 0c1e7a3da2fcd57c38ad7193d7a114cea29a2e18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 20:49:51 +0000
Subject: [PATCH 305/316] renode-unstable: 1.16.1-unstable-2026-04-12 ->
 1.16.1-unstable-2026-04-20

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

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index 15c6772e4c73..f8bf769d22a8 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -14,13 +14,13 @@ let
 in
 renode.overrideAttrs (old: rec {
   pname = "renode-unstable";
-  version = "1.16.1-unstable-2026-04-12";
+  version = "1.16.1-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "renode";
     repo = "renode";
-    rev = "1ad93ffd5b0f2d67ff04f593de6318d12379d897";
-    hash = "sha256-MOCjxn4VB9uaq5UkHbZiGOdJDetUP816lnuPN0kXjTM=";
+    rev = "8fd79472e778216a6bbf5e40bf79ce54a76f7a7b";
+    hash = "sha256-e05IaXImpDWxxwmmI2o6YCnZ9Tp7wtP2Y7786AeoW40=";
     fetchSubmodules = true;
   };
 

From 26c2683755feee4edca58c8ecbb6ec9559840669 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 12 Apr 2026 09:32:25 +0000
Subject: [PATCH 306/316] python3Packages.cuda-bindings: 12.8.0 -> 12.9.6

Diff: https://github.com/NVIDIA/cuda-python/compare/v12.8.0...v12.9.6

Changelog: https://nvidia.github.io/cuda-python/12.9.6/release/12.9.6-notes.html
---
 .../python-modules/cuda-bindings/default.nix  | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/cuda-bindings/default.nix b/pkgs/development/python-modules/cuda-bindings/default.nix
index 288e4a2ffdc9..69fd864aa433 100644
--- a/pkgs/development/python-modules/cuda-bindings/default.nix
+++ b/pkgs/development/python-modules/cuda-bindings/default.nix
@@ -7,12 +7,16 @@
 
   # build-system
   cython,
-  setuptools,
   pyclibrary,
+  setuptools,
+  setuptools-scm,
 
   # env
   symlinkJoin,
 
+  # dependencies
+  cuda-pathfinder,
+
   # tests
   numpy,
   pytestCheckHook,
@@ -23,14 +27,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cuda-bindings";
-  version = "12.8.0";
+  version = "12.9.6";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cuda-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7e9w70KkC6Pcvyu6Cwt5Asrc3W9TgsjiGvArRTer6Oc=";
+    hash = "sha256-uRv27h2b6wXC8oOf5k2KxZ0bUFNvNu6XO05FBbJcU1k=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cuda_bindings";
@@ -48,9 +53,6 @@ buildPythonPackage (finalAttrs: {
     in
     ''
       substituteInPlace cuda/bindings/_internal/nvjitlink_linux.pyx \
-        --replace-fail \
-          'so_name = "libnvJitLink.so"' \
-          'so_name = "${lib.getLib cudaPackages.libnvjitlink}/lib/libnvJitLink.so"' \
         --replace-fail \
           "handle = dlopen('libcuda.so.1'" \
           "handle = dlopen('${libCudaPath}/lib/libcuda.so.1'"
@@ -59,16 +61,6 @@ buildPythonPackage (finalAttrs: {
         --replace-fail \
           "path = 'libcuda.so.1'" \
           "path = '${libCudaPath}/lib/libcuda.so.1'"
-
-      substituteInPlace cuda/bindings/_bindings/cynvrtc.pyx.in \
-        --replace-fail \
-          "dlfcn.dlopen('libnvrtc.so.12'" \
-          "dlfcn.dlopen('${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so.12'"
-
-      substituteInPlace cuda/bindings/_lib/cyruntime/cyruntime.pyx.in \
-        --replace-fail \
-          "dlfcn.dlopen('libcudart.so.12'" \
-          "dlfcn.dlopen('${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so.12'"
     '';
 
   preBuild = ''
@@ -79,6 +71,7 @@ buildPythonPackage (finalAttrs: {
     cython
     pyclibrary
     setuptools
+    setuptools-scm
   ];
 
   env = {
@@ -94,6 +87,11 @@ buildPythonPackage (finalAttrs: {
 
   buildInputs = [
     cudaPackages.cuda_nvcc # crt/host_defines.h
+    cudaPackages.libcufile # cufile.h
+  ];
+
+  dependencies = [
+    cuda-pathfinder
   ];
 
   pythonImportsCheck = [
@@ -133,7 +131,7 @@ buildPythonPackage (finalAttrs: {
   };
 
   meta = {
-    description = "CUDA Python: Performance meets Productivity";
+    description = "Standard set of low-level interfaces, providing access to the CUDA host APIs from Python";
     homepage = "https://github.com/NVIDIA/cuda-python/tree/main/cuda_bindings";
     changelog = "https://nvidia.github.io/cuda-python/${finalAttrs.version}/release/${finalAttrs.version}-notes.html";
     license = lib.licenses.unfreeRedistributable; # NVIDIA Proprietary Software

From 14bb5b0d09b4e120e99310dae74574dba74acb4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Apr 2026 21:49:49 +0200
Subject: [PATCH 307/316] firefox-unwrapped: 149.0.2 -> 150.0

https://www.firefox.com/en-US/firefox/150.0/releasenotes/
---
 .../networking/browsers/firefox/packages/firefox.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index c15ef79b06a9..84119d35af4a 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,14 +9,14 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "149.0.2";
+  version = "150.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "844a46ee068ecdc66b7227d089a057ad3f4945114fea2cb280d5e2a383d0a022fc6628ad57c068ea34cf159472f63c50ea7ed128bc11a0b27f16bb7b67d7f3cf";
+    sha512 = "77e8eae86e7b17c33933fdea6d3b5fbe73e6613949e62c13d9ed3e593e7ba0b50701fa97fc7d56a278961d2e1cdb2902244c30a1020790091b0ae2f0cb1b4e71";
   };
 
   meta = {
-    changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
+    changelog = "https://www.firefox.com/en-US/firefox/${version}/releasenotes/";
     description = "Web browser built from Firefox source tree";
     homepage = "http://www.mozilla.com/en-US/firefox/";
     maintainers = with lib.maintainers; [

From 65e6176112ace26cdee65cb2ff9b0de1a073b872 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Apr 2026 21:51:31 +0200
Subject: [PATCH 308/316] firefox-bin-unwrapped: 149.0.2 -> 150.0

https://www.firefox.com/en-US/firefox/150.0/releasenotes/
---
 .../browsers/firefox-bin/default.nix          |    2 +-
 .../browsers/firefox-bin/release_sources.nix  | 1238 ++++++++---------
 2 files changed, 620 insertions(+), 620 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 2186453baef9..947166188ad2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -155,7 +155,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
+    changelog = "https://www.firefox.com/en-US/firefox/${version}/releasenotes/";
     description = "Mozilla Firefox, free web browser (binary package)";
     homepage = "https://www.mozilla.org/firefox/";
     license = {
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index b363c7f86713..61fd96b85d4f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1859 +1,1859 @@
 {
-  version = "149.0.2";
+  version = "150.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ach/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ach/firefox-150.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "915f7154b19a8824f38c6d8d9ef9fd7dfa0d584e132dc5168d883f2d91637578";
+      sha256 = "6fda3549eeb58d2c0abee981f03cec5abdf0a99031d82be368ab11268791cf28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/af/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/af/firefox-150.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "82fb2ab67e9580f2d00d9648a93273d886257c6451c2afc8b8f0d87edcd650eb";
+      sha256 = "2f564c698f6d287b2574d00380886119ba3ec088f622ebccc08e83799ecdbcaa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/an/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/an/firefox-150.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "34a77b8d91792b0e39b8486451e8ceee38c24707c3468532f2526d6247bb3c93";
+      sha256 = "d91484977a311430e8d883b2de04338d07b166ba1244b215e5a7e3c4381a9e08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ar/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ar/firefox-150.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "0b49c7a9f71c9cced01dd808e89177daf49f39f70e410a91cb3218dbbaff5d92";
+      sha256 = "069c5001055811f1c6e26c80d1b6b94b0d1944d29774ce294863a075bc30610f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ast/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ast/firefox-150.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "39df917e8faeb5d72b8f44dd0a0174e169cbbc7f29f280144cdc021a56a76878";
+      sha256 = "46c58edf509744ae7b2b66fa8b9ccc35b596bb46b19fe36d72c0cfd5df147ecd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/az/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/az/firefox-150.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "233ef08032f7ac8acb355d6d3564c64671f5285354a357adff5ccb98d28ed85d";
+      sha256 = "aee9472480d653b17ca70a27bd02d5809c686eea855c083707f4f97e20fa9e04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/be/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/be/firefox-150.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "bcc477d83ae12cce815bfc23ac063ec2c2fa114384094688f5def74326c25e45";
+      sha256 = "f337bbece77ab7a80a2379d7d937f4b07c33143f33c067586b6b8b9a7a036bcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/bg/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bg/firefox-150.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "792a7bc598d48e13b90a38c29fe7b64a2bcca0c0b5d7f0d04f381b7b58dd9d76";
+      sha256 = "bc93a3c89dd4ddaeca71ab29f60fb0f03d4c575829fb6f008d5d3f768c822483";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/bn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bn/firefox-150.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "d73127cf9823ef87e2477141129c631c1eb0611281dd649970c09dec3d040eb9";
+      sha256 = "5498489c48848ae28416d859951faed4ab176a2f7c1578f28b3d2d59631e6c53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/br/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/br/firefox-150.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "e65aefabcd888eb8c24d81722626b785b511cb6b487c5c62344868306ac1f76b";
+      sha256 = "e37a97e0235c36028bd43e4358bc50a8c64819ea9d28b889dd550afab6f06396";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/bs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bs/firefox-150.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "143e57ec8a7806e621ab536ed2f8e05d33dd6fb42b906f4894cfbe21db8508c1";
+      sha256 = "6e8b7aa778e3423c10c26de2eacddc5fd1adb50f97c90ba5fda3379a1ed74f92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ca-valencia/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ca-valencia/firefox-150.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "f135ca51047e3999e8e65187d557784ed9c68783549098a4e9eb0fbdb29c8bcb";
+      sha256 = "26fb6c5c4018bb318e65ce8545dd1470a76f5865d42b341c7009ec7961f1170a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ca/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ca/firefox-150.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "68a244f947e7a5d4df8d37e29fc0b78a2578a4988bd94da331a610d8d49d8ec1";
+      sha256 = "fa1688801bd1fd16771bd31d457c70b02b15d493f709e37dc947e26f642d7f75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/cak/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cak/firefox-150.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "985cdf7d4c7e485ba6c313c454d9e3fd63026a99beab47fd3f867226e4731203";
+      sha256 = "5334bc92c4912b4500311c8ddcb149abed21ab74a8bb7a91213a3690c43a130a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/cs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cs/firefox-150.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "486bcae2a7319009d6e1eecf93f2cb7c54c4a175725783c8110ce082fc4b81d7";
+      sha256 = "0deaf31785fec9f5212a81ca7908525283205783b3670c41fc669e1288006eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/cy/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cy/firefox-150.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "682fc6666b78bc0c267ed38356685b1bd33994b2c81b5957597706426ed39d82";
+      sha256 = "b19fd410e899ce9e2ed41667e0ea7500d9c6a3eb20579a45563bd7bc7afad21a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/da/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/da/firefox-150.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "59ca679a369dbdb829de61d539d521b253be65749ee18a6d8327d93e04e4ada4";
+      sha256 = "bc609f518235a115c6b64c67e3cbc805098cc2a4c4b19352e951c8e60316e733";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/de/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/de/firefox-150.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "66f368c13d8601a439c14247a655ae5a922d40c2407cb046338f9722336917be";
+      sha256 = "5991544d554bdad4e1d485fba3e3d1bd86909bacf42afe2c794bb7cedf5192de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/dsb/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/dsb/firefox-150.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "2c858b39e5698db1c5ad372dcdeded25d67af095c48baa2e0a0da52a2fc56749";
+      sha256 = "0925ac61578aff7ada7c5d4ce94e4bee685a4487b3930e55817325f1b21c38a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/el/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/el/firefox-150.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "9f98aa8e6ba4ffe8c807b85d9de0d1eebacc4e5edc692232f546618f9ce6623f";
+      sha256 = "ce06c587a2b86fa73e7e8cd93427a74498fbec28ee2603bfbf048c9962931cd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/en-CA/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-CA/firefox-150.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9041c4d4c5263c12c0b79d29af5293db73d49b2a702f8778b39b7e0ce3ed46fc";
+      sha256 = "7187c727aacc8b462c340bc3d68d4e2c78c53a0db6e92efdf1d3a3eb770bcdd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/en-GB/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-GB/firefox-150.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "d86c5bf2302d4b63cb40493764c37853a1e701eaf4d40098e5d32bcb2fb2faea";
+      sha256 = "04802f87d51633e593682c3a67ffe5ad2278d8aefba0a7a963b1aadaf78bb2f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/en-US/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-US/firefox-150.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "814e872b969a4a33b6d44d27a2ab2f4b2c81692560cadb5855c0a3ae269e20e8";
+      sha256 = "2ff987e94bfa6ed51f53d6b4baa7f0f8ec3fc26c4c47bd9f86c70d11aa0fbd60";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/eo/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/eo/firefox-150.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "f055f5fc14b0bc1abab6b35d8324a464ecf282d9938a77cc292f78cf1b998813";
+      sha256 = "1983fb4d167646ec7a9c9320de1b37e4f0042fd24c890848b84a304df13e0e68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/es-AR/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-AR/firefox-150.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "0d6adfb55a6e1a0da7698550b6f4fa223edd63d8ae5f071cb6cd9c9afe742c34";
+      sha256 = "bc2e4b24152c6a2f9b2a29e9a4c7dae698f803ba2cc841a39e318a4e04f95575";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/es-CL/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-CL/firefox-150.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "159404339059544d27204b041637a720591d45514bdf5401ba1b5a2a417ef0d2";
+      sha256 = "0f11ee090d0927239847c22de8e4e8fde5426cb0f48ab5c40bb4819a6d0dfa9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/es-ES/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-ES/firefox-150.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "35a000d479dac8ac487bf54aad540bc65695dc0343d899194f8a57350e58d41b";
+      sha256 = "cd604a866aa7f8e6086d70690671281f975d20206edbfde19f1c153d82d52081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/es-MX/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-MX/firefox-150.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "4a8affb9046887265a41bf9eff242e53ee0dbe47050aab103bc1ecc60582e306";
+      sha256 = "00250676a87308cf1cb0260fd300c3d3abaebbaa01bb58952bced085496bb94b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/et/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/et/firefox-150.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "7315fde254ff4b8ab2f78e3140ac15078013df47e2d8e9ab38d7cdf494532852";
+      sha256 = "e6effc06ee1998a7842e3459ef87d0eb41813239df1a638b19e25cee690f4545";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/eu/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/eu/firefox-150.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "9ec326a2301f7508dafb10dd20caa2a042dbcea87ab3ec13f495eb6994c45cbd";
+      sha256 = "b55c891191869c9b38cc8abdacc73fa46f6f400571247fda0e11351d4eecb8e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/fa/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fa/firefox-150.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "8b8f78d26d47d45c22d1eac3291ac63e2f6b43fa3ac1fc7155ffa905bc4dffe7";
+      sha256 = "8565e9302d61fe53db0aa93b54c77c2e5fa01668a0749f2180d4a2877bd436da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ff/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ff/firefox-150.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "394bb50c5887421d77c732b2561b164f9d1b7a6cf0f5ba4ddce768415f348dc8";
+      sha256 = "9cdf2a235b2900f5773abeff59d929a787576fc76e8b0f8bfbf199d8d3493c86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/fi/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fi/firefox-150.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "c841f5b2bc0a3649c28ed6d0dc0eb565882c8fea7d73450d8c6dec76435a06da";
+      sha256 = "ff8901eb6714133cbbcf8cc0cac83b253686d82e9dbff693538d10a577dbbe17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/fr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fr/firefox-150.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "6f4ecf12fec4d8ee6897193587f78c0faf51a270d4e2fc764c814a2843d76ce7";
+      sha256 = "e5993ec9c373df0e3e738f00e3914fdf727b00e3b15a0ed4892e5d1416f30eff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/fur/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fur/firefox-150.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "8b74a36a1f64ec42b73bd2fa654eef4fab7fdc6fc04668a63b4ba5094ebaaf32";
+      sha256 = "25dec1f12105b87d9ec64847b97b3d66610ca10bfdefa1b0d6c9e94ccd5f1e06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/fy-NL/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fy-NL/firefox-150.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "78a39d20a6c034a7aea1821fa64bd9d0fa466b78ddde260acef0249bbe59f166";
+      sha256 = "13bd01d13edc2a63d334d184adff5b5f58014e50e97c5dfc747f7c22865f67a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ga-IE/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ga-IE/firefox-150.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "d714e00209d4f6caa79d6677639a63c3cbb8e3ee3a875050e981c08f8cae4eca";
+      sha256 = "fc08eb3c9f3e0554a8b449502a91b53562b9a1b90e9bbbe3f5ec7a69835a075c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/gd/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gd/firefox-150.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "88d6d3c4a250e295c486c0066a7fce19a9c7cfcb5cc9ea5aebba19b68aea7730";
+      sha256 = "f93f7c51e96248b8f4bc342f887e698c2a8300c635dc188e243a92344bf9a40c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/gl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gl/firefox-150.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "8c68f7e5fb5560e82eaf91f156aa3b1da93eb76041a617a9e67c56f24fff17b0";
+      sha256 = "94df516061208f827856132baab2f21a3e3099066ca324358586c5de2b8d64d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/gn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gn/firefox-150.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "ab45890636a88ccef67e5e33d2e1d9713f09036f7832a8353a4f263dc147d1ae";
+      sha256 = "fcdd1c0a2ea34e49c82e71b15ff6246fcc94c0a822ec857d20d84ed1194a2426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/gu-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gu-IN/firefox-150.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "e9194c82f2596fbffcd7625fa3ee0818282a4fdf9071b901e58ee4b2cd272c6b";
+      sha256 = "9aa1360317b7a730c5bfbaca9fd4271170299ae7d86d01352a0fe90fd6af7567";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/he/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/he/firefox-150.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "b64db02a5d699e16d5a17138716daa5708e538ef3147cab9a4ed6743bbafa08c";
+      sha256 = "96b935a94a0e57cef008b0fc72de9fa46328ad47aa12eb1f348a51b684588c4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/hi-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hi-IN/firefox-150.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "a8459a9463d0c83c1015053fa32281773ef0a9ed5c0cf0d31967b2f7bab35f19";
+      sha256 = "ab8d3295c74c407cb923035f070b3dd8a8f102e7968b0786010b31c105f0ff61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/hr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hr/firefox-150.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "75f876906cc65bac1a337e8371922f046035e107f261bdaf60af7fbd224ce44e";
+      sha256 = "c07894fc729efd289a16c75bd9791bf9b45da02582aa6b16b1575f215c87baa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/hsb/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hsb/firefox-150.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "60230563672a58abea8da1c42a6c8d702d23039f52b1ed2630ab1a2020dcbd3a";
+      sha256 = "7639cb516533ce99038691116edc6ef571192e74f1458850de438c1cd6591239";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/hu/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hu/firefox-150.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "bcdfd2865640c831c12b2e977d3bf5e11d66b5da8186deba9904405b8e0e8145";
+      sha256 = "9b8a83bef86262ecaa8f0c52cd8f6ea24c37307aa4e757b4e467039cbb91ec6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/hy-AM/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hy-AM/firefox-150.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "0901387338816ad318365b4cc5d9192ce60d16852baaa485db5639de8ee58e5a";
+      sha256 = "034f14b74c65117fe19191da9a48862cfb4b43dc3d96bccba7c52c413af72b82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ia/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ia/firefox-150.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "a1f0c7ba3c67841613264c350ea854504d64eef50402bbc2387311a3cdb065dd";
+      sha256 = "0c99d8783d83621cd75d74ec91b1917aaa7649030c94848af74eeca85fba4f95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/id/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/id/firefox-150.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "b92d59e8dbfd364ce0e2dc876f588e7f4dc3568563053045edb7eba982c52e1e";
+      sha256 = "7836898dd1569518d1e11f872e90b161072f786b0df1ef0a6e561066e48e4fba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/is/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/is/firefox-150.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "eec89ed0cdf6e267b2400a5596feb0a80c31698b930f7b80c54409d530e345ff";
+      sha256 = "9a3425105dc9cae3c61c9c66099d8db45ebdafca3b24ba61a6ae3d9a8367aabc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/it/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/it/firefox-150.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "69d4c0b751ec442d7b3b5f3dc90509a0ac4ade2adeea4119f635561ba410dce5";
+      sha256 = "c46f185b9357b62d4ed2d5f1fd4abc3d88174c72b97846eae87d8a7e0ac149e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ja/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ja/firefox-150.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ea3ec0bcbf915edf5e567885f9e7357fc0787e73137c8d2c6a7923e941fe3d89";
+      sha256 = "86f16a1bc7e8dd1e54ff4abac9684c4380eab88ef55c45b056107aad33c197ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ka/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ka/firefox-150.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "fe0623dc0db3b562dab67af245cc7f53b53c2d1127eec06af092969bff4c1940";
+      sha256 = "711bf219c8271cebbadf735510e06f64732f96a3e82e9f02031c1b4c45210473";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/kab/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kab/firefox-150.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "0b25f77246af6c02331d996932aa749d02d733a3b9285612a41ec11a2fdaaa2b";
+      sha256 = "9e808d0b0433fcaeca0f046bf3504d174afdcb51ca7fcce13cf8d5445dafaeb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/kk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kk/firefox-150.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "28d0d8d7eadb06b986e7a92c0fb957f75da019fed48c0d0becf80f648e7d70d8";
+      sha256 = "e39c684b53088922e06f291e36360d8b7668854e7ccb090897e3c4d6afea2120";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/km/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/km/firefox-150.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "7578b68b26ec9f315d3a3c465ad8b31b3b3b761a17110c43d5d730c35d208c47";
+      sha256 = "27755aaf765e65cbc3813aa780390586db75d0a54e0bf30d9b39c5457efece30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/kn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kn/firefox-150.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "88c60c67e3baaf9e0ec0b9ee6daee5a5cda17cbf3020c1ac85e8da8c2b3d3ac2";
+      sha256 = "59365d692e939a83ee409db0c593200ca5721f3c0c37dc15fd305ff9f4cad8a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ko/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ko/firefox-150.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "1cad5371b3d59bdb9be3c1e27fa5566b6096e86ad2db0f6d87f8d7479f616668";
+      sha256 = "f9b40208d5d782d823caf658b3527778fd569c4beffceebeac0e593fd72ea846";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/lij/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lij/firefox-150.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "fa6dd32729bef1a39e28fdaaf4e5b464d823e72f9772b428b5f6684f8c6acab0";
+      sha256 = "8d92d909dcf6fb2096cdf174c38fd22343b735bd406f1bd7b70ebe2ace40780b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/lt/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lt/firefox-150.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "312fbd4ec659235b62de9e9a548ca46b78517fb08e98154bc4db1f1176a0e438";
+      sha256 = "2ed3230c2989218674b5c5c454e6be6db02aa53a51171f80b710a8854364ea4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/lv/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lv/firefox-150.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "1464cd0d552e02604d0cb27b7b689a71208b02d2d1293b46aed8755fb855c9a9";
+      sha256 = "3cae4a5fee6856fc8d26f9f331e6209c92e368e7d8e0cca116493da5257d1e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/mk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/mk/firefox-150.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "9dfe7cd867786a7f4b35ef3d733541b88896400c455cbd9e2576e257127655b3";
+      sha256 = "4e983c39616f2a0a903f18c7b9c724d3ee30e284b91a2197346d5ef9b89333c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/mr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/mr/firefox-150.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "69fbff9f816d53670f762975e7011874fffa2ad3e240845185176d7e9dcb326b";
+      sha256 = "018c79ec6dd8d80aaf025260ee1f0fa436d1f273a0450401b5582d325d15e808";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ms/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ms/firefox-150.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "15523ef65f7983db03d70593e6f5600505e51bfef685ae65c611680e66455f81";
+      sha256 = "fd6e53060243b54d02cf15f83ae6b6a1fd74387e32c3a872e06287e4e67e7214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/my/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/my/firefox-150.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "914884ecf867b875ad097308ab50e1b6e1784ad91ff3a1641b4f862147aee64f";
+      sha256 = "66be74d223804ea70759e21f67388c506459b1e5dabcb99ea4c6940d8437bd5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/nb-NO/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nb-NO/firefox-150.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "e48a5b90acd1534a28a83185ac37f9eac437b88785ba71e091f4a89197b8cf68";
+      sha256 = "881700e587a36b40c3a363e721b7a8b6bc8525bfac3ef0bc0bd32c4ae55eadb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ne-NP/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ne-NP/firefox-150.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "f4d87eb31eeb041307a8461330f6df4145e93a650a4e99367fa776dcf5cf1efb";
+      sha256 = "612e84a33109f3be70ebf5806d23aa82abfb1e2ee1be26be8871dcc834ef5e90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/nl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nl/firefox-150.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "2e2ca657fbae7d91d3b877660f69717ca2ddbe2ee2246373b364f2099837e4d9";
+      sha256 = "8cf72e25578ef232d111fde5dc233be761467b3ccf9089d356724a202a4af507";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/nn-NO/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nn-NO/firefox-150.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "80f9d57ee5cb2a72205bbd8f8f5c7264f12527cb73eb8af7fe7ea22a3fdf0160";
+      sha256 = "d8b7b4c09f69d8b4f72bf65efb38c1a6fd2cbb7a5e1d628c7747d53f1b752cd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/oc/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/oc/firefox-150.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "211a109b976fbfa73230d2745c79481995e14a6f962f07adfbd14e58c9efd06f";
+      sha256 = "d85c3edbdb601e4b2f185da27dd87a5c991edd57d7093eae0ea504e8c895014b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/pa-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pa-IN/firefox-150.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c2dee5536a44b2abc679f1f814e865a328398b49c1379c3945ecb86608688766";
+      sha256 = "0b1606b64d0b712a7844cd98f51c271400c409a02875fced5830407cf6e24eb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/pl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pl/firefox-150.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "2c6d858db7d0a8e09709ab84d0520b00c6293c674ac1575159a4fc74bb1392c7";
+      sha256 = "e2e48642bcf8b73ae19be2212f4c5faecea12d90ab03467f9ce778a02ac54f92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/pt-BR/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pt-BR/firefox-150.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "4ea72d7749441ae7d3e45ab4e65da83aec2754c8c60ba622b20a2fc841052cf9";
+      sha256 = "d2c9dc14be5395be1e99782644a0dd69cd381bd0558ba905e59842baf2d9fd77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/pt-PT/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pt-PT/firefox-150.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ff8b3fdfe7671a971acfed5c972f6c216f6729788b5c87cadba7722dc28494e0";
+      sha256 = "78ca0c4486fd2b5f36e74fb75de94be6be3ae9863283fc40c098dde7bd056ae5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/rm/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/rm/firefox-150.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "9fa742995a0c409bb0555a5ba2ce89610657a8f3859eb507d3b6291fac028619";
+      sha256 = "5fdcc6ea08da8d9539bdb6b058370880b8387d8b724663e692ac69a70ae1688d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ro/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ro/firefox-150.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ba044b182198710e868b5ddc4727d9dacacbc74a7a0950485ed6d5097c95de1b";
+      sha256 = "ccbd22c2e0a5b42b0a7385e5d18f1f4318f9aee45db45e979f66606b5b38cde1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ru/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ru/firefox-150.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "9c9ed2eaacc96376dbece319028e6c43f89fb55a5ecf623b045858ef8d954b9b";
+      sha256 = "12fa20208db2048f35cda8c868103dcee372fec4fa111fa46e135aaab7d4a556";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sat/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sat/firefox-150.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "ea1ce3c5b12c7318d606c929f5b8bca495bf293da5ac212da89a426eb95c5c7e";
+      sha256 = "719e550ad69aced566f63f2863f5f8f1fd2dd5e7f1bb31606eeee830d151760e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sc/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sc/firefox-150.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "5d0024f6ee9eae87cbb4ab9dd250134ae1290738dc8085d3f281d52e12f3147b";
+      sha256 = "cd215721dba4cf36b00eaf5a3bf29af623c7f86b21e6f4abe54b0f00f6a52214";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sco/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sco/firefox-150.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "1cf505e51e189d84deb66e3010dc55cb04df7c685066f4343a1ab873bc48470a";
+      sha256 = "434a248ede9771a58f7315585609b659287dacfd2f077b3b7726f17d3f32817b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/si/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/si/firefox-150.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "4b954316fe56917dfd0b0c1627d609d343cb9395209b39f1f9b7441af6620871";
+      sha256 = "9eea0ae86f75db6996f5bd2030f5edff11e9071f294ff4bac39cbf1405cab6bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sk/firefox-150.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "23acdf86a812134334f33d464a7a7b283f97aa114b1e2e65a9a935a67d6a2af2";
+      sha256 = "76393f918ffbf5697ac29eb5548545ac3f81d26d1fd126d434eef22037525c9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/skr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/skr/firefox-150.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "3f1fc4f859875736b16b835c2dd091763dc6010e62e63cb11c60d4df84eb4eee";
+      sha256 = "47b2a99f38081ecaebd470c9c92c3764dc22a0d5e8a5b5d1ebd3ef8a5778c6ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sl/firefox-150.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "f559fe15e1d2bc5b2681135267ab95ad93aacfc9dfba2ab82e77eafc9bc4199b";
+      sha256 = "58fb7c5d61b347c1ecb6273f95345fc45adf3cc82951faa3a6704fe0d97475db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/son/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/son/firefox-150.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "33f0c513c128695d4aa43555c2e1c0fad7a01955aa22f333d75c2c8125f146e5";
+      sha256 = "d3eff42279227c045c0c5deeecc2955c316639a1c624d2f431be9eb8dc208981";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sq/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sq/firefox-150.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "106ebc1bacf954f306751be2fe53f40bf564ff77013f50c6c1e70d0de652d920";
+      sha256 = "01223c61da469892fee98effddd3d8c862f2037e1fe0f9a063c0f8d54ca45f66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sr/firefox-150.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "1969da9eac822fc0c31dc2092b3fce1cbba93fce2aa3df43343a2a6625a3fb0e";
+      sha256 = "7341c99e41b96ae73b3eca82aaed9a53d9d7f93148511598a340f2df2c5f1bd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/sv-SE/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sv-SE/firefox-150.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "58ce9b69e1be44987248f2ce04334b5e4d39285cac9a5e3140ae06b59a6cd790";
+      sha256 = "534c40d3b5187ea53514457b74c84e9221fe0e59b7a9c7a543ebb00f2c6b0ebc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/szl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/szl/firefox-150.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "e87a23d50e4ef459f705c61da357d703e388b23d7c72fbb48b0b29b3fc56a2fd";
+      sha256 = "89059713ba528500e256bf36b59b3b29b518e2fe6a1cce387765b5668d377899";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ta/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ta/firefox-150.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "80396a5bbe37acb7922d5053b596d99012cd335c6e0b624b660321b6af2ef9b0";
+      sha256 = "819e223804e6bf19269556a603f5e1de22864973aeb6c02b07dbf5883bddec65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/te/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/te/firefox-150.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "af905da16cb6706220b07589d4f72bb0034d2bcc7d511f1eeded441462a2c913";
+      sha256 = "d0d619885daa8b580cceb419267b213bcb428f240cf33b5cddbb56a371b7b5a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/tg/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tg/firefox-150.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "953fec2761acbacf81c16853eddc71c5bfe807fd674c180bae070a71c63297af";
+      sha256 = "de0a569e50ea10f2581292f91c87b6c9e589c8eaaa925a9154d3c99ef2970fa2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/th/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/th/firefox-150.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "892a39bc5fd4cb4eaf16108757230ca3854b29cec72f2eefd2588cfb8386943e";
+      sha256 = "e24b9a1c30995b3edcea1c62eeaa16d24fe51a917dfd5d77bbb4f28a88298316";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/tl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tl/firefox-150.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "ca50b4d6ef4aece6eabcbba9ce9b6215768f81f8eb9fc2b3126301fad0fcfe1f";
+      sha256 = "572e70a6f3f5095c00ef5c5381f4ed3d686f0cda2b754dd80b2b7f475e36b882";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/tr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tr/firefox-150.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "07f4b3b9dd524bc8d11b2924235322cd2b75f0709385e58e9d5db7d7ea0fedd1";
+      sha256 = "491929752bf6aad4637418779679e09fd4c11831c5c9ae8e5ebe54ec07524bac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/trs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/trs/firefox-150.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "1a5411192e84fac6dd78e81e48dfdfe9a9d920139d8b3bb35f0cfa7606452caa";
+      sha256 = "38ff7c7e4e0296a8774c2fd51b68c966f9c0a9d2b80cb66f3ece90f0b9f3c2b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/uk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/uk/firefox-150.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "6039649e183299cb75328a430425722bdd9cc57fa26ab0a1cff68b4d1b05cd19";
+      sha256 = "477afc4e02ce89b72e999237d36f2088e89abdb9a6e6afb199e1a4ede58d48ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/ur/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ur/firefox-150.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "67dcc7c629b18569ecccfffcc0b7a2e08b8c671ebeef87aa3c3790a60f6a0f40";
+      sha256 = "ff286564a782108c772c8b050464499f08b97e40c108ebbde703de5c539b240e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/uz/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/uz/firefox-150.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "3c540aac04885882bc2edce25319ba8e25cc22d81e6d58f5550311c7afbe7770";
+      sha256 = "88178214e9aa0e4e00b6c7bab3651efe4bf9fbc552b2e3a5fe6374aa4d9c3f79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/vi/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/vi/firefox-150.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "3216080fdb0c255978aac7927279702baf4f516c635aade3ea8a72c564aa12f0";
+      sha256 = "7f8823ed0456189dc3ee7e42ecc605c3445fdab99a82aacb9ce6d7ed5ad9d15b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/xh/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/xh/firefox-150.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "f576dc2ae4d94612de4824871ec7c42522e1deb3ba3df61882123f9da647ffc2";
+      sha256 = "8988a0e5547a5039bdafd01193e3159d96757a36630420f7d5f2ee6e350df329";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/zh-CN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/zh-CN/firefox-150.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "712eba43675e1c3a849fb0d4ce1ab8783123e732a396872c4feccbd36628fefc";
+      sha256 = "c4ec491f484bf7ee35e91f89e297a943b785ab2d657de3e1352320b7de967b01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-x86_64/zh-TW/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/zh-TW/firefox-150.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "749c6075189a957405ee7fe59e2a3ec6cbea15186b26f924eb5870bb5461fb55";
+      sha256 = "dd81e74e904f74b72247f56d92b180bfe8fecec5732f76d3650ebbd5d8051944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ach/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ach/firefox-150.0.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "eeb2e072049ef3cfd9e2f3ef0454486d81c6d012f9a442f3a73b66bbfadf668c";
+      sha256 = "bfb5d97c838501a93f4a8148ecc00de102a51f8d2bfb2019da7e331ea9fbd7b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/af/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/af/firefox-150.0.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "fcc8668dc790bbe870cae3511c188d62745b1acdc76ad180536a7ea8cac0bfbb";
+      sha256 = "f2e2444bce5853d147ebfd62b6663b626207964a3cb34558865a27aa9a499cc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/an/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/an/firefox-150.0.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "a00d9f30ead0e81e43f41faf6e981f8cd71ad7a939a2dc8331c1be46d51d68fd";
+      sha256 = "773d7793172b12ca5ef9931bfdfe45527332b8214a47aa8cce7cec056b9e5ba5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ar/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ar/firefox-150.0.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "f2a53d0f89910a0e8879f72ba7c9bdb473cc4774e3ee621b1524f1a9edb58844";
+      sha256 = "fe2c2721d91dfbf210b2f965abd49ffa0853a9f3ffb7245e09d4b5c432977608";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ast/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ast/firefox-150.0.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "88c48fc67663b8d01754e42c3c1dc5d4e5e47b6f5d39ff711e2428a0efc144de";
+      sha256 = "3d2a9d32b4b65c9d820c7369acf38abd7601fafb2762c8450666bf14cb60fb62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/az/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/az/firefox-150.0.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "7a5c74b6310ac7ef80d2a609fbb84bd9864d0f0f61d85c920d0a81f94226151d";
+      sha256 = "d85d3df76c17e39520f81fbeb763c73ed5f8208a40d91aec2fe73e4b4ef8bd73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/be/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/be/firefox-150.0.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "413de9b35e4a1b4674c0be51db53134e5f10f70416a4271bef6e7ee0a648cf44";
+      sha256 = "ff61b2f17609e9088765a8c2c27c73aefe679ab364178be923e9bd79e7e82c64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/bg/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bg/firefox-150.0.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "b72219f4fe77c7dec63d128cc63c2204126fdf28de3851601d62031def30b871";
+      sha256 = "24d052f7057bd679445abdadf3594ee298913b25d7b6d037c46a4a3d817c2580";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/bn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bn/firefox-150.0.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "35d50919e8c8846b72b4218bbe8bbf5aeb8ff0a4b2b7994656a7f2960ad2151d";
+      sha256 = "d6753fb7c487243faa6767c30d459c69a2c5b922f0b448efe31e17a0f7228050";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/br/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/br/firefox-150.0.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "58d73ec73834881f99901c94dd8d454b791bd81e0c4c74b3299957ebfd99b3aa";
+      sha256 = "01c695d79b76c7b688dbdce4c7be454562b048900a6170ce1831f644cdb2649d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/bs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bs/firefox-150.0.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "87089e8d1a90a32da3137d3ac8de42f83ff164fee5d657693bcad16f2fac5c0c";
+      sha256 = "53ef34e6bde6bd751dfca50e833ce7662cbd916c1202885f560cf0880fb05d4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ca-valencia/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ca-valencia/firefox-150.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "e41b3098f8af0e04982f2d3feaf1038067d0a11a74af1ca50406afb493440a18";
+      sha256 = "169695d4ac628ff56655e37dfce77dafb7f4d52f02f76dfd9791b2ceacf5faff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ca/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ca/firefox-150.0.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "aff532d9d0886dd0ae177966b0c0590b37b73cc3e2b99165ab230da13ca471ab";
+      sha256 = "54ecf88b598f7a0ff1f75a575b09ab6ce210eaf606b85be137282c301fc9a0e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/cak/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cak/firefox-150.0.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "377e4501b1fe9f1fe336264af9f93c753357de0cdc5ea861c948fc884c09b2fb";
+      sha256 = "7d68e7c8307f72b14f588f35f7ea8d4570d28e07c1a779c025be01a8b54a7ab5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/cs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cs/firefox-150.0.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "78c2f0b558483d539cf4640816bca8eae9ed43c70b6202c9d1bc2975098ca652";
+      sha256 = "1d0d62000802d037a2386f5375bfcb924ec7830c9822390ccf18097dde958a99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/cy/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cy/firefox-150.0.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "e4bc09affe615c56270b6dffb8cd20af7059df47d5c2707b33a27c318ed9b5fe";
+      sha256 = "96afc930c806785ef41a37bd6fe1c52746289efb311eaba17af187c76e8aaf88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/da/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/da/firefox-150.0.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "d15e1aae2d3d02de17174fc9b4bcaab85ffb30bccfd71794a54586e96550756f";
+      sha256 = "0519613f94868e1a0a6e07d646c0ff0ca606a6b1d7c850d7f4496f774fa86353";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/de/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/de/firefox-150.0.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "162f10d54fb04e1aa3f794847c07112626a1b6edadc1aad1f28ac452dea70db0";
+      sha256 = "f6cc63dee1b96ed41d60934e002a44a4a16da79f15c06297fba10f13abcc7d13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/dsb/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/dsb/firefox-150.0.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "ae1f74f16f7c0abe1f623952ae43c8b07cc7be387547c58a7621798bae05a64d";
+      sha256 = "692524f3a8df532855c2880ac2e4bba10637d79cfec3e687664afc285d919c20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/el/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/el/firefox-150.0.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "b2dd8b410d910878f79aff1a3c9ef118dd17bd3842a4fe002319feeb3a7a5d85";
+      sha256 = "8c33b155683938adb80db55ea6a6db6df233382d38c75f99288653c2a00fe2c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/en-CA/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-CA/firefox-150.0.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "ab048a1cd63ca60ac62da96e8cf8d0ce644e81517b19cb5d6c704917bedbf656";
+      sha256 = "df7400d44670569befe8695660885e42ffb31a4eaee7e3c822bf01ddcdcce39d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/en-GB/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-GB/firefox-150.0.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "032232aea59c9727bcd993f631a1b0b10bdc4f98272256f3046451fbb4508774";
+      sha256 = "ab5c228fea3531abaaa5f80b25cae5fddb56e8f94f795d44985319e1510625aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/en-US/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-US/firefox-150.0.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "b6c4c861dcb3ccaadadb77959f7de028f8543ecd8bc6a0b9f420752cf07c47b2";
+      sha256 = "9e6e2974ddfa840544caf26efda765c4988931bf2ada85c6b107500cd916cee7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/eo/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/eo/firefox-150.0.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "aa8b822112446df2e2915eb0c60961e066919acefede1b9e180afcb3f44497f0";
+      sha256 = "c70bd558e0566d7c42467a7c950ff3df8a8db4d7ebedcc987464d48fa56def5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/es-AR/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-AR/firefox-150.0.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "48c7a5e5f79e90e3ac7b488f2082490124e7ef6c3ec28792cb34d65f4b10dddc";
+      sha256 = "967de64c73a667ac467fa94a821f50c0cf18993353a1882cf6f297a9d894d5ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/es-CL/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-CL/firefox-150.0.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "ca420775f1ccbd40905cabccd0bd86014347e3a4b2324c8726b279f3d6bfe316";
+      sha256 = "30bcbb562ff20cf4d6d69a22507efe1882e6afb76580cd73c770b41df81cf996";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/es-ES/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-ES/firefox-150.0.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "4c8aaa0577d4609ba2377251a0eb038b2f5e6b41e8219dcc878b729eecddeae4";
+      sha256 = "95b6502bb5c79a86790444e9047ebfbcc0da1bfd4a139b1118af9a3d6034c803";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/es-MX/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-MX/firefox-150.0.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "bcbe32653720db53eb3b7f30fa613037ab2f20adcb5b7c92f1865564fcf47b36";
+      sha256 = "d14341b9dbdf69bd26f7020aea990e7b1260798b2126edb12f26130112ec676f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/et/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/et/firefox-150.0.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "5933fccc6575e717daf5d3c52e33312628767edf1dc0649bf41898ac40961a1e";
+      sha256 = "090fdb54b57196bfe50d95703fd891fc45e5b61a71f01d9f387a4ea090cf185b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/eu/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/eu/firefox-150.0.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "5aa5f710161f42821deb1b12e3ccd423ccead6d0eb45386ea7523a913540ffae";
+      sha256 = "17f09f54c040a86218503a963871e9009ec91ff808cb83544de76978b74e32a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/fa/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fa/firefox-150.0.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "692f413ec30eb824d3137e1a1ed06ebe2459b4c114fea25349da53d72f3f8ef0";
+      sha256 = "2ba0a879cb17e11cdd40f4db120b6c4ce96ef3534427603055224600f3e0eea4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ff/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ff/firefox-150.0.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "bfe66a8163621436fefdc026a10b61596882da726ee7a9e933b5697344fe5f65";
+      sha256 = "968a570398cd970f1884b49e17aa2ed245f59b70f9c7d3c807ec7f75259d5e43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/fi/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fi/firefox-150.0.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "a39bbeb218e966da2173febe6e133910de9c261d20e269f74db3ad7ff204693a";
+      sha256 = "e7f8a50883183b11cdbbee3ec3f31b8efa72571a0e5235a13ced94a756d98ff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/fr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fr/firefox-150.0.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "8a6209f97093f753c2583bc569e048926a84e8b318273cb936c0852ed21856ad";
+      sha256 = "b8abb61dd340aff2d0812e3fe22b128ccacaba4acc8e2c670df99627af5c09b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/fur/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fur/firefox-150.0.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "f275edbe5cf069e61ad9e0827948750ddcdbfb750e49fd0bfd1ed94c89aa00ab";
+      sha256 = "37877b40446d443941f174d26735b50c8b3680e33fac023e97632c056533f586";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/fy-NL/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fy-NL/firefox-150.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "67ab08451f2c43928621862f51dc9e1304f42a6cd543beb216705f63810d78e1";
+      sha256 = "15e36db60b6b31648163dc8f740c6fc91373daa8d39ce573bb3c51bd22aa86db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ga-IE/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ga-IE/firefox-150.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "93e4ade1793e4cdfbb72c1f9c36bafa8f03b5e1a3d8caad1079f3a5d7a2fad4d";
+      sha256 = "80e113f41aba04d445315c3d27766e107e27b01598451eb7f293b7f1a176adb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/gd/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gd/firefox-150.0.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "8533131ac994622e3bab03b6f51856b760fe6ad5c9bd91d1cfce5f4ceaf0705b";
+      sha256 = "50e0a2530aae063cd0928e6d1123eefb275c722b81b29649cdae2a2a9f5f59f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/gl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gl/firefox-150.0.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "b1f53bed7e4ae75616697ef65f210a7a1bf8fdfb7953a3dfb2c3772300bc2eb4";
+      sha256 = "35f9737a3576583e0c3f70df8d7deb96918648b35722bc87e82eae86054ddf25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/gn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gn/firefox-150.0.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "a92b49821f2c1424a934e155967e298a9c30313fae163ef504f76dcca76fe019";
+      sha256 = "beed54e00bef3e35625583175a338d652e09764df312752403a7b3d7402c1d33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/gu-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gu-IN/firefox-150.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "e124252bfd105d14d1fcaaeca567cce5f32250a0df8cb05afd7c9bb444b545fb";
+      sha256 = "b85e6dddf1c4d854502724c6f661da6dc28c2f15504ff0509299ae75feae97fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/he/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/he/firefox-150.0.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "9ca964e267e60246ff2069e0d17877e797cd5f17aa8e93dade658f8e53794bb3";
+      sha256 = "815f9e01499dbb83df62380bee2ed0b5a6bee368f00a51cb14e178465135e3a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/hi-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hi-IN/firefox-150.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "ffcd48b625ca40847c5e6ae957afeebce96205deebf3a61eba76b4c2719313d7";
+      sha256 = "ccb8169a407e548ec662e2149bcd848fc19b8bb6fb7559afff412456c3fb1596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/hr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hr/firefox-150.0.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "eea045a952e125ba804a7b6e08a39e9e532719b24b6cbea500cc69c6313ec03c";
+      sha256 = "66e17b54c9ca0275dcc0dc17a57b64eac0360587f4d80caaf5a8f904bd9f3fbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/hsb/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hsb/firefox-150.0.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "67fb434b8cb9665c32dca1a1172e7088393ecd9692a6435d5bb9749d4e3d2a65";
+      sha256 = "001ab0ccbfe3fdbc6b057664d02929dc3ebc4e9567684749f05f483cb3ebf369";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/hu/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hu/firefox-150.0.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "d81cf206ba390121475076d648e2127d12b117e210b0452bdfa4c4820401004b";
+      sha256 = "16babc87894317efe88d6234762b6f0c14db62323b20987abcb95d9f639f32bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/hy-AM/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hy-AM/firefox-150.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "26ecfcf4e5b35a748729c616aab70b2c02d25284a91936857a9ba0ececacf54f";
+      sha256 = "419d551fca7fc4066303b980e7fff9585f7115270fbbadab3f487b559e88170a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ia/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ia/firefox-150.0.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "db711a01b26a061ac2bf58f83be9738478f57227e7bcb870de8a3349bb505fd7";
+      sha256 = "d6bddb0e06ebb26dad4fbec0589c550c0a4644133ae915a801419b8c5083e5dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/id/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/id/firefox-150.0.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "c6d05c134c5417c1c49db45e2238f4de64e09566f6f276790459d35db2229e9c";
+      sha256 = "02da44560c02c186417906254dd427213aac0f923c17499a89cdb169832069e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/is/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/is/firefox-150.0.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "60fdb608f979a773bc895a8e0bb74fa194d70e4a24de639336410900704ddc6a";
+      sha256 = "acc08d39f248b5b799aa5f2631eaea6a0778157887fb5c0926ff42e7b1145b8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/it/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/it/firefox-150.0.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "27d1cdad67e8fc9fb849dcb203005ef92ebcd64b6841b0e5f509788f6691ca50";
+      sha256 = "96f389427893b009b4b00c0426d7c1e44f4edfe4f85c954665798273dd24cf6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ja/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ja/firefox-150.0.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "4887f17ddcbf952734c18dae24f217b07bdd8a52ff4dbb75e6977e606302d7e2";
+      sha256 = "a28a5dc44c81b8d7bbb36e8529ec12b9eb93a4dbbb315e510591f57df70e431d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ka/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ka/firefox-150.0.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "f497ae93110a598ffd67994274bc58d97e203d287658220ef7bd1921def5eb90";
+      sha256 = "e749135cafc5505f32832b36053a7c1179d3b10ecd00bf22856855e1aa595385";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/kab/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kab/firefox-150.0.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "22f3d3fc6328d09e2d9b44650a5fc154ec88c75e65e5fe3a8eae414e4bbc54ed";
+      sha256 = "56289ea469839fb14e1755b807c8590fdfec417e3ba3e167977d0a775d47ddfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/kk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kk/firefox-150.0.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "b85bc13ed4f3fd1bdaf3ea49d381b43bbf076396cd2817e6f69ca4c96cb31c8f";
+      sha256 = "cf264d6c21e67632ee81eb808a52b624a3a994c6b6075aa93be0fc8cf8867d5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/km/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/km/firefox-150.0.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "b76e5cc3eded3fd1770a94d1e0fbc590d6152873b091bdad590c885980ed72bf";
+      sha256 = "fd96e17527b863213e311ee9e3221b64c6dc44db4465d926afc17cde37970f37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/kn/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kn/firefox-150.0.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "97b527d80a8b0e13520647cc91da8c5f3cadf79f94e8ee388fa6b08a47434c4b";
+      sha256 = "7a47e0e8cf8917bc9626dc0ba59ef7425be9cbcdf54e2b31954402d1cc3988d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ko/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ko/firefox-150.0.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "a00d8029f4e270704cd463355266bf0510ec8737c9285c4e24e352b20960b3ba";
+      sha256 = "a90d9216e1112bb9639f536e6752e8a7f0afc5f19748e4544140096b4b7d1bee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/lij/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lij/firefox-150.0.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "be756699e4d405af72d3953c5dbda14939d59f45955c594734755e3f6755c6b2";
+      sha256 = "c9868c2d93656facbef63bd0267870ca145efb0860063870b13c011debcc0570";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/lt/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lt/firefox-150.0.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "87dea4df9b699533df5f4fe11c5118484710a49c708d78cbcd19f7299ab6948b";
+      sha256 = "8fc2b840950ad2593876794170575af91c04ad334552404f5460a5d006e9d594";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/lv/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lv/firefox-150.0.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "ea07864f49875d3fe354c6ab412fecf1f7014be3dd60ef7b7b370eb3b61dbd13";
+      sha256 = "a534d5e8e12e57a3b288ca1b12be61fb270da791f6ccd33938233eb1c0f3fc07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/mk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/mk/firefox-150.0.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "db67fc34f89568c54c06c5a428df1a71ed0a5a77580e43b5c109738f05b2b8d2";
+      sha256 = "101f937a0a64cc4aeb71ecc0b76334bdcf3c4bc41bc2923a845df89e1b1e4475";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/mr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/mr/firefox-150.0.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "4dabf57482f6294f6eb83131928329a1b41ae9040e1f0b1da63ab21acd650bcf";
+      sha256 = "e9f8226415d5aa07faf0a9493d247c98f20ac1cfd64ad45dffa5b101470f266c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ms/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ms/firefox-150.0.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "ba08818ea28bbad067cdd89a2947ba712d72b0abf6d369840c045675c1b94eed";
+      sha256 = "4860eaef1ffcc84c776645d46d09d05f792b5c939447b5e5cae5015080cba254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/my/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/my/firefox-150.0.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "4c809668d64609ee2046e449592003bf9d0d0439461b2ea41bb531fe3b47d948";
+      sha256 = "365b05ab1bb379d6fe3a7d47f4cad780fd06e8e4cf2d97be8b454e557b549f5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/nb-NO/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nb-NO/firefox-150.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "4b28ffbb8559b7a43f86d38edf51558e319a80c5f03077c211496592747aa8e3";
+      sha256 = "26da7d07de34b248bf31b46456be7db188819782de4be81c3102936ce7a7c147";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ne-NP/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ne-NP/firefox-150.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "4ba080b6c33d927bfb9a1baa468172cf3e612ef69606b32913ffcbd40b4326d1";
+      sha256 = "f18c403279ab4355f3c3af7df37917ddee15cf12d5702ee3631416094e34e29e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/nl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nl/firefox-150.0.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "843f41e8371ab6c4eeabd0b871f67bb31ab8a71b92d0da9e889dc743e63d705d";
+      sha256 = "3af9e6a79b151deb9edbe20637b484763682ce129e19c62bf64d75c1c8b3e3b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/nn-NO/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nn-NO/firefox-150.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "3f858528676b612305728a690f5595c770fe36241837a503d775c48b87bda28b";
+      sha256 = "ced05bce994800f362e23305269324bff93363f6971a6fb3dcd50fd6695b46a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/oc/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/oc/firefox-150.0.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "be0c18de40c22f922aefcd60f88c1eb5af917f0596ae467e7ba5adb704a5a1e1";
+      sha256 = "001a3236dc3221693f00ccf7d3ef9a772a9f85e956086113f2d5ec00097764be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/pa-IN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pa-IN/firefox-150.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "53844254d8d25e8828c7b168f4607b88b74212cb92055c51c74331139c51ff0e";
+      sha256 = "ed8e49b3bad3263620c3335079c72bd01c12b5ec19bf5d2a3ee2501cc9bdfc3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/pl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pl/firefox-150.0.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "895711187cb83b17d80cd005fa31db62a5c96ee681383c9ed94083b14b39e939";
+      sha256 = "3b1518027b323cfdfdc4bb95f66bd75dc43ce387a75fade39f8cdcd789483f55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/pt-BR/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pt-BR/firefox-150.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "dc8bc0f3a3c35091a62154a7599ff824dbd42fe318901bab3d9bbcaee4d32af6";
+      sha256 = "07decb7d696a9cecf4130352c77bdacf23fd0c7b486889fa40f5cf1faff22b5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/pt-PT/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pt-PT/firefox-150.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "975ab649fe829e6ee5924fda3e93820d527a6fdd9f9e0756bf6a911378cdc378";
+      sha256 = "cb011d2ba53d7eaf9d8065fbcf8a0a599ebd46d63a140af48aa68be90e2e89b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/rm/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/rm/firefox-150.0.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "1b76bbb0bd18dc08907c7c7bf606e2e317ba46790b9bf64bf746d2b7b9d6d042";
+      sha256 = "059036333a669b2e332bd1c91f8462f8f2c9197dd200686c93e8bc9c98d9a3e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ro/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ro/firefox-150.0.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "06de2bce30216bc5025ea7d8fd80f1ea9da3f741548f2f921078deeede2ce35b";
+      sha256 = "dc0424e5288f25cf15e9dde77d21ee8b4819f2f3efcfb1a7f9759db38de69435";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ru/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ru/firefox-150.0.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "2d082bd94239e898a90cd668aae6678489e277cd280cf20af7cec4bb634e9d61";
+      sha256 = "acc30078a9be326d58972b4ec86abde7d829309915f573ff930d07453497bde0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sat/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sat/firefox-150.0.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "d241a923bac592d25715192ea45e87c64130688aa1f203d768dddb5a7bf8f296";
+      sha256 = "64fe33329ccf4e46a7c83eba9ace506fb0f1eaa77f84e4fe0fe2a4b79adafe04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sc/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sc/firefox-150.0.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "2407c3733feabd510ac982a423d88615fa06fecc6b49521f92d85695d6384dc7";
+      sha256 = "6865e09f8ac77bcb4f07f9adbb6d8db55d265d60bddd589c8fffd74fe08b88c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sco/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sco/firefox-150.0.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "52520becf02ead01f4cbc7e0e311e2e1e492b7bee3af893f5ff5164fd706cfd1";
+      sha256 = "aa391d7766f94b938e70c1b25c6a94e37c89d0ff9dae04b194aa9f9cb05c6bce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/si/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/si/firefox-150.0.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "acba0375ebd634fbd61e5c37498fef4d2c4b3772f3ae8fb6756bb82917f11758";
+      sha256 = "6724d82646c653cefeadf1170ed0e137541631536d282a7e11ccfd0066f17dbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sk/firefox-150.0.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "4e055de2c05a0a6cba4aeb3c150e6d0d76ff82ba731b70d7fbfbfbb82be40307";
+      sha256 = "c660a9a3fc60a8dec171931f8dc42eab78f2e8eac052ad38b234f27c1cdaaf69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/skr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/skr/firefox-150.0.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "29d57674ec57f2f290f583139ca189f9c1cbc40d6eeb5d0aa926d743a288c589";
+      sha256 = "c4c02f3a144f70bd0ee2e9ad112e523bd5962253afbf72b7c672cbacb09f7f69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sl/firefox-150.0.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "b12961bbfeea5c1e542bb90a97cd9983d8ce940ac6a7d772feeb8a76560e9764";
+      sha256 = "5734549558ace1c969ed2e2b4375a08f8869b25ab560d706bb60ddb4193590c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/son/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/son/firefox-150.0.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "6d010d064a4def1c7efd65762f0c6ea25166394f568afb315fb4763bdcd8e4ef";
+      sha256 = "a5d560cea663dc82152ab9bcf7d2733396254c02dd7308709d74264553e1ae15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sq/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sq/firefox-150.0.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "d6bc6cd25d1afa24305b25ab00540ae3a0d89ae0e7b94bf5053e636907143643";
+      sha256 = "3eb5c4b583205380c13eb99c13df361db7adb46324ab37e4405b892f5c923d21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sr/firefox-150.0.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "73f077937baa63edc36f18064c8cb8fe5673d61701731d76367af1ce9fc43494";
+      sha256 = "83b9a7cc9b19d82771f29f2fc2f20e76b04c0778d51644a3ab38223d46c51c2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/sv-SE/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sv-SE/firefox-150.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "85b6d4620d322fb944f1725206c8f3bf0070da23c02dc1e0131ee0b4280211c3";
+      sha256 = "d60f17565af94a7bac9b4188a036844b170a2183d1adb9323cc0e297121007d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/szl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/szl/firefox-150.0.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "9f6ec16f3e0fe79249a78ea7f0b46ed78c176452548bb1b30029f0afddcb8cae";
+      sha256 = "0ab6422102620f7a2f8a3109e4a1ad7cefcba8692c3ab561cc218b71134fbe16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ta/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ta/firefox-150.0.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "146477087ba0896de262dd726b756fac1f1dddfda224ee217a7f29876236209c";
+      sha256 = "7e6b81fe4bf32f20d6d63b624cfbbdc4534ad39908b9057ee7ec18d90fa0f006";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/te/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/te/firefox-150.0.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "d77ba2802ba5f7fb932f63f278e73601b11619878bf7ae13acfa6916cdf19686";
+      sha256 = "5c66682d957e02c9f93eb248bdec5787a2397099b1ec63d5bfe62e15fee8a616";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/tg/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tg/firefox-150.0.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "70339d076e2c5f430af37f59708dd51b8f4db5c1fdcd53de29dec99f1f46cff9";
+      sha256 = "6151d4822fb5085e2743ace099c3fb5b06b11b10e9aaf48cd100da19e452701e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/th/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/th/firefox-150.0.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "07667686c80f8d94a5429a9a24b666e478babb66bff8b7508a0c385a8850fafe";
+      sha256 = "de1cccee3e3f2734e011dde3aa4c564fefa43a493fa682b631c4f7a81c15260a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/tl/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tl/firefox-150.0.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "9b82b93df9a8768831bab5d5dc9746e3b95fa9011eb365b67fd1a3996e74104f";
+      sha256 = "816f2620046c878db2f2d91ba859b8db6657dfab0f48bf12f9956247edb43ced";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/tr/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tr/firefox-150.0.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "b595fe4b615f9b40d210e4ecc3baaad705b9060dcfdbfaa5bd6093503ca5feb8";
+      sha256 = "c3e21bed21f1d8ded7b8f67fb6a5b971aaedf982358cc2adaa1d22830cd3d4b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/trs/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/trs/firefox-150.0.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "ed01de73c7a77f850b0187ea20a7f5b9f8897d701510e0bbaf50ff3960299305";
+      sha256 = "2e34b768fb5ade0ded463a23278e779f726dc8a98ba50640b4c11d1dd9f439cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/uk/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/uk/firefox-150.0.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "d8af8ff2e70b9db81c1b53e8f3376c5e884ee917ff77370f097a8bdb7db2cc40";
+      sha256 = "2d3668f7dd2250b87d3568ea9a24fd9d56eece1087f0933bb41754f39f1d563e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/ur/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ur/firefox-150.0.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "730f9a84efb8b2c7ce173a659ee9e12edb9abd241067706ca7d6394531be2157";
+      sha256 = "f5b1c24d9d01ad2aa80d83312cb5a149bbb60aa08213ab53cafbb6c5c816055d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/uz/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/uz/firefox-150.0.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "c913c5730a42f084aa973e41ac2a05b4f1a93e625f5616be41c38fe1609e2bb9";
+      sha256 = "6185d107063cb3d37dd57b9931cbd7880c6119bf85c381aa90115fa2b4c69d6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/vi/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/vi/firefox-150.0.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "c76b6d0f2219538cb2195e08398dedd96935b2af78fd551a0494bf2df0aaafc2";
+      sha256 = "97a3ec310672fcb164205418b4a5d253a7e8b7c45798022233f4296c24f77e5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/xh/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/xh/firefox-150.0.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "e75b9b4fb0ae49fd9b5847a244a73b8465ff66d7c726d1f69d133fdd10085dc9";
+      sha256 = "04ff21fad2cbf864fe975706f955f98bed94a731aefa9c50e04804471ba961b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/zh-CN/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/zh-CN/firefox-150.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "15a34006972313c317d355d92b668f4d3e3b6bcd467e510fdf25240a8138898b";
+      sha256 = "b2c97b5d0b1c84fd75f52c7480b262c2f6ce9a951ad30f8ce6c985f6f78b91d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/linux-aarch64/zh-TW/firefox-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/zh-TW/firefox-150.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "49a3ac3bebd410a3fcd832911e5b7aa76273a7779ca25d7448b590b3eb49c317";
+      sha256 = "91ed18bc6d5d9d9422f07f51b0c2e5e231431facb2871d413b5da61cc4119fa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ach/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ach/Firefox%20150.0.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "17458617c6225363376666de5f773ce0e996a66e7725ff1b8555c8c6123993b5";
+      sha256 = "e2f99ffde15698e329db9e7fc0ba6cf50179f5b4246b0af824c694e861c8859d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/af/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/af/Firefox%20150.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "bf13fa2de1f85d5d3b000449f67e92bde6c56e5f763e0ed3b17939e46d6ebdd8";
+      sha256 = "f36f2dd4c98d0cad0edd619c2e7aec22f7a86893f79407e96fd49b9b309f1a8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/an/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/an/Firefox%20150.0.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "a3e5b7383c5298a0527a300a50f24fe4df1b94f74c2e663e5fe5a217819a752f";
+      sha256 = "dfa35cf323f25d1eb7ee8e95fd4ce1a28d1201e1082af5782ee53a6e2831472f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ar/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ar/Firefox%20150.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "2fd7fd5d1145c47e9949f9e479dc00b980221cbd0a09882bf8ad59d744320128";
+      sha256 = "afeec7930073b35949ed52303b3efcb0874f7ece39c697f89aaa78d4c36bad82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ast/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ast/Firefox%20150.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "de5be8997fb4e8749f3f8c04f2e7767bc1a4e913bcd930ba3b93ea69893fdcf7";
+      sha256 = "59611ab660fd04204462ecd7c0f5378539cb32ea65ad9bf009837a52a79c742f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/az/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/az/Firefox%20150.0.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "8bd9bff878e7223ca9bffba1592d80ff6ae0b584b5402393f078db2178fb619b";
+      sha256 = "ad3573544a5856de13c62b2fe44351d6dd72f7d4a620492d6d5095fa495fca31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/be/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/be/Firefox%20150.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "2371584571ea965ec3b147af15ac8e91224809e42d41284dbd134d6a36c823ed";
+      sha256 = "2745f823e387caa1a511a0e4a9480ad00413eb97ca1ff775113f4f0cf4da4d15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/bg/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bg/Firefox%20150.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "8a6337a3b4ccb266470f15fa52611fd469d316256b0c6ae0322ec40fcf96bc01";
+      sha256 = "1566dfe0d417ea0b5fe474454f6ace8a30e673d61f940bb4e2f522e77ec21e64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/bn/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bn/Firefox%20150.0.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "401b530b2101b38b2bd06fa17c25c9e038d70aee86aa42e2da8e509e32007ddf";
+      sha256 = "509e9b7f2a205bdc985413e963aca3d56e32fceff571e1d290fc47d218838b91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/br/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/br/Firefox%20150.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "f158c662da66d41b7a75c810a31cb4fa71b779f44813f49fe99dc8cff6258dbb";
+      sha256 = "3046278dcc38b3454e8946797669d742b845f435fbed655309205dca6d4bcfb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/bs/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bs/Firefox%20150.0.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "556375a5e72e9bfa95454db2ee06be5d5cd344dc32d8c60f84d9f32d9a799ab9";
+      sha256 = "05e4a787bf8a8778035b9ada4a31fcf3bd03bb6178592ce47782baa7caa876ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ca-valencia/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ca-valencia/Firefox%20150.0.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "debfc27c246e0ceb7c20eb37ff344634d575915d35a06aebefa47d583b057b12";
+      sha256 = "913bcc960aebfb8bec9553308cb2e016bb9c1fe01a82f5440425480844f49717";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ca/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ca/Firefox%20150.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "408c5c150cb6a5977d46d878e70d1e5d71683fec0ad6d5c3242efc8b7353dca4";
+      sha256 = "a7efad433f593638bf2c8c9e72fb1f8bf57850ae2349638bbdec0c4180bbce3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/cak/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cak/Firefox%20150.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "734f3688fcfc8c21827e1966b545d7b2c52d4575bfe87c3e9f83786c9c72911a";
+      sha256 = "318b0df6f127c4f064304f3b26a708592d1c47a03c61d20f66661eba747eb2b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/cs/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cs/Firefox%20150.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "ef85a1014e78d60006d341709827a35bd8a0702191630f73c88678a90851be15";
+      sha256 = "071bf4034d1e1a7a1dccb90bec227ee4789a58500db939990c984e823a3c73a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/cy/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cy/Firefox%20150.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "04cd64e4dbdab63149a9cace466acc92a1ac78bd06beb4484dad669bf80784ad";
+      sha256 = "f62445587949d8e6d0ffbbc13d16be51be48b1bd1cbd947f05b7b73e94d1cbda";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/da/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/da/Firefox%20150.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "3c598a4f371ae5b86a396bbcafd3706a8b7f4604b678eae50dbe5617287f177b";
+      sha256 = "0bba3653fa7789ea14f51d16152fc9289b9a12ecb0a375da18fa2cbc738471c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/de/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/de/Firefox%20150.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "57acb06f41b93834199dc7a0711fc3919ea327b55c3d5856b774408fea50046e";
+      sha256 = "ab4a318fc950826e7e2d174c42c36f4d5f7311199dbebdc48ee5a0e0f8e2354d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/dsb/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/dsb/Firefox%20150.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "12c381cce912dc4069fc377a0a343b664445710ee8b8e9755a783eee15076cff";
+      sha256 = "2945d491b0aaf17f86e4b6e63a28d089246cb2cd0b0fa900cda1a73b1ed92837";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/el/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/el/Firefox%20150.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "8400c1760d435a87212a85548cbd7812d69833f03adbcb4703e1d027d8786d35";
+      sha256 = "3bcb364362142750d764812c2d86077cf87b592c4a72baccbb1a18e8de6c09c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/en-CA/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-CA/Firefox%20150.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "90ad15659be49d6d8a4884c6c951dac3d6f668aa0e43bcc27ae44dcace698dda";
+      sha256 = "088bdd837a5771b4aed7686f2e847867a5a1534bbcb983eac6ffac954ec1c079";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/en-GB/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-GB/Firefox%20150.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "e4fec96ba9d5e899513e55199c3de77387833f2bc0ae593e6467ddcdb8dfd306";
+      sha256 = "59ce8018013a9a647c91bffa9c0637821524b677ceb78542b983d6bc88c41649";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/en-US/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-US/Firefox%20150.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "3c4f90c4d8e52ded2ab3c173323d57c9f2943b448d05cb68f938760bb56d524f";
+      sha256 = "203667ff6b0920f89973d477b1394d99b4b78807a613914c97bb1b3200e6da1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/eo/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/eo/Firefox%20150.0.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "da848459fae17021589249f6d39c4d7d39ff5732ce4fe3572700b90b1c5deec3";
+      sha256 = "e6fec1759803d73fc22797cf99334f1eac4da522dbae4ec8b06abe6747880d34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/es-AR/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-AR/Firefox%20150.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "2e19ade06bef4b08298b5346802d291a21121f44eac5a728cd35e791fe08935a";
+      sha256 = "8752226080d09bdc42bfd8b91ed7e694159401837b5aa3218fd595872d3dd926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/es-CL/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-CL/Firefox%20150.0.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "0c8d9b31596b944983cbfde9fa6db894f8101f3efcecff25e9ccbeefbb85efcc";
+      sha256 = "406bfe67e7d92a3b365a314bfce1453c937d950cce47924eff577e924e28557c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/es-ES/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-ES/Firefox%20150.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "e3803389c75d884c11cfd4c0ea453b363e2a3e96c67c34a6603b78de4770e8ce";
+      sha256 = "0a14361560e5393d41f805bbcbac2dc24c3da16d218a18ca042d7913a552c679";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/es-MX/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-MX/Firefox%20150.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "8a0b78333eb98edaa6f947f616d5ef037e53152fbd0485e163be741f6fff4c0c";
+      sha256 = "4a6b627fc6804ed5a6fa4d797cf203690461d9cdb7faa6671ec11314114e867f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/et/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/et/Firefox%20150.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "dc9c52ba1101578895c5eb1cf5f928288dbc73ebb038544b1899299194a5bdac";
+      sha256 = "bd970085f5a9825ec8f4d96c9370a7b89a098f3812e8de27498ba497ea687499";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/eu/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/eu/Firefox%20150.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "af48ade7023f7bf28c401617127fc83959ee8dfd47e8815a50ba79e042b3fd00";
+      sha256 = "520f5732ca766b542c43e8fe520ce5b9e709b66b60d3cf71d36c5565a7f0a9f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/fa/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fa/Firefox%20150.0.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "a877c020de276a13278af602605eefac02f95c0e92c8258fe15c95c3fffdfdbe";
+      sha256 = "6d082bca5b04d9951d9bacc89b1b33f08758c695058a8adc3814c1a362f9520b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ff/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ff/Firefox%20150.0.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "0ee7906713ee776093901eb4746bf79eefe1df2ae2e0810fdbaf53742cbd5c4e";
+      sha256 = "16bb5c8740943579fdb32e82d5ff2b8498fde6251afd2778acfca74a8fe74b45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/fi/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fi/Firefox%20150.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "8e44d9f9a9dc7c3c676e35526226374f80c98bc1a6a5976143b58c4cf3f3dbb1";
+      sha256 = "4119a5949a8602cd3d472342f63b0d9aeb0707e509b07db6aca8ec01aae09220";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/fr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fr/Firefox%20150.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "113dde158c2528e34a1c52ef96e69965e12d666b5914b0295e9d277e90faee00";
+      sha256 = "cdacb332809c8c1862ccb1623031a296357ba6a53d288403445be93ca319a62f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/fur/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fur/Firefox%20150.0.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "a715cbdb3dab942165f561513444edaf1ab8e8ac6a986870af1838593dc9dabc";
+      sha256 = "82f6933e7e04e434904d7e7bc473097200ef071b8c1f59456c0f9f01afa9bef9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/fy-NL/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fy-NL/Firefox%20150.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "7191bb2bbc26638c8a86ab5d8a7b36f2e99d49f5cf0fbdffb1a6d756b1b4e4db";
+      sha256 = "dfc61dba9a4cd772be21c656e04da55ff6eed85adfe38d7cd752d139de7d813e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ga-IE/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ga-IE/Firefox%20150.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "8924594c360ebc68a68d7fefb80710221db783edce0fc72017532a37c95279e8";
+      sha256 = "5ac1ec34a95244839f896b5d9e9f3b89b4276a5ef660880f7ccdf5466938dbfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/gd/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gd/Firefox%20150.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "830557c158734e70e4c19a5dbc7e15757618a73bc7d1a8dfd969f97735b6d35e";
+      sha256 = "a5fe8008b3406793d673100d7d0ec6785a8c878015c11e9c064496547013c204";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/gl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gl/Firefox%20150.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "b7564959fe6feb69749e5f81748d82f6b4ee90f6033f73aa2e797b52c94cf80f";
+      sha256 = "7a2fa34d2526f047b3649b480e0d5046a46a8fdbdfe05a393bcd3b513ec416d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/gn/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gn/Firefox%20150.0.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "6316e287c5974a052ffd2dfd789473f75316e47f4949501498e7c87169ad5930";
+      sha256 = "b6d7bc020d2551632c0063528a35bd9c71dceaf437703f25676663b34e5a9030";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/gu-IN/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gu-IN/Firefox%20150.0.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "ed4112472ca95520805b0a788259b60d30571c59ef13f6176f6b600aca0aae14";
+      sha256 = "deced77571f57a83661c4ebe430bb945ad5135a3137524bee7cdfb39c9837150";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/he/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/he/Firefox%20150.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "0e89db2578b9b27175b09f52b552907f44d323bf94f2fb34de513397b24945e7";
+      sha256 = "147b97dbe732977acbc792956f82cc954d5891ba22717a533fc429f3061c1a07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/hi-IN/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hi-IN/Firefox%20150.0.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "3f7c928c9dd1caffb3504dd368daade3c54fcdc14a10975484b50552f678740a";
+      sha256 = "2625dc7f5959adbc72391e20abd839f6f0bd12b1a0a9d6775e0d270dd43f5f03";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/hr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hr/Firefox%20150.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "2788dc0bb77fa461748d1d4648a1a98cc5302302cfc441046f0fd875e7363cb1";
+      sha256 = "7d1bcc51e2660c132fb880dc2678cc7c4342ec891177f25dc33206e1bf78182a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/hsb/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hsb/Firefox%20150.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "4b84658f914efbccfe8f930e419ad1654faddae02daf7ee7ddd1083383f14345";
+      sha256 = "b63fc4a6ce0bfb1af6d7698b0ecd0dedbb3f79b4cbb5b4037b04eaf566a41aab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/hu/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hu/Firefox%20150.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "478b013d7f867f25058f1a9c4d3d4b50f8f2b930905f3ac008f16f7c652a15a6";
+      sha256 = "48629e9ae8212e03f2d9aa7c6d9bfc531218db350076161ae99808b9abf9069f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/hy-AM/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hy-AM/Firefox%20150.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "b44702c2dd7e817f32a7d434489f1f0795a525ecc22b540d91e100660d71a3f8";
+      sha256 = "249bc6e8fa8e2a46e00d13552d0ea4be0117a608f8d2a70578cbd2372465da22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ia/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ia/Firefox%20150.0.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "3c1caf4c17dc9a9cf24fee9e544ad43029a9d1d15e1e2444083705d687ce3100";
+      sha256 = "8f223ce9c7f32ca477bb9f1bc340e572ea2310f97ca0a04c02cbb811c17ec2b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/id/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/id/Firefox%20150.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "9431e6dda26af4262b70b80dffaa4c80e3d017d7bd66895be4280ba032108165";
+      sha256 = "bcb61e41d888ab6de6854086cbe1bbe3701a8709a48b84170264ab6576aebb73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/is/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/is/Firefox%20150.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "a7d33dbf78360b504bdc46e7b43bdbe09de735ee31d82a47834aa49f94cd2398";
+      sha256 = "79becad3d33edd9beb8ea1bf7dd20320b359020815fb41f07181a3e11c95fb20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/it/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/it/Firefox%20150.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "52fb87adef3276d6975a2b95017712b675ee3a592720b55f1c1b8a52c1e199ab";
+      sha256 = "6ef5871c8951a69ff4f013f6c69d360d613fa01563318b08d98f079b7070b461";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ja-JP-mac/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ja-JP-mac/Firefox%20150.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "62ed2d1ec4ba95c70932d530fb5bb900e40ea7cca7943f6ed85e29d706e0cf5c";
+      sha256 = "48d16cfd50ac3101e248c6c3a61d029a5573284bf47baea329427e7338b54685";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ka/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ka/Firefox%20150.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "0ac6bcf3cc43961d0d9139658a91e4393c2d94c1d20075d01504a7109b353705";
+      sha256 = "e0b956a354597d8f4e258f12193476bda64d3e3853528c9a28e3e3573abe64f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/kab/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kab/Firefox%20150.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "d35c0502704d43f348cf8959237e830ba4e65243bcbd9d2f0e7a420856e66cb2";
+      sha256 = "975021e54d958973ed42c9f51067f083885534b44701c4f27d671bfbffd929b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/kk/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kk/Firefox%20150.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "c5715dc85386553eb2428c05263001e86690d6f541b589b88e1ee2f0b6bd8d00";
+      sha256 = "832e6b87e2543d88ca3fa737e12cee984572eddba6dbd9a641a1452809259c84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/km/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/km/Firefox%20150.0.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "79d67bf1dab004140ec0f443c47e06c12d006a0329c3fee3a6020fa9c29f0e84";
+      sha256 = "bd9ebf1c384f0f50738eae6a2eea9fed6dc4f9044ac040a01acf6e9a7f7e6b85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/kn/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kn/Firefox%20150.0.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "bdae4800346cb39ef25fdbc96fc262e54b92ca11b5c99c144c1271e9490a07a7";
+      sha256 = "2223200b5fd4e96bef71c619255e4431f0162782ce71f4dfc7e0969d6273be10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ko/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ko/Firefox%20150.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "307dbb2455208cc55c6e0ee467bfee681e4d4917b02c615ce0944bba0ba945ae";
+      sha256 = "78e4bf62066f0608a218baf53ab0eae7e0c9214f335e7cb1a38072afb567513d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/lij/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lij/Firefox%20150.0.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "2ef684e1b06b1e918236e973ea033ae43ccf29849fd4dee961e1e29132da37d6";
+      sha256 = "ac4a69804ac2938a4756774180f0cf56d4587757cef872b8d825502d2f1965fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/lt/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lt/Firefox%20150.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "511321df070ad398340285376c7e6ea6f2e5a69cf6fffa13292f8f77d691809d";
+      sha256 = "60a74fcf7a1d7ba9f7eb1cd27360ec32c45016c9c0c9c70dd8d73ceb5fe1d994";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/lv/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lv/Firefox%20150.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "cd1cd39573da46fd0d513788ab3cc2cca4d7a08f804d3ffa848c7ba354c462d6";
+      sha256 = "aadbaab1bd91fbd442b8827591250ef5cff9040c21fd97d4285ba5d81d4457d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/mk/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/mk/Firefox%20150.0.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "18e1d16e36b79070de63c5707639a631bd716e7d866afabcecd3c606026f6b9a";
+      sha256 = "cee675f21a7d2ebf2f402270aee057ed8f0ce0092da12ae7cdd0fc85e3b18758";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/mr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/mr/Firefox%20150.0.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "447d278b00fe53125241a3c5d6255fff8fe1ecb36a571545825d77076828c4c0";
+      sha256 = "8868a5d395347301c55c5f78f697a1bb52de47253b7245589f34fe464c9a1c40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ms/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ms/Firefox%20150.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "2c43f9348400f3a96faa61aafe6e6de2a5bb87aea6d615eb3c4af178540a49f1";
+      sha256 = "750bc64c2ab827826aed35b6da9cca647399e3294df2cf630f5cc636d5da61bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/my/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/my/Firefox%20150.0.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "e371d65ebf9d91b69a5058f93d8abe15698df93372070bc19a5d1013de54134e";
+      sha256 = "038b6bcbb2721c70cfd33cdf879e83f8e5fb307c7c9cbec8ce907fb6e617730d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/nb-NO/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nb-NO/Firefox%20150.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ccaeb9afec6b7654b80fad8ac56c5f597afedf90835793067882157917c79518";
+      sha256 = "bc8935903eeea49bd45e8275f03e9e740c592e5a8169dce577dba14c1d1732a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ne-NP/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ne-NP/Firefox%20150.0.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "c2c6aa0d1711ae72a789b042310b87c8106e267b063024956148262c4870b319";
+      sha256 = "811c118292c752ad5fe1d1f253c47ed2d7f25c23d82eaaa4b20d19b5d0ced135";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/nl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nl/Firefox%20150.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "f593ef8ee7b2a2b117731c81dbf7e54a8921f3dd9d4dfcb916114ab98543cf3a";
+      sha256 = "41c818ea0b92df3e600c3c645f818645aa2e456f40734663fd9281b0732c4c51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/nn-NO/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nn-NO/Firefox%20150.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "e503702b7d13dd94fcb32fc23e63ea94cdb74ff0a34ef2103cda74c26936642d";
+      sha256 = "3184e233f39b648dd7580262ef66591180a92ce9e1596989f195ab5e4e2cda61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/oc/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/oc/Firefox%20150.0.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "5aa3e7639db665021ea0f438fe248870ef9c74b2b7f7bf10e47a0c826a738f4d";
+      sha256 = "c53ccceb610e24be9130fdbf4f603d7010a9dac35e5d914842ea4f676ddc3e74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/pa-IN/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pa-IN/Firefox%20150.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "e9eca004c9ffb34d100da9cc20958c03d1a46eac6e599890d8b7f7cb2b9d85f0";
+      sha256 = "0b99e9868f1a8881fddc1cba7e22ed997edc2df4d719a3dc5641cbcab0def7ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/pl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pl/Firefox%20150.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "9d6594eb2bb66586c22549d59f5db55b5f6279a4d3b5bf081dd8629f11af16cb";
+      sha256 = "02d38b35d439946e1cc06e341b82206a36face5a98d699ef4d525aa43ceb782a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/pt-BR/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pt-BR/Firefox%20150.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "0eb9e5126674e8050f5e17362d06a28fe8736ed8f2d512206557bdacc370afe3";
+      sha256 = "ee872bc7eccb06694ebb40dac937c56968b25a33d11ffffe9b1792fb304dc4f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/pt-PT/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pt-PT/Firefox%20150.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "ca26005a77491953bdc7ec7928f3178815f67ddf6ad6292ec6a7d8efdc351322";
+      sha256 = "8d44bb2dd36833035935bb29fd2006da070dd61b3017e1db3da950908eeeabfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/rm/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/rm/Firefox%20150.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7093779b74769b1730a873d887e12faab722d10e93fd0a17d2e3b7543516be87";
+      sha256 = "ecec9f55bfd0f42466eab33a9dacfa936188e82418a38ad41becf76ec26f4190";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ro/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ro/Firefox%20150.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "568070d89a2a0554da44fafee975886c4c082206e04cc690ca101362734992b2";
+      sha256 = "e6ca0b18792b55afd20aba6014cd2678fc091d6e772760a2ff14e2d39e1f6ab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ru/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ru/Firefox%20150.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "d63292b9119faf59578599c6280133feafef1830857b777501e2b38b0f71d730";
+      sha256 = "f009ae9bfd40cb6cf6a52ea952cd63c363acd1133fa80bb2536aff48412709fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sat/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sat/Firefox%20150.0.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "ec0b0068818987c5347ea3d9a067da75d133d200fe21eae63a542c9082b5e14e";
+      sha256 = "c6e6eed4908b8ee44d8c9d5726c93b19ed6a4c9d931b4a9caae9de842ff899b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sc/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sc/Firefox%20150.0.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "dd2243fe40ce6433273f9831a787882d9f20893fd7aa6e032839ddc5380546d5";
+      sha256 = "451744f61ac1bfd93fd3faf09f7a7570ee828a70191ab5290717cc28ae1e2c37";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sco/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sco/Firefox%20150.0.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ee678e23150f6ddb20d868c7c832ee5f59463d604c4ea33c60c0df7d28860ddd";
+      sha256 = "3f7dd6d01c68ca4cae050e44ede5b870341e66e5ff90156ff9ab083edb5605cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/si/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/si/Firefox%20150.0.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "dfe5b4b143cbf1c55ac5db17f78864274882416c089035b20a4f126bc22ebf96";
+      sha256 = "ddab892764e2019cfe657a794188808f6167bff7c32357a671a057aa0dc63e8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sk/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sk/Firefox%20150.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "870076b37afe4ee7876801704678d57f6f00622932b5997908ba16edfcbbbd36";
+      sha256 = "afccb64c6be439428912bb49f880c3491bd8666cfecd7ad26fcd2d410fdf1a24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/skr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/skr/Firefox%20150.0.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "f223485dd713ccd6e2ee5006ae9167fde722441c40292381628844dd5ed796b6";
+      sha256 = "e765f6c3844f21111f249a79610837d56237b99419bba3ee17c9b145ec35d396";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sl/Firefox%20150.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "d5951f27f4c9d1564331ee9be099f94acc2a31a304e7d9c8bcd9b40465592e50";
+      sha256 = "f621e3fd3e525d52758a4f43537176e740e1fd90207da8eab0215fecb01600d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/son/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/son/Firefox%20150.0.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "7acffca79e8d45c06b74134eade5af48e523ba04c780439b0631291abade95f7";
+      sha256 = "b2ae31affc04473ee6174b7cb08d49bda96e968d2918e363ea9c3ecdcdfcc420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sq/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sq/Firefox%20150.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "4e2039176fc6fd9155220c86348f6825f3ca9d2da6fd66146f5452d87f677ed6";
+      sha256 = "5d921780265bf24a565fee901b2c41aecedc87ad53f7410dd14265c5cae9fb9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sr/Firefox%20150.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8fe5d0dad4918ca5e1c7dc45ad500b7a10be7a3d6c4b2fb93bea923ededc8ddc";
+      sha256 = "8c867b4e486d8b9753b4201f8a939c31710fc6bb315eacc5a079d89f2626d4ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/sv-SE/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sv-SE/Firefox%20150.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "708620552991829c81a13ab2f71cf4f2b0daa0eec9ef7e1f7ddf0f71db015920";
+      sha256 = "c70e230922d4ae6ae8f4ab5e73d4b38a11c74c6fccb14782d58ba19ae1bd5e4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/szl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/szl/Firefox%20150.0.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "fe71a57e63fe57337ca52e973944cef4686e106b9dae6983ff009c1b1c90c27b";
+      sha256 = "3b33c959100bf3856ed18c3985e39fc044376c1eb8d96a8313a3813468810574";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ta/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ta/Firefox%20150.0.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "4ec31cf605fcbe4f9440000f14247bede9dab17a3850d4f023090f0cae42c9c5";
+      sha256 = "db395f1b99caa216113dbc504a109c4e4b8c59e644d7652c54064aced8bd4735";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/te/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/te/Firefox%20150.0.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "77ebdd18be9680ec5642df5d113b8569a51b33ab831e0e4463984358ff27e8fd";
+      sha256 = "800c86a587c6414d0e102d92dcd2e9e41919c6ce6fccc9a63cf0e02edf72b2d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/tg/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tg/Firefox%20150.0.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "3fe67b7101ef95dcb6a8fb5620a1de9c69ce142830ccb0f3c217c376cfe3ff12";
+      sha256 = "756a3e76cdba1e34455b7ac3c637020232f7099918b804bce489258d0a621dfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/th/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/th/Firefox%20150.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "d40026556974703ac4416af86a60200eca370695f9fe2c2512a6253c6ebaa2d8";
+      sha256 = "dad99883df22810004a23231b3c0bf261742de0ae8300a5a347334c295c59303";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/tl/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tl/Firefox%20150.0.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "d8d37b5664f7298579e030f06451a2903198a6d4b214db0aa58c19a03c43d5fc";
+      sha256 = "afc55a8ec60c36b98d4729a99567af1e9174088c9e886b8c1699395ef94840f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/tr/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tr/Firefox%20150.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "849f7044a82bfb91b9e7176c010c2390d0739ddd9719128da75e794daba7cd77";
+      sha256 = "567a203a8372b78ee0b8d1a8a2ae38834bd5bc33ff0c75a547dd3d766588c6e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/trs/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/trs/Firefox%20150.0.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "d199b9b43bd5fd419a0bb25cddf01902f27b303a01fa14c6081a04bd2434bdaf";
+      sha256 = "7fbb43a8fc8830a3de6618c36861cd4ae31263df065663be4b3de78720911636";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/uk/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/uk/Firefox%20150.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "109ce1cacd861d1bb9e6f16c2ec168a2fbc505926ad4afe72f0c5f257459c355";
+      sha256 = "a1e99a73327e9cc5dc910a85f859d4a8d17ee56db837926195432832936bf338";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/ur/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ur/Firefox%20150.0.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "cd4a29cf182344ab765c26639564eb2c362ef00ad46c5c28e999054058cd6c36";
+      sha256 = "dea1ca0d4db9cf690a0fc0cd09e54d61c3348331edb6b53708993ce7c9c33c41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/uz/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/uz/Firefox%20150.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "fe7514078842333b9bb07b704bc250d5bbe030db84dc1b28cc2ce70bc65291d9";
+      sha256 = "1a711465583bec0d94dad20da45d3c78b068b117bfa5602e3b69dc9c6da25a96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/vi/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/vi/Firefox%20150.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "2b36dea774e92328d1d4eadb51eea8cc2db8b510d15adab0ab4afed95cababfd";
+      sha256 = "22c6a53d890f66b01e47965f9ce9a0db22c71c0d722ad336bcf5dce930a4600d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/xh/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/xh/Firefox%20150.0.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "dac74d35bfeb606e535a178bc8cb5431d4ac5f3fc457a5f6a688f119bbcf831c";
+      sha256 = "253552c147b314f419c6a7ada0512e357b91b69331f817709d57849d543acffb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/zh-CN/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/zh-CN/Firefox%20150.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "514c3fe4d728f64bf53bb612521d81d8ea75f558a8cf7ae4b3da07f1558b7681";
+      sha256 = "858c6f75ed5c40e062dac3267d2e7b559af6f0618206a1f9b3be841bee6f4882";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/149.0.2/mac/zh-TW/Firefox%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/zh-TW/Firefox%20150.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "9d2c88564d5ef81285e8465eb18b11ea4ca7f3d853da6bc1159386e57c0057d2";
+      sha256 = "45360816b33a3e30eac95e845e9aa5bcb9f012f19fbae2aca3a8b80b74c2d4ae";
     }
   ];
 }

From 5e4bbd09754479e887a991a20043e2ea4170da8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Apr 2026 23:38:33 +0200
Subject: [PATCH 309/316] firefox-esr-140-unwrapped: 140.9.1esr -> 140.10.0esr

https://www.firefox.com/en-US/firefox/140.10.0/releasenotes/
---
 .../browsers/firefox/packages/firefox-esr-140.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
index 76661f7d88d8..ee0b2849228d 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
@@ -9,15 +9,15 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "140.9.1esr";
+  version = "140.10.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "119a4e4e536fd4534adcc4a546a988e553285f9326bf16e9771854ec2dc7d039a729aedc5925623e172260a5e154172c56a011f131068736eb2a89a8de611840";
+    sha512 = "56b274df21d0a908e826af6dda89a42b77fb0f597b75542b0330d448ae22be07a3636a3187ff1b488e466cc8c5264a8a75f79901354a49e35a3e99dcb0852514";
   };
 
   meta = {
-    changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
+    changelog = "https://www.firefox.com/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
     description = "Web browser built from Firefox source tree";
     homepage = "http://www.mozilla.com/en-US/firefox/";
     maintainers = with lib.maintainers; [ hexa ];

From de523ce492491a2a622df1a11d14632577867da5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 21:58:05 +0000
Subject: [PATCH 310/316] glitchtip: 6.1.4 -> 6.1.6

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

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index 23e6504dd076..6e87db12f35d 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -10,13 +10,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "6.1.5";
+  version = "6.1.6";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YngWs12wJLi3NgRT3RhGYy38dhOqBATYPMsXEbeoycU=";
+    hash = "sha256-CDszzMDvjC8GOg/Nuh1G2Vwq75tOrwBithYOTNubQhM=";
   };
 
   nodejs = nodejs_22;
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     npmDepsFetcherVersion = 3;
-    hash = "sha256-8T2Ci8S0YHyzY1jjgcNXt5mxUy/4toJrD2edUxtJz3M=";
+    hash = "sha256-pakglYUPHTB872cVG1IZ3WyYXR5+fFYQr5zvTh2IrMo=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 0f02c9d83c0f..9b3c6949bbb7 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -76,14 +76,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "6.1.4";
+  version = "6.1.6";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wju/QbIwdtNYQmRppCfjoaqb++spFZbqAsvBwwZyeUM=";
+    hash = "sha256-BUWLN3+ob934MgIoDLirY0O8fn6G3zmGA5wuVGPPp7w=";
   };
 
   postPatch = ''

From 48e723f27773eca0efede747c3e34e112e1a1dd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 23:03:29 +0000
Subject: [PATCH 311/316] ytdl-sub: 2026.03.19 -> 2026.04.13.post1

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

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index f18ef7cee3c6..03979e23b14b 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ytdl-sub";
-  version = "2026.03.19";
+  version = "2026.04.13.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = finalAttrs.version;
-    hash = "sha256-h7VCI2UrTCJvSOfIUwirAdcIkUkL80hItF/XqSpBKZk=";
+    hash = "sha256-nItpaxK2AuBn4yZLRGmUhqykawDIMZqxqPIXImZZwBE=";
   };
 
   postPatch = ''

From 195f6b92012fe49b7c95fdcc445416c79c1279ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Apr 2026 01:19:28 +0200
Subject: [PATCH 312/316] python3Packages.pydantic-graph: 1.82.0 -> 1.84.1

https://github.com/pydantic/pydantic-ai/compare/v1.82.0...v1.84.1
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index b28589a558a4..66d55f15247b 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.82.0";
+  version = "1.84.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M6CIoSHxxfWGU7zS4uZefRzP1vX/9Z3J1p4wmH2uiRg=";
+    hash = "sha256-LMfRGmLr51DzgJO97I/mJvyrVYD9tsF9OkCfw0ABWfw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From ed8a5e787a9938ba34d50f7bd3829819b71170c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Apr 2026 01:20:00 +0200
Subject: [PATCH 313/316] python3Packages.pydantic-ai-slim: 1.82.0 -> 1.84.1

https://github.com/pydantic/pydantic-ai/compare/v1.82.0...v1.84.1
---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 993e22e3d512..1eeddfc39a13 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.82.0";
+  version = "1.84.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M6CIoSHxxfWGU7zS4uZefRzP1vX/9Z3J1p4wmH2uiRg=";
+    hash = "sha256-LMfRGmLr51DzgJO97I/mJvyrVYD9tsF9OkCfw0ABWfw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";

From 051b9ea0fba41f9638d2a74ede399165b8c4e8eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Apr 2026 01:55:48 +0200
Subject: [PATCH 314/316] python3Packages.libknot: 3.5.3 -> 3.5.4

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

diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index 900e6b9e7bed..f03fb728feae 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.5.3";
+  version = "3.5.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jnJ7xWO29V04Xln8xSZ+ky5ravQ2rEpSRx8Xh6PWbyw=";
+    hash = "sha256-pwXOlz5oxtDOkUXWcqTSwPc9BeYaikG4E7qJ4rbVsAk=";
   };
 
   postPatch = ''

From b8a46e4c86b065eb0938686272e6032ff2047c9d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Apr 2026 01:56:06 +0200
Subject: [PATCH 315/316] prometheus-knot-exporter: 3.5.3 -> 3.5.4

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

diff --git a/pkgs/by-name/pr/prometheus-knot-exporter/package.nix b/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
index b02cfe0ddedc..8345fb8cda52 100644
--- a/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-knot-exporter/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.5.3";
+  version = "3.5.4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-sCmzYS6mjEUHomA25HRxJs2X+9Uv50ll4tqR2BAj0ro=";
+    hash = "sha256-3i1k3xCKdmDV/oNX8vhoJNzigx562OwdZ+oXbDjdbiI=";
   };
 
   build-system = [

From 09ddb874c10822e5470ae314ef73591b50f2cfb0 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 20 Apr 2026 19:26:32 -0400
Subject: [PATCH 316/316] github: Serialize git worktree initialization

Fixes #511286
---
 .github/actions/checkout/action.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index 1c0ca74cc31a..5b8d2f2d8c65 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -103,14 +103,14 @@ runs:
             await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
           }
 
-          // Create all worktrees in parallel.
-          await Promise.all(
-            commits.map(async ({ sha, path }) => {
-              await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
-              await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
-              await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
-            })
-          )
+          // Git worktree setup can race when multiple worktrees are created and
+          // initialized at the same time against one repository. See #511286.
+          // Keep the setup sequential so shared repo config updates cannot contend.
+          for (const { sha, path } of commits) {
+            await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
+            await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
+            await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
+          }
 
           // Apply pin bump to untrusted worktree
           if (pin_bump_sha) {