From abd94905b5a26111f13c1ee46483ee02218769b1 Mon Sep 17 00:00:00 2001
From: Jonathan Troyer <15098499+JonathanTroyer@users.noreply.github.com>
Date: Wed, 18 Mar 2026 10:28:56 -0500
Subject: [PATCH 01/16] nixos/regreet: fix extraCss store paths written as
 literal text

lib.isPath only matches Nix path literals, not strings containing
store paths. When extraCss is set to a derivation's outPath (a string
like "/nix/store/..."), the condition falls through to the `text`
branch, writing the store path as literal CSS content instead of using
it as a file source.

Add lib.isStorePath to the condition so string store paths are
correctly handled via `source`.

Ref: https://github.com/nix-community/stylix/issues/2190
---
 nixos/modules/programs/regreet.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix
index 151ad3a623ca..800642e2087a 100644
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@@ -159,7 +159,10 @@ in
 
     environment.etc = {
       "greetd/regreet.css" =
-        if lib.isPath cfg.extraCss then { source = cfg.extraCss; } else { text = cfg.extraCss; };
+        if lib.isPath cfg.extraCss || lib.isStorePath cfg.extraCss then
+          { source = cfg.extraCss; }
+        else
+          { text = cfg.extraCss; };
 
       "greetd/regreet.toml".source =
         if lib.isPath cfg.settings then

From 40b3b096a9d35effce234a530d2eff9ed0077f3d Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 11 Apr 2026 08:10:07 +0800
Subject: [PATCH 02/16] zinit: use $man and normalize install permissions

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

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index bd9ec48a7553..64e73f9cf6ba 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -34,20 +34,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     # Source files
     mkdir -p $out/share/zinit
-    install -m0644 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
-    install -m0755 share/git-process-output.zsh $out/share/zinit
-    install -m0644 share/rpm2cpio.zsh $out/share/zinit
+    install -m0444 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
+    install -m0555 share/git-process-output.zsh $out/share/zinit
+    install -m0444 share/rpm2cpio.zsh $out/share/zinit
 
     # Autocompletion
     installShellCompletion --zsh _zinit
 
     # Manpage
-    mkdir -p ${placeholder "man"}/share/man/man{1..9}
+    # otherwsise zinit tries to create them in the nix store
+    mkdir -p $man/share/man/man{1..9}
     installManPage doc/zinit.1
 
     mkdir -p $doc/share/doc/zinit
-    install -m0644 doc/zsdoc/*.adoc $doc/share/doc/zinit
-    install -m0644 doc/HACKING.md $doc/share/doc/zinit
+    install -m0444 doc/zsdoc/*.adoc $doc/share/doc/zinit
+    install -m0444 doc/HACKING.md $doc/share/doc/zinit
 
     runHook postInstall
   '';
@@ -55,8 +56,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   postFixup = ''
     substituteInPlace $out/share/zinit/zinit.zsh \
       --replace-fail zinit.1 zinit.1.gz \
-      --replace-fail "\''${ZINIT[BIN_DIR]}/doc" ${placeholder "man"}/share/man/man1 \
-      --replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=${placeholder "man"}/share/man"
+      --replace-fail "\''${ZINIT[BIN_DIR]}/doc" $man/share/man/man1 \
+      --replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=$man/share/man"
   '';
 
   passthru = {

From 4882231942db3d3d3c5b0157591066f96ffe62e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Apr 2026 12:54:26 +0000
Subject: [PATCH 03/16] oxlint: 1.58.0 -> 1.59.0

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

diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 29949da00c57..59acd68893fb 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -23,25 +23,25 @@
 # runs without an external linter, which leaves `jsPlugins` configs inert.
 stdenv.mkDerivation (finalAttrs: {
   pname = "oxlint";
-  version = "1.58.0";
+  version = "1.59.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-FqKqLO31ej9NgBdcCjzVkgjlfMHV6RZMcHbdBVVwhHs=";
+    hash = "sha256-o4vacOuKNUdLdkd6v94jQcevA8dCXG32fYmO2ZEj330=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-OpMGS5+pTPZvfY2EMxQMTWrCHhnxUQb9kQC/pLvrZSY=";
+    hash = "sha256-lppnmePEmbguoDDGyIM3gWbEX0ShgymoCjvrx1tK2Lw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-cYlY8UHd9yWWJkktycfhbvg/7N2rY9h/jYA+QQ20rK0=";
+    hash = "sha256-5T3lrAjMH03Rngc7u7oCLzp9E1sz7jOvG2XmPhouAz0=";
   };
 
   dontUseCmakeConfigure = true;

From 5fa08ada63593b3afdff9e25afeab79d086332fe Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 10 Mar 2026 20:44:52 +0100
Subject: [PATCH 04/16] xfr: init at 0.9.6

---
 pkgs/by-name/xf/xfr/package.nix | 57 +++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/xf/xfr/package.nix

diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix
new file mode 100644
index 000000000000..ba28136c9743
--- /dev/null
+++ b/pkgs/by-name/xf/xfr/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xfr";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "lance0";
+    repo = "xfr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wYhwDSL9C4rtWgkhaXimk3u03c9UHj2O9eEe8pRlj6c=";
+  };
+
+  cargoHash = "sha256-f8m5vFNk62iXyK1Sh3Dda0pV6rUNErymS6QxiCuZ8DA=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  postInstall = ''
+    installShellCompletion --cmd xfr \
+      --bash <($out/bin/xfr --completions bash) \
+      --fish <($out/bin/xfr --completions fish) \
+      --zsh <($out/bin/xfr --completions zsh)
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Modern iperf3 alternative with a live TUI, multi-client server, and QUIC support.";
+    mainProgram = "xfr";
+    homepage = "https://github.com/lance0/xfs";
+    changelog = "https://github.com/lance0/xfr/releases/tag/v${finalAttrs.version}";
+    maintainers = with lib.maintainers; [
+      _0x4A6F
+      herbetom
+    ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    platforms = lib.platforms.linux;
+  };
+})

From e7c273a44a793bb2999efc83d106448ad5d3af08 Mon Sep 17 00:00:00 2001
From: shaunkh <shaun.khundker@gmail.com>
Date: Mon, 13 Apr 2026 13:09:36 -0400
Subject: [PATCH 05/16] taskwarrior-tui: 0.26.6 -> 0.27.0

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

diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index 91945c1f5ade..948fa1d0479c 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taskwarrior-tui";
-  version = "0.26.6";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3RUTNQe0D9EquqWowsXI3Ho9mKdckC0XilDcNLmtfCk=";
+    sha256 = "sha256-8Gpf8D7XocdcHuJKLqfT1QeqkIa7cQHEAoTkKIl/RrU=";
   };
 
-  cargoHash = "sha256-dXdbvsQ1RJWORZMWsxF///8y1wsar6FiCblHyZD7t8o=";
+  cargoHash = "sha256-u0W1qVj0SRYVtnoWMqxeuBC9QvibogL4quiQLxzM8LM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doCheck = false;
 
   postInstall = ''
-    installManPage docs/taskwarrior-tui.1
     installShellCompletion completions/taskwarrior-tui.{bash,fish} --zsh completions/_taskwarrior-tui
   '';
 

From 7d8119771239bab74343c392bde5dd67fe297f86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:14:02 +0000
Subject: [PATCH 06/16] androidStudioPackages.beta: 2025.3.3.5 -> 2025.3.4.5

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 9884c28b95d3..89b6bf4014d6 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -21,9 +21,9 @@ let
     url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.6/android-studio-panda3-linux.tar.gz";
   };
   betaVersion = {
-    version = "2025.3.3.5"; # "Android Studio Panda 3 | 2025.3.3 RC 1"
-    sha256Hash = "sha256-lKpFKw2Oq7OlDrPjFJhMH3aQsJO7TeOKy7HGUCE0B1U=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.5/android-studio-panda3-rc1-linux.tar.gz";
+    version = "2025.3.4.5"; # "Android Studio Panda 4 | 2025.3.4 RC 1"
+    sha256Hash = "sha256-NiNq1j+rzPU4KsLKYymfi5/Vx2Bn3hK8I3OVIUFloX0=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
   };
   latestVersion = {
     version = "2025.3.4.4"; # "Android Studio Panda 4 | 2025.3.4 Canary 4"

From c010e03f8efbf8609f508974380307330ce1593a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:37:25 +0000
Subject: [PATCH 07/16] cursor-cli: 0-unstable-2026-03-30 ->
 0-unstable-2026-04-08

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 7e3c452a7f9d..63ca93d924fc 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-4NS2EdsRHS2+dkdDhicb/z4duyzG3fUn+dXVgBss4qA=";
+      url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-zHNiy5I61cN6BpfRv1TozdRk+2R/RNxIanCPkwqdfZE=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-dRBud1TlTcCoZ2naQ94D/FzUpEuS5lxvpowYbHtXgSU=";
+      url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-xcbIoTunBlL79SgE8h5PeT4HwguHY0UUQTiYdtppv7c=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-9z4nTSikG/WTksC0KvgK1m1gZqUjtNQ3sXOAJzikWEg=";
+      url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-O9OoPaBBHAAazYnEvHSB8okyDHdEqMu1A0CbUwsw93I=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-+l5f/W38rJlbOzrmsBdad+PX6MuzHaQxvhIwdgEDKrQ=";
+      url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-TGyQxZbn5yGTjqqfrbKRGXCp9MhuEHSV6oNZOIEoZDA=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2026-03-30";
+  version = "0-unstable-2026-04-08";
 
   src = sources.${hostPlatform.system};
 

From f8b8c5e73618d47cf8509b980541f193c4c82dae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 18:58:39 +0000
Subject: [PATCH 08/16] sesh: 2.24.2 -> 2.25.0

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

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index b5aed0e9ad72..b04e116fffec 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -8,7 +8,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "sesh";
-  version = "2.24.2";
+  version = "2.25.0";
 
   nativeBuildInputs = [
     go-mockery
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
     owner = "joshmedeski";
     repo = "sesh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iisAIn4km/uFw2DohA2mjoYmKgDQ3lYUH284Le3xQD0=";
+    hash = "sha256-azs1tf9eR4MVSdjMdd3U/xdPAANn1Kyamf0TwFrBSTU=";
   };
 
   # NOTE: prevent crash when getting vendor deps/hash
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     mockery
   '';
 
-  vendorHash = "sha256-WHMQ7O5EZ43biR7HxjO9gUq8skFPCZVOx47NIPp5iSE=";
+  vendorHash = "sha256-9IiDp/HaxXQAyNzuVBLiO+oIijBbdKBjssCmj8WV9V4=";
 
   ldflags = [
     "-s"

From b7cae3429d3a4b05b71eee1b73ce8abd6b2fb893 Mon Sep 17 00:00:00 2001
From: Michael Schneider <michael@m1-s.com>
Date: Mon, 13 Apr 2026 21:16:59 +0100
Subject: [PATCH 09/16] postgresql: reduce duplicated postgresqlWithPackages

---
 pkgs/servers/sql/postgresql/generic.nix | 37 ++++++++-----------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 6b1158e06aa0..d787431157fa 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -655,6 +655,14 @@ let
     f:
     let
       installedExtensions = f postgresql.pkgs;
+      recurse = postgresqlWithPackages {
+        inherit
+          buildEnv
+          lib
+          makeBinaryWrapper
+          postgresql
+          ;
+      };
       finalPackage = buildEnv {
         pname = "${postgresql.pname}-and-plugins";
         inherit (postgresql) version;
@@ -696,33 +704,10 @@ let
             };
           };
 
-          withJIT = postgresqlWithPackages {
-            inherit
-              buildEnv
-              lib
-              makeBinaryWrapper
-              postgresql
-              ;
-          } (_: installedExtensions ++ [ postgresql.jit ]);
-          withoutJIT = postgresqlWithPackages {
-            inherit
-              buildEnv
-              lib
-              makeBinaryWrapper
-              postgresql
-              ;
-          } (_: lib.remove postgresql.jit installedExtensions);
+          withJIT = recurse (_: installedExtensions ++ [ postgresql.jit ]);
+          withoutJIT = recurse (_: lib.remove postgresql.jit installedExtensions);
 
-          withPackages =
-            f':
-            postgresqlWithPackages {
-              inherit
-                buildEnv
-                lib
-                makeBinaryWrapper
-                postgresql
-                ;
-            } (ps: installedExtensions ++ f' ps);
+          withPackages = f': recurse (ps: installedExtensions ++ f' ps);
         };
       };
     in

From 2841a229e5dc0a89f29290c731e7c6c1e1a59065 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Apr 2026 22:40:47 +0000
Subject: [PATCH 10/16] dopamine: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 8de91bb93814..6702fad34cba 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -7,11 +7,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "dopamine";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
-    hash = "sha256-jSES9FJKrA2z6+f376Vc9NtHbRBG215Fc2335Vp/h1A=";
+    hash = "sha256-sm8/ZzSqa1CsQJ7XfQ67yAKX5rR9E8J/Z6v1rLVhNwI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a4ca468475ad93c5161c52642cd10ef8277cd2ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 00:18:45 +0000
Subject: [PATCH 11/16] terraform-providers.auth0_auth0: 1.42.0 -> 1.43.0

---
 .../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 67018d55cd5c..34d99fcd5a76 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -73,13 +73,13 @@
     "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
   },
   "auth0_auth0": {
-    "hash": "sha256-1gtBZPyzYk3UqLrRKHeyLt/2KPPP6QlJYo042XNDWkY=",
+    "hash": "sha256-Ha+2Z0gVNJ7oOozSWmW9XVpwlZo2LpvET03pAvh/3Mo=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.42.0",
+    "rev": "v1.43.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-g1xtMHyQ1zD5dzfB2+MtVUo42RG95TX9uni3Hf8FiRQ="
+    "vendorHash": "sha256-E6NOuhalQ9bXwRp6UTS5t35K3lOmFr9krGdRWtdtjGI="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",

From b698b0234a37bf8b9d352189d50320ab83927a12 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Tue, 14 Apr 2026 11:11:39 +0800
Subject: [PATCH 12/16] zashboard: init at 0.3.4

---
 pkgs/by-name/za/zashboard/package.nix | 58 +++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix            |  1 -
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/za/zashboard/package.nix

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
new file mode 100644
index 000000000000..9ab47d6579ae
--- /dev/null
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pnpm_10,
+  pnpm ? pnpm_10,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "zashboard";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Zephyruso";
+    repo = "zashboard";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-S5NrXjD34UwbsYQrHWMAgLc10/R1U2ZZ1gW0zkUXg6w=";
+  };
+
+  npmDeps = null;
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-DMR9vNgsWdBK0BbSGzxEZUBZpa4szF2NIFO/GePwIUw=";
+  };
+
+  nativeBuildInputs = [ pnpm ];
+  npmConfigHook = pnpmConfigHook;
+
+  postPatch = ''
+    substituteInPlace vite.config.ts \
+      --replace-fail "getGitCommitId()" '""'
+  '';
+
+  __darwinAllowLocalNetworking = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Dashboard Using Clash API";
+    homepage = "https://github.com/Zephyruso/zashboard";
+    changelog = "https://github.com/Zephyruso/zashboard/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chillcicada ];
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1331fca251ee..6fa1327c12f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2491,7 +2491,6 @@ mapAliases {
   zabbix72 = throw "'zabbix72' was removed as it has reached its end of life"; # Added 2026-02-11
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
-  zashboard = throw "'zashboard' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zdoom = throw "'zdoom' has been removed as it was broken and unmaintained upstream. Consider using UZDoom instead."; # Added 2026-04-04
   zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31

From e009415adbe6b3232232ec394c0e649abce441c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 03:14:34 +0000
Subject: [PATCH 13/16] server-box: 1.0.1351 -> 1.0.1365

---
 pkgs/by-name/se/server-box/package.nix       |  4 ++--
 pkgs/by-name/se/server-box/pubspec.lock.json | 24 ++++++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index 2fbcbed20c25..7212be05a57c 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -13,14 +13,14 @@
 }:
 
 let
-  version = "1.0.1351";
+  version = "1.0.1365";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-zCe45ESYbtMZaOZEppOKjSDs0l6+UtEQ7fs9r3yzDP4=";
+    hash = "sha256-rZTQ3ZDWfVWHKLg/+uEDWE5KzLK01S/JCj1KhOGzZsA=";
   };
 in
 flutter341.buildFlutterApplication {
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index 836bbb6fea5c..8e14d94dc821 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -971,6 +971,26 @@
       "source": "hosted",
       "version": "4.1.5+1"
     },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "js": {
       "dependency": "transitive",
       "description": {
@@ -1285,11 +1305,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
+        "sha256": "914a07484c4380e572998d30486e77e0d9cd2faec72fee268086d07bf7f302c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.23"
+      "version": "2.3.0"
     },
     "path_provider_foundation": {
       "dependency": "transitive",

From 6e58b21d31d30b6cad199f5a36b0b9127a21a2e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 03:51:57 +0000
Subject: [PATCH 14/16] valdi: 1.0.8 -> 1.0.11

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

diff --git a/pkgs/by-name/va/valdi/package.nix b/pkgs/by-name/va/valdi/package.nix
index fb79afa06c9c..40364ef56f81 100644
--- a/pkgs/by-name/va/valdi/package.nix
+++ b/pkgs/by-name/va/valdi/package.nix
@@ -6,20 +6,20 @@
 
 buildNpmPackage rec {
   pname = "valdi";
-  version = "1.0.8";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "Snapchat";
     repo = "Valdi";
-    rev = "e5bec35276f9aa5727384252fdeefff98dd53d6c";
-    hash = "sha256-cXLSZK7duxdgkAnDDJRDgEVdiz6dt08A7KvrmBfX37c=";
+    rev = "e4f8ab9fa885ac044121ae61186164e36824f18a";
+    hash = "sha256-VWcV7Jg4B50gtMm/6vDZqIo7PG8rqVSA4e9fn3Jw5eI=";
   };
 
   passthru.updateScript = ./update.sh;
 
   sourceRoot = "${src.name}/npm_modules/cli";
 
-  npmDepsHash = "sha256-h1DuH8HE5T7mEBQKlegbqkvRQSx3yEFJhcNVHh5Uo6Y=";
+  npmDepsHash = "sha256-UFdWHEdi6VQYLBQ7gmwxcLNRfoHLKwx4l0ANe5lZnZc=";
 
   meta = {
     description = "Cross-platform UI framework CLI by Snapchat";

From 8b87850e493f1d37b490aa97d672127fea4d62a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 04:22:46 +0000
Subject: [PATCH 15/16] python3Packages.hueble: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/hueble/default.nix b/pkgs/development/python-modules/hueble/default.nix
index 883ff3f88446..051b1bd68303 100644
--- a/pkgs/development/python-modules/hueble/default.nix
+++ b/pkgs/development/python-modules/hueble/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "hueble";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "flip-dots";
     repo = "HueBLE";
     tag = "v${version}";
-    hash = "sha256-BokZeQMgOseIlxs4u5BpYmGLKCM5IwSCvV8ic0ZVIeI=";
+    hash = "sha256-JbihHDG44PeS6rxUOXSRF9NlH/smUGz3/JrCmXqTT5s=";
   };
 
   build-system = [ setuptools ];

From 8c98ec6f14e16e168cf0d73a34dcf61bfa36eb2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 04:28:49 +0000
Subject: [PATCH 16/16] gemini-cli: 0.37.0 -> 0.37.2

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

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index c38404fc1986..3d8911c8311a 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -15,18 +15,18 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.37.0";
+  version = "0.37.2";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8UiHsBggmiJCs9sWGQoq0W2FNToAKFakGdAKvFl4ceo=";
+    hash = "sha256-jmVYARto5NoqX1DbT+jYQOTzMkeSi0Z7A5oKDN5fCnY=";
   };
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-lLywxLYmfO7EIYewPwISV5izAcOpy1350oJGwdsV6L8=";
+  npmDepsHash = "sha256-Hxxi2eKDLXucZLhUswcQ3kVEKoRNbs81m6IFr+CYxzs=";
 
   dontPatchElf = stdenv.isDarwin;