From cbe6c1767d43fef95beef325c91d1883a1c295b3 Mon Sep 17 00:00:00 2001
From: Rvfg <i@rvf6.com>
Date: Fri, 9 Jan 2026 16:55:42 +0800
Subject: [PATCH 001/138] nixos/nixos-containers: fix interface name escaping
 in systemd.device unit name

systemd escapes interface names in generated .device units.
e.g. dummy-test -> dummy\x2dtest
---
 nixos/modules/virtualisation/nixos-containers.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index ce86487bbbc3..771ebddcb92b 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  utils,
   ...
 }@host:
 
@@ -1052,8 +1053,8 @@ in
                 }
                 // (optionalAttrs containerConfig.autoStart {
                   wantedBy = [ "machines.target" ];
-                  wants = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${i}.device") cfg.interfaces);
-                  after = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${i}.device") cfg.interfaces);
+                  wants = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
+                  after = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
                   restartTriggers = [
                     containerConfig.path
                     config.environment.etc."${configurationDirectoryName}/${name}.conf".source

From 6ce61209e477cc26f8cee4cebbe6600624fa8760 Mon Sep 17 00:00:00 2001
From: Rvfg <i@rvf6.com>
Date: Fri, 9 Jan 2026 16:57:01 +0800
Subject: [PATCH 002/138] nixos/tests/containers-physical_interfaces: add
 autoStart test

---
 .../tests/containers-physical_interfaces.nix  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index a0be80df7852..0cc36a1673c3 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -25,6 +25,28 @@
           };
         };
       };
+    autoStart =
+      { ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        networking.useNetworkd = true;
+
+        systemd.network.netdevs."20-dummy-test".netdevConfig = {
+          Name = "dummy-test";
+          Kind = "dummy";
+        };
+
+        containers.autoStart = {
+          autoStart = true;
+          privateNetwork = true;
+          interfaces = [ "dummy-test" ];
+
+          config = {
+            networking.firewall.enable = false;
+          };
+        };
+      };
     bridged =
       { ... }:
       {
@@ -117,6 +139,16 @@
         # that the device is present in the container.
         server.succeed("nixos-container run server -- ip a show dev eth1 >&2")
 
+    with subtest("Simple dummy interface is up, with autoStart enabled"):
+        autoStart.wait_for_unit("container@autoStart")
+
+        # Check if any dependency of container@autoStart.service timed out.
+        # If a non-existing .device dependency is set in Wants, systemd will
+        # wait until that unit times out, resulting a delay of the container.
+        autoStart.fail("journalctl _PID=1 | grep sys-subsystem-net-devices | grep 'timed out'")
+
+        autoStart.succeed("nixos-container run autoStart -- ip a show dev dummy-test >&2")
+
     with subtest("Physical device in bridge in container can ping server"):
         bridged.wait_for_unit("default.target")
         bridged.succeed("nixos-container start bridged")

From bf3d134bd6aa5a6d4ddbbc8f7b09196c249c6106 Mon Sep 17 00:00:00 2001
From: Rvfg <i@rvf6.com>
Date: Fri, 9 Jan 2026 17:23:58 +0800
Subject: [PATCH 003/138] nixos/nixos-containers: format

---
 nixos/modules/virtualisation/nixos-containers.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 771ebddcb92b..b348fd83e51b 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -1053,8 +1053,14 @@ in
                 }
                 // (optionalAttrs containerConfig.autoStart {
                   wantedBy = [ "machines.target" ];
-                  wants = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
-                  after = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
+                  wants = [
+                    "network.target"
+                  ]
+                  ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
+                  after = [
+                    "network.target"
+                  ]
+                  ++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
                   restartTriggers = [
                     containerConfig.path
                     config.environment.etc."${configurationDirectoryName}/${name}.conf".source

From d3cb3bd006349d9a372c835ed472783423337894 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 24 Jan 2025 18:35:05 +0300
Subject: [PATCH 004/138] mathematica: allow user to provide version info

---
 pkgs/by-name/ma/mathematica/generic.nix  |   8 +-
 pkgs/by-name/ma/mathematica/package.nix  |  81 +++--
 pkgs/by-name/ma/mathematica/versions.nix | 420 +++++++++++------------
 3 files changed, 261 insertions(+), 248 deletions(-)

diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index d9be4633e5cb..27aa6e03ce0c 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -3,8 +3,6 @@
   autoPatchelfHook,
   lib,
   makeWrapper,
-  requireFile,
-  runCommand,
   stdenv,
   symlinkJoin,
   # arguments from default.nix
@@ -91,9 +89,13 @@ stdenv.mkDerivation {
     meta
     pname
     src
-    version
     ;
 
+  version =
+    version # a comment to trick nixfmt
+    + lib.optionalString cudaSupport "-cuda"
+    + lib.optionalString (lang != "en") "-${lang}";
+
   nativeBuildInputs = [
     autoPatchelfHook
     makeWrapper
diff --git a/pkgs/by-name/ma/mathematica/package.nix b/pkgs/by-name/ma/mathematica/package.nix
index 62ce806a98b0..c23563629324 100644
--- a/pkgs/by-name/ma/mathematica/package.nix
+++ b/pkgs/by-name/ma/mathematica/package.nix
@@ -1,34 +1,61 @@
 {
   callPackage,
+  requireFile,
   config,
   lib,
   cudaPackages,
   cudaSupport ? config.cudaSupport,
+  /*
+    If you want an older version or a version with web documentation or different language,
+    you can override any of the following attributes:
+    ```nix
+    my_mathematica = mathematica.override {
+      version = "X.Y.Z";
+      lang = "??";
+      webdoc = true;
+    };
+    ```
+    This, however, requires that the version you are requesting is known to nixpkgs
+    and is added as an entry in `./versions.nix`.
+    If it is not, you can manually specify all the necessary information:
+    ```nix
+    my_mathematica = mathematica.override {
+      versionInfo = {
+        version = "X.Y.Z";
+        lang = "en";
+        language = "English";
+        # Get this hash via a command similar to this:
+        # nix-hash --type sha256 --sri \
+        # $(nix store add-path Wolfram_XX.X.X_BNDL_LINUX.sh --name 'Wolfram_XX.X.X_BNDL_LINUX.sh')
+        hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+        installer = "Installer_File_Name.sh";
+      };
+    };
+    ```
+    `versionInfo` will take precedence over `version`, `lang`, & `webdoc`.
+  */
   lang ? "en",
   webdoc ? false,
   version ? null,
+  versionInfo ? null,
   /*
-    If you wish to completely override the src, use:
+    By default, this nix expression will try to find the installer in the Nix Store
+    based on the filename and hash (either found in ./versions.nix or provided by user in `versionInfo`).
+    But you can completely override the `src`:
+    ```nix
     my_mathematica = mathematica.override {
-      source = pkgs.requireFile {
-        name = "Mathematica_XX.X.X_BNDL_LINUX.sh";
-        # Get this hash via a command similar to this:
-        # nix-store --query --hash \
-        # $(nix store add-path Mathematica_XX.X.X_BNDL_LINUX.sh --name 'Mathematica_XX.X.X_BNDL_LINUX.sh')
-        sha256 = "0000000000000000000000000000000000000000000000000000";
-        message = ''
-          Your override for Mathematica includes a different src for the installer,
-          and it is missing.
-        '';
-        hashMode = "recursive";
+      source = pkgs.fetchurl {
+        url = "https://example.com/Wolfram_XX.X.X_BNDL_LINUX.sh";
+        hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
       };
-    }
+    };
+    ```
   */
   source ? null,
 }:
 
 let
-  versions = callPackage ./versions.nix { };
+  versions = import ./versions.nix;
 
   matching-versions = lib.sort (v1: v2: lib.versionOlder v2.version v1.version) (
     lib.filter (
@@ -56,19 +83,31 @@ let
     in
     lib.compareLists lib.compare (sublist as) (sublist bs) == 0;
 
-  matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc;
+  matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.installer != null) == webdoc;
+
+  selected = lib.defaultTo found-version versionInfo;
+
+  defaultSource = requireFile {
+    name = selected.installer;
+    message = ''
+      This nix expression requires that ${selected.installer} is
+      already part of the store. Find the file on your Mathematica CD
+      and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
+    '';
+    inherit (selected) hash;
+  };
 
 in
 
 callPackage ./generic.nix {
   inherit cudaSupport cudaPackages;
-  inherit (found-version) lang;
-  src = if source == null then found-version.src else source;
+
   pname = "mathematica";
-  version =
-    found-version.version
-    + lib.optionalString cudaSupport "-cuda"
-    + lib.optionalString (lang != "en") "-${lang}";
+
+  inherit (selected) version lang;
+
+  src = lib.defaultTo defaultSource source;
+
   meta = {
     description = "Wolfram Mathematica computational software system";
     homepage = "https://www.wolfram.com/mathematica/";
diff --git a/pkgs/by-name/ma/mathematica/versions.nix b/pkgs/by-name/ma/mathematica/versions.nix
index 339574ff5af5..67ae0e5d3086 100644
--- a/pkgs/by-name/ma/mathematica/versions.nix
+++ b/pkgs/by-name/ma/mathematica/versions.nix
@@ -1,231 +1,203 @@
-{ lib, requireFile }:
-
 /*
   To calculate the hash of an installer, use a command like this:
 
     nix --extra-experimental-features nix-command hash file <installer-file>
 */
-
-let
-  versions = [
-    {
-      version = "14.3.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-F4Rl4xz3vso+N//Uz7ZXvh5CrM6nsKMQxrRR11o/aNA=";
-      installer = "Wolfram_14.3.0_LIN.sh";
-    }
-    {
-      version = "14.3.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-FvcXXijGOcuRA1UFyVvPIyR1YaK/qrkMpLxf+mz+A/c=";
-      installer = "Wolfram_14.3.0_LIN_Bndl.sh";
-    }
-    {
-      version = "14.2.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc=";
-      installer = "Wolfram_14.2.1_LIN.sh";
-    }
-    {
-      version = "14.2.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg=";
-      installer = "Wolfram_14.2.1_LIN_Bndl.sh";
-    }
-    {
-      version = "14.2.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-wIuyWufKuchPl7phCxVM9vIIkjUHfRxIECfDyGJliqs=";
-      installer = "Wolfram_14.2.0_LIN.sh";
-    }
-    {
-      version = "14.2.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-wY6acGoUc7y22enSi7RrcRFLvvPGaeYTta4yWExlXho=";
-      installer = "Wolfram_14.2.0_LIN_Bndl.sh";
-    }
-    {
-      version = "14.1.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns=";
-      installer = "Wolfram_14.1.0_LIN.sh";
-    }
-    {
-      version = "14.1.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310=";
-      installer = "Wolfram_14.1.0_LIN_Bndl.sh";
-    }
-    {
-      version = "14.0.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI=";
-      installer = "Mathematica_14.0.0_LINUX.sh";
-    }
-    {
-      version = "14.0.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4=";
-      installer = "Mathematica_14.0.0_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.3.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo=";
-      installer = "Mathematica_13.3.1_LINUX.sh";
-    }
-    {
-      version = "13.3.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk=";
-      installer = "Mathematica_13.3.1_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.3.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-24MC0O+kBUe3TrwXUb+7QZt8tQHvWVIT8F9B6Ih+4k8=";
-      installer = "Mathematica_13.3.0_LINUX.sh";
-    }
-    {
-      version = "13.3.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-91bw7+4ht+7g+eF32BNYf77yEQWyuPffisj4kB63pcI=";
-      installer = "Mathematica_13.3.0_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.2.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w=";
-      installer = "Mathematica_13.2.1_LINUX.sh";
-    }
-    {
-      version = "13.2.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8=";
-      installer = "Mathematica_13.2.1_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.2.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o=";
-      installer = "Mathematica_13.2.0_LINUX.sh";
-    }
-    {
-      version = "13.2.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";
-      installer = "Mathematica_13.2.0_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.1.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM=";
-      installer = "Mathematica_13.1.0_LINUX.sh";
-    }
-    {
-      version = "13.1.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
-      installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.0.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-NnKpIMG0rxr9SAcz9tZ2Zbr4JYdX3+WabtbXRAzybbo=";
-      installer = "Mathematica_13.0.1_BNDL_LINUX.sh";
-    }
-    {
-      version = "13.0.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-FbutOaWZUDEyXR0Xj2OwDnFwbT7JAB66bRaB+8mR0+E=";
-      installer = "Mathematica_13.0.0_BNDL_LINUX.sh";
-    }
-    {
-      version = "12.3.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-UbnKsS/ZGwCep61JaKLIpZ6U3FXS5swdcSrNW6LE1Qk=";
-      installer = "Mathematica_12.3.1_LINUX.sh";
-    }
-    {
-      version = "12.3.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-BF3wRfbnlt7Vn2TrLg8ZSayI3LodW24F+1PqCkrtchU=";
-      installer = "Mathematica_12.3.0_LINUX.sh";
-    }
-    {
-      version = "12.2.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-O2Z2ogPGrbfpxBilSEsDeXQoe1vgnGTn3+p03cDkANc=";
-      installer = "Mathematica_12.2.0_LINUX.sh";
-    }
-    {
-      version = "12.1.1";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-rUe4hr5KmGTXD1I/eSYVoFHU68mH2aD2VLZFtOtDswo=";
-      installer = "Mathematica_12.1.1_LINUX.sh";
-    }
-    {
-      version = "12.1.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-56P1KKOTJkQj+K9wppAsnYpej/YB3VUNL7DPLYGgqZY=";
-      installer = "Mathematica_12.1.0_LINUX.sh";
-    }
-    {
-      version = "12.0.0";
-      lang = "en";
-      language = "English";
-      sha256 = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc=";
-      installer = "Mathematica_12.0.0_LINUX.sh";
-    }
-  ];
-
-in
-
-lib.flip map versions (
+[
   {
-    version,
-    lang,
-    language,
-    sha256,
-    installer,
-  }:
-  {
-    inherit version lang;
-    src = requireFile {
-      name = installer;
-      message = ''
-        This nix expression requires that ${installer} is
-        already part of the store. Find the file on your Mathematica CD
-        and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
-      '';
-      inherit sha256;
-    };
+    version = "14.3.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-F4Rl4xz3vso+N//Uz7ZXvh5CrM6nsKMQxrRR11o/aNA=";
+    installer = "Wolfram_14.3.0_LIN.sh";
   }
-)
+  {
+    version = "14.3.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-FvcXXijGOcuRA1UFyVvPIyR1YaK/qrkMpLxf+mz+A/c=";
+    installer = "Wolfram_14.3.0_LIN_Bndl.sh";
+  }
+  {
+    version = "14.2.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc=";
+    installer = "Wolfram_14.2.1_LIN.sh";
+  }
+  {
+    version = "14.2.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg=";
+    installer = "Wolfram_14.2.1_LIN_Bndl.sh";
+  }
+  {
+    version = "14.2.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-wIuyWufKuchPl7phCxVM9vIIkjUHfRxIECfDyGJliqs=";
+    installer = "Wolfram_14.2.0_LIN.sh";
+  }
+  {
+    version = "14.2.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-wY6acGoUc7y22enSi7RrcRFLvvPGaeYTta4yWExlXho=";
+    installer = "Wolfram_14.2.0_LIN_Bndl.sh";
+  }
+  {
+    version = "14.1.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns=";
+    installer = "Wolfram_14.1.0_LIN.sh";
+  }
+  {
+    version = "14.1.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310=";
+    installer = "Wolfram_14.1.0_LIN_Bndl.sh";
+  }
+  {
+    version = "14.0.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI=";
+    installer = "Mathematica_14.0.0_LINUX.sh";
+  }
+  {
+    version = "14.0.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4=";
+    installer = "Mathematica_14.0.0_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.3.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo=";
+    installer = "Mathematica_13.3.1_LINUX.sh";
+  }
+  {
+    version = "13.3.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk=";
+    installer = "Mathematica_13.3.1_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.3.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-24MC0O+kBUe3TrwXUb+7QZt8tQHvWVIT8F9B6Ih+4k8=";
+    installer = "Mathematica_13.3.0_LINUX.sh";
+  }
+  {
+    version = "13.3.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-91bw7+4ht+7g+eF32BNYf77yEQWyuPffisj4kB63pcI=";
+    installer = "Mathematica_13.3.0_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.2.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w=";
+    installer = "Mathematica_13.2.1_LINUX.sh";
+  }
+  {
+    version = "13.2.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8=";
+    installer = "Mathematica_13.2.1_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.2.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o=";
+    installer = "Mathematica_13.2.0_LINUX.sh";
+  }
+  {
+    version = "13.2.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";
+    installer = "Mathematica_13.2.0_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.1.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM=";
+    installer = "Mathematica_13.1.0_LINUX.sh";
+  }
+  {
+    version = "13.1.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
+    installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.0.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-NnKpIMG0rxr9SAcz9tZ2Zbr4JYdX3+WabtbXRAzybbo=";
+    installer = "Mathematica_13.0.1_BNDL_LINUX.sh";
+  }
+  {
+    version = "13.0.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-FbutOaWZUDEyXR0Xj2OwDnFwbT7JAB66bRaB+8mR0+E=";
+    installer = "Mathematica_13.0.0_BNDL_LINUX.sh";
+  }
+  {
+    version = "12.3.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-UbnKsS/ZGwCep61JaKLIpZ6U3FXS5swdcSrNW6LE1Qk=";
+    installer = "Mathematica_12.3.1_LINUX.sh";
+  }
+  {
+    version = "12.3.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-BF3wRfbnlt7Vn2TrLg8ZSayI3LodW24F+1PqCkrtchU=";
+    installer = "Mathematica_12.3.0_LINUX.sh";
+  }
+  {
+    version = "12.2.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-O2Z2ogPGrbfpxBilSEsDeXQoe1vgnGTn3+p03cDkANc=";
+    installer = "Mathematica_12.2.0_LINUX.sh";
+  }
+  {
+    version = "12.1.1";
+    lang = "en";
+    language = "English";
+    hash = "sha256-rUe4hr5KmGTXD1I/eSYVoFHU68mH2aD2VLZFtOtDswo=";
+    installer = "Mathematica_12.1.1_LINUX.sh";
+  }
+  {
+    version = "12.1.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-56P1KKOTJkQj+K9wppAsnYpej/YB3VUNL7DPLYGgqZY=";
+    installer = "Mathematica_12.1.0_LINUX.sh";
+  }
+  {
+    version = "12.0.0";
+    lang = "en";
+    language = "English";
+    hash = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc=";
+    installer = "Mathematica_12.0.0_LINUX.sh";
+  }
+]

From 189afacd24afc35ab8e9ce821a7b512be6d912e9 Mon Sep 17 00:00:00 2001
From: Mario <191101255+wariuccio@users.noreply.github.com>
Date: Thu, 29 Jan 2026 20:46:19 +0000
Subject: [PATCH 005/138] papra: init at 26.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: bitbloxhub <45184892+bitbloxhub@users.noreply.github.com>
Co-Authored-By: Sandro Jäckel <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/pa/papra/package.nix | 101 ++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 pkgs/by-name/pa/papra/package.nix

diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix
new file mode 100644
index 000000000000..2853e4f2cf82
--- /dev/null
+++ b/pkgs/by-name/pa/papra/package.nix
@@ -0,0 +1,101 @@
+{
+  makeBinaryWrapper,
+  nodejs,
+  node-gyp,
+  fetchPnpmDeps,
+  fetchFromGitHub,
+  pnpm_10,
+  pnpmConfigHook,
+  stdenv,
+  lib,
+  vips,
+  pkg-config,
+  python3,
+}:
+let
+  pnpm = pnpm_10;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "papra";
+  version = "26.2.2";
+  src = fetchFromGitHub {
+    owner = "papra-hq";
+    repo = "papra";
+    tag = "@papra/app@${finalAttrs.version}";
+    hash = "sha256-0MIar+fBwXRE8LlVLZDx/C0GOYVpobDTqFwkMs2k06Y=";
+  };
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    nodejs
+    node-gyp
+    python3
+    pkg-config
+    pnpmConfigHook
+    pnpm
+  ];
+
+  buildInputs = [
+    vips
+  ];
+
+  env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;
+  env.npm_config_nodedir = nodejs;
+
+  postPatch = ''
+    substituteInPlace apps/papra-server/src/modules/app/static-assets/static-assets.routes.ts \
+      --replace-fail "./public" "$out/lib/public" \
+      --replace-fail "public/index.html" "$out/lib/public/index.html"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm config set inject-workspace-packages true
+
+    pushd node_modules/sharp
+    pnpm run install
+    popd
+
+    pnpm --filter "@papra/app-client..." run build
+    pnpm --filter "@papra/app-server..." run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib}
+
+    pnpm deploy --filter=@papra/app-server --prod $out/lib/
+
+    mkdir -p $out/lib/public
+    cp -r apps/papra-client/dist/* $out/lib/public/
+
+    makeWrapper "${lib.getExe nodejs}" $out/bin/papra \
+      --add-flags "$out/lib/dist/index.js" \
+      --set "NODE_PATH" $out/lib/node_modules
+
+    runHook postInstall
+  '';
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-NQakyRlL6deG13yt+FlmVcVvEkNWHW0Lhf/3NecfwaE=";
+    pnpmWorkspaces = [
+      "@papra/app-client..."
+      "@papra/app-server..."
+    ];
+  };
+
+  meta = {
+    description = "Open-source document management platform designed to help you organize, secure, and archive your files effortlessly.";
+    homepage = "https://papra.app/";
+    changelog = "https://github.com/papra-hq/papra/releases";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ wariuccio ];
+  };
+})

From ed235bc82584f15120b5480e38a4157640dcee43 Mon Sep 17 00:00:00 2001
From: Mario <191101255+wariuccio@users.noreply.github.com>
Date: Thu, 29 Jan 2026 20:47:10 +0000
Subject: [PATCH 006/138] nixos/papra: init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Sandro Jäckel <sandro.jaeckel@gmail.com>
---
 .../manual/release-notes/rl-2605.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/papra.nix     | 103 ++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/papra.nix

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index dea390ae8dfc..63052e584eb7 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -20,6 +20,8 @@
 
 - [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
 
+- [papra](https://papra.app/), an open-source document management platform designed to help you organize, secure, and archive your files effortlessly. Available as [services.papra](#opt-services.papra.enable).
+
 - [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).
 
 - [Tailscale Serve](https://tailscale.com/kb/1552/tailscale-services), configure Tailscale Serve for exposing local services to your tailnet. Available as [services.tailscale.serve](#opt-services.tailscale.serve.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a6913729e510..e44b06d76c51 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1709,6 +1709,7 @@
   ./services/web-apps/openwebrx.nix
   ./services/web-apps/outline.nix
   ./services/web-apps/pairdrop.nix
+  ./services/web-apps/papra.nix
   ./services/web-apps/part-db.nix
   ./services/web-apps/peering-manager.nix
   ./services/web-apps/peertube-runner.nix
diff --git a/nixos/modules/services/web-apps/papra.nix b/nixos/modules/services/web-apps/papra.nix
new file mode 100644
index 000000000000..8ee55736f1eb
--- /dev/null
+++ b/nixos/modules/services/web-apps/papra.nix
@@ -0,0 +1,103 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.papra;
+  defaultUser = "papra";
+  defaultGroup = "papra";
+  defaultEnv = {
+    SERVER_SERVE_PUBLIC_DIR = true;
+    PORT = 1221;
+    DATABASE_URL = "file:/var/lib/papra/db.sqlite";
+    DOCUMENT_STORAGE_FILESYSTEM_ROOT = "/var/lib/papra/local-documents";
+  };
+in
+{
+  options = {
+    services.papra = {
+      enable = lib.mkEnableOption "Papra";
+
+      user = lib.mkOption {
+        default = defaultUser;
+        type = lib.types.str;
+        description = "User under which Papra runs.";
+      };
+
+      group = lib.mkOption {
+        default = defaultGroup;
+        type = lib.types.str;
+        description = ''
+          If the default user "${defaultUser}" is configured then this is the primary
+          group of that user.
+        '';
+      };
+
+      package = lib.mkPackageOption pkgs "papra" { };
+
+      environment = lib.mkOption {
+        type =
+          with lib.types;
+          attrsOf (oneOf [
+            str
+            int
+            float
+            bool
+            path
+            package
+          ]);
+        default = defaultEnv;
+        example = {
+          PORT = 1221;
+        };
+        description = "Environment variables to set for the service.";
+      };
+
+      environmentFile = lib.mkOption {
+        type = with lib.types; nullOr path;
+        default = null;
+        description = "Environment file, usefult to provide secrets to the service";
+      };
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    users = {
+      users = lib.optionalAttrs (cfg.user == defaultUser) {
+        "${defaultUser}" = {
+          description = "Papra service user";
+          isSystemUser = true;
+          group = cfg.group;
+        };
+      };
+      groups = lib.optionalAttrs (cfg.group == defaultGroup) {
+        "${defaultGroup}" = { };
+      };
+    };
+
+    systemd.services.papra = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Restart = "on-failure";
+        ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts";
+        ExecStart = "${cfg.package}/bin/papra";
+        User = cfg.user;
+        Group = cfg.group;
+        StateDirectory = "papra";
+        EnvironmentFile = cfg.environmentFile;
+      };
+      environment =
+        let
+          environmentwithDefaults = defaultEnv // cfg.environment;
+        in
+        (lib.mapAttrs (
+          _: s: if lib.isBool s then lib.boolToString s else toString s
+        ) environmentwithDefaults);
+    };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ wariuccio ];
+  };
+}

From 02a1f1c0cf2e70c0cadbaaa3f5022d70cb6f0f0c Mon Sep 17 00:00:00 2001
From: Jhony Elmer Angulo Fabian <leohjaf@gmail.com>
Date: Wed, 4 Mar 2026 01:30:15 -0500
Subject: [PATCH 007/138] tree-sitter-grammars.tree-sitter-vue: pin to
 2026-01-24 commit

Switch tree-sitter-vue source to tree-sitter-grammars/tree-sitter-vue
and pin it to commit ce8011a414fdf8091f4e4071752efc376f4afb08
(2026-01-24), while keeping version at 0.1.0 because upstream
does not provide a newer tag/release version
---
 .../parsing/tree-sitter/grammars/grammar-sources.nix     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 87b94bfa0e78..688460ca8199 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -2867,10 +2867,11 @@
   };
 
   vue = {
-    version = "0.2.1-unstable-2021-04-04";
-    url = "github:ikatyang/tree-sitter-vue";
-    rev = "91fe2754796cd8fba5f229505a23fa08f3546c06";
-    hash = "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=";
+    version = "0.1.0";
+    url = "github:tree-sitter-grammars/tree-sitter-vue";
+    # NOTE: no upstream tag; using commit from 2026-01-24
+    rev = "ce8011a414fdf8091f4e4071752efc376f4afb08";
+    hash = "sha256-pCoyDRuRCpfpJh7vQIM8yZz5aPcqrdYlTJGM/K5oQFs=";
     meta = {
       license = lib.licenses.mit;
     };

From b9c9618c0dfebf889a6c9aae3e3935be0b617e47 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Mar 2026 14:16:32 +0100
Subject: [PATCH 008/138] python3Packages.sentry-sdk: 2.53.0 -> 2.54.0

https://github.com/getsentry/sentry-python/blob/2.54.0/CHANGELOG.md
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index ed374872ea05..6e5d7602a967 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sentry-sdk";
-  version = "2.53.0";
+  version = "2.54.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = finalAttrs.version;
-    hash = "sha256-QPbfgzXPf1pp9BRaehS6e1yaeOegFsdjcAeqvrfx0zA=";
+    hash = "sha256-+NMOfOhzj7QAkwspI28wGNs6ATDzH6HWT479+7l9DBo=";
   };
 
   postPatch = ''

From 8abcd1fb0447850aabb2aaf7e882b76abafdaf38 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 9 Mar 2026 17:35:11 +0000
Subject: [PATCH 009/138] libpcap: allow building with RDMA protocol support

disabled by default for a couple reasons:
1. enabling would cause a mass-rebuild.
2. libpcap is an indirect input to rdma-core, hence a circular
   dependency. but rdma-core doesn't actually use libpcap: this loop
   will be removed by <https://github.com/NixOS/nixpkgs/pull/498294>.
---
 pkgs/by-name/li/libpcap/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/li/libpcap/package.nix b/pkgs/by-name/li/libpcap/package.nix
index 057d3e08e4dc..fefde4c82aa9 100644
--- a/pkgs/by-name/li/libpcap/package.nix
+++ b/pkgs/by-name/li/libpcap/package.nix
@@ -10,7 +10,9 @@
   libnl,
   libxcrypt,
   pkg-config,
+  rdma-core,
   withBluez ? false,
+  withRdma ? false,
   withRemote ? false,
 
   # for passthru.tests
@@ -46,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     bash
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl ]
+  ++ lib.optionals withRdma [ rdma-core ]
   ++ lib.optionals withRemote [ libxcrypt ]
   ++ lib.optionals withBluez [ bluez ];
 
@@ -63,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--disable-universal"
   ]
+  ++ lib.optionals withRdma [
+    "--enable-rdma"
+  ]
   ++ lib.optionals withRemote [
     "--enable-remote"
   ]

From 354b40b89de04a46b04e959288fc1f4aeac535c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2026 15:16:24 +0000
Subject: [PATCH 010/138] ppsspp: 1.19.3 -> 1.20.3

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

diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index 1bc3b1a69348..0509acbba662 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString enableQt "-qt"
     + lib.optionalString (!enableQt) "-sdl"
     + lib.optionalString forceWayland "-wayland";
-  version = "1.19.3";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-71oIjUXYGFNyhcXQP65Bd2gYF6golrPR4USwS7bTxFQ=";
+    hash = "sha256-BE+4juBSl4mwN7hQNevC1F4UMoVEWB1zhRUgB2ejf/M=";
   };
 
   patches = lib.optionals useSystemFfmpeg [

From 97c94811dbc7675ed84e8db6769e71ebe3d30209 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 21 Mar 2026 00:42:53 +0800
Subject: [PATCH 011/138] nezha: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index e88c1160a096..0aebafab97c9 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo126Module,
+  buildGoModule,
   fetchFromGitHub,
   go-swag,
   versionCheckHook,
@@ -46,15 +46,15 @@ let
     in
     (formats.yaml { }).generate "frontend-templates.yaml" (officialThemes ++ communityThemes);
 in
-buildGo126Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "nezha";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g5mXt0NfRFezLmQ27FAE+wU+a+sSHlCzx2oh/z1Xz+I=";
+    hash = "sha256-ZqDqua76y9b2bqcb8kVzZHqQzBAuhoxWT4yEj95wvyk=";
   };
 
   proxyVendor = true;
@@ -94,7 +94,7 @@ buildGo126Module (finalAttrs: {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
   '';
 
-  vendorHash = "sha256-k1Xcmsx1QnkDCmSijtdG+rB34L6d1AbNLuU14zWTDhY=";
+  vendorHash = "sha256-gRvWCX+6fSTEbL6Rp7FRoqNXz1HRVIlYl4ADi/fIq80=";
 
   ldflags = [
     "-s"

From 8b822ed1bdff1b635f35b3b7d2b8c64c30b8a36c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Mar 2026 00:41:15 +0100
Subject: [PATCH 012/138] python3Packages.samplerate: 0.2.3 -> 0.2.4

https://github.com/tuxu/python-samplerate/releases/tag/v0.2.4
---
 .../python-modules/samplerate/default.nix           |  9 ++-------
 .../samplerate/numpy-2.4-compat.patch               | 13 -------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch

diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index 2812c7ba4c07..99cf2ec1e647 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -23,21 +23,16 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "samplerate";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tuxu";
     repo = "python-samplerate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7FAdIqsYCapmEAYiAuoS5m/jFExXZX3hn3kwxn9NWEc=";
+    hash = "sha256-wetpPAoCenzOo6pD3+F0YNb/fc1BvaeKiw325C19rS0=";
   };
 
-  patches = [
-    # https://github.com/tuxu/python-samplerate/pull/33
-    ./numpy-2.4-compat.patch
-  ];
-
   # unvendor pybind11, libsamplerate
   postPatch = ''
     rm -r external
diff --git a/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch b/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch
deleted file mode 100644
index 6e980aa31ba9..000000000000
--- a/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_api.py b/tests/test_api.py
-index 1fef8de..f5b8fac 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -48,7 +48,7 @@ def test_simple(data, converter_type, ratio=2.0):
- def test_process(data, converter_type, ratio=2.0):
-     num_channels, input_data = data
-     src = samplerate.Resampler(converter_type, num_channels)
--    src.process(input_data, ratio)
-+    src.process(input_data.copy(), ratio)
- 
- 
- def test_match(data, converter_type, ratio=2.0):

From b91eaf9dbacf2a28f1f5c7c28e1c6be2b5ad0a51 Mon Sep 17 00:00:00 2001
From: Paul J <paul@trespaul.com>
Date: Mon, 23 Mar 2026 10:48:19 +0200
Subject: [PATCH 013/138] hayagriva: add trespaul as maintainer

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

diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 54ce9213f6a5..eab9cff39089 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ trespaul ];
     mainProgram = "hayagriva";
   };
 })

From 81d08b43d36e0abb6f46f62837a344800c6384c6 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 24 Mar 2026 01:31:03 +0100
Subject: [PATCH 014/138] pvsneslib: fix build

---
 pkgs/by-name/pv/pvsneslib/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix
index e2501bc76f43..c085a142ef61 100644
--- a/pkgs/by-name/pv/pvsneslib/package.nix
+++ b/pkgs/by-name/pv/pvsneslib/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
   dontConfigure = true;
 
   postPatch = ''
+    substituteInPlace compiler/wla-dx/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
     substituteInPlace tools/816-opt/Makefile \
       --replace-fail 'LDFLAGS := -lpthread' 'LDFLAGS :=' \
       --replace-fail 'LDFLAGS := -pthread' 'LDFLAGS += -pthread' \

From a8166cd197d440cdd7c0d3e702f21e99ca2c6eb6 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Tue, 24 Mar 2026 06:13:57 -0500
Subject: [PATCH 015/138] doomrunner: add nix-update-script

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

diff --git a/pkgs/by-name/do/doomrunner/package.nix b/pkgs/by-name/do/doomrunner/package.nix
index dc8594514f9a..a7609c649116 100644
--- a/pkgs/by-name/do/doomrunner/package.nix
+++ b/pkgs/by-name/do/doomrunner/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   kdePackages,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
       rm -rf $out/usr
     '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Preset-oriented graphical launcher of various ported Doom engines";
     mainProgram = "DoomRunner";

From ddd32c6f0d0eaeec6e3dbf6cd74f1084b131f332 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Tue, 24 Mar 2026 06:25:09 -0500
Subject: [PATCH 016/138] doomrunner: 1.9.1 -> 1.9.2

---
 pkgs/by-name/do/doomrunner/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/do/doomrunner/package.nix b/pkgs/by-name/do/doomrunner/package.nix
index a7609c649116..862133accdd6 100644
--- a/pkgs/by-name/do/doomrunner/package.nix
+++ b/pkgs/by-name/do/doomrunner/package.nix
@@ -1,27 +1,31 @@
 {
   lib,
   stdenv,
-  kdePackages,
+  qt6,
+  minizip,
   fetchFromGitHub,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doomrunner";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "Youda008";
     repo = "DoomRunner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N5kj2Z3QW29kOw2khET6Z4E9nFBBjNTgKw2xbCQrWKY=";
+    hash = "sha256-YkLW3og51e2sydWUiMDr2DOr1uHxzv4Z3rr/WRys5bY=";
   };
 
-  buildInputs = [ kdePackages.qtbase ];
+  buildInputs = [
+    minizip
+    qt6.qtbase
+  ];
 
   nativeBuildInputs = [
-    kdePackages.qmake
-    kdePackages.wrapQtAppsHook
+    qt6.qmake
+    qt6.wrapQtAppsHook
   ];
 
   makeFlags = [
@@ -46,12 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Preset-oriented graphical launcher of various ported Doom engines";
-    mainProgram = "DoomRunner";
-    homepage = "https://github.com/Youda008/DoomRunner";
     changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt";
+    description = "Preset-oriented graphical launcher of various ported Doom engines";
+    homepage = "https://github.com/Youda008/DoomRunner";
     license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.all;
+    mainProgram = "DoomRunner";
     maintainers = with lib.maintainers; [ keenanweaver ];
+    platforms = lib.platforms.all;
   };
 })

From 9076a793c8b9fe6772c37d74217f592e218b593a Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Tue, 24 Mar 2026 23:04:40 +0800
Subject: [PATCH 017/138] github-linguist: 9.1.0 -> 9.5.0

---
 pkgs/by-name/gi/github-linguist/Gemfile.lock |  65 ++++----
 pkgs/by-name/gi/github-linguist/gemset.nix   | 150 +++++++++++++------
 pkgs/by-name/gi/github-linguist/package.nix  |   4 +-
 3 files changed, 145 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/gi/github-linguist/Gemfile.lock b/pkgs/by-name/gi/github-linguist/Gemfile.lock
index 106752132fd0..98ae39886916 100644
--- a/pkgs/by-name/gi/github-linguist/Gemfile.lock
+++ b/pkgs/by-name/gi/github-linguist/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-linguist (9.1.0)
+    github-linguist (9.5.0)
       cgi
       charlock_holmes (~> 0.7.7)
       mini_mime (~> 1.0)
@@ -10,26 +10,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    byebug (12.0.0)
-    cgi (0.4.2)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
+    cgi (0.5.1)
     charlock_holmes (0.7.9)
     coderay (1.1.3)
-    dotenv (3.1.8)
-    faraday (2.13.1)
+    csv (3.3.5)
+    dotenv (3.2.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    json (2.11.3)
-    licensed (4.5.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    io-console (0.8.2)
+    json (2.19.2)
+    licensed (5.0.6)
+      csv (~> 3.3)
       json (~> 2.6)
       licensee (~> 9.16)
+      ostruct (~> 0.6.3)
       parallel (~> 1.22)
       pathname-common_prefix (~> 0.0.1)
-      reverse_markdown (~> 2.1)
+      reverse_markdown (>= 2.1, < 4.0)
       ruby-xxHash (~> 0.4.0)
       thor (~> 1.2)
       tomlrb (~> 2.0)
@@ -42,40 +47,44 @@ GEM
     logger (1.7.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.5)
-    mocha (2.7.1)
+    mini_portile2 (2.8.9)
+    minitest (5.27.0)
+    mocha (2.8.2)
       ruby2_keywords (>= 0.0.5)
-    net-http (0.6.0)
-      uri
-    nokogiri (1.18.10)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
+    ostruct (0.6.3)
     parallel (1.27.0)
     pathname-common_prefix (0.0.2)
     plist (3.7.2)
-    pry (0.15.2)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.1)
+      reline (>= 0.6.0)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rake (13.2.1)
+    rake (13.3.1)
     rake-compiler (0.9.9)
       rake
-    reverse_markdown (2.1.1)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    reverse_markdown (3.0.2)
       nokogiri
     ruby-xxHash (0.4.0.2)
     ruby2_keywords (0.0.5)
     rugged (1.9.0)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    thor (1.3.2)
-    tomlrb (2.0.3)
-    uri (1.0.3)
+    thor (1.5.0)
+    tomlrb (2.0.4)
+    uri (1.1.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
@@ -85,7 +94,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   byebug
   github-linguist!
-  licensed (~> 4.0)
+  licensed (~> 5.0)
   licensee (~> 9.15)
   minitest (~> 5.15)
   mocha (~> 2.1)
@@ -96,4 +105,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.4)
 
 BUNDLED WITH
-   2.5.22
+   2.6.9
diff --git a/pkgs/by-name/gi/github-linguist/gemset.nix b/pkgs/by-name/gi/github-linguist/gemset.nix
index eb768588c0c6..653c96e3f201 100644
--- a/pkgs/by-name/gi/github-linguist/gemset.nix
+++ b/pkgs/by-name/gi/github-linguist/gemset.nix
@@ -8,30 +8,31 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc";
       type = "gem";
     };
-    version = "2.8.7";
+    version = "2.8.9";
   };
   byebug = {
+    dependencies = [ "reline" ];
     groups = [ "debug" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl";
+      sha256 = "0pg05blj56sxdxq9d54386y9rlvj36vl95x21x9clh8rfpz3w9nj";
       type = "gem";
     };
-    version = "12.0.0";
+    version = "13.0.0";
   };
   cgi = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3";
+      sha256 = "1s8qdw1nfh3njd47q154njlfyc2llcgi4ik13vz39adqd7yclgz9";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.5.1";
   };
   charlock_holmes = {
     groups = [ "default" ];
@@ -56,6 +57,19 @@
     };
     version = "1.1.3";
   };
+  csv = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
+      type = "gem";
+    };
+    version = "3.3.5";
+  };
   dotenv = {
     groups = [
       "default"
@@ -64,10 +78,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
+      sha256 = "17b1zr9kih0i3wb7h4yq9i8vi6hjfq07857j437a8z7a44qvhxg3";
       type = "gem";
     };
-    version = "3.1.8";
+    version = "3.2.0";
   };
   faraday = {
     dependencies = [
@@ -82,10 +96,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.14.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -96,10 +110,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.2";
   };
   github-linguist = {
     dependencies = [
@@ -114,7 +128,21 @@
       path = ./.;
       type = "path";
     };
-    version = "9.1.0";
+    version = "9.5.0";
+  };
+  io-console = {
+    groups = [
+      "debug"
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
+      type = "gem";
+    };
+    version = "0.8.2";
   };
   json = {
     groups = [
@@ -124,15 +152,17 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
+      sha256 = "1kw39sqnr0lprwsd2h0zx1ic96skhqf88i14xv7c8drcicqvvqg7";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.19.2";
   };
   licensed = {
     dependencies = [
+      "csv"
       "json"
       "licensee"
+      "ostruct"
       "parallel"
       "pathname-common_prefix"
       "reverse_markdown"
@@ -144,10 +174,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hyphm8wyijpbz4wy2cyl6whxd66y2c9dqrljirl397gc08idykk";
+      sha256 = "0vz2xz4md69wn9l2073ln68mpjxycqqivkqg8bsr3i1d3q7lv4zs";
       type = "gem";
     };
-    version = "4.5.0";
+    version = "5.0.6";
   };
   licensee = {
     dependencies = [
@@ -210,20 +240,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [ "development" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "1mbpz92ml19rcxxfjrj91gmkif9khb1xpzyw38f81rvglgw1ffrd";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "5.27.0";
   };
   mocha = {
     dependencies = [ "ruby2_keywords" ];
@@ -231,10 +261,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lgqyxxdxgfik77a7lk2hjkr6flimgxr4gcbg3y7bg1ybn6m6zcg";
+      sha256 = "1vjfizp8yq0319dkc8yzzxr2bv5f1ki1qiknyx72prs7vclyfxqz";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.2";
   };
   net-http = {
     dependencies = [ "uri" ];
@@ -245,24 +275,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
+      sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.9.1";
   };
   nokogiri = {
     dependencies = [
       "mini_portile2"
       "racc"
     ];
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
+      sha256 = "0mhp90nf3g3yy5vgjnwd34czi6rbi0p7057vgngfmmdkknsxiz9q";
       type = "gem";
     };
-    version = "1.18.10";
+    version = "1.19.2";
   };
   octokit = {
     dependencies = [
@@ -281,6 +314,19 @@
     };
     version = "9.2.0";
   };
+  ostruct = {
+    groups = [
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
   parallel = {
     groups = [
       "default"
@@ -321,15 +367,16 @@
     dependencies = [
       "coderay"
       "method_source"
+      "reline"
     ];
     groups = [ "development" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
+      sha256 = "0kh5nv8v74k1ccy6gc7nd04aaf1cjkbk7g8pwy2izvcqaq36jv6p";
       type = "gem";
     };
-    version = "0.15.2";
+    version = "0.16.0";
   };
   public_suffix = {
     groups = [
@@ -339,10 +386,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "7.0.5";
   };
   racc = {
     groups = [
@@ -362,10 +409,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
       type = "gem";
     };
-    version = "13.2.1";
+    version = "13.3.1";
   };
   rake-compiler = {
     dependencies = [ "rake" ];
@@ -378,6 +425,21 @@
     };
     version = "0.9.9";
   };
+  reline = {
+    dependencies = [ "io-console" ];
+    groups = [
+      "debug"
+      "default"
+      "development"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
   reverse_markdown = {
     dependencies = [ "nokogiri" ];
     groups = [
@@ -387,10 +449,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j";
+      sha256 = "1bxqlpwnixn8x4bnna958w6m6qkdkbnd23b9j6ib3nrrrs9bp3l1";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "3.0.2";
   };
   ruby-xxHash = {
     groups = [
@@ -443,10 +505,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
+      sha256 = "0hayryyz46nlkcb6j0ij0kxq6i3ryiigwfc6ccvp0108hhlij3qd";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "0.9.3";
   };
   thor = {
     groups = [
@@ -456,10 +518,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.5.0";
   };
   tomlrb = {
     groups = [
@@ -469,10 +531,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2";
+      sha256 = "168v339gqaly00i4zqg2ag2h10r3rl7999d0cqrrpb63gaa7fbr6";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "2.0.4";
   };
   uri = {
     groups = [
@@ -482,10 +544,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.1";
   };
   yajl-ruby = {
     groups = [ "development" ];
diff --git a/pkgs/by-name/gi/github-linguist/package.nix b/pkgs/by-name/gi/github-linguist/package.nix
index 991c1f610dd6..448bc0cef2f9 100644
--- a/pkgs/by-name/gi/github-linguist/package.nix
+++ b/pkgs/by-name/gi/github-linguist/package.nix
@@ -8,12 +8,12 @@
 
 let
   gemName = "github-linguist";
-  version = "9.1.0";
+  version = "9.5.0";
   src = fetchFromGitHub {
     owner = "github-linguist";
     repo = "linguist";
     tag = "v${version}";
-    hash = "sha256-nPIUo6yQY6WvKuXvT1oOx6LZq49QLa9YIJmOrRYgAdg=";
+    hash = "sha256-kxPiHsWrd+iwvasXfHiwZYAJFMmzZGOsZtsor5Jf1fg=";
   };
 
   deps = bundlerEnv {

From 5fd29c8051f5745d73a5d07123d9f595211be215 Mon Sep 17 00:00:00 2001
From: Maciej Zonski <me@zonni.pl>
Date: Sun, 8 Mar 2026 11:04:41 +0100
Subject: [PATCH 018/138] uefitool: a72 -> a73

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/system/uefitool/new-engine.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/uefitool/new-engine.nix b/pkgs/tools/system/uefitool/new-engine.nix
index a365943b5568..4f06f5dc0dce 100644
--- a/pkgs/tools/system/uefitool/new-engine.nix
+++ b/pkgs/tools/system/uefitool/new-engine.nix
@@ -2,31 +2,40 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
+  qt6,
+  wrapGAppsHook3,
   cmake,
-  wrapQtAppsHook,
   zip,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uefitool";
-  version = "A72";
+  version = "A73";
 
   src = fetchFromGitHub {
-    hash = "sha256-sVosxqUUvkZwJIY9FZ9N6xoDyBpSgTLFUmD4B9ymTHs=";
     owner = "LongSoft";
     repo = "uefitool";
     tag = finalAttrs.version;
+    hash = "sha256-XZGddj0i/r1rqntEcqU2AK6ihvqwN031TR12qmEmKLk=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt6.qtbase ];
+
   nativeBuildInputs = [
     cmake
     zip
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
+    wrapGAppsHook3
   ];
+
   patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bundle-destination.patch ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = {
     description = "UEFI firmware image viewer and editor";
     homepage = "https://github.com/LongSoft/uefitool";

From 6dd5322fff644b2cb4f1c0e03c707bfc263e5032 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 25 Mar 2026 03:13:01 +0700
Subject: [PATCH 019/138] astro-language-server: 2.16.3 -> 2.16.6

---
 pkgs/by-name/as/astro-language-server/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 562535472bce..d9404b551d92 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "astro-language-server";
-  version = "2.16.3";
+  version = "2.16.6";
 
   src = fetchFromGitHub {
     owner = "withastro";
     repo = "astro";
-    rev = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-ONpSW6VMoiW1Q0Aa5Dp1pZx3LAQ2Kzv5YHKxHOxbXdo=";
+    tag = "@astrojs/language-server@${finalAttrs.version}";
+    hash = "sha256-xuAkfTVF+do7Tmk6LUOFkS7yunhVRkl+ZGpsOC7Ob4M=";
   };
 
   # https://pnpm.io/filtering#--filter-package_name-1
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-Kqw4W3ZWRHWNnJYLGks9IHjCYAYEIigskwb//yKvb6c=";
+    hash = "sha256-QJSFRJ3U7M0B7ukiU+BYY2KdrcNUpyiOcGA7G3xja3I=";
   };
 
   nativeBuildInputs = [
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/withastro/astro/tree/main/packages/language-tools";
     changelog = "https://github.com/withastro/astro/blob/%40astrojs/language-server%40${finalAttrs.version}/packages/language-tools/language-server/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ miniharinn ];
     mainProgram = "astro-ls";
     platforms = lib.platforms.unix;
   };

From bddb3008a552114ea38bea45d9525eb11b2b234b Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Wed, 25 Mar 2026 12:37:27 +0800
Subject: [PATCH 020/138] opensmtpd: patch another usage of PATH_LIBEXEC

---
 pkgs/by-name/op/opensmtpd/proc_path.diff | 37 +++++++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/op/opensmtpd/proc_path.diff b/pkgs/by-name/op/opensmtpd/proc_path.diff
index a60bb603aacf..b1e948b8ba4d 100644
--- a/pkgs/by-name/op/opensmtpd/proc_path.diff
+++ b/pkgs/by-name/op/opensmtpd/proc_path.diff
@@ -1,8 +1,8 @@
 diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
-index e049f07c..a1bd03a0 100644
+index 2365b1ee..b1b6bcec 100644
 --- a/usr.sbin/smtpd/smtpd.c
 +++ b/usr.sbin/smtpd/smtpd.c
-@@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
+@@ -1224,6 +1224,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname,
  	char		path[PATH_MAX];
  	char		name[PATH_MAX];
  	char		*arg;
@@ -10,7 +10,7 @@ index e049f07c..a1bd03a0 100644
  
  	if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
  		log_warnx("warn: %s-proc: conf too long", key);
-@@ -1167,7 +1168,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
+@@ -1234,7 +1235,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname,
  	if (arg)
  		*arg++ = '\0';
  
@@ -24,20 +24,41 @@ index e049f07c..a1bd03a0 100644
  	    (ssize_t)sizeof(path)) {
  		log_warn("warn: %s-proc: exec path too long", key);
  		return (-1);
+@@ -1387,6 +1393,7 @@ fork_filter_process(const char *name, const char *command, const char *user, con
+ 	int		 sp[2], errfd[2];
+ 	struct passwd	*pw;
+ 	struct group	*gr;
++	char		*proc_path;
+ 	char		 exec[_POSIX_ARG_MAX];
+ 	int		 execr;
+ 
+@@ -1455,8 +1462,12 @@ fork_filter_process(const char *name, const char *command, const char *user, con
+ 	if (command[0] == '/')
+ 		execr = snprintf(exec, sizeof(exec), "exec %s", command);
+ 	else
++		proc_path = getenv("OPENSMTPD_PROC_PATH");
++		if (proc_path == NULL) {
++			proc_path = PATH_LIBEXEC;
++		}
+ 		execr = snprintf(exec, sizeof(exec), "exec %s/%s", 
+-		    PATH_LIBEXEC, command);
++		    proc_path, command);
+ 	if (execr >= (int) sizeof(exec))
+ 		fatalx("%s: exec path too long", name);
+ 
 diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c
-index 9cfdfb99..24dfcca4 100644
+index e62b47af..2ee186bf 100644
 --- a/usr.sbin/smtpd/table.c
 +++ b/usr.sbin/smtpd/table.c
-@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
+@@ -229,17 +229,23 @@ table_create(struct smtpd *conf, const char *backend, const char *name,
+ 	struct table		*t;
  	struct table_backend	*tb;
- 	char			 buf[LINE_MAX];
  	char			 path[LINE_MAX];
 +	const char		*proc_path;
  	size_t			 n;
  	struct stat		 sb;
  
-@@ -215,11 +216,16 @@ table_create(const char *backend, const char *name, const char *tag,
- 	if (name && table_find(name, NULL))
+ 	if (name && table_find(conf, name))
  		fatalx("table_create: table \"%s\" already defined", name);
  
 +	proc_path = getenv("OPENSMTPD_PROC_PATH");

From acf8f668ed0a4068e27c6b4340e08cb59cb40878 Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Wed, 25 Mar 2026 13:00:59 +0800
Subject: [PATCH 021/138] doc: backward incompatibility of
 `opensmtpd-filter-dkimsign`

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

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index a66e6abcd87a..85fb2cac10eb 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -216,6 +216,8 @@
 - `light` has been removed because it was unmaintained.
   `brightnessctl` and `acpilight` provide similar functionality.
 
+- `opensmtpd-filter-dkimsign` is now installed into `libexec/smtpd` instead of `libexec/opensmtpd` so that now it is properly linked into the environment built by `services.opensmtpd.procPackages`. If you hardcoded path to `filter-dkimsign` please consider using this option.
+
 - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported.
 
 - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.

From 5cade141104d281e0aaba0d7214acf476ac5c7c2 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Wed, 25 Mar 2026 09:51:04 +0100
Subject: [PATCH 022/138] pimsync: install zsh completion

This was added in v0.5.6.
---
 pkgs/by-name/pi/pimsync/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix
index 06f628871e03..795225cc7820 100644
--- a/pkgs/by-name/pi/pimsync/package.nix
+++ b/pkgs/by-name/pi/pimsync/package.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = ''
     installManPage pimsync.1 pimsync.conf.5 pimsync-migration.7
+    installShellCompletion --zsh contrib/_pimsync
   '';
 
   nativeInstallCheckInputs = [

From de6e046083e46cbc9e09a415d022a8d5d3d1fafe Mon Sep 17 00:00:00 2001
From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com>
Date: Thu, 26 Mar 2026 12:29:31 +0100
Subject: [PATCH 023/138] tilt: 0.36.3 -> 0.37.0

---
 pkgs/by-name/ti/tilt/assets.nix  | 2 +-
 pkgs/by-name/ti/tilt/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
index 04d0522a168c..c9522a620638 100644
--- a/pkgs/by-name/ti/tilt/assets.nix
+++ b/pkgs/by-name/ti/tilt/assets.nix
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation {
     dontInstall = true;
 
     outputHashAlgo = "sha256";
-    outputHash = "sha256-l8raiOxKoajfXO0PzsJsqPzmvGdKBqTqudMaCPsFuaQ=";
+    outputHash = "sha256-78RL0hYnnlWFxBZO4pvR9eSVR4hRD2FK+C0Th2QPYlc=";
     outputHashMode = "recursive";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 2b73c59abf3d..5916daf2a50b 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.36.3";
+    version = "0.37.0";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-Rd/39TfKbrW1te//BQYBAZsoxKy9NYKzI8O1s4RXZKA=";
+      hash = "sha256-NxxQP53vN+1hJUBZyk0bJFlOcUFxU2bfFzwTGkTKuFo=";
     };
   };
 

From 81977db45a7aad393dc1b277f3a6d320a2aedaf6 Mon Sep 17 00:00:00 2001
From: Denperidge <cat@denperidge.com>
Date: Thu, 26 Mar 2026 19:20:21 +0100
Subject: [PATCH 024/138] way-edges: 0.11.1 -> 0.12.1

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

diff --git a/pkgs/by-name/wa/way-edges/package.nix b/pkgs/by-name/wa/way-edges/package.nix
index 0495e54e8991..a6f1cc8f0698 100644
--- a/pkgs/by-name/wa/way-edges/package.nix
+++ b/pkgs/by-name/wa/way-edges/package.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "way-edges";
-  version = "0.11.1";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "way-edges";
     repo = "way-edges";
     tag = finalAttrs.version;
-    hash = "sha256-1P4iOsoQolxfVGZEe+x0DvcDwB5bdBqR0OsfL+y3qQM=";
+    hash = "sha256-hvIy5WAv+DqA8Agln2Wgc8dHG/yDktfUU1k/3nlwjmw=";
   };
-  cargoHash = "sha256-RSCBQUZp6mxZcwsvr6OwQeXa5CmEhN8QUezv0By5j/s=";
+  cargoHash = "sha256-E1MmCUBZSXkV0oEJ7vHiO2YawnTteu24h2+IVgB71fc=";
 
   nativeBuildInputs = [
     pkg-config

From 84b4eb0bed558334032cb43febb1962bab4999a4 Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Fri, 27 Mar 2026 15:49:17 +0100
Subject: [PATCH 025/138] osimum: fix desktop item

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

diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index f3b7376034be..e81a1e258de1 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
     ln -s $out/opt/resources/assets/icons/256x256.png $out/share/pixmaps/osmium.png
     ln -s $out/opt/resources/assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/osmium.png
 
+    ln -s "$desktopItem/share/applications" $out/share
+
     runHook postInstall
   '';
 

From 1dacef5cc0e61994f4cf27192bf3dd911fd3147c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 20 Jan 2026 17:56:44 +0100
Subject: [PATCH 026/138] rebels-in-the-sky: 1.5.1 -> 1.6.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../by-name/re/rebels-in-the-sky/disable-radio.patch | 12 ++++--------
 pkgs/by-name/re/rebels-in-the-sky/package.nix        |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/re/rebels-in-the-sky/disable-radio.patch b/pkgs/by-name/re/rebels-in-the-sky/disable-radio.patch
index 250d678bed18..5ba0d7d52c28 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/disable-radio.patch
+++ b/pkgs/by-name/re/rebels-in-the-sky/disable-radio.patch
@@ -1,24 +1,20 @@
 diff --git a/assets/data/stream_data.json b/assets/data/stream_data.json
-index c049ec7..fe51488 100644
+index 6069c5d..fe51488 100644
 --- a/assets/data/stream_data.json
 +++ b/assets/data/stream_data.json
-@@ -1,18 +1 @@
+@@ -1,14 +1 @@
 -[
 -    {
 -        "name": "Radio Frittura",
--        "url_string": "https://radio.frittura.org/frittura.ogg"
+-        "url_string": "https://radio.frittura.org/rebels"
 -    },
 -    {
 -        "name": "Matt Johnson radio",
 -        "url_string": "https://us2.internet-radio.com/proxy/mattjohnsonradio?mp=/stream"
 -    },
 -    {
--        "name" : "Lofi 24/7",
+-        "name": "Lofi 24/7",
 -        "url_string": "http://usa9.fastcast4u.com/proxy/jamz?mp=/1"
--    },
--    {
--        "name" : "Radio Sarajevo",
--        "url_string": "https://cast2.asurahosting.com/proxy/balkanhi/stream"
 -    }
 -]
 \ No newline at end of file
diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index e18a155323a2..853f678f4057 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebels-in-the-sky";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "ricott1";
     repo = "rebels-in-the-sky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VyQfwZWvutc5BnAi6BbIfgRm5G4xBre76cyraQSvn6o=";
+    hash = "sha256-P0GPdMTOomqNQ6WLfZnASO1FiD7DJTHj/a8eoYzAvAY=";
   };
 
-  cargoHash = "sha256-PL5WhqCLlH482uDoWETfwHarz3e2NJ0vezDMs52QavQ=";
+  cargoHash = "sha256-Ldy/1Gv1qguWQ2lLk0jiiq7nM9r85LY7pXkXf2nCUA0=";
 
   patches = lib.optionals (!withRadio) [
     ./disable-radio.patch

From 8c016f88752798512b57dc52ef34853073b13d7d Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Sun, 29 Mar 2026 15:52:19 +0200
Subject: [PATCH 027/138] appflowy: 0.11.4 -> 0.11.5

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.11.5
---
 pkgs/by-name/ap/appflowy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 551fa76b10a3..91917fc8b34a 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -27,11 +27,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-A2XPADCc63OqskfPpkMwL8jCp9k7QsPyN2/FL+eCpfI=";
+        hash = "sha256-zr84SNbUuVWlLzYjQt1ZK2yk1sDgva3jzDUHsS1/7aM=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-YanQYRaGCqq5bOLeSFqUYbq0EtVun80gxGdFJtyZdoI=";
+        hash = "sha256-m303tVHbyUUibBfyi8svpbbhgv/msBfh1WVIZl96XvQ=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -40,7 +40,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.11.4";
+  version = "0.11.5";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From e95f5c6fa73bed3d4da66e102e05360332b69a5f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sun, 29 Mar 2026 07:54:13 -0700
Subject: [PATCH 028/138] python3Packages.inject: 5.3.0 ->
 5.3.0-unstable-2026-01-05

Bump to upstream master to fix test failures on Python 3.14, where
the implicit event loop from asyncio.get_event_loop() was removed.
The upstream fix (commit 3d525d0) is not part of any release yet.
---
 .../development/python-modules/inject/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix
index c2ecb109732e..50e2d5c8352e 100644
--- a/pkgs/development/python-modules/inject/default.nix
+++ b/pkgs/development/python-modules/inject/default.nix
@@ -4,22 +4,25 @@
   hatch-vcs,
   hatchling,
   lib,
-  nix-update-script,
   pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "inject";
-  version = "5.3.0";
+  version = "5.3.0-unstable-2026-01-05";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ivankorobkov";
     repo = "python-inject";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-c/OpEsT9KF7285xfD+VRorrNHn3r9IPp/ts9JHyGK9s=";
+    rev = "2ca60abc5370cd91d87e5a21ac373d0ca710f76d";
+    hash = "sha256-FumossBUGwp1XxWthx3gpIietvZsmPpkd52y9jjVKjQ=";
   };
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION =
+    assert lib.hasInfix "unstable" finalAttrs.version;
+    builtins.head (lib.splitString "-" finalAttrs.version);
+
   build-system = [
     hatchling
     hatch-vcs
@@ -31,12 +34,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "inject" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Python dependency injection framework";
     homepage = "https://github.com/ivankorobkov/python-inject";
-    changelog = "https://github.com/ivankorobkov/python-inject/blob/${finalAttrs.src.tag}/CHANGES.md";
+    changelog = "https://github.com/ivankorobkov/python-inject/blob/${finalAttrs.src.rev}/CHANGES.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ PerchunPak ];
   };

From 0f0f0397830cc9b56a7e98846e12292d3e445cf6 Mon Sep 17 00:00:00 2001
From: Luna Heyman <luna@toodeluna.net>
Date: Sun, 29 Mar 2026 18:08:24 +0200
Subject: [PATCH 029/138] azure-functions-core-tools: 4.7.0 -> 4.8.0

---
 .../az/azure-functions-core-tools/deps.json   | 177 ++++++++----------
 .../az/azure-functions-core-tools/package.nix |   4 +-
 2 files changed, 85 insertions(+), 96 deletions(-)

diff --git a/pkgs/by-name/az/azure-functions-core-tools/deps.json b/pkgs/by-name/az/azure-functions-core-tools/deps.json
index aceacf1528e3..f283ba10d5e5 100644
--- a/pkgs/by-name/az/azure-functions-core-tools/deps.json
+++ b/pkgs/by-name/az/azure-functions-core-tools/deps.json
@@ -24,6 +24,11 @@
     "version": "1.41.0",
     "hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y="
   },
+  {
+    "pname": "Azure.Core",
+    "version": "1.43.0",
+    "hash": "sha256-/AE7soQTyaXesI7TdGKjSlxKR6z8t9HpdlOaNUC7eEk="
+  },
   {
     "pname": "Azure.Core",
     "version": "1.44.1",
@@ -71,13 +76,13 @@
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.21.2",
-    "hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o="
+    "version": "12.22.1",
+    "hash": "sha256-YPEJQ4MeV4rXoAwfroKVIaaXKZRvvQFJDyDaEawHxo0="
   },
   {
     "pname": "Azure.Storage.Common",
-    "version": "12.20.1",
-    "hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w="
+    "version": "12.21.0",
+    "hash": "sha256-yS7Kq9+Ne/2oXT0KCEHXykIFceaza6xpsL+lr1KrbvU="
   },
   {
     "pname": "Colors.Net",
@@ -141,8 +146,8 @@
   },
   {
     "pname": "Microsoft.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
+    "version": "2.23.0",
+    "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
   },
   {
     "pname": "Microsoft.ApplicationInsights.AspNetCore",
@@ -151,8 +156,8 @@
   },
   {
     "pname": "Microsoft.ApplicationInsights.AspNetCore",
-    "version": "2.22.0",
-    "hash": "sha256-BIa8rILgulQ+ZztaP3P5cD467x7Jpd+uSUBZZu2eeGc="
+    "version": "2.23.0",
+    "hash": "sha256-Q5XayWR5vRKYX2IrPqQnW2/8dITGReC9fORSxUSOQq8="
   },
   {
     "pname": "Microsoft.ApplicationInsights.DependencyCollector",
@@ -161,28 +166,23 @@
   },
   {
     "pname": "Microsoft.ApplicationInsights.DependencyCollector",
-    "version": "2.22.0",
-    "hash": "sha256-TDh1aRFgrjfBxFWFyJ0xRHzxlc2z88ZI5ceizO0In9I="
+    "version": "2.23.0",
+    "hash": "sha256-7sinHYtyjfpO9EsyeFlvTcI2sIzmZkN2OBeJrUtyUdg="
   },
   {
     "pname": "Microsoft.ApplicationInsights.EventCounterCollector",
-    "version": "2.22.0",
-    "hash": "sha256-8pBA3ECv99HU8NlkEOSP5Y4kgPPzpCfVBKyNi+qip+Y="
+    "version": "2.23.0",
+    "hash": "sha256-aF+1pINoOKFjHUIalZFnEAmd3U3F5RaBBs26xOCWFeo="
   },
   {
     "pname": "Microsoft.ApplicationInsights.PerfCounterCollector",
-    "version": "2.21.0",
-    "hash": "sha256-hcU7tR9ZcytiwubRWwEKUCN04p5htNkZTmRaNVb8aA8="
-  },
-  {
-    "pname": "Microsoft.ApplicationInsights.PerfCounterCollector",
-    "version": "2.22.0",
-    "hash": "sha256-pOUi4ANSyfHPLS8Q+WFskVcazXrd28ijvm/iVjoIFiM="
+    "version": "2.23.0",
+    "hash": "sha256-GXYvx/cHoLhvBjyUdEG9ObZPSIwwTmYhT5KlbaI8pM4="
   },
   {
     "pname": "Microsoft.ApplicationInsights.SnapshotCollector",
-    "version": "1.4.4",
-    "hash": "sha256-oaxpiMbuHfDBIRjheo83iS7i+aAtqrlAvdnTXGHK4nk="
+    "version": "1.4.6",
+    "hash": "sha256-swprkO1f43DCGL4thcBDbdchgyKvB4fmS5Bfq5OrvRQ="
   },
   {
     "pname": "Microsoft.ApplicationInsights.WindowsServer",
@@ -191,8 +191,8 @@
   },
   {
     "pname": "Microsoft.ApplicationInsights.WindowsServer",
-    "version": "2.22.0",
-    "hash": "sha256-oaWcrMK/TCtExq9BrTRvVs98a0YnlnMEbntsMYZhrCI="
+    "version": "2.23.0",
+    "hash": "sha256-WQ1kNYXRYWiE34+EHimGd4FBX6Taq302OkiHY0gtkLc="
   },
   {
     "pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel",
@@ -201,8 +201,8 @@
   },
   {
     "pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel",
-    "version": "2.22.0",
-    "hash": "sha256-JkqPzRI+wdtefP1UulOenrA5kkGB0cWzZqa3SLP3p8w="
+    "version": "2.23.0",
+    "hash": "sha256-ljFMP7722wl6jWUtQQgJ2ZAvykeGL/qLT6IAW/LdPec="
   },
   {
     "pname": "Microsoft.AspNet.WebApi.Client",
@@ -582,9 +582,9 @@
   },
   {
     "pname": "Microsoft.Azure.Functions.PythonWorker",
-    "version": "4.40.2",
-    "hash": "sha256-XRH3J+iUr5Ox3jWb1dVwOeHEj4mQZC4RzNjfkj0zkhI=",
-    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.40.2/microsoft.azure.functions.pythonworker.4.40.2.nupkg"
+    "version": "4.41.2",
+    "hash": "sha256-xxQvSgNl43VuJ2GoGzYHkwJh06ahiThsDvBYOmayqPU=",
+    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.41.2/microsoft.azure.functions.pythonworker.4.41.2.nupkg"
   },
   {
     "pname": "Microsoft.Azure.Functions.Worker.ItemTemplates",
@@ -616,30 +616,25 @@
     "version": "3.0.32",
     "hash": "sha256-u8xcdtQYUu8X52WNmpyNw4TRjmSlZulA6RmR08fV28w="
   },
-  {
-    "pname": "Microsoft.Azure.WebJobs",
-    "version": "3.0.37",
-    "hash": "sha256-C6ztW9QdUgxNTsYewOZDQGrl3Pxy99X7J8kQxUpivMk="
-  },
-  {
-    "pname": "Microsoft.Azure.WebJobs",
-    "version": "3.0.39",
-    "hash": "sha256-Ndym81F4BFIHsH4NF/weySuRdWgzQQM8hHsjTW8c1vs="
-  },
-  {
-    "pname": "Microsoft.Azure.WebJobs",
-    "version": "3.0.41",
-    "hash": "sha256-w5ojyAOq2qewkpP8NC1r7YV/GiC9eFbRrRC+keB4CDA="
-  },
   {
     "pname": "Microsoft.Azure.WebJobs",
     "version": "3.0.42",
     "hash": "sha256-pAAq5ZcRZVgX2v/SSoK84cAiBbUCn4R2KK0ME3FIqtg="
   },
+  {
+    "pname": "Microsoft.Azure.WebJobs",
+    "version": "3.0.43",
+    "hash": "sha256-Bw1HhUdmmPIGLm2++4XrbSm2lxdvS8baUpOXvRN18HY="
+  },
+  {
+    "pname": "Microsoft.Azure.WebJobs",
+    "version": "3.0.44",
+    "hash": "sha256-U6y8iCcNtY2hZKgmRc86OgzbmVpZwOxGsR15KYfYYMg="
+  },
   {
     "pname": "Microsoft.Azure.WebJobs.Core",
-    "version": "3.0.42",
-    "hash": "sha256-kIaV8zb9TO1M/Dac4P3Csa34CBDMaPRza534ll4FW7A="
+    "version": "3.0.44",
+    "hash": "sha256-qdkfPYChaUrSXnA+yPwEWDVf3NA5KquTUlNXjxRKMv0="
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Extensions",
@@ -668,8 +663,8 @@
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Host.Storage",
-    "version": "5.0.1",
-    "hash": "sha256-ZbjinILfgrME2Z+9LkdHD4fGoIwy44im9WJfDnANWng="
+    "version": "5.0.2",
+    "hash": "sha256-FOMP7w8YcOua4BDBuaIjzJ+z0duBOaivB8rvTG+f0g4="
   },
   {
     "pname": "Microsoft.Azure.WebJobs.ItemTemplates",
@@ -678,9 +673,8 @@
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Logging.ApplicationInsights",
-    "version": "3.0.42-12121",
-    "hash": "sha256-LHQL+cdP95W4l3jkPNIAIIqfWIDk9rEtvh71ZrosToc=",
-    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.logging.applicationinsights/3.0.42-12121/microsoft.azure.webjobs.logging.applicationinsights.3.0.42-12121.nupkg"
+    "version": "3.0.44",
+    "hash": "sha256-dvP7dzgpEKebtyrMj5ojzYeOp7HDYL3vSS6n7MJaUhY="
   },
   {
     "pname": "Microsoft.Azure.WebJobs.ProjectTemplates",
@@ -689,14 +683,14 @@
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Rpc.Core",
-    "version": "3.0.37",
-    "hash": "sha256-YXg+mFUP66g12KLz/UggGBOYW/LI3REzhS8f5Sd8usU="
+    "version": "3.0.44",
+    "hash": "sha256-AAPQ/qABYuVLZEO4+fVza6E62rdM2N3UhblgeWuuzx4="
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Script",
-    "version": "4.1045.200",
-    "hash": "sha256-OQJgJABMEtK+UMFNkQOyMuiYOe0CtiBVG1A5DA4MaIY=",
-    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1045.200/microsoft.azure.webjobs.script.4.1045.200.nupkg"
+    "version": "4.1046.100",
+    "hash": "sha256-urd7cB7bX5HFavRcwRYLIK9l9AUWWv/tvnnl/2iI10s=",
+    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1046.100/microsoft.azure.webjobs.script.4.1046.100.nupkg"
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Script.Abstractions",
@@ -705,15 +699,15 @@
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Script.Grpc",
-    "version": "4.1045.200",
-    "hash": "sha256-JA/mDxn6DR/PWED4Gieh9Gh0tGChIHNGIqINyZDL2P0=",
-    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1045.200/microsoft.azure.webjobs.script.grpc.4.1045.200.nupkg"
+    "version": "4.1046.100",
+    "hash": "sha256-s3jFYSGbF939VjBQFcRSg0nVfw0LM2WpqcZVFVVSEtg=",
+    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1046.100/microsoft.azure.webjobs.script.grpc.4.1046.100.nupkg"
   },
   {
     "pname": "Microsoft.Azure.WebJobs.Script.WebHost",
-    "version": "4.1045.200",
-    "hash": "sha256-jaf7HzuWFYYU1zqPnx7b/c2D9ASCzNvohpA/JBwPL94=",
-    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1045.200/microsoft.azure.webjobs.script.webhost.4.1045.200.nupkg"
+    "version": "4.1046.100",
+    "hash": "sha256-IxQORWQFt4H89iLnOI3TCVwuMQeFtRNcNg8DhTtB0jo=",
+    "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1046.100/microsoft.azure.webjobs.script.webhost.4.1046.100.nupkg"
   },
   {
     "pname": "Microsoft.Azure.WebSites.DataProtection",
@@ -818,13 +812,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Azure",
-    "version": "1.7.1",
-    "hash": "sha256-ZEOoC9sU7DL/IRk7P5Bnqe5V2xZ7/scnwST4oIsxZlU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "1.0.0",
-    "hash": "sha256-TSbJFK4eRIe1AKnzJNTTon30Tg+IECwZ2zTKy+qTXEg="
+    "version": "1.7.5",
+    "hash": "sha256-VBS4Kqkvn2pw7zqqbqK2no5jXDGcZbyd9Gh4wd2gzKk="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
@@ -911,6 +900,11 @@
     "version": "9.0.6",
     "hash": "sha256-11bIIn40Qadrlp1MZpQmAlpBHXPcbxB4Gjcp12EUQ1M="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "2.1.0",
+    "hash": "sha256-FNOrXx7bJbc6qrscne8RhRj28kxK3uq+3ltdXzhCKHQ="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
     "version": "2.1.1",
@@ -968,8 +962,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "1.0.0",
-    "hash": "sha256-EW99BPB7ztVVd5nONd4Qjn9Ji+a1FX+nAe3Z/a+UnzA="
+    "version": "2.1.0",
+    "hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -1211,6 +1205,11 @@
     "version": "9.0.0",
     "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "2.1.0",
+    "hash": "sha256-0i4YUnMQ4DE0KDp47pssJLUIw8YAsHf2NZN0xoOLb78="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "2.1.1",
@@ -1263,8 +1262,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-nGGJRpZax8fv6NJSveHjNronvBYltEOFr4HU+zdc9vs="
+    "version": "2.23.0",
+    "hash": "sha256-ptN8Y3vyAW81he8VhJ5P7W/pxyBToKuBMEcQa9qXZjo="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
@@ -1308,8 +1307,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "1.0.0",
-    "hash": "sha256-vU5mAhwBnf0EXQw1QMNwkt1aiEA0xjUMZmXOBo/MIz4="
+    "version": "2.1.0",
+    "hash": "sha256-ol0tKlHOyX1qAQqNWuag0thb2mMCU2JHNiw0nzUhJnE="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -2391,11 +2390,6 @@
     "version": "4.3.0",
     "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.2",
-    "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="
-  },
   {
     "pname": "System.Reactive",
     "version": "5.0.0",
@@ -2531,11 +2525,6 @@
     "version": "5.0.0",
     "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0",
-    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.1.0",
@@ -2576,11 +2565,6 @@
     "version": "4.3.0",
     "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
   },
-  {
-    "pname": "System.Runtime.Loader",
-    "version": "4.3.0",
-    "hash": "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="
-  },
   {
     "pname": "System.Runtime.Numerics",
     "version": "4.0.1",
@@ -2616,6 +2600,11 @@
     "version": "6.0.0",
     "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
   },
+  {
+    "pname": "System.Security.Claims",
+    "version": "4.3.0",
+    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
+  },
   {
     "pname": "System.Security.Cryptography.Algorithms",
     "version": "4.2.0",
@@ -2746,6 +2735,11 @@
     "version": "6.0.0",
     "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
   },
+  {
+    "pname": "System.Security.Principal",
+    "version": "4.3.0",
+    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
+  },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "4.3.0",
@@ -2846,11 +2840,6 @@
     "version": "4.3.0",
     "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
-  {
-    "pname": "System.Threading.Channels",
-    "version": "8.0.0",
-    "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
-  },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.0.11",
diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix
index c053b385b704..27eaa122b9c4 100644
--- a/pkgs/by-name/az/azure-functions-core-tools/package.nix
+++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix
@@ -8,14 +8,14 @@
   go,
 }:
 let
-  version = "4.7.0";
+  version = "4.8.0";
   templatesVersion = "3.1.1648";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-functions-core-tools";
     tag = version;
-    hash = "sha256-2Bs1jxJmZzzShSrUK3XP+cNdXlczPEr6UCnh4oQRaoA=";
+    hash = "sha256-OY2FPzST1ejU+OPccv7Qvd8cM3gtiiL2CQNj2APDIx0=";
   };
 
   templates = fetchurl {

From 983fb98da2212665cbb1cd098636f53d93950c8a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 30 Mar 2026 00:03:35 +0700
Subject: [PATCH 030/138] smassh: 3.1.7 -> 3.2.1

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

diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix
index dae7b299c80a..4e872ed019f1 100644
--- a/pkgs/by-name/sm/smassh/package.nix
+++ b/pkgs/by-name/sm/smassh/package.nix
@@ -8,17 +8,17 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "smassh";
-  version = "3.1.7";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kraanzu";
     repo = "smassh";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-i04DzsurF6sMMBHZjBOrkKKmkn6Nt6uF27QXABE3igg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4w7mkZrm8m3MA18QLRRoRF022aaQP64iUGKUWsskqDk=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [ poetry-core ];
+  nativeBuildInputs = with python3.pkgs; [ hatchling ];
 
   pythonRelaxDeps = [
     "platformdirs"

From 0a4516997569f38781df30c62a80be5044ef4e0f Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 29 Mar 2026 19:05:12 -0700
Subject: [PATCH 031/138] engage: 0.2.1 -> 0.3.0

---
 .../en/engage/mdbook-0.5-support.patch        | 16 --------
 pkgs/by-name/en/engage/package.nix            | 38 ++++++-------------
 2 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/en/engage/mdbook-0.5-support.patch

diff --git a/pkgs/by-name/en/engage/mdbook-0.5-support.patch b/pkgs/by-name/en/engage/mdbook-0.5-support.patch
deleted file mode 100644
index 0082bf5e7a37..000000000000
--- a/pkgs/by-name/en/engage/mdbook-0.5-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/book.toml
-+++ b/book.toml
-@@ -1,6 +1,5 @@
- [book]
- language = "en"
--multilingual = false
- src = "book"
- title = "Engage"
-
-@@ -8,5 +7,5 @@ build-dir = "public"
-
- [output.html]
--git-repository-icon = "fa-git-square"
-+git-repository-icon = "fab-square-git"
- git-repository-url = "https://gitlab.computer.surgery/charles/engage"
-
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 7c1fc1f965ae..f84600272bdd 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -3,21 +3,15 @@
   installShellFiles,
   rustPlatform,
   fetchFromGitLab,
-  stdenv,
   mdbook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "engage";
-  version = "0.2.1";
-
-  outputs = [
-    "out"
-    "doc"
-  ];
+  version = "0.3.0";
 
   env = {
-    ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html";
+    ENGAGE_BOOK_PATH = "${placeholder "out"}/share/doc/${finalAttrs.pname}";
   };
 
   src = fetchFromGitLab {
@@ -25,29 +19,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "charles";
     repo = "engage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-n7ypFJBYT712Uzh1NnWWSOIpEDKR0e6sQxbiIN6pZgo=";
+    hash = "sha256-dKnpovsBcx3fyDK2eSVf4vzJaQ0uNGcKoYSE56kUDEg=";
   };
 
-  patches = [
-    # Support mdbook 0.5.x - remove deprecated multilingual field
-    ./mdbook-0.5-support.patch
-  ];
-
-  cargoHash = "sha256-UTIxxPBtxzsZilxriAT8ksl2ovoDzIhB+8f+b2cGN3k=";
+  cargoHash = "sha256-wHPjVP/hzMdmKVYDzjUGoaSKwcf7A9nYeM5HhvBQ+bc=";
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  checkFlags = [
-    # Upstream doesn't set `ENGAGE_DOCS_LINK` during tests so the output differs.
-    "--skip=long_help"
-  ];
+  buildAndTestSubdir = "crates/engage";
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+  postInstall = ''
     installShellCompletion --cmd engage ${
       builtins.concatStringsSep " " (
-        map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
+        map (shell: "--${shell} <(cargo xtask completions ${shell})") [
           "bash"
           "zsh"
           "fish"
@@ -56,15 +42,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     }
 
     ${lib.getExe mdbook} build
-    mkdir -p "$doc/share/doc"
-    mv public "$doc/share/doc/engage"
+    mkdir -p $out/share/doc
+    mv public $out/share/doc/${finalAttrs.pname}
   '';
 
   meta = {
-    description = "Task runner with DAG-based parallelism";
+    description = "Process composer with ordering and parallelism based on directed acyclic graphs";
     mainProgram = "engage";
-    homepage = "https://gitlab.computer.surgery/charles/engage";
-    changelog = "https://charles.gitlab-pages.computer.surgery/engage/changelog.html";
+    homepage = "https://engage.computer.surgery";
+    changelog = "https://engage.computer.surgery/changelog.html";
     license = with lib.licenses; [
       asl20
       mit

From 9f8844f1e28686d28732cb9e6a6da3c3e737dc94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Mon, 30 Mar 2026 09:12:13 +0200
Subject: [PATCH 032/138] cddlparser: 0.5.0 -> 0.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 pkgs/development/python-modules/cddlparser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cddlparser/default.nix b/pkgs/development/python-modules/cddlparser/default.nix
index 1737f4b85b48..ba7237bcc840 100644
--- a/pkgs/development/python-modules/cddlparser/default.nix
+++ b/pkgs/development/python-modules/cddlparser/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "cddlparser";
-  version = "0.5.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tidoust";
     repo = pname;
     tag = "v${version}";
-    sha256 = "sha256-Hrf6u5HeCICffgPAOcbb1FhybEVhgre7EXzQZhS8D9o=";
+    sha256 = "sha256-LcIxU77bYpsuE4j1QgzdD3d7CO/EUEA9xwn+uIV68Oc=";
   };
 
   build-system = [

From 0965ae890a2e276e0a9c77d530e675bc769a2edf Mon Sep 17 00:00:00 2001
From: Paul Joubert <paul@trespaul.com>
Date: Mon, 30 Mar 2026 10:16:13 +0200
Subject: [PATCH 033/138] hayagriva: add update script

and other conventions suggested by @JarvisCraft
---
 pkgs/by-name/ha/hayagriva/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index eab9cff39089..ba23f539917f 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -2,6 +2,8 @@
   lib,
   rustPlatform,
   fetchCrate,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -9,7 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.9.1";
 
   src = fetchCrate {
-    inherit (finalAttrs) pname version;
+    inherit (finalAttrs) version;
+    pname = "hayagriva";
     hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
   };
 
@@ -26,10 +29,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=csl::tests::test_csl"
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Work with references: Literature database management, storage, and citation formatting";
     homepage = "https://github.com/typst/hayagriva";
-    changelog = "https://github.com/typst/hayagriva/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/typst/hayagriva/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit

From 29a721d448841c9c20eba71386a2616c0d80f314 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 30 Mar 2026 12:59:54 +0300
Subject: [PATCH 034/138] xq-xml: add progrm_jarvis to maintainers

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

diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 8ae50c91c5c6..af5df97ccc97 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -38,6 +38,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/sibprogrammer/xq";
     changelog = "https://github.com/sibprogrammer/xq/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
 })

From c33de3d997afb86b0bda7f8a52ae1fc76b39c50d Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 30 Mar 2026 13:16:19 +0300
Subject: [PATCH 035/138] xq-xml: add nix-update-script

---
 pkgs/by-name/xq/xq-xml/package.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index af5df97ccc97..5b806abd8649 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -2,8 +2,8 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  testers,
-  xq-xml,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sibprogrammer";
     repo = "xq";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6iC5YhCppzlyp6o+Phq98gQj4LjQx/5pt2+ejOvGvTE=";
   };
 
@@ -22,21 +22,20 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X=main.commit=${finalAttrs.src.rev}"
+    "-X=main.commit=v${finalAttrs.version}"
     "-X=main.version=${finalAttrs.version}"
   ];
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = xq-xml;
-    };
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Command-line XML and HTML beautifier and content extractor";
     mainProgram = "xq";
     homepage = "https://github.com/sibprogrammer/xq";
-    changelog = "https://github.com/sibprogrammer/xq/releases/tag/${finalAttrs.src.rev}";
+    changelog = "https://github.com/sibprogrammer/xq/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.progrm_jarvis ];
   };

From 89a33be7f810909f55bb9943bfe661db4f4bffb3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 30 Mar 2026 15:34:08 +0200
Subject: [PATCH 036/138] python3Packages.accelerate: disable failing tests on
 aarch64-linux

These require cpuinfo, which is no available on aarch64-linux.
---
 pkgs/development/python-modules/accelerate/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 0b47f04e3e60..d38a2fe1e37f 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -107,6 +107,12 @@ buildPythonPackage (finalAttrs: {
     "CheckpointTest"
     # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here)
     "test_mpi_multicpu_config_cmd"
+    # fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox
+    "test_layerwise_upcasting_inference_0"
+    "test_compute_module_sizes"
+    "test_compute_module_total_buffer_size"
+    "test_load_checkpoint_in_model_dtype"
+    "test_set_module_tensor_sets_dtype"
   ]
   ++
     lib.optionals

From 2289a7381753aa9a5a7e247a02e90cbaeae7eb56 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Wed, 1 Apr 2026 08:38:38 -0700
Subject: [PATCH 037/138] garble: 0.14.1 -> 0.15.0

---
 .../ga/garble/0001-Add-version-info.patch     | 39 ++++++-------------
 pkgs/by-name/ga/garble/package.nix            | 12 +++---
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/ga/garble/0001-Add-version-info.patch b/pkgs/by-name/ga/garble/0001-Add-version-info.patch
index 153ab8f4bf6d..e17500e967fc 100644
--- a/pkgs/by-name/ga/garble/0001-Add-version-info.patch
+++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch
@@ -1,38 +1,21 @@
-From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Sun, 3 Nov 2024 15:11:49 +0800
-Subject: [PATCH] Add version info
-
----
- main.go                    | 1 +
- testdata/script/help.txtar | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/main.go b/main.go
-index 0de5a2f..1c830b1 100644
 --- a/main.go
 +++ b/main.go
-@@ -362,6 +362,7 @@ func mainErr(args []string) error {
- 		// manually construct something like a pseudo-version.
- 		// TODO: remove when this code is dead, hopefully in Go 1.22.
- 		if mod.Version == "(devel)" {
-+			mod.Version = "@version@"
- 			var vcsTime time.Time
- 			var vcsRevision string
- 			for _, setting := range info.Settings {
-diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar
-index 8f25260..859f492 100644
+@@ -370,6 +370,7 @@
+ 			mod = mod.Replace
+ 		}
+ 
++		mod.Version = "@version@"
+ 		fmt.Printf("%s %s\n\n", mod.Path, mod.Version)
+ 		fmt.Printf("Build settings:\n")
+ 		for _, setting := range info.Settings {
 --- a/testdata/script/help.txtar
 +++ b/testdata/script/help.txtar
-@@ -91,7 +91,7 @@ stderr 'directory not found'
- # and to be able to use static VCS info, use an environment variable.
- # First, test without the information, and then with it.
+@@ -88,7 +88,7 @@
+ # Test the version command. Note that test binaries exclude VCS build info,
+ # and we reuse the test binary for garble itself, so that's missing.
  exec garble version
 -stdout -count=1 'mvdan.cc/garble \(devel\)'
 +stdout -count=1 'mvdan.cc/garble @version@'
  stdout -count=1 'Build settings'
  stdout -count=3 '-compiler|GOOS|GOARCH'
  ! stdout 'vcs'
--- 
-2.46.1
-
diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix
index 7434c2b7bf7b..a92a90117325 100644
--- a/pkgs/by-name/ga/garble/package.nix
+++ b/pkgs/by-name/ga/garble/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   git,
   versionCheckHook,
@@ -9,15 +9,15 @@
   nix-update-script,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "garble";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "burrowers";
     repo = "garble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zS/K2kOpWhJmr0NuWSjEjNXV8ILt81yLIQWSPDuMwt8=";
+    hash = "sha256-9Vjv5Eis+ALUm2aaXOj4i8w3UmylPggMXqgwXtD2YA8=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
 
   checkFlags = [
     "-skip"
-    "TestScript/gogarble"
+    "TestScript/gogarble|TestScript/gotoolchain|TestScript/tiny"
   ];
 
-  vendorHash = "sha256-xxG1aQrALVuJ7oVn+Z+sH655eFQ7rcYFmymGCUZD1uU=";
+  vendorHash = "sha256-EOmAb2k9LSzsvumsCZdeJIDKQBJBeRFt15mWAyyVl1k=";
 
   # Used for some of the tests.
   nativeCheckInputs = [

From 0cd4b7fd55e1b3b8c9a8f851eb897b4b8124895c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Sat, 21 Mar 2026 14:58:09 +0100
Subject: [PATCH 038/138] whisper-cpp: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index d27925dcfc5b..b507e34814d2 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TeS1lGKEzkHOoBemy/tMGtIsy0iouj9DTYIgTjUNcQk=";
+    hash = "sha256-YCuWKDKlrhbx+t3t2kDpAwuKt4rkipDsOXO6uqIU/W0=";
   };
 
   # The upstream download script tries to download the models to the

From 973d6242fb7ebec71c0d948436be00f85bdf63cc Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 1 Apr 2026 23:07:20 -0400
Subject: [PATCH 039/138] python3Packages.ml-dtypes: include upstream patch for
 numpy 2.4.3

Numpy 2.4.3 (currently present on staging) changes the float equality
semantics for NaN-equivalence, which breaks ml_dtypes' tests. We
include an upstream commit to fix this:
https://github.com/jax-ml/ml_dtypes/commit/04c4dc8b23720d9d92f3cc849ffc387d5798db84
---
 pkgs/development/python-modules/ml-dtypes/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix
index fb7f135e6462..a7a8b8cdef9b 100644
--- a/pkgs/development/python-modules/ml-dtypes/default.nix
+++ b/pkgs/development/python-modules/ml-dtypes/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   setuptools,
@@ -30,6 +31,15 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Fix tests for numpy 2.4.3, which changed the way testing assertions
+    # handle behaviors with NaN equivalence on the custom numeric types.
+    (fetchpatch2 {
+      url = "https://github.com/jax-ml/ml_dtypes/commit/04c4dc8b23720d9d92f3cc849ffc387d5798db84.patch?full_index=1";
+      hash = "sha256-jqqiDYcHq58JxSqtHfXcNWFbMFhvufqafDPHmORe6F0=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools~=" "setuptools>="

From 011b4839899705f64d809350d458a374488dd2c1 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 2 Apr 2026 01:58:04 -0400
Subject: [PATCH 040/138] brave: 1.88.136 -> 1.88.138

https://community.brave.app/t/release-channel-1-88-138/651279
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index b136e39a00d4..f211c2d245d1 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.88.136";
+  version = "1.88.138";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-niseHDxEz2fhGeLUCMtMK2GYhe4U5Zk/btf8jariaiA=";
+      hash = "sha256-8qsWJeHsSPukHbsYIssELvr5Sq6TIxnDzXak/eQrwYk=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-2OLaXWJ7J58z7y9bUrzWNwRL1T6ZOCDHeUmcb/qnHY0=";
+      hash = "sha256-Z1cXDihjzrVTj9XsG9ral8NMZSdPqL4q8VIZ2Ee05Qc=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-Jf/dQy8o87iytsWcTUpPlYTOcdvnzJjlkH1M6y+x9Dw=";
+      hash = "sha256-yDBGo/J2b5iu9e4NvXN3EgYEDYaMq1V9MVb9xeGHpHo=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-NvDEExLdgeukyT7MTe1MR3Emp0o1Q2bdO5mpSWeBGcA=";
+      hash = "sha256-RzLlDoyqPdL51aDD4/3r+f8sO4Tz8Osso50fsFR3iBc=";
     };
   };
 

From 2d7a9fbcef477052676909056547cc707a768763 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 19:35:25 +0200
Subject: [PATCH 041/138] mcp-server-fetch: init at 2026.1.26

---
 pkgs/by-name/mc/mcp-server-fetch/package.nix | 49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-fetch/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix
new file mode 100644
index 000000000000..4030c46e1118
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "mcp-server-fetch";
+  version = "2026.1.26-unstable-2026-05-17";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    rev = "f4244583a6af9425633e433a3eec000d23f4e011";
+    hash = "sha256-bHknioQu8i5RcFlBBdXUQjsV4WN1IScnwohGRxXgGDk=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/src/fetch/";
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    httpx
+    markdownify
+    mcp
+    protego
+    pydantic
+    readabilipy
+    requests
+  ];
+
+  # Tests require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "mcp_server_fetch" ];
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "Model Context Protocol server providing tools to fetch and convert web content for usage by LLMs";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-fetch";
+    platforms = lib.platforms.all;
+  };
+})

From f8c34bea53c74afe803865dd30b3d7039b3ab282 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 21:20:08 +0200
Subject: [PATCH 042/138] mcp-server-filesystem: init at 2026.1.26

---
 .../mc/mcp-server-filesystem/package.nix      | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-filesystem/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-filesystem/package.nix b/pkgs/by-name/mc/mcp-server-filesystem/package.nix
new file mode 100644
index 000000000000..190cba24a12d
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-filesystem/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildNpmPackage,
+  typescript,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "mcp-server-filesystem";
+  version = "2026.1.26";
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    tag = finalAttrs.version;
+    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+  };
+
+  nativeBuildInputs = [
+    typescript
+  ];
+
+  dontNpmPrune = true;
+  npmWorkspace = "src/filesystem";
+  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+
+  # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
+  postInstall = ''
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
+  '';
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "MCP server for filesystem access";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-filesystem";
+    platforms = lib.platforms.all;
+  };
+})

From 76a41c0584ddc8b9bc409045cd90a7b909efbedb Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 21:22:41 +0200
Subject: [PATCH 043/138] mcp-server-memory: init at 2026.1.26

---
 pkgs/by-name/mc/mcp-server-memory/package.nix | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-memory/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-memory/package.nix b/pkgs/by-name/mc/mcp-server-memory/package.nix
new file mode 100644
index 000000000000..8ce6a1dd34e9
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-memory/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildNpmPackage,
+  typescript,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "mcp-server-memory";
+  version = "2026.1.26";
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    tag = finalAttrs.version;
+    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+  };
+
+  nativeBuildInputs = [
+    typescript
+  ];
+
+  dontNpmPrune = true;
+  npmWorkspace = "src/memory";
+  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+
+  # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
+  postInstall = ''
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
+  '';
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "MCP server for enabling memory for Claude through a knowledge graph";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-memory";
+    platforms = lib.platforms.all;
+  };
+})

From d6fa308ff0961afe9ed5220f11f01f8a15a79ea6 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 21:23:27 +0200
Subject: [PATCH 044/138] mcp-server-sequential-thinking: init at 2026.1.26

---
 .../package.nix                               | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
new file mode 100644
index 000000000000..3fd8b4ba0ec5
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildNpmPackage,
+  typescript,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "mcp-server-sequential-thinking";
+  version = "2026.1.26";
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    tag = finalAttrs.version;
+    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+  };
+
+  nativeBuildInputs = [
+    typescript
+  ];
+
+  dontNpmPrune = true;
+  npmWorkspace = "src/sequentialthinking";
+  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+
+  # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
+  postInstall = ''
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
+    rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
+  '';
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "MCP server for sequential thinking and problem solving";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-memory";
+    platforms = lib.platforms.all;
+  };
+})

From ef9aa3ae88f3c2dc3a2b99d0f9c19166d06c7ec4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 21:28:03 +0200
Subject: [PATCH 045/138] mcp-server-git: init at 2026.1.26

---
 pkgs/by-name/mc/mcp-server-git/package.nix | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-git/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-git/package.nix b/pkgs/by-name/mc/mcp-server-git/package.nix
new file mode 100644
index 000000000000..f5f78899a692
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-git/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "mcp-server-git";
+  version = "2026.1.26";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    tag = finalAttrs.version;
+    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/src/git/";
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    gitpython
+    mcp
+    pydantic
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mcp_server_git" ];
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-git";
+    platforms = lib.platforms.all;
+  };
+})

From 14a7c47d41aa628b42366af9eefe18274f37b71c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Apr 2026 21:31:13 +0200
Subject: [PATCH 046/138] mcp-server-time: init at 2026.1.26

---
 pkgs/by-name/mc/mcp-server-time/package.nix | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-server-time/package.nix

diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix
new file mode 100644
index 000000000000..0739e45953e3
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-server-time/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "mcp-server-time";
+  version = "2026.1.26";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "servers";
+    tag = finalAttrs.version;
+    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/src/time/";
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    mcp
+    pydantic
+    tzdata
+    tzlocal
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    freezegun
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mcp_server_time" ];
+
+  meta = {
+    changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
+    description = "Model Context Protocol server providing tools for time queries and timezone conversions for LLMs";
+    homepage = "https://github.com/modelcontextprotocol/servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcp-server-git";
+    platforms = lib.platforms.all;
+  };
+})

From a8e4970af6005a4339a14f2e46fa30ee270ae933 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 3 Apr 2026 09:36:46 +0800
Subject: [PATCH 047/138] swift-format: add shell completions support

Add shell completions for bash, zsh, and fish using
swift-format's built-in --generate-completion-script flag.
---
 .../compilers/swift/swift-format/default.nix        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix
index f1d435a6cca5..adb76e7a359a 100644
--- a/pkgs/development/compilers/swift/swift-format/default.nix
+++ b/pkgs/development/compilers/swift/swift-format/default.nix
@@ -1,11 +1,11 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   callPackage,
   swift,
   swiftpm,
   swiftpm2nix,
+  installShellFiles,
   Dispatch,
   Foundation,
 }:
@@ -22,6 +22,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     swift
     swiftpm
+    installShellFiles
   ];
   buildInputs = [ Foundation ];
 
@@ -38,6 +39,16 @@ stdenv.mkDerivation {
     binPath="$(swiftpmBinPath)"
     mkdir -p $out/bin
     cp $binPath/swift-format $out/bin/
+
+    # Generate shell completions
+    for shell in bash zsh fish; do
+      $out/bin/swift-format --generate-completion-script $shell > swift-format.$shell
+    done
+
+    installShellCompletion --cmd swift-format \
+      --bash swift-format.bash \
+      --zsh swift-format.zsh \
+      --fish swift-format.fish
   '';
 
   meta = {

From 1065d9a8609caa0a66dccf973789fb434d5070df Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 3 Apr 2026 14:03:58 +0800
Subject: [PATCH 048/138] nb-cli: 1.6.0 -> 1.7.3

---
 pkgs/by-name/nb/nb-cli/package.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 3909c8af32ee..83c146cc12f8 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -1,30 +1,31 @@
 {
-  fetchPypi,
   lib,
-  nb-cli,
+  fetchFromGitHub,
   python3,
+  nb-cli,
   testers,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "nb-cli";
-  version = "1.6.0";
+  version = "1.7.3";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "nb_cli";
-    inherit (finalAttrs) version;
-    hash = "sha256-IbYyPZuhTkr4RInIR1lpMzl2+VYzu4IFQt2pOko92ZQ=";
+  src = fetchFromGitHub {
+    owner = "nonebot";
+    repo = "nb-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/OZHDMfwaajePiQ7Nb6BsQcpUPybP5SDWHWG/tVUxCo=";
   };
 
-  pythonRelaxDeps = [
-    "watchfiles"
-    "noneprompt"
-  ];
+  pythonRemoveDeps = [ "pip" ];
 
-  build-system = [
-    python3.pkgs.babel
-    python3.pkgs.pdm-backend
+  # too strict
+  pythonRelaxDeps = true;
+
+  build-system = with python3.pkgs; [
+    babel
+    pdm-backend
   ];
 
   dependencies = with python3.pkgs; [

From 81ac017424770e41077ee181425b5936c19036cc Mon Sep 17 00:00:00 2001
From: Nathan Gill <nathan.j.gill@outlook.com>
Date: Fri, 3 Apr 2026 12:30:13 +0100
Subject: [PATCH 049/138] noctalia-shell: 4.7.1 -> 4.7.5

- bump `noctalia-shell` from 4.7.1 to 4.7.5

resolves #505468
---
 pkgs/by-name/no/noctalia-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/noctalia-shell/package.nix b/pkgs/by-name/no/noctalia-shell/package.nix
index f12557168d6f..d8c138bb03d6 100644
--- a/pkgs/by-name/no/noctalia-shell/package.nix
+++ b/pkgs/by-name/no/noctalia-shell/package.nix
@@ -68,13 +68,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "noctalia-shell";
-  version = "4.7.1";
+  version = "4.7.5";
 
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia-shell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h5jMVGjgrfVPufMG3AMj/HGfU/EqU/4WEK7HCKhMN2E=";
+    hash = "sha256-0xoCuJSRSWcn4mCX382lCxqLbnuOrrqS4dOcdpoUmZg=";
   };
 
   nativeBuildInputs = [

From 49e1c9c9a4d9f686068ba50f73765e030de42c93 Mon Sep 17 00:00:00 2001
From: Philip Johansson <philip@phlipphlop.me>
Date: Fri, 3 Apr 2026 20:02:21 +0200
Subject: [PATCH 050/138] qbit-manage: 4.6.5 -> 4.7.0

---
 pkgs/by-name/qb/qbit-manage/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/qb/qbit-manage/package.nix b/pkgs/by-name/qb/qbit-manage/package.nix
index e3dc8f09d75f..13cf1324639e 100644
--- a/pkgs/by-name/qb/qbit-manage/package.nix
+++ b/pkgs/by-name/qb/qbit-manage/package.nix
@@ -8,22 +8,20 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "qbit-manage";
-  version = "4.6.5";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "StuffAnThings";
     repo = "qbit_manage";
     tag = "v${version}";
-    hash = "sha256-JCsbf2mPRhs7Mbekl946G/y/CSNSSvQBLvlwVy/Avcg=";
+    hash = "sha256-cPN4GhB7TuhiGau8Nb9hVNubF6fppyS2tuFGJ+spPaI=";
   };
 
   pyproject = true;
   build-system = [ python3Packages.setuptools ];
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "==" ">=" \
-      --replace "bencodepy" "bencode.py"
+    substituteInPlace pyproject.toml --replace "==" ">="
   '';
 
   dependencies = with python3Packages; [
@@ -43,10 +41,9 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "croniter"
     "fastapi"
-    "gitpython"
-    "humanize"
-    "ruamel.yaml"
+    "requests"
     "uvicorn"
   ];
 

From f3a543eb9affc94af08e20a709766c5e6c76d5d2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 4 Apr 2026 02:33:20 +0200
Subject: [PATCH 051/138] zsign: fix build

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

diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix
index 9c54ff4ea46c..40f58d68e1c6 100644
--- a/pkgs/by-name/zs/zsign/package.nix
+++ b/pkgs/by-name/zs/zsign/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-e4k3W+FkdydqPy3DuhH6MbC+IilLZfqOb7FAbIiv/kM=";
   };
 
+  postPatch = ''
+    substituteInPlace ../../src/common/archive.cpp \
+      --replace-fail "#include <zip.h>" "#include <minizip/zip.h>" \
+      --replace-fail "#include <unzip.h>" "#include <minizip/unzip.h>"
+  '';
+
   sourceRoot = "${finalAttrs.src.name}/build/${platformName}";
 
   nativeBuildInputs = [ pkg-config ];

From df40544f0df814d0bdb576f602fac0f1ba99eb7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 01:02:14 +0000
Subject: [PATCH 052/138] kubevirt: 1.7.2 -> 1.8.1

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

diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index 24e4d9d50543..1476f05d774f 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevirt";
-  version = "1.7.2";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "kubevirt";
     repo = "kubevirt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Bx2DzuKNcDkFnkyiEay9WosM6qZ4vnDLrz2NwNn5J3E=";
+    hash = "sha256-EBF2Pkw4Yl8D5ghE/SA/NOwC2lUQwpk1JZkujWPce6E=";
   };
 
   vendorHash = null;

From db89b6a6448684058068495c0102266052226b41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 02:52:13 +0000
Subject: [PATCH 053/138] fabric-ai: 1.4.441 -> 1.4.442

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

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index b1be5f211f22..1c84870c492b 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fabric-ai";
-  version = "1.4.441";
+  version = "1.4.442";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hbK4AOqK9IkvKPrQWCQd5K1IWcfXiP0fVPEMtstJSsI=";
+    hash = "sha256-f9GgCJC7Ho0W2eX98ooIrQ71ToCFJrQROQdewibvyAs=";
   };
 
   vendorHash = "sha256-Ay+ndVlyHwA93QdzMRsQfpp38MAzQgXX5pif6ElbO4M=";

From ba5729fef07039ef8138b0fe09329d31ff9bf720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 20:35:07 -0700
Subject: [PATCH 054/138] python3Packages.aioslimproto: fix src tag

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

diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index eba6bf22859c..a76649e8bd5a 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioslimproto";
-    tag = "v${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-xHdwikriA6mcb7tmElqa6suINYxeyyGZQ5iO+P7dRCo=";
   };
 

From 9bac017ad487b51fe936369d0da665e845c07ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:14:23 -0700
Subject: [PATCH 055/138] python3Packages.holidays: 0.85 -> 0.93

Diff: https://github.com/vacanza/python-holidays/compare/v0.85...v0.93

Changelog: https://github.com/vacanza/holidays/blob/v0.93/CHANGES.md
---
 .../python-modules/holidays/default.nix           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 647859ca8621..9a62135a5f16 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -13,16 +13,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "holidays";
-  version = "0.85";
+  version = "0.93";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
-    tag = "v${version}";
-    hash = "sha256-ExleK66foB2Q/KK7zcPJ16q4ucz3gOkntB2SQETfHqk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6WgwDkgd6Wn67gNcOw/H2fg55OHcOP7h+76HrML6p80=";
   };
 
   build-system = [
@@ -36,6 +36,9 @@ buildPythonPackage rec {
 
   postPatch = ''
     patchShebangs scripts/l10n/*.py
+
+    substituteInPlace holidays/version.py \
+      --replace-fail 'version("holidays")' '"${finalAttrs.version}"'
   '';
 
   preBuild = ''
@@ -59,11 +62,11 @@ buildPythonPackage rec {
   meta = {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
-    changelog = "https://github.com/vacanza/holidays/blob/${src.tag}/CHANGES.md";
+    changelog = "https://github.com/vacanza/holidays/blob/${finalAttrs.src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
       jluttine
     ];
   };
-}
+})

From d73b7bda43edb0e03e141ec4db20d3fc3488133f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:47:11 -0700
Subject: [PATCH 056/138] python3Packages.pysmartthings: 3.7.2 -> 3.7.3

Diff: https://github.com/andrewsayre/pysmartthings/compare/v3.7.2...v3.7.3

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

diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index 3a9218e042c7..de4d913d8891 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pysmartthings";
-  version = "3.7.2";
+  version = "3.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "andrewsayre";
     repo = "pysmartthings";
     tag = "v${version}";
-    hash = "sha256-zz5UUvegBUXqqJeV7S3OF0eoGISC5hd8hfevY9UQ0nM=";
+    hash = "sha256-Z3E+7z/4P08OI/pgMe0g5vnzfNLLTd712jFdUqgBFXc=";
   };
 
   build-system = [ poetry-core ];

From 5ee698b3add20ef6e076fc037449d404b5fdc906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:47:35 -0700
Subject: [PATCH 057/138] python3Packages.pysmhi: 1.1.0 -> 2.0.0

Diff: https://github.com/gjohansson-ST/pysmhi/compare/v1.1.0...v2.0.0

Changelog: https://github.com/gjohansson-ST/pysmhi/releases/tag/v2.0.0
---
 pkgs/development/python-modules/pysmhi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
index 9427b8ca00a8..2a7cc8700758 100644
--- a/pkgs/development/python-modules/pysmhi/default.nix
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pysmhi";
-  version = "1.1.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pysmhi";
     tag = "v${version}";
-    hash = "sha256-n2eDQ9fbELGvO/SYqdrwT+lZNIZs5GgihmrimvI3a1w=";
+    hash = "sha256-9t/mhmQfNwuX2QVS1OOeKZOARXK9otjGtwJEfVeizPU=";
   };
 
   build-system = [ poetry-core ];

From e02032f074d209d16c6be587ddb684884dc2f6d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:48:18 -0700
Subject: [PATCH 058/138] python3Packages.soco: 0.30.14 -> 0.30.15

Diff: https://github.com/SoCo/SoCo/compare/v0.30.14...v0.30.15

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

diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index 7733c5ef9efb..19e1a705fc1c 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.30.14";
+  version = "0.30.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SoCo";
     repo = "SoCo";
     tag = "v${version}";
-    hash = "sha256-b9VOYOu2rkLOSEwKxXko08sFPRiUspm5iTLZu0j92rc=";
+    hash = "sha256-wnfqxFKDSO7gcIc5UGJs/v3VxttlQPrRWYeZc5IlriU=";
   };
 
   build-system = [ setuptools ];

From 425ab89d4b9627056649d41248f28380ec0ccb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:49:18 -0700
Subject: [PATCH 059/138] python3Packages.zinvolt: 0.3.0 -> 0.4.1

Diff: https://github.com/joostlek/python-zinvolt/compare/v0.3.0...v0.4.1

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

diff --git a/pkgs/development/python-modules/zinvolt/default.nix b/pkgs/development/python-modules/zinvolt/default.nix
index 07163b51a3ee..ff9c7aaee82b 100644
--- a/pkgs/development/python-modules/zinvolt/default.nix
+++ b/pkgs/development/python-modules/zinvolt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "zinvolt";
-  version = "0.3.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-zinvolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4p+2zzBDuS6N6b+FhE6mWRFBzCzzkxApVlQai7sG/HM=";
+    hash = "sha256-b6NWEk2sn0LpCd2qTpcU4pVH01FzMNHM6ybQU24mN1c=";
   };
 
   build-system = [ poetry-core ];

From f24bf22d479db0662948088bf7700baba8e2e1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:13:32 -0700
Subject: [PATCH 060/138] home-assistant.frontend: 20260325.5 -> 20260325.6

Changelog: https://github.com/home-assistant/frontend/releases/tag/20260325.6
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 313017e0e2d3..cd3a3632099c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.4.0";
+  version = "2026.4.1";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index d3bf1d387f8e..478c7b42d1e8 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20260325.5";
+  version = "20260325.6";
   format = "wheel";
 
   src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-JRQrocKeC2vYsYBYk6KLbuAZADL/57T7egLHZF/v8UI=";
+    hash = "sha256-YGIJW+MCiTzFlQkUEjtxMvYpYgvJJZXyslin7Zw1jRU=";
   };
 
   # there is nothing to strip in this package

From 0ad4039191dec2384c0160d6ea286ece4735ec4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:11:39 -0700
Subject: [PATCH 061/138] home-assistant: 2026.4.0 -> 2026.4.1

Diff: https://github.com/home-assistant/core/compare/2026.4.0...2026.4.1

Changelog: https://github.com/home-assistant/core/releases/tag/2026.4.1
---
 pkgs/servers/home-assistant/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2a32fac3f700..e5dd32ef59e6 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -253,13 +253,13 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.4.0";
+  hassVersion = "2026.4.1";
 
 in
 python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
   version =
-    #assert (componentPackages.version == hassVersion);
+    assert (componentPackages.version == hassVersion);
     hassVersion;
   pyproject = true;
 
@@ -274,13 +274,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-K/PK2i8yOqLm/GJNz5LZG8DZRKXziPzDPaguIMcKMpY=";
+    hash = "sha256-Cowd0vNtWeh5XTNZQxkLqZtYZjfbdw/6FhuIGs1cNQ4=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-rSckOYhEYZnmZNCfajGW3b52SMMnXvvSP+O/3jw/GuU=";
+    hash = "sha256-5nEhbXFZp4u8zTw00fd2W3PBafPhynPzpmF6Dj+G7Mo=";
   };
 
   build-system = with python.pkgs; [

From 47b2e5b7f52c99d9fc5739bba11c488ee6f62a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:12:49 -0700
Subject: [PATCH 062/138] 
 home-assistant-custom-components.waste_collection_schedule: 2.12.1 -> 2.13.0

Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/2.12.1...2.13.0

Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.13.0
---
 .../waste_collection_schedule/package.nix     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 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 cb65fb41b95e..b8777bce765b 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
@@ -3,36 +3,51 @@
   buildHomeAssistantComponent,
   fetchFromGitHub,
   beautifulsoup4,
-  cloudscraper,
+  curl-cffi,
+  homeassistant,
   icalendar,
   icalevents,
+  jinja2,
   lxml,
+  pdfminer-six,
   pycryptodome,
   pypdf,
+  pytestCheckHook,
+  pyyaml,
+  requests,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.12.1";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = version;
-    hash = "sha256-mR8UCDQDQBMYCxIA8DKLhD+u9utfMx+woS5L2E7mxXM=";
+    hash = "sha256-Tl9Z48d+OjyHmk0e6ALz/ywWHgzUhX+rhKjwZh4INo4=";
   };
 
   dependencies = [
     beautifulsoup4
-    cloudscraper
+    curl-cffi
     icalendar
     icalevents
     lxml
+    pdfminer-six
     pycryptodome
     pypdf
   ];
 
+  nativeCheckInputs = [
+    homeassistant
+    jinja2
+    pytestCheckHook
+    pyyaml
+    requests
+  ];
+
   meta = {
     changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}";
     description = "Home Assistant integration framework for (garbage collection) schedules";

From 013dc975b8ed53597646c1fd0c2d021f63e0e0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:45:40 -0700
Subject: [PATCH 063/138] python3Packages.aiohomematic: 2026.3.23 -> 2026.4.0

Diff: https://github.com/SukramJ/aiohomematic/compare/2026.3.23...2026.4.0

Changelog: https://github.com/SukramJ/aiohomematic/blob/2026.4.0/changelog.md
---
 pkgs/development/python-modules/aiohomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 8c9ab2ae39bf..28382e92fb67 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2026.3.23";
+  version = "2026.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.14";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-zbXz/pg5CB8YLs6oF3Nv8gVimc/jQu3pHRpD/y3Wp5Q=";
+    hash = "sha256-rujAMHFYzTccrXZF2//5k2iGL90fEdigL3Ni40Ogmxo=";
   };
 
   build-system = [ setuptools ];

From 10385b8fb5513d26c09022cacd53e65573ee8da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 15:45:54 -0700
Subject: [PATCH 064/138] home-assistant-custom-components.homematicip_local:
 2.5.0 -> 2.5.2

Diff: https://github.com/SukramJ/custom_homematic/compare/2.5.0...2.5.2

Changelog: https://github.com/SukramJ/custom_homematic/blob/2.5.2/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index b306bb3c0c1f..e6461a7305f8 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -14,13 +14,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "2.5.0";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-ncD72aL5+SI2CDnAHvHqbJffnEApomjC2k88VIQH9O8=";
+    hash = "sha256-aGxz46s1LMFZkAS101gfpAerkWPQz4eNjxvc4EMgj5M=";
   };
 
   postPatch = ''

From 65ca0996b48bb1fe7930309359e1ef0f37e2b46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 17:09:35 -0700
Subject: [PATCH 065/138] home-assistant-custom-components.battery_notes: 3.3.4
 -> 3.4.0

Diff: https://github.com/andrew-codechimp/HA-Battery-Notes/compare/3.3.4...3.4.0

Changelog: https://github.com/andrew-codechimp/HA-Battery-Notes/releases/tag/3.4.0
---
 .../custom-components/battery_notes/package.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
index 8a6333941933..7ccfaa9453c6 100644
--- a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "andrew-codechimp";
   domain = "battery_notes";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HA-Battery-Notes";
     tag = version;
-    hash = "sha256-H++0Q7X4mQ8d+goTMuvfQiLExax0+0AhotJALTYVz1s=";
+    hash = "sha256-0OGAwpYLXDOWqCxxmA7ggdAAT7LUfiaX1qlvYXZD/OM=";
   };
 
   # has no tests

From 85049238ab3caa62c66a13376afd67a157565fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 17:10:57 -0700
Subject: [PATCH 066/138] home-assistant-custom-components.polaris-mqtt: 1.1.2
 -> 1.1.3

Diff: https://github.com/samoswall/polaris-mqtt/compare/v1.1.2...v1.1.3
---
 .../home-assistant/custom-components/polaris-mqtt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
index b47189dcf7ce..5dcb54c919eb 100644
--- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "samoswall";
   domain = "polaris";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "samoswall";
     repo = "polaris-mqtt";
     tag = "v${version}";
-    hash = "sha256-N8/NTipJEltyHekQaZZjvqfw+noI7pu/YStoidV9ddw=";
+    hash = "sha256-GKwc9EwPygA1ZJx7wcDOdV7FzhOdrNhQuKv3h35NgUU=";
   };
 
   meta = {

From 04773f1977a34c6ab1008bca23a5cbf39faba2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Apr 2026 20:38:08 -0700
Subject: [PATCH 067/138] python3Packages.homeassistant-stubs: 2026.4.0 ->
 2026.4.1

Diff: https://github.com/KapJI/homeassistant-stubs/compare/2026.4.0...2026.4.1

Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2026.4.1
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 1d55b1308db5..2e2fc3778eb2 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.4.0";
+  version = "2026.4.1";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-uD9+WkhRwwr5l4pKpg7GosTsLqgGCTQA6u3mN+XBhio=";
+    hash = "sha256-jU1257IfLevROsRXHmx6jmq3ud0WhpsuiXaUm0tLKgc=";
   };
 
   build-system = [

From d7794d1543e51af2a1d3af9dfc8387fefebccb54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 04:58:24 +0000
Subject: [PATCH 068/138] modrinth-app-unwrapped: 0.12.4 -> 0.12.6

---
 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 b07812984535..0f50b306728b 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.4";
+  version = "0.12.6";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cx6GBkncRF8dK8Xa5UELVZYMQ8BuReLxeLvZZpBwkuE=";
+    hash = "sha256-qVFDCn+8dtiIULNIq37wIrqaUNvNIoXoHl8QhUTyz48=";
   };
 
   patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-kQD/g90gtWFp7Nb8W4H5wfYA71yTnA/4affXdmhQgyY=";
+  cargoHash = "sha256-PDsq5XEU+ZfyGzwtwxQ3i2TURjhies/Up3SVysOprZ0=";
   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-pY0Ppp+swKkLP2qg3GYrWRPKkWeyHQZ9i7AfephZf1U=";
+    hash = "sha256-JD+mzSHMVLGnkc5Jrxy+mtZ8W82E0pQhglsC3NmfszQ=";
   };
 
   nativeBuildInputs = [

From e4163c66ecee9af29fa303316d1cd34e50bd768a Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Sat, 4 Apr 2026 14:00:10 +0800
Subject: [PATCH 069/138] sparkle: fix build with pnpm_10_29_2

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

diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix
index 3fdca51b126f..81ff8fd08c96 100644
--- a/pkgs/by-name/sp/sparkle/package.nix
+++ b/pkgs/by-name/sp/sparkle/package.nix
@@ -3,8 +3,7 @@
   stdenvNoCC,
   buildGoModule,
   fetchFromGitHub,
-  pnpm_10,
-  pnpm ? pnpm_10,
+  pnpm_10_29_2,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -38,6 +37,8 @@ let
 
     meta.mainProgram = "sparkle-service";
   };
+
+  pnpm = pnpm_10_29_2;
 in
 
 stdenvNoCC.mkDerivation (finalAttrs: {

From b0b8fdc5e555370c1353abf7c997c1248cca7b34 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 4 Apr 2026 08:11:33 +0200
Subject: [PATCH 070/138] foomatic-db-engine: 0-unstable-2024-02-10 ->
 0-unstable-2026-04-03

Changes with this update:

https://github.com/OpenPrinting/foomatic-db-engine/pull/14 Fix typo
https://github.com/OpenPrinting/foomatic-db-engine/pull/15 Fix typo
https://github.com/OpenPrinting/foomatic-db-engine/pull/16 Fix typo
https://github.com/OpenPrinting/foomatic-db-engine/pull/17 Fix usages of "open ... ||"
---
 pkgs/by-name/fo/foomatic-db-engine/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/foomatic-db-engine/package.nix b/pkgs/by-name/fo/foomatic-db-engine/package.nix
index 59f70a550469..b2179b863663 100644
--- a/pkgs/by-name/fo/foomatic-db-engine/package.nix
+++ b/pkgs/by-name/fo/foomatic-db-engine/package.nix
@@ -18,15 +18,15 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "foomatic-db-engine";
-  version = "0-unstable-2024-02-10";
+  version = "0-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     # there is also a daily snapshot at the `downloadPage`,
     # but it gets deleted quickly and would provoke 404 errors
     owner = "OpenPrinting";
     repo = "foomatic-db-engine";
-    rev = "a2b12271e145fe3fd34c3560d276a57e928296cb";
-    hash = "sha256-qM12qtGotf9C0cjO9IkmzlW9GWCkT2Um+6dU3mZm3DU=";
+    rev = "e4e7b9cd28ba160428f82bc5234559d1f50e5c42";
+    hash = "sha256-wpGFGr2H2adN4AVrYBNc+f4nE9x7OtzAxF5PkzmieXc=";
   };
 
   outputs = [ "out" ];

From 07415c1c8f3c072cca84fe868edb87dfb59507a0 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 4 Apr 2026 13:59:18 +0700
Subject: [PATCH 071/138] qdrant: 1.16.3 -> 1.17.1

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

diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix
index 3ce8c95160d5..80d82b5f3227 100644
--- a/pkgs/by-name/qd/qdrant/package.nix
+++ b/pkgs/by-name/qd/qdrant/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  cacert,
   protobuf,
   pkg-config,
   openssl,
@@ -13,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qdrant";
-  version = "1.16.3";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p2xQStTwbC6MoEsaM1JXlBHK2CqwIfD7x+WwciuY49s=";
+    hash = "sha256-EGk1BM8/SjH4LO25fG5GGtRXTnhA9prmGR5MxyzJNd4=";
   };
 
-  cargoHash = "sha256-DEOMoG13eDDEadScwQOD6jxuJBxaU2+fUNK/QLXLG8M=";
+  cargoHash = "sha256-8+tMZQUsyouNbxlvykfQ66/THd9PMPnVUbWaXwMtVCM=";
 
   nativeBuildInputs = [
     protobuf
@@ -39,6 +40,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Needed to get openssl-sys to use pkg-config.
   env.OPENSSL_NO_VENDOR = 1;
 
+  nativeCheckInputs = [ cacert ];
+
+  checkFlags = [
+    # This test assumes the process starts without any existing children,
+    # which is not reliable in the Nix build sandbox.
+    "--skip=common::metrics::procfs_metrics::test_child_processes"
+  ];
+
   # Fix cargo-auditable issue with bench_rocksdb = ["dep:rocksdb"]
   auditable = false;
 

From 7554fbabb7e540b2ee6c60b398e5ab8bed455d5e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 4 Apr 2026 14:00:03 +0700
Subject: [PATCH 072/138] qdrant: add miniharinn as a maintainer

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

diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix
index 80d82b5f3227..cf0f155dff40 100644
--- a/pkgs/by-name/qd/qdrant/package.nix
+++ b/pkgs/by-name/qd/qdrant/package.nix
@@ -68,6 +68,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://github.com/qdrant/qdrant";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ dit7ya ];
+    maintainers = with lib.maintainers; [
+      dit7ya
+      miniharinn
+    ];
   };
 })

From 20e346320f6e089ab8621328d0399579d1dd3bff Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 4 Apr 2026 10:13:35 +0200
Subject: [PATCH 073/138] claude-code: 2.1.91 -> 2.1.92

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/package-lock.json | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 20b825f41315..0e9dc25c3830 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.1.91",
+  "version": "2.1.92",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.91",
+      "version": "2.1.92",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 258243479998..29fdae0555e3 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.91";
+  version = "2.1.92";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-u7jdM6hTYN05ZLPz630Yj7gI0PeCSArg4O6ItQRAMy4=";
+    hash = "sha256-CLLCtVK3TeXFZ8wBnRRHNc2MoUt7lTdMJwz8sZHpkFM=";
   };
 
-  npmDepsHash = "sha256-0ppKP+XMgTzVVZtL7GDsOjgvSPUDrUa7SoG048RLaNg=";
+  npmDepsHash = "sha256-5LvH7fG5pti2SiXHQqgRxfFpxaXxzrmGxIoPR4dGE+8=";
 
   strictDeps = true;
 

From 4c4a6ae00dc89f22685295795528e81ce9ac4734 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 4 Apr 2026 10:13:36 +0200
Subject: [PATCH 074/138] claude-code-bin: 2.1.91 -> 2.1.92

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code-bin/manifest.json | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json
index 211a12a84f78..b7febebaf9b0 100644
--- a/pkgs/by-name/cl/claude-code-bin/manifest.json
+++ b/pkgs/by-name/cl/claude-code-bin/manifest.json
@@ -1,46 +1,46 @@
 {
-  "version": "2.1.91",
-  "buildDate": "2026-04-02T22:04:30Z",
+  "version": "2.1.92",
+  "buildDate": "2026-04-03T23:31:32Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "7433d76d3ec5d223a340e21d7a05f3d481d89999f228113168ad5d64c66fd376",
-      "size": 198092944
+      "checksum": "6d1b9657727dce81332b3cda11bfe0a8c83e2392e3c062a31022e10b0e71cdd1",
+      "size": 198736976
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "47409dc476c199711d5c776cf359773f75cb9dc72ce7494a4e4cb100520e8ab4",
-      "size": 199574608
+      "checksum": "d422b5cc974b3bc4b28f698144fd0316f3e17774babe0bc1eb76c2bb0858d0aa",
+      "size": 200226896
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "dddba100b352ea6d06aa7e036d5afe49749edddd1309a4aa22e47049fafcadf9",
-      "size": 230427200
+      "checksum": "08deb3d56477496eb92e624f492e25b123f4527dd5674f71afff58a48eccd953",
+      "size": 231082560
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "01b74e1b02e3330940b3526d2f6e00bf32f7fd9e6b3861be6a61e01cfd7296e6",
-      "size": 230161024
+      "checksum": "e22324514967ff2d5e9f91f0ee37e4675bf8b6dfec27fafb19cb25cc5b23fcaf",
+      "size": 230787712
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "3dcaacefb510f6aee3573d35fe65f5dccbbbf4b6fdcca9a5a5455c03556a2f8b",
-      "size": 223480256
+      "checksum": "d0163f8857511b8f9dad7de1f072de2ca8c4e881d006b3b43525af3534050ae3",
+      "size": 224201152
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "b05d9447b7d9a4fa92f936b2275ca87db3bada52d8589bf4e4c49d437366942a",
-      "size": 224459200
+      "checksum": "e0f4a300ff9d0d9cb9c3ee37c706a9db239e3bbce96118245196ae6bc1b0492e",
+      "size": 225102272
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "12f69849f6774749718520f41fb94f6fc30779b55d8f9b0acaaf20c755e6b55d",
-      "size": 239873184
+      "checksum": "ebd9007c464d912593418f133a61d9f24866428530a81e88e910a24823066415",
+      "size": 240482464
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "389de7f1f2b979cb4098f7752ca0099275cedabcfe3908a9886d143ef594972b",
-      "size": 236586144
+      "checksum": "c258bce79aefac609f909e5abde92d1653bcef47d3577656d299d1d56f1604bb",
+      "size": 237192864
     }
   }
 }

From 351c4f0cc8ac5f50438337ff5cea0b864ebbee80 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 4 Apr 2026 10:13:37 +0200
Subject: [PATCH 075/138] vscode-extensions.anthropic.claude-code: 2.1.90 ->
 2.1.92

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index f847e370173a..6f17beb99dac 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.1.90";
-    hash = "sha256-8xHAEqxxCA0bw/4eNFL2PutMquD2H7FO1o2yycAJ4ME=";
+    version = "2.1.92";
+    hash = "sha256-L3W9LoFA6JzsPa20Md9rOJBG/siauIJeuDcE7euZxMg=";
   };
 
   postInstall = ''

From 4aa2b30706ccd410e9ce5c3d7d6ecd48e5e9cf7e Mon Sep 17 00:00:00 2001
From: Sergei Volkov <taranarmo@gmail.com>
Date: Sat, 4 Apr 2026 11:07:28 +0200
Subject: [PATCH 076/138] qwen-code: 0.13.1 -> 0.14.0

---
 pkgs/by-name/qw/qwen-code/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 3d0f2307871b..8cd2c90e3c69 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -14,17 +14,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8qSjr/VsJX6p6/sBRr9jlu2jjPhr1ZpdPe9WZofL/ug=";
+    hash = "sha256-XeJeBNfIFo2XowIRGgxixAtfz1saeKxt93/EK7EF5tA=";
   };
 
   npmDepsFetcherVersion = 3;
-  npmDepsHash = "sha256-nmydorBc1r7OA/oXvetKw7ivyeqSppScINFXEpPYES0=";
+  npmDepsHash = "sha256-UeEldKIcCS7km1nuyfLlSawDVBQDn+k97wxe9ZgaHtM=";
 
   # npm 11 incompatible with fetchNpmDeps
   # https://github.com/NixOS/nixpkgs/issues/474535
@@ -76,7 +76,11 @@ buildNpmPackage (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    # Build web-templates package first (required by main bundle)
+    # Build several internal packages first (required by main bundle)
+    npm run build --workspace=@qwen-code/channel-base
+    npm run build --workspace=@qwen-code/channel-telegram
+    npm run build --workspace=@qwen-code/channel-weixin
+    npm run build --workspace=@qwen-code/channel-dingtalk
     npm run build --workspace=@qwen-code/web-templates
 
     npm run generate

From fc8d1962a28450b0b86472e96e5b0963ea9a63ce Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 16 Mar 2026 23:33:58 +0400
Subject: [PATCH 077/138] =?UTF-8?q?serial-studio:=203.1.10-unstable-2025-1?=
 =?UTF-8?q?2-12=20=E2=86=92=203.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serial-studio/0001-CMake-Deploy-Fix.patch | 23 +++++++-------
 pkgs/by-name/se/serial-studio/package.nix     | 30 ++++++++++++++-----
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch
index 3ea75fbf5d43..9bef968a5bb0 100644
--- a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch
+++ b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch
@@ -1,11 +1,11 @@
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index e69150cd..c4ce7975 100644
---- a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -392,17 +392,6 @@
-   set(deploy_tool_options_arg "-force-openssl --release --no-translations")
+diff --git i/app/CMakeLists.txt w/app/CMakeLists.txt
+index 1ab415ea..23792435 100644
+--- i/app/CMakeLists.txt
++++ w/app/CMakeLists.txt
+@@ -872,17 +872,6 @@ elseif(WIN32)
+   set(deploy_tool_options_arg "-force-openssl --release --no-translations --no-compiler-runtime")
  endif()
-
+ 
 -qt_generate_deploy_qml_app_script(
 -  TARGET ${PROJECT_EXECUTABLE}
 -  OUTPUT_SCRIPT deploy_script
@@ -17,9 +17,6 @@ index e69150cd..c4ce7975 100644
 -
 -install(SCRIPT ${deploy_script})
 -
- #-------------------------------------------------------------------------------
- # Packaging
- #-------------------------------------------------------------------------------
--- 
-2.47.2
-
+ #---------------------------------------------------------------------------------------------------
+ # CPack installer/package generation
+ #---------------------------------------------------------------------------------------------------
diff --git a/pkgs/by-name/se/serial-studio/package.nix b/pkgs/by-name/se/serial-studio/package.nix
index 1505a8941d8c..821c71849af7 100644
--- a/pkgs/by-name/se/serial-studio/package.nix
+++ b/pkgs/by-name/se/serial-studio/package.nix
@@ -4,29 +4,34 @@
   fetchFromGitHub,
   cmake,
   qt6,
+  expat,
+  zlib,
   pkg-config,
+  wrapGAppsHook3,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "serial-studio";
-  version = "3.1.10-unstable-2025-12-12";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "Serial-Studio";
     repo = "Serial-Studio";
-    rev = "b2e8b5430da59969dd697636677873f3f6c10c7c";
-    hash = "sha256-O/KAYKpVGn2Q0CPaReh564P5l+ilHuQYRJ4w5aFKZmg=";
-    fetchSubmodules = true;
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KY7ePFeO29jKnaFbP5IJo1Z/OqldTvmZUGuzZ+yqyK8=";
   };
 
   nativeBuildInputs = [
     cmake
     qt6.wrapQtAppsHook
     pkg-config
+    wrapGAppsHook3 # required for FileChooser
   ];
 
   buildInputs = [
+    expat
+    zlib
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtsvg
@@ -39,12 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qt5compat
   ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_ZLIB" true)
+    (lib.cmakeBool "USE_SYSTEM_EXPAT" true)
+  ];
+
   patches = [ ./0001-CMake-Deploy-Fix.patch ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin}
     mv $out/Serial-Studio-GPL3.app $out/Applications
-    ln --symbolic $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio
+    ln -s $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio-gpl3
+  '';
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
   passthru.updateScript = nix-update-script {
@@ -53,8 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Multi-purpose serial data visualization & processing program";
-    mainProgram = "serial-studio";
-    homepage = "https://serial-studio.github.io/";
+    mainProgram = "serial-studio-gpl3";
+    homepage = "https://serial-studio.com/";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ sikmir ];
     platforms = lib.platforms.unix;

From b8120448336188ba2b919b57aa22b52b608dff50 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 4 Apr 2026 16:44:27 +0700
Subject: [PATCH 078/138] beszel: 0.18.4 -> 0.18.6

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

diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index a14c962232d8..fbbace20a7f3 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "beszel";
-  version = "0.18.4";
+  version = "0.18.6";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ugxy23bLrKIDclrYRFJc6Nq4Ak2S3OLeyMaxuRkS/tY=";
+    hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So=";
   };
 
   webui = buildNpmPackage {
@@ -51,13 +51,25 @@ buildGo126Module (finalAttrs: {
     npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";
   };
 
-  vendorHash = "sha256-V9P3VP4CsboaWPIt/MhtxYDsYH3pwKL4xK5YcLKgbI8=";
+  vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE=";
+
+  tags = [ "testing" ];
 
   preBuild = ''
     mkdir -p internal/site/dist
     cp -r ${finalAttrs.webui}/* internal/site/dist
   '';
 
+  checkFlags =
+    let
+      skippedTests = [
+        "TestCollectorStartHelpers/nvtop_collector"
+        "TestApiRoutesAuthentication/GET_/update_-_shouldn't_exist_without_CHECK_UPDATES_env_var"
+        "TestConfigSyncWithTokens"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   postInstall = ''
     mv $out/bin/agent $out/bin/beszel-agent
     mv $out/bin/hub $out/bin/beszel-hub

From 6c6fb617eaffd3cbb5ea0ed75387d0b53c89b151 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 4 Apr 2026 12:30:11 +0200
Subject: [PATCH 079/138] gmu: drop

Doesn't build with GCC 15. I builds successfully with `-std=c17` but
then it fails to start with:

    gmu: Unknown parameter (-e). Try -h for help.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gm/gmu/package.nix | 72 ---------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 pkgs/by-name/gm/gmu/package.nix

diff --git a/pkgs/by-name/gm/gmu/package.nix b/pkgs/by-name/gm/gmu/package.nix
deleted file mode 100644
index e3255c103b62..000000000000
--- a/pkgs/by-name/gm/gmu/package.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  SDL,
-  SDL_gfx,
-  SDL_image,
-  tremor,
-  flac,
-  mpg123,
-  libmikmod,
-  speex,
-  ncurses,
-  keymap ? "default",
-  conf ? "unknown",
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gmu";
-  version = "0.10.1";
-
-  src = fetchurl {
-    url = "https://wej.k.vu/files/gmu-${finalAttrs.version}.tar.gz";
-    sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
-  };
-
-  patches = [
-    # pull pending upstream inclusion fix for ncurses-6.3:
-    #  https://github.com/jhe2/gmu/pull/7
-    (fetchpatch {
-      name = "ncurses-6.3.patch";
-      url = "https://github.com/jhe2/gmu/commit/c8b3a10afee136feb333754ef6ec26383b11072f.patch";
-      sha256 = "0xp2j3jp8pkmv6yvnzi378m2dylbfsaqrsrkw7hbxw6kglzj399r";
-    })
-
-    # pull upstream fix for -fno-common toolchains like
-    # upstream gcc-10 of clang-13.
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/jhe2/gmu/commit/b705209f08ddfda141ad358ccd0c3d2d099be5e6.patch";
-      sha256 = "1ci2b8kz3r58rzmivlfhqjmcgqwlkwlzzhnyxlk36vmk240a3gqq";
-    })
-  ];
-
-  buildInputs = [
-    SDL
-    SDL_gfx
-    SDL_image
-    tremor
-    flac
-    mpg123
-    libmikmod
-    speex
-    ncurses
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  postInstall = ''
-    cp ${keymap}.keymap $out/share/gmu/default.keymap
-    cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
-    mkdir -p $out/etc/gmu
-    cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
-  '';
-
-  meta = {
-    homepage = "http://wejp.k.vu/projects/gmu";
-    description = "Open source music player for portable gaming consoles and handhelds";
-    license = lib.licenses.gpl2;
-  };
-})

From 9ac969d715d749c4442e6696cf372c86b1c1bb68 Mon Sep 17 00:00:00 2001
From: Phileas Lebada <47661139+clushie@users.noreply.github.com>
Date: Sat, 4 Apr 2026 12:14:59 +0200
Subject: [PATCH 080/138] atuin: sort buildFeatures

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

diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index fbe5ec0b89f1..2dc6b855210e 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -26,9 +26,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = [
     "client"
-    "sync"
     "clipboard"
     "daemon"
+    "sync"
   ];
 
   nativeBuildInputs = [ installShellFiles ];

From 44a2dd497a562f2048f374ab9fe2d3ceb53250b5 Mon Sep 17 00:00:00 2001
From: Phileas Lebada <47661139+clushie@users.noreply.github.com>
Date: Sat, 4 Apr 2026 12:15:47 +0200
Subject: [PATCH 081/138] atuin: add missing upstream default Cargo.toml build
 features

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

diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 2dc6b855210e..1e9db1613a82 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -25,9 +25,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # for distribution builds. List all other default features.
   buildNoDefaultFeatures = true;
   buildFeatures = [
+    "ai"
     "client"
     "clipboard"
     "daemon"
+    "hex"
     "sync"
   ];
 

From d2135d99120927fbb20ae63b77709a1c9c6e1f81 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 4 Apr 2026 09:39:35 +0000
Subject: [PATCH 082/138] python3Packages.blackjax: 1.4 -> 1.5

Diff: https://github.com/blackjax-devs/blackjax/compare/1.4...1.5

Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.5
---
 .../python-modules/blackjax/default.nix       | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 1e40b9ac7d9e..8b746d71a285 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -8,8 +9,6 @@
   setuptools-scm,
 
   # dependencies
-  fastprogress,
-  ipython,
   jax,
   jaxlib,
   numpy,
@@ -17,22 +16,25 @@
   scipy,
   typing-extensions,
 
+  # optional-dependencies
+  fastprogress,
+
   # checks
   chex,
-  pytestCheckHook,
   pytest-xdist,
+  pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "blackjax";
-  version = "1.4";
+  version = "1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blackjax-devs";
     repo = "blackjax";
     tag = finalAttrs.version;
-    hash = "sha256-x/K/M7C+XNhqMdRZdDPpKmGgmnrjGsruDL3lFia2ioQ=";
+    hash = "sha256-tKJfukTqSiW2Xg3/8DakxtxlwGpJ14S/7qUE1OGM97I=";
   };
 
   build-system = [
@@ -41,8 +43,6 @@ buildPythonPackage (finalAttrs: {
   ];
 
   dependencies = [
-    fastprogress
-    ipython
     jax
     jaxlib
     numpy
@@ -51,11 +51,18 @@ buildPythonPackage (finalAttrs: {
     typing-extensions
   ];
 
+  optional-dependencies = {
+    progress = [
+      fastprogress
+    ];
+  };
+
   nativeCheckInputs = [
     chex
     pytestCheckHook
     pytest-xdist
-  ];
+  ]
+  ++ finalAttrs.passthru.optional-dependencies.progress;
 
   disabledTestPaths = [
     "tests/test_benchmarks.py"
@@ -78,6 +85,10 @@ buildPythonPackage (finalAttrs: {
     "test_nuts__without_device"
     "test_nuts__without_jit"
     "test_smc_waste_free__with_jit"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # AssertionError: Not equal to tolerance rtol=1e-07, atol=1e-05
+    "test_equal_matrices"
   ];
 
   pythonImportsCheck = [ "blackjax" ];

From affa61c7d8ff32742c1d808b70f3251151e9a7f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 11:38:17 +0000
Subject: [PATCH 083/138] pyfa: 2.66.1 -> 2.66.2

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

diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index 8fc79b3881e9..551a9b8ec3d8 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -11,7 +11,7 @@
   copyDesktopItems,
 }:
 let
-  version = "2.66.1";
+  version = "2.66.2";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     tag = "v${version}";
-    hash = "sha256-lSX+ZCPUjXE5t8OmKcA9yD+g6Xiizj1Qi6+SstZbq2g=";
+    hash = "sha256-LXmmbgnm1CZzwNtNj0TEaKh3xN6np5SseE1hoP25Emc=";
   };
 
   desktopItems = [

From 3557c5bb4726bafce3cb4b598b6f3ec823889de4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 11:39:32 +0000
Subject: [PATCH 084/138] git-pkgs: 0.15.0 -> 0.15.2

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

diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix
index f9129e58a864..2aa82bebe181 100644
--- a/pkgs/by-name/gi/git-pkgs/package.nix
+++ b/pkgs/by-name/gi/git-pkgs/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "git-pkgs";
-  version = "0.15.0";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "git-pkgs";
     repo = "git-pkgs";
     tag = "v${version}";
-    hash = "sha256-ePkLzUlHgFTJjzcZ5SP1LNcSCnaUhTO2nxDpt/jjvBc=";
+    hash = "sha256-2vtzWzl9x6wd6XE0Z3a9Z/Ph9kschBwcTsNGC7JEFrA=";
   };
 
-  vendorHash = "sha256-3753+h7NBpawkk0+UL+chIvS7vfklDU+T8uKjHsD6Yc=";
+  vendorHash = "sha256-USEs7eL0gwrddZDiKUUejYEBEAzWxt62qBo9o5/7AKc=";
 
   subPackages = [ "." ];
 

From 77a33a8805c11d367efef2e071fb973cfe0de4c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 12:07:39 +0000
Subject: [PATCH 085/138] tutanota-desktop: 338.260318.0 -> 340.260326.1

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index c2ddac18d454..94fca3d54348 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "338.260318.0";
+  version = "340.260326.1";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-VDdUHTvOBuC7TNGnJxNRkAgRsc0ykKVTUSFO2E1A8hA=";
+    hash = "sha256-9QtiB4VyktUgItJkOIdeGYthFxGt8RsNlAFf9ERoAEg=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 6ae8efaf5f5c0e8ee87932cd5f44c1215964b863 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 4 Apr 2026 14:00:10 +0200
Subject: [PATCH 086/138] splice: replace listToAttrs+map with mapAttrs

listToAttrs forces every list element to extract `.name`, calling merge
eagerly for the entire union of attribute names (~60k). mapAttrs already
knows the keys; the lambda is only invoked when a key is selected,
letting the 99.7% unforced ones stay as untouched thunks.

NIX_SHOW_STATS delta on pkgsCross.aarch64-multiplatform.hello.drvPath:

  nrFunctionCalls:  567,512 -> 507,404   (-10.6%)
  nrThunks:         613,138 -> 552,356   (-9.9%)
  sets.number:      158,787 -> 98,339    (-38.1%)
  list.elements:    295,085 -> 174,189   (-41.0%)
  gc.totalBytes:      117.5M -> 111.7M   (-4.9%)

Repro:

  NIX_SHOW_STATS=1 nix-instantiate --eval \
    -E '(import ./. {}).pkgsCross.aarch64-multiplatform.hello.drvPath' \
    2>stats.json >/dev/null
  jq . stats.json
---
 pkgs/top-level/splice.nix | 69 +++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 2c6f060f23e1..5468d23c377d 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -31,43 +31,42 @@ let
         # The same pkgs sets one probably intends
         // inputs.buildHost
         // inputs.hostTarget;
-      merge = name: {
-        inherit name;
-        value =
-          let
-            defaultValue = mash.${name};
-            # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
-            value' = mapCrossIndex (x: x.${name} or { }) inputs;
+      # perf: mapAttrs defers merge calls until a key is selected, avoiding
+      # ~60k eager closures that listToAttrs+map would create.
+      merge =
+        name: defaultValue:
+        let
+          # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
+          value' = mapCrossIndex (x: x.${name} or { }) inputs;
 
-            augmentedValue = defaultValue // {
-              __spliced = lib.filterAttrs (k: v: inputs.${k} ? ${name}) value';
-            };
-            # Get the set of outputs of a derivation. If one derivation fails to
-            # evaluate we don't want to diverge the entire splice, so we fall back
-            # on {}
-            tryGetOutputs =
-              value0:
-              let
-                inherit (builtins.tryEval value0) success value;
-              in
-              getOutputs (lib.optionalAttrs success value);
-            getOutputs =
-              value: lib.genAttrs (value.outputs or (lib.optional (value ? out) "out")) (output: value.${output});
-          in
-          # The derivation along with its outputs, which we recur
-          # on to splice them together.
-          if lib.isDerivation defaultValue then
-            augmentedValue
-            // spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; })
-          else if lib.isAttrs defaultValue then
-            spliceReal value'
-          else
-            # Don't be fancy about non-derivations. But we could have used used
-            # `__functor__` for functions instead.
-            defaultValue;
-      };
+          augmentedValue = defaultValue // {
+            __spliced = lib.filterAttrs (k: v: inputs.${k} ? ${name}) value';
+          };
+          # Get the set of outputs of a derivation. If one derivation fails to
+          # evaluate we don't want to diverge the entire splice, so we fall back
+          # on {}
+          tryGetOutputs =
+            value0:
+            let
+              inherit (builtins.tryEval value0) success value;
+            in
+            getOutputs (lib.optionalAttrs success value);
+          getOutputs =
+            value: lib.genAttrs (value.outputs or (lib.optional (value ? out) "out")) (output: value.${output});
+        in
+        # The derivation along with its outputs, which we recur
+        # on to splice them together.
+        if lib.isDerivation defaultValue then
+          augmentedValue
+          // spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; })
+        else if lib.isAttrs defaultValue then
+          spliceReal value'
+        else
+          # Don't be fancy about non-derivations. But we could have used used
+          # `__functor__` for functions instead.
+          defaultValue;
     in
-    lib.listToAttrs (map merge (lib.attrNames mash));
+    builtins.mapAttrs merge mash;
 
   splicePackages =
     {

From dce8765c0439fd39d8834eec54cc415cebbbc046 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 4 Apr 2026 14:13:52 +0200
Subject: [PATCH 087/138] meritous: fix build with GCC 15

Part of: https://github.com/NixOS/nixpkgs/issues/475479

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/me/meritous/gcc15-fix.patch | 34 ++++++++++++++++++++++++
 pkgs/by-name/me/meritous/package.nix     |  3 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/me/meritous/gcc15-fix.patch

diff --git a/pkgs/by-name/me/meritous/gcc15-fix.patch b/pkgs/by-name/me/meritous/gcc15-fix.patch
new file mode 100644
index 000000000000..1291cf11adf7
--- /dev/null
+++ b/pkgs/by-name/me/meritous/gcc15-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/src/levelblit.c b/src/levelblit.c
+index 5a04a8e..f530aa8 100644
+--- a/src/levelblit.c
++++ b/src/levelblit.c
+@@ -2575,7 +2575,7 @@ void SpecialTile(int x, int y)
+ 			break;
+ 		case 42:
+ 			if (rooms[player_room].room_type == 5) {
+-				if (CanGetArtifact(rooms[player_room].room_param)) {
++				if (CanGetArtifact()) {
+ 					
+ 				} else {
+ 					sprintf(message, _("The artifact is tainted with shadow. You must slay more of the shadow first.") );
+diff --git a/src/save.h b/src/save.h
+index dd67443..bcf0471 100644
+--- a/src/save.h
++++ b/src/save.h
+@@ -24,7 +24,7 @@
+ #ifndef SAVE_H
+ #define SAVE_H
+ 
+-void DoSaveGame();
++void DoSaveGame(char *);
+ 
+ void FWInt(int val);
+ void FWChar(unsigned char i);
+@@ -39,6 +39,6 @@ void SaveGame(char *);
+ void LoadGame(char *);
+ void CloseFile();
+ 
+-int IsSaveFile();
++int IsSaveFile(char *);
+ 
+ #endif
diff --git a/pkgs/by-name/me/meritous/package.nix b/pkgs/by-name/me/meritous/package.nix
index 5bf5b2830816..6498864d5a0f 100644
--- a/pkgs/by-name/me/meritous/package.nix
+++ b/pkgs/by-name/me/meritous/package.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/meritous/meritous/-/commit/68029f02ccaea86fb96d6dd01edb269ac3e6eff0.patch";
       hash = "sha256-YRV0cEcn6nEJUdHF/cheezNbsgZmjy0rSUw0tuhUYf0=";
     })
+
+    # https://gitlab.com/meritous/meritous/-/merge_requests/6
+    ./gcc15-fix.patch
   ];
 
   prePatch = ''

From 670a8d86dc8f60d16fbe21f4b4351bbb25621c3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 12:24:11 +0000
Subject: [PATCH 088/138] python3Packages.elevenlabs: 2.40.0 -> 2.41.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 155ee5cc4313..ee2a9a47d34f 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.40.0";
+  version = "2.41.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1t+CJ+gHnF8wpq6/NpbuophKczXE/usKwwYCrgAZqsY=";
+    hash = "sha256-Kykhwy2JxEKWxO/lRmMxB/P0jnaxBfmpJDz4+g1oBrQ=";
   };
 
   build-system = [ poetry-core ];

From 02b4ca8506351ed746b0c0eaa68b63c4b0cd8e21 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Sat, 4 Apr 2026 20:32:45 +0800
Subject: [PATCH 089/138] ovito: 3.15.0 -> 3.15.2

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

diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix
index 29482befe143..e64ad9d32100 100644
--- a/pkgs/by-name/ov/ovito/package.nix
+++ b/pkgs/by-name/ov/ovito/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ovito";
-  version = "3.15.0";
+  version = "3.15.2";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-017GjyHPHqrZt03lRFJn9yxFhD6HHyhX5vxsRX06PdA=";
+    hash = "sha256-A7TE84B63JG2X4iBUxQiahLSYTlu7y+x92NTii26pmg=";
     fetchSubmodules = true;
   };
 

From c7952af58e6698db982513d446457627995fc440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Sat, 4 Apr 2026 14:57:36 +0200
Subject: [PATCH 090/138] libgff: Fix wrongly reported version

---
 pkgs/by-name/li/libgff/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libgff/package.nix b/pkgs/by-name/li/libgff/package.nix
index 866a905f9f4f..64ba39b94483 100644
--- a/pkgs/by-name/li/libgff/package.nix
+++ b/pkgs/by-name/li/libgff/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OgXnNGIgWZDIChRdEfmHwvl+oQM03V3a/HnndGLjcHk=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "set(ver_patch 0)" "set(ver_patch 1)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   meta = {

From 0a4874ad9defee588b3e790777427f5d7a41ae54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Sat, 4 Apr 2026 14:58:27 +0200
Subject: [PATCH 091/138] salmon: 1.10.3 -> 1.11.4

Upgrade and adapt to major revamp of salmon build system
---
 pkgs/by-name/sa/salmon/fetch-pufferfish.patch | 60 -------------------
 pkgs/by-name/sa/salmon/fix_pufferfish.patch   | 21 +++++++
 pkgs/by-name/sa/salmon/package.nix            | 58 ++++++++++++++----
 3 files changed, 67 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/by-name/sa/salmon/fetch-pufferfish.patch
 create mode 100644 pkgs/by-name/sa/salmon/fix_pufferfish.patch

diff --git a/pkgs/by-name/sa/salmon/fetch-pufferfish.patch b/pkgs/by-name/sa/salmon/fetch-pufferfish.patch
deleted file mode 100644
index a8682426fcc4..000000000000
--- a/pkgs/by-name/sa/salmon/fetch-pufferfish.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh
-index 95e30053..8866767c 100755
---- a/scripts/fetchPufferfish.sh
-+++ b/scripts/fetchPufferfish.sh
-@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
- EXTERNAL_DIR=${CURR_DIR}/../external
- INSTALL_DIR=${CURR_DIR}/../external/install
- 
--if [ -d ${EXTERNAL_DIR}/pufferfish ] ; then
--    rm -fr ${EXTERNAL_DIR}/pufferfish
--fi
--
- if [ -d ${INSTALL_DIR}/include/pufferfish ] ; then
-     rm -fr ${INSTALL_DIR}/include/pufferfish
- fi
-@@ -23,42 +19,10 @@ if [ -d ${INSTALL_DIR}/src/pufferfish ] ; then
-     rm -fr ${INSTALL_DIR}/src/pufferfish
- fi
- 
--SVER=salmon-v1.10.3
--#SVER=develop
--#SVER=sketch-mode
--
--EXPECTED_SHA256=52b6699de0d33814b73edb3455175568c2330d8014be017dce7b564e54134860 
--
--mkdir -p ${EXTERNAL_DIR}
--curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip
--
--hashcheck=""
--if exists sha256sum; then
--	hashcheck="sha256sum"
--elif exists shasum; then
--	hashcheck="shasum -a256"
--else
--	unset hashcheck
--fi
--
--
--if [ -z "${hashcheck-}" ]; then
--    echo "Couldn't find shasum command; can't verify contents of downloaded pufferfish";
--else
--
--    if [[ $SVER != develop && $SVER != onetbb ]]; then
--        echo "${EXPECTED_SHA256}  ${EXTERNAL_DIR}/pufferfish.zip" | ${hashcheck} -c - || { echo "pufferfish.zip did not match expected SHA1! Exiting."; exit 1; }
--    else
--        echo "not testing sha since pulling from develop"
--    fi
--fi
--
--
--rm -fr ${EXTERNAL_DIR}/pufferfish
--unzip ${EXTERNAL_DIR}/pufferfish.zip -d ${EXTERNAL_DIR}
--mv ${EXTERNAL_DIR}/pufferfish-${SVER} ${EXTERNAL_DIR}/pufferfish
- 
- mkdir -p ${INSTALL_DIR}/include/pufferfish
-+# This is needed later when pufferfish is compiled for Salmon
-+cp -r ${pufferFishSrc} ${EXTERNAL_DIR}/pufferfish
- 
- cp ${EXTERNAL_DIR}/pufferfish/include/ProgOpts.hpp ${INSTALL_DIR}/include/pufferfish
- cp ${EXTERNAL_DIR}/pufferfish/include/BooPHF.hpp ${INSTALL_DIR}/include/pufferfish
diff --git a/pkgs/by-name/sa/salmon/fix_pufferfish.patch b/pkgs/by-name/sa/salmon/fix_pufferfish.patch
new file mode 100644
index 000000000000..65e64633c096
--- /dev/null
+++ b/pkgs/by-name/sa/salmon/fix_pufferfish.patch
@@ -0,0 +1,21 @@
+diff --git a/cmake/SalmonDependencies.cmake b/cmake/SalmonDependencies.cmake
+index b6bebe0..a67571a 100644
+--- a/cmake/SalmonDependencies.cmake
++++ b/cmake/SalmonDependencies.cmake
+@@ -86,6 +86,8 @@ if(ZLIBNG_FOUND)
+   set(SALMON_ZLIB_LIBRARIES ZLIBNG::ZLIBNG)
+   set(ZLIB_INCLUDE_DIR ${ZLIBNG_INCLUDE_DIR})
+   set(ZLIB_LIBRARY ZLIBNG::ZLIBNG)
++  add_library(zlibstatic ALIAS ${ZLIB_LIBRARY})
++  message(STATUS "Created zlibstatic alias for pufferfish embedded mode")
+ elseif(SALMON_FETCH_MISSING_DEPS)
+   message(STATUS "zlib-ng not found; fetching pinned zlib-ng release in compatibility mode")
+   set(ZLIB_COMPAT ON CACHE BOOL "" FORCE)
+@@ -421,6 +423,7 @@ else()
+   set(SALMON_CURL_LIBRARIES "" CACHE INTERNAL "" FORCE)
+ endif()
+ if(SALMON_USE_SYSTEM_DEPS)
++  find_package(OpenSSL REQUIRED)
+   find_package(HTSlib QUIET)
+ endif()
+ if(HTSlib_FOUND)
diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix
index ad1ed4fd5620..4caba4faf339 100644
--- a/pkgs/by-name/sa/salmon/package.nix
+++ b/pkgs/by-name/sa/salmon/package.nix
@@ -3,45 +3,62 @@
   stdenv,
   boost,
   bzip2,
+  catch2_3,
   cereal,
   cmake,
   curl,
   fetchFromGitHub,
+  htslib,
   icu,
   jemalloc,
+  libdeflate,
   libgff,
   libiconv,
   libstaden-read,
-  pkg-config,
+  mimalloc,
   onetbb,
+  openssl,
+  pkg-config,
+  python3,
   xz,
-  zlib,
+  zlib-ng,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "salmon";
-  version = "1.10.3";
+  version = "1.11.4";
 
+  # SALMON_PUFFERFISH_GIT_TAG defined in cmake/SalmonDependencies.cmake
   pufferFishSrc = fetchFromGitHub {
     owner = "COMBINE-lab";
     repo = "pufferfish";
-    rev = "salmon-v${finalAttrs.version}";
-    hash = "sha256-g4pfNuc620WQ7UDv8PQHVbbTVt78aGVqcHHMszmBIkA=";
+    fetchSubmodules = true;
+    rev = "ace68c1c022816ba8c50a1a07c5d08f2abd597d6";
+    hash = "sha256-Zwl45sUYSmHOqsYLZPscigjgd1V3Waza0jRvhvNh7jU=";
+  };
+
+  # SALMON_FQFEEDER_GIT_TAG defined in cmake/SalmonDependencies.cmake
+  FQFeederSrc = fetchFromGitHub {
+    owner = "rob-p";
+    repo = "FQFeeder";
+    rev = "f5b08d1002351c192b69048ac9f6cf4c7c116265";
+    hash = "sha256-csRKUdNlEKKHNIvKRRTt79+27LBmnsJpswzBnWtA/XU=";
   };
 
   src = fetchFromGitHub {
     owner = "COMBINE-lab";
     repo = "salmon";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HGcDqu0XzgrU3erHavigXCoj3VKk82ixMLY10Kk9MW4=";
+    hash = "sha256-BjWXNQtycSwCTe40kujN/YzCNhGjkz2ULGOYtI01yos=";
   };
 
-  patches = [
-    # Use pufferfish source fetched by nix
-    ./fetch-pufferfish.patch
-  ];
+  patches = [ ./fix_pufferfish.patch ];
 
-  postPatch = "patchShebangs .";
+  postPatch = ''
+    patchShebangs .
+
+    substituteInPlace CMakeLists.txt --replace-fail "CMP0167 OLD" "CMP0167 NEW"
+  '';
 
   buildInputs = [
     (boost.override {
@@ -49,21 +66,38 @@ stdenv.mkDerivation (finalAttrs: {
       enabledStatic = true;
     })
     bzip2
+    catch2_3
     cereal
     curl
+    htslib
     icu
     jemalloc
+    libdeflate
     libgff
     libstaden-read
+    mimalloc
     onetbb
+    openssl
     xz
-    zlib
+    zlib-ng
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    python3
+  ];
+
+  cmakeFlags = [
+    "-DSALMON_PUFFERFISH_SOURCE_DIR=${finalAttrs.pufferFishSrc}"
+    "-DSALMON_FQFEEDER_SOURCE_DIR=${finalAttrs.FQFeederSrc}"
+  ];
+
+  # These are needed to please htslib
+  env.NIX_LDFLAGS = toString [
+    "-lcrypto"
+    "-ldeflate"
   ];
 
   strictDeps = true;

From 852ecf4be3c4cc96a49aaefdfbb96698f4c9f859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 4 Apr 2026 06:28:38 -0700
Subject: [PATCH 092/138] 
 home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.321 ->
 0.13.322

Diff: https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/compare/0.13.321...0.13.322

Changelog: https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/0.13.322/CHANGELOG.md
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 19d22ca3234a..fd5b5f6ca8d1 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.321";
+  version = "0.13.322";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-slmIxLRbicyzYhnYmefLnPcqq//wRjmJ5xGeJBYxacQ=";
+    hash = "sha256-5SnDNnFdMFIT9f4+vbSk/F34lM2sWxkgk+IyqRqbT0Y=";
   };
 
   build-system = [ setuptools ];

From fdbc4c7288420846fcd5af27d0661c9e90050ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 4 Apr 2026 06:29:03 -0700
Subject: [PATCH 093/138] 
 home-assistant-custom-components.waste_collection_schedule: 2.13.0 -> 2.14.0

Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/2.13.0...2.14.0

Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.14.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 b8777bce765b..10af5e277c27 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.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = version;
-    hash = "sha256-Tl9Z48d+OjyHmk0e6ALz/ywWHgzUhX+rhKjwZh4INo4=";
+    hash = "sha256-L7SHqBCBFmcegCUl88L8DrNXPGbY9CDKqlvLSOWCQ+g=";
   };
 
   dependencies = [

From 46d1b75608a3ebafdeb2fcc9b5195a2bba962bce Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 4 Apr 2026 08:34:48 -0500
Subject: [PATCH 094/138] flirc: migrate to by-name

---
 .../video => by-name/fl}/flirc/99-flirc.rules          |  0
 .../flirc/default.nix => by-name/fl/flirc/package.nix} | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  4 ----
 3 files changed, 4 insertions(+), 10 deletions(-)
 rename pkgs/{applications/video => by-name/fl}/flirc/99-flirc.rules (100%)
 rename pkgs/{applications/video/flirc/default.nix => by-name/fl/flirc/package.nix} (92%)

diff --git a/pkgs/applications/video/flirc/99-flirc.rules b/pkgs/by-name/fl/flirc/99-flirc.rules
similarity index 100%
rename from pkgs/applications/video/flirc/99-flirc.rules
rename to pkgs/by-name/fl/flirc/99-flirc.rules
diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/by-name/fl/flirc/package.nix
similarity index 92%
rename from pkgs/applications/video/flirc/default.nix
rename to pkgs/by-name/fl/flirc/package.nix
index 5de7e4e46830..8cdba0579874 100644
--- a/pkgs/applications/video/flirc/default.nix
+++ b/pkgs/by-name/fl/flirc/package.nix
@@ -3,11 +3,9 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  wrapQtAppsHook,
   hidapi,
   readline,
-  qtsvg,
-  qtxmlpatterns,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -21,14 +19,14 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     hidapi
     readline
-    qtsvg
-    qtxmlpatterns
+    libsForQt5.qtsvg
+    libsForQt5.qtxmlpatterns
   ];
 
   dontConfigure = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10e58b8c0268..c3aab3ce5a6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1517,10 +1517,6 @@ with pkgs;
 
   libfx2 = with python3Packages; toPythonApplication fx2;
 
-  flirc = libsForQt5.callPackage ../applications/video/flirc {
-    readline = readline70;
-  };
-
   foxdot = with python3Packages; toPythonApplication foxdot;
 
   fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; };

From 53ab00d3663293bb9e3f3d333fc31f162a42c5dd Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 4 Apr 2026 08:42:15 -0500
Subject: [PATCH 095/138] tensor: migrate to by-name

---
 .../default.nix => by-name/te/tensor/package.nix} | 15 ++++++---------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 6 insertions(+), 11 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/tensor/default.nix => by-name/te/tensor/package.nix} (91%)

diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/by-name/te/tensor/package.nix
similarity index 91%
rename from pkgs/applications/networking/instant-messengers/tensor/default.nix
rename to pkgs/by-name/te/tensor/package.nix
index a9588a52b0b7..4d5fbaead3b9 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/by-name/te/tensor/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtquickcontrols,
+  libsForQt5,
   makeDesktopItem,
 }:
 
@@ -25,13 +22,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtquickcontrols
+    libsForQt5.qtbase
+    libsForQt5.qtquickcontrols
   ];
 
   desktopItem = makeDesktopItem {
@@ -80,6 +77,6 @@ stdenv.mkDerivation rec {
     mainProgram = "tensor";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ peterhoeg ];
-    inherit (qtbase.meta) platforms;
+    platforms = libsForQt5.qtbase.meta.platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10e58b8c0268..790bb45e1ea8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1621,8 +1621,6 @@ with pkgs;
     charles5
     ;
 
-  tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
-
   libtensorflow = python3.pkgs.tensorflow-build.libtensorflow;
 
   libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { };

From 58f95d290314d75fdf5b468b66393d9df3ada3f9 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 4 Apr 2026 08:43:15 -0500
Subject: [PATCH 096/138] tensor: migrate to finalAttrs pattern

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

diff --git a/pkgs/by-name/te/tensor/package.nix b/pkgs/by-name/te/tensor/package.nix
index 4d5fbaead3b9..58554d914b34 100644
--- a/pkgs/by-name/te/tensor/package.nix
+++ b/pkgs/by-name/te/tensor/package.nix
@@ -9,7 +9,7 @@
 # we now have libqmatrixclient so a future version of tensor that supports it
 # should use that
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tensor";
   version = "unstable-2017-02-21";
 
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
     name = "tensor";
     exec = "@bin@";
     icon = "tensor.png";
-    comment = meta.description;
+    comment = finalAttrs.meta.description;
     desktopName = "Tensor Matrix Client";
-    genericName = meta.description;
+    genericName = finalAttrs.meta.description;
     categories = [
       "Chat"
       "Utility"
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
         install -Dm755 tensor $out/bin/tensor
         install -Dm644 client/logo.png \
                        $out/share/icons/hicolor/512x512/apps/tensor.png
-        install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
+        install -Dm644 ${finalAttrs.desktopItem}/share/applications/tensor.desktop \
                        $out/share/applications/tensor.desktop
 
         substituteInPlace $out/share/applications/tensor.desktop \
@@ -79,4 +79,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ peterhoeg ];
     platforms = libsForQt5.qtbase.meta.platforms;
   };
-}
+})

From 16942052b7c610eca7db28242da482f88baeefc2 Mon Sep 17 00:00:00 2001
From: Samuel Silva <samuel@ossystems.com.br>
Date: Sat, 4 Apr 2026 10:45:36 -0300
Subject: [PATCH 097/138] openfreebuds: install desktop entry

---
 pkgs/by-name/op/openfreebuds/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/op/openfreebuds/package.nix b/pkgs/by-name/op/openfreebuds/package.nix
index f8c259042295..62ccf9cc3123 100644
--- a/pkgs/by-name/op/openfreebuds/package.nix
+++ b/pkgs/by-name/op/openfreebuds/package.nix
@@ -67,6 +67,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
+  postInstall = ''
+    mkdir -p "$out/share/applications"
+    mv openfreebuds_qt/assets/pw.mmk.OpenFreebuds.desktop "$out/share/applications"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From d51f525afe8b061bd628a80cb7a4f0690d669a34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 14:12:59 +0000
Subject: [PATCH 098/138] terraform-providers.huaweicloud_huaweicloud: 1.88.0
 -> 1.89.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 89de589dda40..f096d29e2142 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -715,11 +715,11 @@
     "vendorHash": "sha256-rd7QuDdq7xRMyaQIDyXY1DI2Tt/wy3oXan/nE0HIyT0="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-dBjanfq9CghhGV8L4So3fV2LFw/Yx7g8lLPLWY3GVUI=",
+    "hash": "sha256-wkUdMBRyD16fDTC2+/Ie1Ugf9Eo1X3FQQXn2ivwpHx0=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.88.0",
+    "rev": "v1.89.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 780d7cdd4e9d81f864b62aa6d07be42bd229458e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?=
 <terence.chateigne@posteo.net>
Date: Sat, 4 Apr 2026 17:37:01 +0200
Subject: [PATCH 099/138] gowebly: update to 3.1.0 & fix runtime dependencies

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

diff --git a/pkgs/by-name/go/gowebly/package.nix b/pkgs/by-name/go/gowebly/package.nix
index 4acff5d8372e..ae484dc3f453 100644
--- a/pkgs/by-name/go/gowebly/package.nix
+++ b/pkgs/by-name/go/gowebly/package.nix
@@ -4,20 +4,25 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  makeWrapper,
+  air,
+  nodejs,
+  bun,
+  templ,
 }:
 
 buildGoModule rec {
   pname = "gowebly";
-  version = "3.0.5";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "gowebly";
     repo = "gowebly";
     tag = "v${version}";
-    hash = "sha256-r1yyMbnpt0sDgqkm/EqaYysQnm48uIXzQHqJObVpT9g=";
+    hash = "sha256-/MB8YuqeZUb9P6RPO2sgwtYShaNkEFckiVBtnHRPkc4=";
   };
 
-  vendorHash = "sha256-N48/67fMPsylNGr6ixay4si+9ifUryxkIJxKDYU46+o=";
+  vendorHash = "sha256-8i1o0Dn4xJ1P3CrYDW0X8epiIpjmIac6gENBYi/bmQo=";
 
   env.CGO_ENABLED = 0;
 
@@ -26,6 +31,22 @@ buildGoModule rec {
     "-w"
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/gowebly \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          air
+          templ
+          bun
+          nodejs
+        ]
+      }
+  '';
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "doctor";
   doInstallCheck = true;

From 196968faa1945e416d96daa9007c7fa9435a5f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 15:46:01 +0000
Subject: [PATCH 100/138] color-transformation-language: 1.5.3 -> 1.5.5

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

diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix
index 24e1651244b9..238c9ee18b7f 100644
--- a/pkgs/by-name/co/color-transformation-language/package.nix
+++ b/pkgs/by-name/co/color-transformation-language/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ctl";
-  version = "1.5.3";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "ampas";
     repo = "CTL";
     rev = "ctl-${finalAttrs.version}";
-    hash = "sha256-jG+38jsPw+4CEAbOG+hudfPBPbZLG+Om7PszkFa6DuI=";
+    hash = "sha256-X6W6IXZUMBTZJTzpAk7FmoEhSPELTmhYv68dZmqUJ2g=";
   };
 
   nativeBuildInputs = [

From dd57c0254d7ad2b7e42e5036ef123a21cbf989f9 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sat, 4 Apr 2026 18:59:57 +0300
Subject: [PATCH 101/138] searchix: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix
index 9dcfe196e3e2..adeeebcf2281 100644
--- a/pkgs/by-name/se/searchix/package.nix
+++ b/pkgs/by-name/se/searchix/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildGoModule,
   fetchFromGitea,
   fetchFromGitHub,
@@ -19,17 +18,17 @@ in
 
 buildGoModule (finalAttrs: {
   pname = "searchix";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "alinnow";
     repo = "searchix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2pffyKBX+ICYEN+42gwN2byjw+T9H4esi2+oTqs52GE=";
+    hash = "sha256-anmPuZ2En0KNhbnf4MiwiR/YP8QabOrjHHcQoZJ5Dho=";
   };
 
-  vendorHash = "sha256-yfcQgy4cQFRvtsyLHLojnJaWhle1ZR3unmaFQj8ljuw=";
+  vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";
 
   overrideModAttrs = old: {
     # netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.

From eb6f09f20aa539d47a768d87cac97427af134619 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 3 Apr 2026 15:19:47 -0500
Subject: [PATCH 102/138] vimPlugins: update on 2026-04-03

---
 .../editors/vim/plugins/generated.nix         | 948 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   6 +
 2 files changed, 480 insertions(+), 474 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index af4ca97880a1..59bff468f7a6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "4.7.4-unstable-2026-03-23";
+    version = "4.7.4-unstable-2026-03-29";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "9fec6c3c2a4069b1f649e116c10e6fbcf1463764";
-      hash = "sha256-sQ/12smnEI2rykuz1szYtSeO+lKK7enN1V4kvqxni3Q=";
+      rev = "d2d2574863529cb76b62b028cb5c3196ef5796d6";
+      hash = "sha256-EWc6IkcdB41ETkCRET7LTE3bHDsjbxAGcxfTkAW1+Lk=";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -87,12 +87,12 @@ final: prev: {
 
   Coqtail = buildVimPlugin {
     pname = "Coqtail";
-    version = "1.9.0-unstable-2026-02-21";
+    version = "1.9.0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "d470fff7591bf826ca10090a14ccf2e1dc8199db";
-      hash = "sha256-gXTXaCGIXyZfRfz9c29FG1kWD6E1sFXfB4Ar7wXr4H4=";
+      rev = "157e738fcddda66ef7ed0cf46ee5a27ed664d1c9";
+      hash = "sha256-XIA993tCitBKDr0WX0InPEy5S2qBXTHfq2vtedGruNA=";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
     meta.hydraPlatforms = [ ];
@@ -204,12 +204,12 @@ final: prev: {
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "15.14.0-unstable-2026-03-21";
+    version = "15.15.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "96f4f18d7d81c786ac0df5723bc7aca058bf2165";
-      hash = "sha256-flDu86sHQ4CQ+5tSXPWMRw9kfVdU5xfLHdDYVhkBsoE=";
+      rev = "83d90f339defdb109a6ede333865a66ffc7ef6aa";
+      hash = "sha256-IANdrxjLdthOPjKuYqkWBDkbqwX0CxOO0heCFNnQFCA=";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
     meta.hydraPlatforms = [ ];
@@ -217,12 +217,12 @@ final: prev: {
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "1.25-unstable-2026-03-25";
+    version = "1.25-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "7ba67ea7df6ce97ffe3f738b23daf9d5b4090be0";
-      hash = "sha256-dzCSjNtOPJu6GGxXTRws7sByzaJU9ddF99N6wrTH56s=";
+      rev = "b096f56f24443111bd1cf428655d3999389536cd";
+      hash = "sha256-uAZPrt7AGooR/XkwGa26I8UYh65yGxzdRNWnRYPl0fI=";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -412,12 +412,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-03-23";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "66e53f3316515ac8548b47826f8d273955aa7af1";
-      hash = "sha256-YDD2maK1DwRRBWqZKRSlV1Z1fiR50HfcOWttcTEnpjU=";
+      rev = "6d0329adb9c8cbe51b9a28299890a5eb104db7dc";
+      hash = "sha256-APoq33uUGXQZMOlPvjwLtScgsS2WfZIKZyum9CtLqps=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -804,12 +804,12 @@ final: prev: {
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "4.0.0-unstable-2026-02-17";
+    version = "4.0.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "69c945d5daecadf8e4c4c499d0a7babda748d603";
-      hash = "sha256-FSabpNexVFMdJaD1Y/o5Zrgy8Nx9vtn4mV6q+R3dqqU=";
+      rev = "ba8b9cbab95131e284c5be926642f803b2be0058";
+      hash = "sha256-scPqOKPQ2SAISAHZvzd1feQTUiavLSYfhEH+Eu/pxr4=";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -986,12 +986,12 @@ final: prev: {
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "2.1.1-unstable-2026-02-18";
+    version = "3.0.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      rev = "a29046604356b977df0df874face71cca78dc124";
-      hash = "sha256-Rc/5EluObfP8/FQWIWKiIaXUDVzGptmu6yrgMTwfMGY=";
+      rev = "b061e0c185cd5fecbac7489151a98117ce799a47";
+      hash = "sha256-xo+B5zgyKLWHegF+J8evv4Zr7rwTjeLW8zlkoCIhH94=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
     meta.hydraPlatforms = [ ];
@@ -999,12 +999,12 @@ final: prev: {
 
   astrolsp = buildVimPlugin {
     pname = "astrolsp";
-    version = "3.2.1-unstable-2025-09-25";
+    version = "4.0.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrolsp";
-      rev = "0befe28a4ea96e46b7f7c01e4a634c04225ba55a";
-      hash = "sha256-yihSqpqs8KqK0Vo0PG0b9KIGnfBA24nOZD+aONk5t1g=";
+      rev = "ebc1676127b3bfbd46e3e26589b104853cac3730";
+      hash = "sha256-N8uwx9PpGey0itrvq/OKOEwtRxXfto0MQ5Tbb7Bnc8w=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrolsp/";
     meta.hydraPlatforms = [ ];
@@ -1025,12 +1025,12 @@ final: prev: {
 
   astroui = buildVimPlugin {
     pname = "astroui";
-    version = "3.1.5-unstable-2025-07-23";
+    version = "4.0.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astroui";
-      rev = "4943abbd42674b43249313afe83b91065a40e4be";
-      hash = "sha256-4J3RXbPU6yiVApSFpXHu1M0IXhWpcQDHQkNYX+5Ltuw=";
+      rev = "920dd5df6629a9076a11ea10f0d21f4225203585";
+      hash = "sha256-290PxuIz8Pc1UWz6Huy0ZQH1CxGeoqN5x2U+VDCRBJc=";
     };
     meta.homepage = "https://github.com/AstroNvim/astroui/";
     meta.hydraPlatforms = [ ];
@@ -1259,12 +1259,12 @@ final: prev: {
 
   auto-save-nvim = buildVimPlugin {
     pname = "auto-save.nvim";
-    version = "1.1.0-unstable-2026-02-07";
+    version = "1.1.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "okuuva";
       repo = "auto-save.nvim";
-      rev = "61892d67acd5b7c845f5da4d780b26fcd7f63e34";
-      hash = "sha256-ns7MB6eg6HK5tMczsRFC2UXT8/ttv+EBw+S/ma8o4PE=";
+      rev = "9aabcb8396224dcbf8d51c0c1d620d88a46e89d7";
+      hash = "sha256-udN8ETRYKmVEeu+/2J6yZHnnBWtnLV7yKiOY0AvS8rg=";
     };
     meta.homepage = "https://github.com/okuuva/auto-save.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1298,12 +1298,12 @@ final: prev: {
 
   autolist-nvim = buildVimPlugin {
     pname = "autolist.nvim";
-    version = "3.0.1-unstable-2023-07-07";
+    version = "3.0.2-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "gaoDean";
       repo = "autolist.nvim";
-      rev = "5f70a5f99e96c8fe3069de042abd2a8ed2deb855";
-      hash = "sha256-lavDbTFidmbYDOxYPumCExkd27sesZ5uFgwHc1xNuW0=";
+      rev = "a4a3d83ea97c05ac83d2cce3997db0c1fca3d6eb";
+      hash = "sha256-GGKlKwDaTe0Pl+ggYNiVvYgihYt5PTxX71ADdkjI+ME=";
     };
     meta.homepage = "https://github.com/gaoDean/autolist.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1831,12 +1831,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2.2.5-unstable-2026-03-23";
+    version = "2.2.5-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "ca9c2028cd95ac2fd2426b121816051eba0b9764";
-      hash = "sha256-SukloH3EWaU8/psYS4e+kgj/lNSGgdZoKU/9+wKoU7E=";
+      rev = "21aaa06bebeced2e71b60a9ae65dd3d9f366d594";
+      hash = "sha256-/6ApmOkNLi4FL74e5CN5hXUu+cU7nTTtgqjVqcs2lSY=";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2052,12 +2052,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "1.11.0-unstable-2026-03-22";
+    version = "2.0.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "a7788416689dbefea659d9e9415c87926b0ba5d8";
-      hash = "sha256-NuwqxzZQ6YWHZdWYnCWDSlFIeagTU+Q4JdIHy25VR3A=";
+      rev = "16408d203973da7e43fab87c6f9d3bf7fa98fa8b";
+      hash = "sha256-C+bsDGpXwuie67yCFQjbqg6POC+y94eBIz9zxqo9jGM=";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -2351,12 +2351,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2026-03-17";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "5fc40e9e252a113be945019ab16301b851eb98d1";
-      hash = "sha256-IdiYj7vsYXzk1jBrEhIdvDvUHcGPR6Kt2ga829dGqn8=";
+      rev = "e100f40b117381dadf42a34b0718f8e4350715b2";
+      hash = "sha256-DMuuGg3VP0XxUPoMfiueQdH60lru7rfJJ+bISDvqMk8=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3131,12 +3131,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-03-24";
+    version = "0.0.82-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "fb74029fc12b16e714c245d1f265f3071d1ea07c";
-      hash = "sha256-XZcf48CuDhV14RcRfSWfj/pVGImbs9Q+dblF+eVqblE=";
+      rev = "23780f32f5d5be3332c848927dc10a72f6485bd9";
+      hash = "sha256-IELvNNZa42cyY8jyR0c7GAaRq/JvpmRolUGU3XnvmXk=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3209,12 +3209,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.6.0-unstable-2026-03-25";
+    version = "19.8.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "e010179d64538ce1fd88310d08b4697b356b17c8";
-      hash = "sha256-860ek9xwjv3mfPH9cj18tRa1NxhQLlWbBajgCJEvSOo=";
+      rev = "eadd05011e6941bcd8a614e7702748b358d07722";
+      hash = "sha256-ELpy6gDzeygP3i9FwNu6J64dKqmwhzidm7dgy7745Mg=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3235,12 +3235,12 @@ final: prev: {
 
   codesettings-nvim = buildVimPlugin {
     pname = "codesettings.nvim";
-    version = "1.6.7-unstable-2026-03-25";
+    version = "1.6.7-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "codesettings.nvim";
-      rev = "96019a81f7ca4ca01bf7eba86ed6db582bbb2654";
-      hash = "sha256-zpLA3FRkyJy4LCKxbhUHUcYYElWHxopaUHrkmfYcoT0=";
+      rev = "3ec73eec63c24b16c5226d8f24a47ce153b12a3a";
+      hash = "sha256-MlFt6KIFVFQ70grmwGhiO2M8IKOJ46bazLRTOyDB34c=";
     };
     meta.homepage = "https://github.com/mrjones2014/codesettings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3365,12 +3365,12 @@ final: prev: {
 
   command-t = buildVimPlugin {
     pname = "command-t";
-    version = "8.1-unstable-2026-03-20";
+    version = "8.1-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "c148d0cdd7f807927193cd9c05329607a4e8cbc0";
-      hash = "sha256-jm4u9d2d+zYwb1lubjkOGDN5f/ywBzQkYnsbRztMzbc=";
+      rev = "4403db21a6b42db27adfbb058241345687babcb2";
+      hash = "sha256-ilWnNjypTvDj2bsGtcg54bI0CxeMsoUK56BlxHabQ3g=";
     };
     meta.homepage = "https://github.com/wincent/command-t/";
     meta.hydraPlatforms = [ ];
@@ -3548,12 +3548,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "4.59.0-unstable-2026-03-23";
+    version = "4.59.0-unstable-2026-03-28";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "5dddccee789f65606387c991f5efadea7af52cb7";
-      hash = "sha256-xQKiF7v+MPqT6UzhIZ2b2zWYTSOkpXiD9MIy13GZjcw=";
+      rev = "ecf783607efaf33c69c6f80a737a93d572cfc688";
+      hash = "sha256-cluKVeixP+IudHvvs32+bSSre52xWxrxJcmaKBpVA9c=";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3639,12 +3639,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2.0.1-unstable-2026-03-24";
+    version = "2.0.1-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "538f15c4eaad8661389a4a0d1ace2d6e079fac29";
-      hash = "sha256-RzHCniW/n796uYdVA1LtHWBI3XxoPgmdw2N8RpUjPJQ=";
+      rev = "faa347cef2a9429eec14dada549e000a3b8d0fc9";
+      hash = "sha256-K3jeiJGyvT8dNtPNjd2cMwTjAewd9d6NB7akkdTl4Yk=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3808,12 +3808,12 @@ final: prev: {
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "0.3.0-unstable-2026-01-21";
+    version = "0.3.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "6eb1308c8f74adbcaa0d681a742f39d4165d063d";
-      hash = "sha256-To2BQc/dVRhJqmAfvpBNSgq/Z92V2Z1HIh7atoYpKH8=";
+      rev = "b06b6d76f5b179f1c7f4aae7077551b9b0e61028";
+      hash = "sha256-iZOT4RKbiCIuZVy2tai6tzqm2Jn6VmOmy39d8MaOPBk=";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4016,12 +4016,12 @@ final: prev: {
 
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
-    version = "0.1.0-unstable-2026-03-06";
+    version = "0.1.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "db2ef169d6ae08e2bdb7ca44aac3ebb3367c9802";
-      hash = "sha256-eXpdrrAWwp1vXgOA0hZukAy4enkh39lwzWKy41e9inc=";
+      rev = "5d8f54cd9c0ca9faf02c593737872be25f85464f";
+      hash = "sha256-bnXNN6B+sP/mRfBiHBsAo8hAZ15otbIjLe1Wiewr0pU=";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
     meta.hydraPlatforms = [ ];
@@ -4042,12 +4042,12 @@ final: prev: {
 
   dashboard-nvim = buildVimPlugin {
     pname = "dashboard-nvim";
-    version = "0-unstable-2025-08-31";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "dashboard-nvim";
-      rev = "0775e567b6c0be96d01a61795f7b64c1758262f6";
-      hash = "sha256-0eXKel2IVbDcJqBtr2g8HliqLG8GS3QHqXhH/2CyhkA=";
+      rev = "62a10d9d55132b338dd742afc3c8a2683f3dd426";
+      hash = "sha256-gT+RSBQmmJb+Z34qG+ibRuzbKsgpiMzxUv76ItEQIEk=";
     };
     meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
     meta.hydraPlatforms = [ ];
@@ -4185,12 +4185,12 @@ final: prev: {
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "7.1.0-unstable-2026-03-08";
+    version = "7.1.1-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "76c98c000b9eccce7edfe5cc5f9d41bf255b7425";
-      hash = "sha256-4jnyauMdzRt8wrHLvZ6I5oQ2uF/+v6fUMR36TWBdK0c=";
+      rev = "1afec6935f551a4701fba9d813e47ac17d659208";
+      hash = "sha256-Jt5tqEqjm8idFZgehVE9U1aPLtJDBh0QBSd5YY0OQ7Y=";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4694,12 +4694,12 @@ final: prev: {
 
   diffs-nvim = buildVimPlugin {
     pname = "diffs.nvim";
-    version = "0.3.2-unstable-2026-03-25";
+    version = "0.3.2-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "barrettruth";
       repo = "diffs.nvim";
-      rev = "0cb16a0e2384f1d3dd6330f6ea517de8e07aa8e8";
-      hash = "sha256-BLOmtz/E2viBd6DW+i7+NHZoh42FPo9lI4qj5MyTHbQ=";
+      rev = "eb69a53b3f31c581d674abde5b94802a1127aabf";
+      hash = "sha256-Bi2R26F02aB/CnnWUEmjDvdNe+FYmRlb2wH6/RjBM5k=";
     };
     meta.homepage = "https://github.com/barrettruth/diffs.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4863,12 +4863,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-03-20";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "ed5aabc5040395f2dd6c59263412ec3bed921b29";
-      hash = "sha256-5QFxFSrFIVNSCubXYeazfjC62l4ja+DW4xYp6bJ9+DA=";
+      rev = "175594892bac9198f1392937d753426b297ee11b";
+      hash = "sha256-qm8NE4P47t2fyzdaPYz5y4P9IMkHsvPcnacTL5QcaJQ=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5125,11 +5125,11 @@ final: prev: {
 
   evergarden-nvim = buildVimPlugin {
     pname = "evergarden-nvim";
-    version = "0-unstable-2026-03-21";
+    version = "0-unstable-2026-03-31";
     src = fetchgit {
       url = "https://codeberg.org/evergarden/nvim";
-      rev = "ded46a3eaaab08ffd9ba206bd7eff9e93598d2e5";
-      hash = "sha256-UEnor+FziURTnBKtDyMJPu3GzkdjEZ7XQyePsCA5HIY=";
+      rev = "f74fc61a5345818caf7c56bd4c6dcd16f17a1fdd";
+      hash = "sha256-kYfNaAx0koqFBSXKC1IuVJaZeUQC+0rT9deEqgcRt8I=";
     };
     meta.homepage = "https://codeberg.org/evergarden/nvim";
     meta.hydraPlatforms = [ ];
@@ -5607,12 +5607,12 @@ final: prev: {
 
   fugit2-nvim = buildVimPlugin {
     pname = "fugit2.nvim";
-    version = "0.2.1-unstable-2025-09-02";
+    version = "0.2.1-unstable-2026-03-28";
     src = fetchFromGitHub {
       owner = "SuperBo";
       repo = "fugit2.nvim";
-      rev = "619b3dc130f50e0ecb0cb0026133b393ec202fae";
-      hash = "sha256-iqmoNt/RcOiGtbckuysoQLcmCnG/E0rbHS09y7DzkR0=";
+      rev = "e1d6d261caa093a5845595d15cfaf24570e43c1f";
+      hash = "sha256-8+3oO1HAWdfEjBX6V7bLm4w+giJD1syqWPZCHZ7p94U=";
     };
     meta.homepage = "https://github.com/SuperBo/fugit2.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5828,12 +5828,12 @@ final: prev: {
 
   ghcid = buildVimPlugin {
     pname = "ghcid";
-    version = "0.8.9-unstable-2026-03-17";
+    version = "0.8.9-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "55622eb4c1efabb8feec5bc7c51d214a2496a545";
-      hash = "sha256-PRwomyvseUIWpjE+Wp/hJ0jz3SEjbzAq8zwv+/vLaRg=";
+      rev = "daf89d0ca7430f2abbc2c9175ab1e89ab1fc9926";
+      hash = "sha256-hb6Da0dZOmmsRZSawVT184UTDPotby/q3B1qe9Y5YXI=";
     };
     meta.homepage = "https://github.com/ndmitchell/ghcid/";
     meta.hydraPlatforms = [ ];
@@ -6049,12 +6049,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "0.10.4-unstable-2026-03-22";
+    version = "0.10.4-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "51a6f3b19b59f6e8e5d8d06aa23704ff2b6ed6bd";
-      hash = "sha256-BE1AjayhdmmlBqsV11x4sOtFpYpOQMA8wmD5vYxDXEo=";
+      rev = "3cfece46344d4f35099d3b207c7cae76da0b48d6";
+      hash = "sha256-uq8R47NP6lRUJvDtI+ewQCOkqFsCp7ok3t7ug8WrucM=";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6244,12 +6244,12 @@ final: prev: {
 
   gruvbox-material = buildVimPlugin {
     pname = "gruvbox-material";
-    version = "1.2.5-unstable-2026-01-21";
+    version = "1.2.5-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "790afe9dd085aa04eccd1da3626c5fa05c620e53";
-      hash = "sha256-gyBfUYgSngpQn8BhKISWqgEKSyq8DuRT4csQ7q7bXM4=";
+      rev = "afb275d8e6dc379762d122bd24e1773fc057abf3";
+      hash = "sha256-+RfjN/1vYtgduTWMiBmNL+kihc4lReOycjwMln0eRmM=";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
     meta.hydraPlatforms = [ ];
@@ -6257,12 +6257,12 @@ final: prev: {
 
   gruvbox-material-nvim = buildVimPlugin {
     pname = "gruvbox-material.nvim";
-    version = "1.8.0-unstable-2026-03-15";
+    version = "1.8.1-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "f4z3r";
       repo = "gruvbox-material.nvim";
-      rev = "a57f8ecdb2e7320b1b3b0bbc12934112027d38a5";
-      hash = "sha256-u9tp0mccjdF1VbZig+gy9eHW8SvJCJc+aiu6M/snPBc=";
+      rev = "cec765e35bf99247e0dc7ef62ec375463edd7bcf";
+      hash = "sha256-sP0XEvEHUkECqeBE/T6M5eBpTDVLhuPYIxxdbWYLJVI=";
     };
     meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6322,12 +6322,12 @@ final: prev: {
 
   guihua-lua = buildVimPlugin {
     pname = "guihua.lua";
-    version = "0.1-unstable-2026-03-08";
+    version = "0.1-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "guihua.lua";
-      rev = "fdca486468a5d94676477917872767b5e67a2b4c";
-      hash = "sha256-/Pm5VKJrBHvWQZgjgOCg1JDJ31uoM2LPU/NQyEszqv0=";
+      rev = "c4f1b5ee1a66dbcef0b2c5ee26e42b9757684f61";
+      hash = "sha256-rl2Tp9ykVwNHldYQIwtIjgWx1RVFeYe4Feyhdf2bK34=";
     };
     meta.homepage = "https://github.com/ray-x/guihua.lua/";
     meta.hydraPlatforms = [ ];
@@ -6701,12 +6701,12 @@ final: prev: {
 
   hotpot-nvim = buildVimPlugin {
     pname = "hotpot.nvim";
-    version = "0.15.0-unstable-2025-12-23";
+    version = "2.0.9-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "rktjmp";
       repo = "hotpot.nvim";
-      rev = "0059a358eb9e01f11319c8d63747798dcb0f08e4";
-      hash = "sha256-WFa+yORq42fHLTXzkN0GoJzHglFvuomBAZpbLxYQlv0=";
+      rev = "50f2383afc8a99d9dd2100e5ac8c084281c9d023";
+      hash = "sha256-8w1rX4j2ySK2ds56WZN/BLcroYmiNc5z/eZKuRaaMEk=";
     };
     meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7156,12 +7156,12 @@ final: prev: {
 
   iswap-nvim = buildVimPlugin {
     pname = "iswap.nvim";
-    version = "0-unstable-2024-05-23";
+    version = "0-unstable-2026-03-25";
     src = fetchFromGitHub {
       owner = "mizlan";
       repo = "iswap.nvim";
-      rev = "e02cc91f2a8feb5c5a595767d208c54b6e3258ec";
-      hash = "sha256-lAYHvz23f9nJ6rb0NIm+1aq0Vr0SwjPVitPuROtUS2A=";
+      rev = "d828a3adb2e21d4fc0b264b55059402aaff1f08a";
+      hash = "sha256-RasWfUX7UTJY14bfgArdai/zyvEqdKlbwUZWzsE+Kwo=";
     };
     meta.homepage = "https://github.com/mizlan/iswap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7639,12 +7639,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025.10.1-unstable-2026-03-25";
+    version = "2025.10.1-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "a30b6f8496a88ff555862b7cf542e25549afcd81";
-      hash = "sha256-rkcwnCBdw1HzRYkrbJ/dIsNb4X/cEcWHElIx8jJFxwg=";
+      rev = "58c6d4819ef433ba141cd4e3604a0316c83d99de";
+      hash = "sha256-rsbGMYqqjNVOM8RbcjYx5FyWadGwAaDasYDJTuaQ/jk=";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7678,11 +7678,11 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "0-unstable-2026-03-24";
+    version = "0-unstable-2026-03-31";
     src = fetchgit {
       url = "https://codeberg.org/andyg/leap.nvim/";
-      rev = "e20f33507bd2d6c671b7273f797f2d3cf521ac61";
-      hash = "sha256-dJ7nR+JDzjhXptPrLXd48pGlrm52nG31gsw9X3+tT0Q=";
+      rev = "b960d5038c5c505c52e56a54490f9bbb1f0e6ef6";
+      hash = "sha256-3xL4cwZdrRX0pCu/oqk0hz8zOeg/VRwn5cB9I9cG4DI=";
     };
     meta.homepage = "https://codeberg.org/andyg/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7950,12 +7950,12 @@ final: prev: {
 
   lir-nvim = buildVimPlugin {
     pname = "lir.nvim";
-    version = "0-unstable-2026-03-20";
+    version = "0-unstable-2026-03-29";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "lir.nvim";
-      rev = "a240f93bbdb3ab05235cfd85b6a07fd1dee8c3e7";
-      hash = "sha256-gd6rPQXE5KoIj3cH/RrSblkZ0oxeZkc83fHNdx9ph+s=";
+      rev = "f1291b88d3649743165cfb5d0d44a7722d4021ea";
+      hash = "sha256-N2RXXWjvGJ2TAnX/i+riPKCrs10/3bElUJVJFOG1fZw=";
     };
     meta.homepage = "https://github.com/tamago324/lir.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8067,12 +8067,12 @@ final: prev: {
 
   live-share-nvim = buildVimPlugin {
     pname = "live-share.nvim";
-    version = "1.0.0-unstable-2025-05-03";
+    version = "2.0.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "azratul";
       repo = "live-share.nvim";
-      rev = "11edb945131752c534fc903b7af2abfd6cf7edc6";
-      hash = "sha256-nPc18JJtT7ADHJ36gyKalcO3ARt2IbfdP6Y9ESfxUYU=";
+      rev = "66414b75b48209b376e425b393fd94e9649537fe";
+      hash = "sha256-iYXsp0rk788y0sVqscjiRqC1hzC0XpAiWwRdp1HCNrs=";
     };
     meta.homepage = "https://github.com/azratul/live-share.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8080,12 +8080,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "0-unstable-2026-01-31";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "a1c8e6e40cb45df59b78add5b65d575386832465";
-      hash = "sha256-xX8B0VW16CpYsWlYBhJ7t3waE6BmGbx6gYgaz2EytQ4=";
+      rev = "cfb472aa94e08e982e0ae395bbf01f2cc8a3c6b7";
+      hash = "sha256-aYX33Btw00YQqvxgPdA6xifrOpeo7c+pBeKIB7po2qQ=";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -8093,12 +8093,12 @@ final: prev: {
 
   llm-nvim = buildVimPlugin {
     pname = "llm.nvim";
-    version = "0-unstable-2025-01-09";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "huggingface";
       repo = "llm.nvim";
-      rev = "ce69731ba3f8d3ea8bc4c8f58c74c2f9ea0b33de";
-      hash = "sha256-8bJwksIEE5/K4g1akzYRWpkkTLb5bEBWwiCFC8VGfSU=";
+      rev = "fdc0758187da61612f9d3365f7a1ac45de47471c";
+      hash = "sha256-vjSa/ae6p/xCFIgRXOwZFsyLu6Gap+/H0DIeIHMnyVs=";
     };
     meta.homepage = "https://github.com/huggingface/llm.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8510,12 +8510,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2.1.0-unstable-2026-03-20";
+    version = "2.1.0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "a979821a975897b88493843301950c456a725982";
-      hash = "sha256-phvchsgzvpd3Y8O4ZVRLdepNxtSA/hY8cKrUiJ+3HpE=";
+      rev = "25f609e7fca78af7cede4f9fa3af8a94b1c4950b";
+      hash = "sha256-VjnN8NMXDjayF3whr2Oa5fQJmW18+798q9T4jFxAG3U=";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8731,12 +8731,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4";
-      hash = "sha256-XnDd1boghdwRsq5eOUttJV1jjVepVX1obgQcwLvru3A=";
+      rev = "43eb2074843950a3a25aae56a5f41362ec043bfa";
+      hash = "sha256-vrCIUPR3+oHpXyaYI4qEXcOvQQaE9lexWqB0XGalHYY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.hydraPlatforms = [ ];
@@ -8744,12 +8744,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "4d45e0e4f1fd8baefb6ae52a44659704fe7ebe8b";
-      hash = "sha256-MdbSIDfCasGbS9MPGLRUh8rYbu1zKpSiyEtzgJlgf4k=";
+      rev = "6f3c69cd57134ad8fbf1e85dcdc90cb37a8c75c8";
+      hash = "sha256-7VwbEcd+PEgPXMRhFG9zCijMsqhpQWtzA1LAs0kBx9k=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.hydraPlatforms = [ ];
@@ -8757,12 +8757,12 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "8814b56e282cd86635ce9a392ed56b6a85f59731";
-      hash = "sha256-ZTmHeNXgHqny3joHJeRFv2vOGmD+3Tm06xrSgqddVGo=";
+      rev = "0f2117aa519ec238846223d581272a9205fef7c2";
+      hash = "sha256-02399W4xi/ffRvX1iDU1RRTaTnOadeQzENJFst6AWos=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.hydraPlatforms = [ ];
@@ -8770,12 +8770,12 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "e1e82653c1ece8b7fbe7e17e1d06b5f23139f5e5";
-      hash = "sha256-Z3v+GVGcsq8ujcPAcq+Onhwgc9Ec3QK1IYCC64uuOzE=";
+      rev = "800f107b27a00978b0dadd672d6da21a5b12fa9a";
+      hash = "sha256-wGKFapSEWc7MUWGboe9lLTuTwgNB5whTNg6ZNGLiPwQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.hydraPlatforms = [ ];
@@ -8783,12 +8783,12 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "611f7147173ec60196d145203e1e2d6e3899fefc";
-      hash = "sha256-5/wdsHIeMixx7hSBVUHpT/F6x9/RKpUhd84ZvKbxhJQ=";
+      rev = "30b9d5c026965bbf6cfedc0d30ee66273f6c4084";
+      hash = "sha256-lx+5plFDSB4ot8abgYR3fHlJzTHwDQQpUlC9DRP4V68=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.hydraPlatforms = [ ];
@@ -8796,12 +8796,12 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "75369c33613b911d1ce304475dc4d30cd255c9ed";
-      hash = "sha256-/ycxlNY1iT4OIfhd2mFP8rwNqXpzF6r9D9uPSLQER48=";
+      rev = "efb969a6a9583a5d48bfbe36363769351e38f967";
+      hash = "sha256-nyD3/+UJXWQ+zhhNUiKKfQgHBZpH8TKkr/T1Mftz7nU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.hydraPlatforms = [ ];
@@ -8809,12 +8809,12 @@ final: prev: {
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bufremove";
-      rev = "ee69f823f84508c556127a5882760d9783692023";
-      hash = "sha256-bGCyXpa22i86gMupyZxc/lVYAR9vJsgSNzEiS9qzZao=";
+      rev = "8603490905fdfa31943cf2ede7ef4475e3dbac9a";
+      hash = "sha256-dNpmKx48LDoXbXcV8deAl7QbUoC42ufKXgW+CKmNKLA=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
     meta.hydraPlatforms = [ ];
@@ -8822,12 +8822,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "0.17.0-unstable-2026-03-17";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "3012ba5349b2ef725c5e418a581174edc5c19dc3";
-      hash = "sha256-ptKNg/G3uGaJnsYa6TJLXtFa6EQaBhoU3JMGZCNq9T8=";
+      rev = "f8a11789cf34a7bae396dc0f828d06cdb5066793";
+      hash = "sha256-Ig7UPa9Yo8PukCse/LRamBYfR5QZNnxC54smvtgwrbA=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -8835,12 +8835,12 @@ final: prev: {
 
   mini-cmdline = buildVimPlugin {
     pname = "mini.cmdline";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cmdline";
-      rev = "b1184b252512c85562d75fa998d4835a2fa6a3f7";
-      hash = "sha256-crOfLvSzH4/n7b/TlwuTYMwT0ikR/8FgZE+z0f6/aRc=";
+      rev = "abae396a175779dcbfe1500231f9bb48cda557c1";
+      hash = "sha256-TjArbkIwP5iPrHEx8x6bGJQEPnNQNXb+Nr9ujSQJ5tM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cmdline/";
     meta.hydraPlatforms = [ ];
@@ -8848,12 +8848,12 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "c2d5efa3f7aa66c164fa43f3bc4c58c601d09cdd";
-      hash = "sha256-822Vo0c0vrX9FQ+JZHLX3B2c/O9bU3D87wA/n8ENBrM=";
+      rev = "58a827e0996a5c47158284259c4d7b3202d97f62";
+      hash = "sha256-dxw3mIsC4zrFvS156Q18V5Lhim/LpdBb29LLs4OqWL4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.hydraPlatforms = [ ];
@@ -8861,12 +8861,12 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "597d32ed2c9fbfbf9a250bec7c6b9035f71214f5";
-      hash = "sha256-eN+hmYXOsloUBO3n58Fmp4mRm/gqs33RKBKE0MADIcQ=";
+      rev = "8e5ff3ed3cc0e8f216617aae01020c00c20f7a87";
+      hash = "sha256-ADlpVkkUSyWY8dQLiGRIIBGqwMuwGhe97wJ/wGqZ/UQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.hydraPlatforms = [ ];
@@ -8874,12 +8874,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "4f94cafdeef02bf3ef9997cd6862658801caa22c";
-      hash = "sha256-j6N8MfZTNnKORFFjJ8lpwQ37sYbRipyb0hMKcTzVdHw=";
+      rev = "09884c629cac1a8c999ffb6c57dc8424450aea5e";
+      hash = "sha256-/82KpdKohXS9VWgfRtiohXISBdPUexo3ZfwqFcRa9ps=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -8887,12 +8887,12 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "8dcf45bc820f3c5f778960ba55206938246b70b7";
-      hash = "sha256-/fPx5AaTB0Ovssxfl7Le0i8NkTfZCtO1IJpKCFJ6Mpc=";
+      rev = "a7e606208197ca5d1c5288750d5163429b4c74da";
+      hash = "sha256-swg5gxbUVY5Zkf6MThUP53aIg2NdSsEgmaFpoHwygSw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.hydraPlatforms = [ ];
@@ -8900,12 +8900,12 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "0.17.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "8f6f74a8b68dbad02f1813dff4ddae5afeee92df";
-      hash = "sha256-vhgGRzBWcw3JrKqKBh2/gP9MimtH+5ms5cBg3186qGM=";
+      rev = "d2c375398ca88d4fdf553e1c4441a865673d09f7";
+      hash = "sha256-V1cDkMnFf81BPwRjRQC/wAmfTQjsxckhAobM6X9jZeg=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.hydraPlatforms = [ ];
@@ -8913,12 +8913,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "ff3cd5e76e812fa18bde0f8126d6f3bb62008c79";
-      hash = "sha256-l8VrJMDhkOd7QSGdQxMKq9VchlACqRSgrYTtNzpdLXQ=";
+      rev = "ab11575a6c147ecfba894d676d0c93e855021d34";
+      hash = "sha256-mXpH4pZ542tLXpth9ESi60BE3wVJtB33dRu8k8KRjks=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.hydraPlatforms = [ ];
@@ -8926,12 +8926,12 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "16ca2739889f1d567ea23955247d9d4cd7b141b1";
-      hash = "sha256-mnJkllDByoBb0Zo1K5WyQFYHnkBND9/0LefiOvTEhLM=";
+      rev = "7688a470921ec04c3dbbbe7d38d1c75e7d0a7bcb";
+      hash = "sha256-bw3nejD8F5149CXLg88LqNUuHf4o46kAifQG6WRyzLc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.hydraPlatforms = [ ];
@@ -8939,12 +8939,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "0.17.0-unstable-2026-03-01";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "0ccc67319240cf8712f5f614db50c262eccd9db3";
-      hash = "sha256-4i/vN2p6bRQNcey++A+qbscw1NEsRvk+h4SZdKoqqEU=";
+      rev = "ca1932c95c6e757c06d2cc133b87835a01d909dd";
+      hash = "sha256-KM5vH3dsHOVS1p1DvcbSPwoZ+e6VTB9s+1HtHVj2Fy4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.hydraPlatforms = [ ];
@@ -8952,12 +8952,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.17.0-unstable-2026-03-19";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "b4796e09eb103f9f2d1e00aa2dab3753b879b17b";
-      hash = "sha256-mXUp2RVX1iM5n7U2hy5GhyNKtn9H8oeRJKTpULRBydI=";
+      rev = "ced297546b8fdb8e215d416d4753a735514a2fe0";
+      hash = "sha256-n9QaqALXQV4EdVlIA08+qntAD86hw6FtXmOMZ0X3XFU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -8965,12 +8965,12 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "1d55e3d50a1074f0e644688f8c140cfe65f2b489";
-      hash = "sha256-ssXLU1yjg3nXJOxJ0MNQa4RiCcfLQBBXbz+FwZ53m/M=";
+      rev = "4c0a54f83a27e99b67d06e9a74b3483c8ffe264c";
+      hash = "sha256-dnhT17eTP/jSjdFl1TIFRcozt1w+jieE7tTDwvV5BGQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.hydraPlatforms = [ ];
@@ -8978,12 +8978,12 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
-      rev = "a9565e3a58808dcb3130ddde9faa9215c414335b";
-      hash = "sha256-IXIHp7yD+yPAT70B41IMsmQojz6UK5dl2EVuGXbIM3I=";
+      rev = "a007cc40a4585c4f54787ddcf07295c2689daeb4";
+      hash = "sha256-1qexFbUk/Tyv5MbaZdmhOU6xFBIHbFaoqtzGNP7SPQ0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.hydraPlatforms = [ ];
@@ -8991,12 +8991,12 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "2c5dce6dc7443de814d16f7470549811ee86e664";
-      hash = "sha256-dYLx4DQXH1kXSUHTS4M/0ucUR/fjhblJ5xQhB2IA9ZM=";
+      rev = "a3ffba45e4119917b254c372df82e79f7d8c4aad";
+      hash = "sha256-mHwVLqyvmt7Cw4qZ+iVHK3ODtsaoZ4XUVcEwiNieTxk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.hydraPlatforms = [ ];
@@ -9004,12 +9004,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "0.17.0-unstable-2026-03-23";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "d0cd643e3e77f773ecda7205e6504ac8b6f04806";
-      hash = "sha256-ktHaXAymdunHNM3aADvbYIwK7yA9OedElOVISEuxkVQ=";
+      rev = "943c966c5c165f4401164d72a6a221197fe124a4";
+      hash = "sha256-CQLsJl3EUw71eAzd4Af0dnqfGbgEmmsWJRhwnuB+HJQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -9017,12 +9017,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e";
-      hash = "sha256-Tmf/KjoWM8MZmbwNYSPb87grdgtqNN8q3uz3hO9AyE4=";
+      rev = "7fdae2443a0e2910015ca39ad74b50524ee682d3";
+      hash = "sha256-rcoCa3/F/LmU3l3RYF14pjYa14f6ILN+1Rl9neBhxeI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.hydraPlatforms = [ ];
@@ -9030,12 +9030,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "065c7713fb4cd0124fe1462f15f27feeb8b04406";
-      hash = "sha256-0PpLyR32K6qr/UdcgVcB9WTAgn9eg2O5iWrZPCnpcF0=";
+      rev = "e0601f75aa5137a5a13bb92a988c9a300f5bd3de";
+      hash = "sha256-kbydWyaslRWTvKJMsuiMgIQi/FroPhBUke4DeRWLmQI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.hydraPlatforms = [ ];
@@ -9043,12 +9043,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "0.17.0-unstable-2026-03-19";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "1e99b8c6ad5691b441f778489b2bad7dee872872";
-      hash = "sha256-dGhpjX2dLfNAy+LgOTwVD26XI51gqIAMpjJNpDMKfDA=";
+      rev = "9e94f41a3ebcd5f5771d36fdedb18fde9d28da76";
+      hash = "sha256-sJS5JSM7TRRcKaabxKokBsuRKrVoxypvi1adQ9h9Jvc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.hydraPlatforms = [ ];
@@ -9056,12 +9056,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "5a37ec9d1faab7c90e8a85bba83d97ea359b6d84";
-      hash = "sha256-3DAzUCNc53tJFZ0newTh4K5K8cKwo7fn3I9JCGoeIWg=";
+      rev = "c0df3170873b712b61951781aeee9942a92ba1f1";
+      hash = "sha256-4ugbxE0U7mlakpHWx3zAvTlk58UCAX4RNhrGeLz4fz8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.hydraPlatforms = [ ];
@@ -9069,12 +9069,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "c6f362c835914188d499694743fb89014a815e2c";
-      hash = "sha256-O3Ryygjkc9XIhEfbw6Sme7aiz6RwbDSEIj6nnwtIr3c=";
+      rev = "dc3b688b26a810f519cdd0572a27587a138ced78";
+      hash = "sha256-hL6fsUxmRzie3iZpbMOQ/C/iQzpJiHNB9HfsrgVTF4o=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.hydraPlatforms = [ ];
@@ -9082,12 +9082,12 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
-      rev = "fafb77ad3be300393793ebc434c6491a6ba6eea2";
-      hash = "sha256-AKoUy+FQ2l4YeMmKsIvV4KXoxaWQ7N1QUN43NuX/UHA=";
+      rev = "d6ee603115ed3c81a63a3387eceb2c6a5e3d1393";
+      hash = "sha256-F+oh8ywcwFTgBEXJWg10nAqs/qp2LtrmXLbaJJisQiI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.hydraPlatforms = [ ];
@@ -9095,12 +9095,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "de8947231c29012271722651aa07f6749c41d1ed";
-      hash = "sha256-P1HzbUxZyL0AA6hqMYPXw/L4cEQNOcQ8gThbNbBhsvI=";
+      rev = "4157b1f4cf28525c3c498ce82b1f3480d034a375";
+      hash = "sha256-dofaKsGEVbW8OgkOuQbIxac27P/WvgCP1enfcx5VIY0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.hydraPlatforms = [ ];
@@ -9108,12 +9108,12 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
-      rev = "b8ba0b77e91b5f0fe8e014e03f7f59799dec1d96";
-      hash = "sha256-qImwWtUK0bBB2O3Dl2Yc6a6/lE+2GaIknz8dCQc/ozM=";
+      rev = "74d140143b1bb905c3d0aebcfc2f216fd237080e";
+      hash = "sha256-+OTW77wcX1I2Ua5W6O7tX/4J22RLTxZ2YviV1Atr7OI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.hydraPlatforms = [ ];
@@ -9121,12 +9121,12 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "0.17.0-unstable-2026-02-23";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "e506fb6da26c0a31ee6b1d2eb99626cb147f28ca";
-      hash = "sha256-CQ3Dp2sXHGRYd7r8LFGEabJp1gx/RkUL8l+6sDR7sMw=";
+      rev = "32d3544b9368c76c562f22027ab25b750647fdf1";
+      hash = "sha256-L/zq4rSdIaZxkPyjql1/ZAytm28WfAUVz1O7ygjEQrs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.hydraPlatforms = [ ];
@@ -9134,12 +9134,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-03-23";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "439cdcd6992bc9012efd7d8ed7a7b7a0f1fac32a";
-      hash = "sha256-pxI8tHG6T7Dtdqzi7IEf1XMG0nmoBVvB6SsnnFCYSFI=";
+      rev = "402ee6c6ec8ea44b22330446c8fb4e615fd3953e";
+      hash = "sha256-ckrtKu8/Gfn6oRwels8jV1+YjDUDw8RPDmP2Ft8jaMI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9147,12 +9147,12 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "0.17.0-unstable-2026-03-20";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "65bc941bca46fb3f33bb2fdcc7b67417fb474a10";
-      hash = "sha256-MgGPmL2L7You377v+VFvXVmSRSAswBG8yj2Kue302T0=";
+      rev = "fccb5e3ef0cc319b217ed9c7db1a4672dd6b766c";
+      hash = "sha256-qMdxVUKjVX1+gPvf4VI1+qgykOZejzsVsXGR4PFu8J0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.hydraPlatforms = [ ];
@@ -9160,12 +9160,12 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "b7fde3719340946feb75017ef9d75edebdeb0566";
-      hash = "sha256-ewUZT8YuJJ1OInVDAp9AG0/5K6l1LjKUZDgXcY10hPg=";
+      rev = "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9";
+      hash = "sha256-ewUVK+bPzzB8NySrm7iTyNJ4se71YBediFWpUFJCNfs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.hydraPlatforms = [ ];
@@ -9173,12 +9173,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.17.0-unstable-2026-03-23";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "fe079c2bd894a5ee70b62f23d819620ef40c4949";
-      hash = "sha256-VrY7XeYce9eO8TgQg4zzDUHbE6dr5AxOAN5fB7Q6aUA=";
+      rev = "fd7e7efadddcec3f3d7f3b363a99aa44e7286c65";
+      hash = "sha256-EUCkjgGxQsVQkA5ahV9oPwpkSU59fWWS0O8D7e2bpJY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.hydraPlatforms = [ ];
@@ -9186,12 +9186,12 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "408477bc3e1d76e5c57adebd2b688f05a0ef9bb4";
-      hash = "sha256-QIfGdPZUnrzY5l57skarDfNQo9KIvVw7TPviC+ROYHM=";
+      rev = "2e419949f6846871b3b87bcd7c418b0d1f0ad68a";
+      hash = "sha256-PDR6SG8n4x4GBH8swI0xFh4oGSVSWxVm58XOljpakDo=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.hydraPlatforms = [ ];
@@ -9199,12 +9199,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "0d0b435e3f9563965f73703a6a6d17acb432a93c";
-      hash = "sha256-afXxZssWgdQHgDdthsQH2a0V4mD8R8uozdmCfl/pfQk=";
+      rev = "8e3acd41bd7ee8f89967c83bacc93871b98a14aa";
+      hash = "sha256-4putVLcfKrbOqpD9L/fLpKGES0ZCOmGXt3mxRfptYx8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.hydraPlatforms = [ ];
@@ -9212,12 +9212,12 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "8112e794cbb022b9d4b7af60b64e9896930f1697";
-      hash = "sha256-kw3IJduA7RcJ+3F7FDZDancW2YwnxlJcqXiRxuJvNV0=";
+      rev = "8bd5a3d581b9f3dd3bc91fe495e210b8b0ee981d";
+      hash = "sha256-wgXJc58gco5mNYJpjmOZEirYo7xFSY0k8pCKAbmQbOQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.hydraPlatforms = [ ];
@@ -9225,12 +9225,12 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "cdf909e5bda577e09c61fa6d9a36bb2a88dbc636";
-      hash = "sha256-T8isX6VwsXc/vow21kYEBONTORALIpjgWlcYe2b//EQ=";
+      rev = "7bdc9decc8b623f245c1e42a64bc41e61d574c5e";
+      hash = "sha256-9blx4VllXj9jNMd5LjXZoebtjgFDnrycTJu/S/ezpp4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.hydraPlatforms = [ ];
@@ -9238,12 +9238,12 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "8c3829d4ef02b693f68e43fc131b433f11049b2b";
-      hash = "sha256-X7EFD+cE41cytLe1aED3Az3Gsyq+oGju/gHm/uEaz7U=";
+      rev = "b456bfe845e475e9cec065b7a9a1ef657ad2f41b";
+      hash = "sha256-RHMbkng5tQclXQ6qzpjgeV8NMUL4TkF1wMzrR+UdExU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.hydraPlatforms = [ ];
@@ -9251,12 +9251,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "d205d1741d1fcc1f3117b4e839bf00f74ad72fa2";
-      hash = "sha256-Cywra3S8oOwwx7VoL2CvfWDtAJlmyIZw6gxTeAXVr2Q=";
+      rev = "2715e04bea3ec9244f15b421dc5b18c0fe326210";
+      hash = "sha256-H+VXj4N/7dTTcLx2uzu7TD7IJeQbR9TcgoEmS/fHloI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -9264,12 +9264,12 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "d03f10bf562cef57bd9f80f82c54269ff4816a15";
-      hash = "sha256-AEKe21zK6IzoMr/H9riwCkm09R2h+vMaf+bR0KB6Mao=";
+      rev = "169af955ad2ed0ffcc3d2c83e850bcc7eaac2f0e";
+      hash = "sha256-Oqq4Q/+ykxY8d7Cxz3tlM7pmq1a3jJD8/v6ZGWJaEoQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.hydraPlatforms = [ ];
@@ -9277,12 +9277,12 @@ final: prev: {
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.trailspace";
-      rev = "27acb69562a4742256ab3e4b0127391fcb49dbb3";
-      hash = "sha256-pGQY5DChqhsQCfpzP68mzoXwuQQ1mBm0kPkM6usaNls=";
+      rev = "b362246495d18c29b4545a8f1c47f627f8011b7c";
+      hash = "sha256-5c8X1+zxYBJtoQ3rvZ2hyELVce1ojBN/talNaPRrYxc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
     meta.hydraPlatforms = [ ];
@@ -9290,12 +9290,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "0.17.0-unstable-2026-02-21";
+    version = "0.17.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "317a37ce8cc3640a0998b57a19dac9890ea84040";
-      hash = "sha256-hjR13RsUmhviKIDs9f2qmC64x32+BdThsp+55/upWFM=";
+      rev = "dc91169809deec9612b684f22f617619f5b3279b";
+      hash = "sha256-p2samqxhCQdp2imNejVjk1XoWDDFHsZOwQUTsYYS6WI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.hydraPlatforms = [ ];
@@ -9316,12 +9316,12 @@ final: prev: {
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "0.8.0-unstable-2026-03-21";
+    version = "0.8.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "c7cb94070b701d6e44f05a03b49081c54f4fc2e5";
-      hash = "sha256-H0+tBKaJsqtV5RaPrFRynHXfHq1E5oyW4w3U2GzefVo=";
+      rev = "75e84161c8297e2c4ca649060c0b2c709041fb57";
+      hash = "sha256-btwpr9eDCtVRxlWTJ8Asl0lITESIRn/ByGDamaa3f7k=";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9342,12 +9342,12 @@ final: prev: {
 
   mkdnflow-nvim = buildVimPlugin {
     pname = "mkdnflow.nvim";
-    version = "2.22.2-unstable-2026-03-11";
+    version = "2.22.2-unstable-2026-03-25";
     src = fetchFromGitHub {
       owner = "jakewvincent";
       repo = "mkdnflow.nvim";
-      rev = "708162864ba2760eb5e715d3543affb49d188311";
-      hash = "sha256-HKU9iHWpuBjQyuqimWpj3Qs1cutpfS7cvoYQRhCNOWg=";
+      rev = "f20732686f70f60f18f09f4befe984ae63a99201";
+      hash = "sha256-DxoSwy8WTgfKpguNVKsII2IUNfMS4oDGO18JmqalCcQ=";
     };
     meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9810,12 +9810,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "3.39.0-unstable-2026-03-22";
+    version = "3.40.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "1f75801ad71b440d1303c927fc489bc706eeee51";
-      hash = "sha256-R8KJXR/ruMRp5XWTYvXdF3W3P8r999IuFvQ4BrMsdH4=";
+      rev = "08edbf0ca8b5a05086c14c824e139cc67020c718";
+      hash = "sha256-+q+Pz0893FUH3qXHL46FzSjclKezZmMovtbw65Ot6rM=";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9836,12 +9836,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-03-25";
+    version = "1.4.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "44f5235b8511f8f9e1cdfd7daf82260b1d756aad";
-      hash = "sha256-MWn7Z/akhQeetMiqJ1vp6q1DVdHsjgtSzRo/4ZzgV5E=";
+      rev = "e4d12202917fc6334344df440740fd219b3ee868";
+      hash = "sha256-K65nKrDmU7aaL7txEDVCygXkAX4UZScPhJVCiRlpFNs=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9914,12 +9914,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-03-25";
+    version = "3.0.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "64b1a01a9fc3d3ee8b2368230563bedf3eb66e54";
-      hash = "sha256-8DUU+GRfyxU705lvHFsUJ1ZYBKCx1HTDck+XxJ81sN4=";
+      rev = "5a7fca171e3ad07380745d573d791e95268b8f3f";
+      hash = "sha256-2A1IYTkdXB+ctGC+vLvpxzmXNmfUhMD3JYh2ywDoPt4=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -10097,12 +10097,12 @@ final: prev: {
 
   neotest-ctest = buildVimPlugin {
     pname = "neotest-ctest";
-    version = "0.2.0-unstable-2026-02-19";
+    version = "0.2.0-unstable-2026-03-26";
     src = fetchFromGitHub {
       owner = "orjangj";
       repo = "neotest-ctest";
-      rev = "1e35ca810ea0070ed83888ac3c3549b0bdfb250e";
-      hash = "sha256-Owc8nbc4E3Y5wXJ/HPrCnL5wdI49f4///LgyQuClfoM=";
+      rev = "4c99a85a95cea0bf22e228c9886da8be8bdb2530";
+      hash = "sha256-5wbTW/LaaoH9NZrt8A4SOFuhGtAWHyJHCXl9zyZfBDY=";
     };
     meta.homepage = "https://github.com/orjangj/neotest-ctest/";
     meta.hydraPlatforms = [ ];
@@ -10229,12 +10229,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "3.0.1-unstable-2026-03-25";
+    version = "3.0.1-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "1539e23fa942ff957d83082c9efa617772a92f6a";
-      hash = "sha256-QD2LefD8V13G/9YGmpP0wxoz1tDIr6vtztL5Z0kgmlI=";
+      rev = "964657046a7be5b50b9cbd84d245c96b6fbd27ef";
+      hash = "sha256-G1FeLnJO7MKkqJ4RBAyC3ZwfN196Q13xSZ2Y3NzMb/c=";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -10242,12 +10242,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "0.36.0-unstable-2026-03-20";
+    version = "0.36.2-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "f08ee74308b78c511ebd80b310432ea0bc2de042";
-      hash = "sha256-tpZ20f6eJSpKLzDIttV4BVad+auyHbKnIRhRs0sg41Y=";
+      rev = "aa82bef145fcbd9c3e0e0e7b5ec1d1087b578288";
+      hash = "sha256-z1EeHNv8bHglCPPpy+TXkwWf6LKFQNj+s/eiUP3xPRI=";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -10255,12 +10255,12 @@ final: prev: {
 
   neotest-jest = buildVimPlugin {
     pname = "neotest-jest";
-    version = "0-unstable-2025-12-27";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-jest";
-      rev = "3f0cc2cff1ee05394081805c622dc2551b54d8c4";
-      hash = "sha256-LOD9G3iArygBAQwKhfN8ACyz7ucO05bLU1I8+UKSEnA=";
+      rev = "0e7979d51301dfae5ef839d771bd28cf593fde3f";
+      hash = "sha256-TaEYHfNOQIX+TWZZym+h6e5kYUZLH7NfeEcEpi3QCus=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
     meta.hydraPlatforms = [ ];
@@ -10281,12 +10281,12 @@ final: prev: {
 
   neotest-mocha = buildVimPlugin {
     pname = "neotest-mocha";
-    version = "0-unstable-2025-10-20";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "adrigzr";
       repo = "neotest-mocha";
-      rev = "bf24f5ba9bbb35ba5156b9642bccb80b8cc80eb0";
-      hash = "sha256-AOYGXgehSTC2y0loKZkBa4UJdraQAzTXJ1U3CSQnMA8=";
+      rev = "e28317a93e48ed7901d8ddb1bd252b64220b2e2c";
+      hash = "sha256-hVUYoyWT982RSFy/b/t8kzRk86BnPuqrCBMwmaRjHqs=";
     };
     meta.homepage = "https://github.com/adrigzr/neotest-mocha/";
     meta.hydraPlatforms = [ ];
@@ -10307,12 +10307,12 @@ final: prev: {
 
   neotest-phpunit = buildVimPlugin {
     pname = "neotest-phpunit";
-    version = "0-unstable-2026-03-18";
+    version = "0-unstable-2026-03-25";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-phpunit";
-      rev = "4737f5521fbaa52acb8cf9b1d01153db005fe97b";
-      hash = "sha256-SgHHdL0dbnBB2yYV1IHGl+BwfytXGtBBO9Oieh6oUPE=";
+      rev = "40e53c4294726a16f34f1a383a94c570553c6d46";
+      hash = "sha256-vKLA/FDmsbR8VlOvxE5Ini/e+r6xGvaTGb2ulCge75Q=";
     };
     meta.homepage = "https://github.com/olimorris/neotest-phpunit/";
     meta.hydraPlatforms = [ ];
@@ -10346,12 +10346,12 @@ final: prev: {
 
   neotest-python = buildVimPlugin {
     pname = "neotest-python";
-    version = "0-unstable-2025-10-13";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-python";
-      rev = "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9";
-      hash = "sha256-3rK561yVzrof0WKxsKfVPeOazShllkPRVqnguNQs/x4=";
+      rev = "06d71bea813e8edb1bbe5da2687146c7a536885e";
+      hash = "sha256-dp3tfENTVE9woJi0bec+5Ptp+le8UaH1UKnx7qItLeI=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
     meta.hydraPlatforms = [ ];
@@ -10670,12 +10670,12 @@ final: prev: {
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "0-unstable-2026-01-18";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "3b48dc0c5921f899aeb1e6e61b77b9345888a2f7";
-      hash = "sha256-QyvbNpCqLgIEQB0Nv5SZbCEPKuSDyvXfywfwNuYaFF8=";
+      rev = "250ee0eb4975e59a277f50cc03c980eef27fb483";
+      hash = "sha256-FkyUVuOydxBWRqBUb2JZrHmFL5epDG2U3BSqd865wcE=";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -11021,12 +11021,12 @@ final: prev: {
 
   nvim-bqf = buildVimPlugin {
     pname = "nvim-bqf";
-    version = "1.1.1-unstable-2026-02-02";
+    version = "1.1.1-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-bqf";
-      rev = "f65fba733268ffcf9c5b8ac381287eca7c223422";
-      hash = "sha256-/mpnDjlOiWbezhPFmbDMnJNk7AwrAh1JY1oik3HhcM0=";
+      rev = "c282a62bec6c0621a1ef5132aa3f4c9fc4dcc2c7";
+      hash = "sha256-jm6xyNel7rmyQHijP9JBBk1ZiUY7+CvCEZVO4W5R21c=";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
     meta.hydraPlatforms = [ ];
@@ -11086,12 +11086,12 @@ final: prev: {
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "0-unstable-2026-03-24";
+    version = "0-unstable-2026-03-27";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "32fcc38ab7e559f24763f6b3d9c37658ebf407d6";
-      hash = "sha256-5+X1LsVAsq2xNDLUAJYfNPKKPpeihZqWnR2NA1ablVA=";
+      rev = "c8c2c19436d33165ec34fa90c975bc0a739fe3fb";
+      hash = "sha256-gB40s09NNw9sc42J6dcxCXNQXbB2K3gJ8rDFq4eSTzs=";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
     meta.hydraPlatforms = [ ];
@@ -11164,11 +11164,11 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "0.10.0-unstable-2026-03-06";
+    version = "0.10.0-unstable-2026-03-26";
     src = fetchgit {
       url = "https://codeberg.org/mfussenegger/nvim-dap/";
-      rev = "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5";
-      hash = "sha256-U9RMvCDeNQjZ/8TFn848YQXhccIvZsBf7Axa/IipX/Q=";
+      rev = "4f5deb110d9ff8994d96c21df95e2271d11214f9";
+      hash = "sha256-H3LML3FgqvD4xI4IljAp2E3dxAdFx/As+nzjC+jPzyc=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -11253,12 +11253,12 @@ final: prev: {
 
   nvim-dap-ui = buildVimPlugin {
     pname = "nvim-dap-ui";
-    version = "4.0.0-unstable-2026-03-23";
+    version = "4.0.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "f5b6673f374626515401c5bc51b005f784a4f252";
-      hash = "sha256-vK311E7N3woU6yE+2KR0425EPFaMzx78YubsmMGBws0=";
+      rev = "d9770a55188bb34c2bdce7d90a6151181beb6966";
+      hash = "sha256-p/yOHqyRIpwJ9fSswalXtOqfIaxe+m8ELUXI6SYGuMw=";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
     meta.hydraPlatforms = [ ];
@@ -11266,12 +11266,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "1.0.1-unstable-2026-03-17";
+    version = "1.0.1-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "af144cfbdeafd90dfdaa3d406e3f8e06ddc4f0e3";
-      hash = "sha256-N2uf71PWXsYTtfj5qXST3Fvx4/zQolNTmTucKzB4RIc=";
+      rev = "e57ac4051aa56293e89991ab93bc148de35321ca";
+      hash = "sha256-Pt5BUeaw8JD0yUwB787WArfEtPryHsWMfbKTvivdScM=";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -11318,12 +11318,12 @@ final: prev: {
 
   nvim-early-retirement = buildVimPlugin {
     pname = "nvim-early-retirement";
-    version = "0-unstable-2026-02-06";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-early-retirement";
-      rev = "05f50eb61d3303678981c7510c126204ac5af4f0";
-      hash = "sha256-vbyLdLhnpJG+5RbU28mb2H9EyLJnwdzXOW/yaLMiATE=";
+      rev = "0ff579d2da40b070f78861005f8b7838bc663a8b";
+      hash = "sha256-Sd63185AZq8P7yu/8VF3kUsG2YnWXloPpqqjEFYJETY=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/";
     meta.hydraPlatforms = [ ];
@@ -11383,12 +11383,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "0-unstable-2026-02-06";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "0e9ca5e104edc53110896e00466e3c6a4af1ae7d";
-      hash = "sha256-NKO3KZRtVzTSY80DE4ol/YAK9WBBrkNUbtTKFhpGcok=";
+      rev = "d5b697f791173a99b13665c90ca08ddc1ab8b1f1";
+      hash = "sha256-2QewWnrRDKpbGc42mvfgDVZRub1+xYgtSU4bp5Upx3M=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -11422,12 +11422,12 @@ final: prev: {
 
   nvim-highlite = buildVimPlugin {
     pname = "nvim-highlite";
-    version = "4.22.0-unstable-2026-03-05";
+    version = "4.22.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "a598eab67aeee9d4876106b738211e9467b4ffd5";
-      hash = "sha256-13rMnmSwwx4lYNZAZHB1yiVPhq/SWAcMrbSJUOFwQJw=";
+      rev = "1ae61fe95e871dac03f430e01c48c5b6a24b310b";
+      hash = "sha256-N/eFc1M2pmadJWPM+h2/uT8Z62NCxCDoprSy9IoNafM=";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
     meta.hydraPlatforms = [ ];
@@ -11590,12 +11590,12 @@ final: prev: {
 
   nvim-lightbulb = buildVimPlugin {
     pname = "nvim-lightbulb";
-    version = "1.0.0-unstable-2025-03-29";
+    version = "1.0.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "kosayoda";
       repo = "nvim-lightbulb";
-      rev = "aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805";
-      hash = "sha256-1XNhioGMqQV5sI7N6YrtCA6Y9zRiPEi7ikgseL1x6HI=";
+      rev = "e974b1a93c917c840545f51b9a66cfd72c520522";
+      hash = "sha256-WHJ/MV4xKl4Unpxyxxj5j9qbxE0gP0pWe6eVXB4CGvg=";
     };
     meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
     meta.hydraPlatforms = [ ];
@@ -11629,11 +11629,11 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "0-unstable-2026-02-23";
+    version = "0-unstable-2026-03-26";
     src = fetchgit {
       url = "https://codeberg.org/mfussenegger/nvim-lint/";
-      rev = "606b823a57b027502a9ae00978ebf4f5d5158098";
-      hash = "sha256-WotyvU8lqfjN3PVXVpDQm7HMahmwYRYgTN0+WsJwyWQ=";
+      rev = "4b03656c09c1561f89b6aa0665c15d292ba9499d";
+      hash = "sha256-YFAI32eISZmYO2p1Nv6neQ48tJrNmADCu1t8nZaEm+4=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11680,12 +11680,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2.7.0-unstable-2026-03-25";
+    version = "2.7.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "46204c8fdaa36a9aa3768780450e4bc7a210025f";
-      hash = "sha256-TtvGEfxkddKFzAhOKcMrWyloG77IvRC94B9a5jEM420=";
+      rev = "9ccd58a7949091c0cc2777d4e92a45a209c808c1";
+      hash = "sha256-t8iFoSJGODxHhxZbg2kUapNKUHK08IjCfeafGEDO28g=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11875,12 +11875,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "1.9-unstable-2026-03-06";
+    version = "1.9-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "e5b527f41d18c2ee5af868e1a3939b60f15fdb90";
-      hash = "sha256-OXEVR0bKXd0LxcFwSXHK4eMUaLMSOtWejr/voDIs6xA=";
+      rev = "cbeb5fed494137d6d129e577003c10e2bffc6bd1";
+      hash = "sha256-+6DyGuBQs6Vlpgg03xzdIAe3DBITcZvndnNr9Wsd/0E=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11992,12 +11992,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "0-unstable-2026-02-06";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "1fae57ead7e1f3221286beced9e32fdd661e453b";
-      hash = "sha256-OZ/LbGJ5zwqSla+hbYhCFG38f1DZYupF40JbuThmWKk=";
+      rev = "3ff85033206aa9fbf9b988b2cc71e25ae4566424";
+      hash = "sha256-03u+THYpwdpUWBs4C4xamcheVTp4JT0cy11Ct7fVTNw=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -12005,12 +12005,12 @@ final: prev: {
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "0-unstable-2026-03-11";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "855ce6ba0c0bf3b03428d6352f61940cdcf332f3";
-      hash = "sha256-jEzWjzi6gbGiAi8D0a1BC4PCqDeQDwDqcDKlgEs2Mo0=";
+      rev = "9d22ecef2d019a72748f23cec9db32c7f7b222d2";
+      hash = "sha256-seviSWbVh5vYT/oNQbkkbvxP4VA0zmcEbCNBfdxkCW0=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -12122,12 +12122,12 @@ final: prev: {
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "0-unstable-2026-02-26";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "4bca4dbc53f01b37385146b37ab5ce55bdc083fc";
-      hash = "sha256-LKJm7tRX+mo1uEKo/U/mITnLA/xVyE2JdzSPEL8SAes=";
+      rev = "af2f73ffd62e61a091b3503845b7704d76d81d95";
+      hash = "sha256-jixcc2CGwz3Vu/mvYAOqctkP7zkhmEFQ2oHD60xR+y8=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -12135,12 +12135,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "4.0.4-unstable-2026-03-07";
+    version = "4.0.4-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "61319d4bd1c5e336e197defa15bd104c51f0fb29";
-      hash = "sha256-3rvRrTVYImIuOPk7DsbP3m2w4M7WS1mjKE2EOKibGf4=";
+      rev = "19e39478ccf5fa2eefdb3595af2f2927d0ff2416";
+      hash = "sha256-BFte0J3arjBX3olpfrKyiPPh93PJHo0Mi2WZvR9JBlk=";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -12187,12 +12187,12 @@ final: prev: {
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "1.0-unstable-2026-02-06";
+    version = "1.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "d108d5c163476fc9676ede36a40e43f4429bf373";
-      hash = "sha256-Ma58q7r+WtO4B5TgsVwPLR1/9M73Tj/mgfXE/j/ZEHo=";
+      rev = "518f7a874a4ccbc628a974ff670f134253dbde08";
+      hash = "sha256-xeh1h/e7+CfHeQFEZ7YOZREsB5wGfgmKJuagVVA0rls=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
     meta.hydraPlatforms = [ ];
@@ -12200,12 +12200,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "1.16.0-unstable-2026-03-23";
+    version = "1.16.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "3d385d3346e4883d60dc37cf642bd47bed78a46e";
-      hash = "sha256-W72JNBnsVMWVpdHL9i273qp4j/T8EqsWxNfB4Nx01ls=";
+      rev = "31503ad5d869fca61461d82a9126f62480ecb0ab";
+      hash = "sha256-LB8LoHnNWP359oJUd3OagdvRS6Mcx4wQtGtLLBzW8Xw=";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -12213,12 +12213,12 @@ final: prev: {
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "0.10.0-unstable-2026-03-23";
+    version = "0.10.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "6620ae1c44dfa8623b22d0cbf873a9e8d073b849";
-      hash = "sha256-Md10P3QJ1q8SYOF2CpvOMCGrbgobU0lOIFnrT26ikJg=";
+      rev = "4916d6592ede8c07973490d9322f187e07dfefac";
+      hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.hydraPlatforms = [ ];
@@ -12226,12 +12226,12 @@ final: prev: {
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "1.0.0-unstable-2026-03-22";
+    version = "1.0.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "adf4b6b0420b7be6c717ef0ac7993183d6c201b1";
-      hash = "sha256-rkM+v1AjE0bBWMYpwTkojqEiFx0vEBtdN7U0u3skuY4=";
+      rev = "b0c45cefe2c8f7b55fc46f34e563bc428ef99636";
+      hash = "sha256-K4o+iJY8+D0PRvRvXuBqX2q3fwxizAPp/FFpm0O0I9E=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.hydraPlatforms = [ ];
@@ -12382,12 +12382,12 @@ final: prev: {
 
   nvim-ts-context-commentstring = buildVimPlugin {
     pname = "nvim-ts-context-commentstring";
-    version = "0-unstable-2024-12-07";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "joosepalviste";
       repo = "nvim-ts-context-commentstring";
-      rev = "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f";
-      hash = "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=";
+      rev = "a681c2114cbe52e9a6878d09c9d41c35b800ce5a";
+      hash = "sha256-W213Sr6o7AV0NlsoI00MShkwINn1CP0hhQGZ7ootvPE=";
     };
     meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
     meta.hydraPlatforms = [ ];
@@ -12421,12 +12421,12 @@ final: prev: {
 
   nvim-unity = buildVimPlugin {
     pname = "nvim-unity";
-    version = "1.0.0-unstable-2026-02-22";
+    version = "1.0.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "apyra";
       repo = "nvim-unity";
-      rev = "92ef46c6da077d1a8c159266902da29eb695427f";
-      hash = "sha256-CvdgVieZNe+lK+At3fLz67bcZfkAiq+/7pWDu7F/qwk=";
+      rev = "35737bef467d114c8b64767534a6bb8a960d26c1";
+      hash = "sha256-M5EAMy4pbrkYTcnqTex2Ym1lKeOCpBXYh7zgMKSkPKI=";
     };
     meta.homepage = "https://github.com/apyra/nvim-unity/";
     meta.hydraPlatforms = [ ];
@@ -12434,12 +12434,12 @@ final: prev: {
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "0-unstable-2026-02-10";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "34ca4f6b54cf167554c5792cacc69c930b654136";
-      hash = "sha256-hCdnCKm8F1ysOKY73C4jxfwGs6KvRTyWfaBn90SDoI0=";
+      rev = "e049b24fc2042a424843a8db79af5ceb273be6f6";
+      hash = "sha256-F8dkARLPSVoVcu23nynjjuTFqDHLzZ8wxgrdB9cXCk0=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -12590,12 +12590,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "3.16.0-unstable-2026-03-24";
+    version = "3.16.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "c165637e159284931d981261d8aed9b60c211874";
-      hash = "sha256-rqBMYBmNTiEPt3OajXAjTqW7fUlnHT8xTDv/Av4pyQ8=";
+      rev = "6d71af427ceb72ae9c16e3b359bac56d508a019b";
+      hash = "sha256-1V8vdSvWtsorbdPt1xMeoV9hL2Cxjj/LO9TLgduo1/c=";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12642,12 +12642,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-03-23";
+    version = "0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "6f09b9269b18c32d837bbfe20eb4ec70859581c8";
-      hash = "sha256-MgTLcSeESeIKajpGiJDNV1hQsjn0hcFP5OyV6kYFTNM=";
+      rev = "b51e52888e678441a266bfd5ae2dc0a02a21d67e";
+      hash = "sha256-Vqzoru8DcnQT4tpRdz3OcG1u/pY+ip9NWmw8ZmrO3YM=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12694,12 +12694,12 @@ final: prev: {
 
   oklch-color-picker-nvim = buildVimPlugin {
     pname = "oklch-color-picker.nvim";
-    version = "3.9.2-unstable-2026-03-25";
+    version = "4.0.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "eero-lehtinen";
       repo = "oklch-color-picker.nvim";
-      rev = "33efb703257cd8a372900a641a66a5e6ec0bb3a3";
-      hash = "sha256-yhFNuy8hR78NcJLTKnS8WJoWyt8wYK1lwo20dVTRnXA=";
+      rev = "134b7b2622866e058ab93e51790a585e6fda5ae6";
+      hash = "sha256-uNbC+CNr1nkR9ltPHnAHL7rnIboK0qVFItcCb1PCDhM=";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12876,12 +12876,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.5.2-unstable-2026-03-24";
+    version = "0.6.0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      rev = "4f4ff2c2a4bd979bf8f20a90e44be1b86855cfea";
-      hash = "sha256-ABj3BvzUHep1jNWUf2diVfLGdHxdTIGIEUZjE5HffQo=";
+      rev = "fa0a495fa2c229115404cb3c1970578f9c6d2f76";
+      hash = "sha256-b1hGZFm7HoUm/bTRy66/9+qZQ5+LgnQcWk28Hp2hkL8=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12902,12 +12902,12 @@ final: prev: {
 
   openscad-nvim = buildVimPlugin {
     pname = "openscad.nvim";
-    version = "0-unstable-2025-09-25";
+    version = "0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "salkin-mada";
       repo = "openscad.nvim";
-      rev = "e81d938252fde30fbbe156bfc544bf2d9758272a";
-      hash = "sha256-K0TKik9+YNlcxwhIxL+Azb8i+r9ULBzSIjZx2TqeSzM=";
+      rev = "a3533dee22bf1db5e3e0f04ba669a228364b53bf";
+      hash = "sha256-ysvLVXx8P3NP8E7QRCFVT4aMTnhHo3KpW/AgRP0SYBs=";
     };
     meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12915,12 +12915,12 @@ final: prev: {
 
   org-notebook-nvim = buildVimPlugin {
     pname = "org-notebook.nvim";
-    version = "0-unstable-2025-12-18";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "bitbloxhub";
       repo = "org-notebook.nvim";
-      rev = "fd381c5381930c773ef99d1ff11d0f77dc409f65";
-      hash = "sha256-O1AwDqi2SdmycDHe1wWBeo5dEMPmYlFDjZJBSCCf3fM=";
+      rev = "5c2753b323dabc896fb1906b09d27b89607ac122";
+      hash = "sha256-GD+fQcnlsXMRge5Eo03m+RNVbV5iTFiOfdJ/i6t6rFc=";
     };
     meta.homepage = "https://github.com/bitbloxhub/org-notebook.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12954,12 +12954,12 @@ final: prev: {
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2.14.4-unstable-2026-02-14";
+    version = "2.14.5-unstable-2026-03-27";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "4796602953348e19fb24916557af7b89e188751f";
-      hash = "sha256-L4MMWXyAZGrdhKiiTQz93nOMSAUnO8k+UQUOSl4GJ4s=";
+      rev = "a455e68a99d395889ab30a25ac3846a135e93c46";
+      hash = "sha256-kTDFzud+Kx3YAI36QhEi+WjVkB6Owao7PdUBX3mLXKw=";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12967,12 +12967,12 @@ final: prev: {
 
   outline-nvim = buildVimPlugin {
     pname = "outline.nvim";
-    version = "1.2.0-unstable-2026-01-31";
+    version = "1.2.0-unstable-2026-03-29";
     src = fetchFromGitHub {
       owner = "hedyhli";
       repo = "outline.nvim";
-      rev = "ead1820d49c8e79ce89cab1c2c318981b695c9d2";
-      hash = "sha256-+jN6VV7McqszRLHPx7sYme2mq3BzaOr5IOHbF+uZPrc=";
+      rev = "c293eb56db880a0539bf9d85b4a27816960b863e";
+      hash = "sha256-xKu05IgOpgtt2W+WqXuTUjX66ffDrU8BDi8z7M6M1q4=";
     };
     meta.homepage = "https://github.com/hedyhli/outline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12980,12 +12980,12 @@ final: prev: {
 
   overseer-nvim = buildVimPlugin {
     pname = "overseer.nvim";
-    version = "2.1.0-unstable-2026-03-10";
+    version = "2.1.0-unstable-2026-04-01";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "overseer.nvim";
-      rev = "a2194447f4c5a1baf95139c5c7b539fa7b0d012f";
-      hash = "sha256-4QeZR68i4zYqDpovEH+UkKjVq2OoMaZLEK/TGE8RB74=";
+      rev = "f818eefff81f4b12fb7cf236f1b6c16768a2fcbc";
+      hash = "sha256-f7uEyEAh+iVdtY9OtyfnmsGAN/XeCOFv30p0y493A+g=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@@ -13541,12 +13541,12 @@ final: prev: {
 
   pum-vim = buildVimPlugin {
     pname = "pum.vim";
-    version = "2.0-unstable-2026-03-23";
+    version = "2.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "c571869ef143e17e55730b8ce77aea5f5b2a0146";
-      hash = "sha256-H/K8e+37S8/XJ7OTvNBxf20Nda30f1yQvivt0gQdzQk=";
+      rev = "69aafe85ccbe001da3c709875e2af8051f8f421f";
+      hash = "sha256-wa1i0gqOUK3SAT5NVZypDSGAHX3kvybntX9C5I2zRm8=";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
     meta.hydraPlatforms = [ ];
@@ -13919,12 +13919,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "8.12.0-unstable-2026-03-09";
+    version = "8.12.0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "e3c18ddd27a853f85a6f513a864cf4f2982b9f26";
-      hash = "sha256-7O8V8XDYn4ITF9VfvV1OSkto+piIm/DpwtEe+vJcE2g=";
+      rev = "c7188a8f9d2953696b6303caccbf39c51fa2c1b1";
+      hash = "sha256-qTepmp+xaLIXR88GGkZNBfrTDCl0Smajw656EV3GeWk=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14167,12 +14167,12 @@ final: prev: {
 
   satellite-nvim = buildVimPlugin {
     pname = "satellite.nvim";
-    version = "1.0.0-unstable-2026-01-22";
+    version = "1.0.0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "satellite.nvim";
-      rev = "633d60d45d7b266dabcc82261bea51385a972e8b";
-      hash = "sha256-3/QhHuJ4dQ5cKNPww5BVDAKeiSoZt3OB4d0AlEv2P5U=";
+      rev = "62b0aa1a941e35e694e8a50b589150bcca8c084d";
+      hash = "sha256-s6AaO2hO+7ha0G6lyOENdKZZrnYak2OHJSgc/jtLMuE=";
     };
     meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14467,12 +14467,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.0.5-unstable-2026-03-20";
+    version = "2.0.5-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "96afd5d3b029ac354aaa369fb33b4613a0bbf2f0";
-      hash = "sha256-Zcoy6z09Qvl+V10VmJa+ZEOGv9J9jePvPw/yDmwwSy0=";
+      rev = "0bd02161ee5c5378bf4133fcedf53d1fc4179e1d";
+      hash = "sha256-Jg4/opFVFMfDFjcoBTvuOyWdONAjBTc25jsP4ksopL8=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15890,12 +15890,12 @@ final: prev: {
 
   texpresso-vim = buildVimPlugin {
     pname = "texpresso.vim";
-    version = "0-unstable-2025-08-20";
+    version = "0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "let-def";
       repo = "texpresso.vim";
-      rev = "d543df30b61ea886cb726a18c1d1d28ea36d30cc";
-      hash = "sha256-RppHh5rK5EX22dS6NawSAVJhFWlR3kEIyQMZKZpk92Y=";
+      rev = "5630dca6090787c446e72886812a1b6a5716c2fa";
+      hash = "sha256-ZLPxy1JNTfjLerSVDJAxmqqQUWhm+SuVdDUcjRH8lEU=";
     };
     meta.homepage = "https://github.com/let-def/texpresso.vim/";
     meta.hydraPlatforms = [ ];
@@ -16020,12 +16020,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-03-05";
+    version = "1.0.0-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "aae5d90cf4821d550130ffc2107de903a07a582f";
-      hash = "sha256-wY33dkB+2IY4qQ8oVKfQ88achNSEc2MEiKNEFEhE2w4=";
+      rev = "567f5cc97a05b9cc970e7519bfa86bb9f51c16be";
+      hash = "sha256-rNMNE4uxSU5IFg7sMEDt0WCyM9f7xUYuIQmxBnfF3/4=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.hydraPlatforms = [ ];
@@ -16256,12 +16256,12 @@ final: prev: {
 
   treesitter-modules-nvim = buildVimPlugin {
     pname = "treesitter-modules.nvim";
-    version = "0-unstable-2026-02-05";
+    version = "0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "treesitter-modules.nvim";
-      rev = "0cc09da40061051b0186479203faa75052cddab6";
-      hash = "sha256-sk/lVkcRpnXL93CGmhtsilFz3lCZa9IzjI7+HeesJxg=";
+      rev = "34e50df1c49376592788dcb245683e2f43444444";
+      hash = "sha256-52TPncwFQeATM1yO3gdOMJ530rhPWUuPUkuqV1GbnjE=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/treesitter-modules.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16282,12 +16282,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "0-unstable-2026-03-18";
+    version = "0-unstable-2026-03-26";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "7baacb0efbdc2ac523ede90e266d685bc2227673";
-      hash = "sha256-ny+yC6wiyyMtCaahss1az59znQC5+vMNKYJeririxWM=";
+      rev = "a37a12b6ae937c616d4cb16b5c26c07a85899b44";
+      hash = "sha256-B0lsmKdjz7twAkAenCrX58dzljTYTgOOo8r2KG2lLJY=";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16544,12 +16544,12 @@ final: prev: {
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "1.4.2-unstable-2026-03-21";
+    version = "1.4.2-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "a42c86ef1875100c2be92e90a637064efb0eab06";
-      hash = "sha256-E26QySwuTWBDDhf2lEh6mbxYWco4acfzHAYgAyuFFek=";
+      rev = "87db18b8d19c8b0eed399f52e4c527ce5afe4817";
+      hash = "sha256-EUYiHzDWJQM9Guk6ZM5GWE/etB+GHM48myRg/BPtOV0=";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16687,12 +16687,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "0-unstable-2026-03-24";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "454955c2762614302dafdd71bcbd35f937036114";
-      hash = "sha256-i3EsJjFfakTlRKoWRGokHRXe5flREOtY3Ggdz9iMFz8=";
+      rev = "2dab719755be1c30f5aacb1f225796f57553e682";
+      hash = "sha256-WKhB4dWK9jyzbm0h0PF1nU2HOEX8X/tAVJy33izJUAQ=";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16817,12 +16817,12 @@ final: prev: {
 
   venv-selector-nvim = buildVimPlugin {
     pname = "venv-selector.nvim";
-    version = "0-unstable-2026-03-02";
+    version = "0-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "linux-cultist";
       repo = "venv-selector.nvim";
-      rev = "42e8faadf9b819654f29eb1a785797a3a328f301";
-      hash = "sha256-2+jbneudVXDejMBqaz6svJMsIUWqRKIyhRlbOr35K9s=";
+      rev = "bcb2f58533c59b01565285eba49693f00bc460f5";
+      hash = "sha256-oP4TeD2FEwL1M7D3wl1BQi812x+GhPdRQvFmrZ8l4Rc=";
     };
     meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
     meta.hydraPlatforms = [ ];
@@ -18975,12 +18975,12 @@ final: prev: {
 
   vim-go = buildVimPlugin {
     pname = "vim-go";
-    version = "1.29-unstable-2026-03-15";
+    version = "1.29-unstable-2026-03-28";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "005120403fce914b1592600aa38f09474c6ddee9";
-      hash = "sha256-ZZAQ7cXMAv0pej4Lq2EbgDnZu4DnJ0Sh/W3v2Dsu4bw=";
+      rev = "f4b4ba17035aebcd222df90375c1cbb1dc4d8c5b";
+      hash = "sha256-0mmt7i8GImhVR2kmr8MOQHFybw8QDXVRrYVg/ty30zU=";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
     meta.hydraPlatforms = [ ];
@@ -19718,12 +19718,12 @@ final: prev: {
 
   vim-kitty-navigator = buildVimPlugin {
     pname = "vim-kitty-navigator";
-    version = "0-unstable-2026-03-23";
+    version = "0-unstable-2026-03-26";
     src = fetchFromGitHub {
       owner = "knubie";
       repo = "vim-kitty-navigator";
-      rev = "e17e63582341c3ae6bf3dcec0eab274da88353ee";
-      hash = "sha256-8CJKFGrxLvlThbwIFTew7bN8Ocoxcsjr3iFOD7ga/kM=";
+      rev = "504032c138261b10b281a1d83b2d47078e4566df";
+      hash = "sha256-XoOEVCCAmD5TfyuUrHXNFmmXLIFwgJgl/fSFTbgytyg=";
     };
     meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
     meta.hydraPlatforms = [ ];
@@ -19952,12 +19952,12 @@ final: prev: {
 
   vim-lsp = buildVimPlugin {
     pname = "vim-lsp";
-    version = "0.1.4-unstable-2026-03-24";
+    version = "0.1.4-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "392657e5be4493e558440b96558e3682797b2546";
-      hash = "sha256-OttIhwTjpE/QFQeq03cnzQhZbKs50hzPsO5n++54rig=";
+      rev = "0c49560e5fbc97876e51bef6b993e48677cc15fc";
+      hash = "sha256-JSRwIPCQW7Dq/SAJjnrBXJB2iRiKOqro8CqICDwzh5w=";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
     meta.hydraPlatforms = [ ];
@@ -19991,12 +19991,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "0.0.1-unstable-2026-03-25";
+    version = "0.0.1-unstable-2026-03-27";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "1035cd9138abe0f19a67000e951040962db76d8f";
-      hash = "sha256-d+Bdg9PZWRQP6Zi4YqbizxdG+78tl6JsHlNbXn2gZYU=";
+      rev = "1da485c2d78e943e19e0aa261487f6a13014d170";
+      hash = "sha256-QMuOWjAxgtrH+UV9Dvpp0Gb7tTHFXYVAKwZmcAurGDQ=";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.hydraPlatforms = [ ];
@@ -20251,12 +20251,12 @@ final: prev: {
 
   vim-moonfly-colors = buildVimPlugin {
     pname = "vim-moonfly-colors";
-    version = "0-unstable-2026-01-18";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-moonfly-colors";
-      rev = "d11b3d04cc1cb71a778d67a4df73283a5a6d66f4";
-      hash = "sha256-+zUmQWRUNzdUDZBV7xmrA0415/HlagHDi+O9ehdaDN8=";
+      rev = "43d8eb9dd2a1154dd8259ee3ce37cbbdb28c405c";
+      hash = "sha256-jyZKY2N0ix53x5xhYo+B31G02fKcxhYkSGlJ3VFA2Ng=";
     };
     meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -21369,12 +21369,12 @@ final: prev: {
 
   vim-sexp = buildVimPlugin {
     pname = "vim-sexp";
-    version = "0-unstable-2026-03-21";
+    version = "0-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "vim-sexp";
-      rev = "62086c04eb28a7b596c285ca4c791d3459b4da6f";
-      hash = "sha256-PQdmyKGQX4SZbJn6ycKtkfjijruoBtlLnjk8iBvnKT4=";
+      rev = "df29da7cfe5b46eec08bb8f3408ca19590896e0a";
+      hash = "sha256-heagL7sPG36yTBHjMd3jlGfLcq8+bUOD2tOxF3rDXLs=";
     };
     meta.homepage = "https://github.com/guns/vim-sexp/";
     meta.hydraPlatforms = [ ];
@@ -21668,12 +21668,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "0.5.2-unstable-2026-02-19";
+    version = "0.5.2-unstable-2026-03-31";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "4869f235a6c8b57769cbe8c36bf09f9213eaeb0d";
-      hash = "sha256-r9RBARho9zXTPREuGa57p4Y7/u7R7Y60cwbncxHVZCs=";
+      rev = "d8b8703323a7b4160dd4fc5e8b456b75d47d7d16";
+      hash = "sha256-8E6MwgnaUcCdJr94II+EV11u3MFquxYPIeNVNtfezqE=";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -21954,12 +21954,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2.1.0-unstable-2026-03-20";
+    version = "2.1.0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "8fe182032e4c7c933e2e598fe402d24cbf782b8d";
-      hash = "sha256-57558rjEidqgQemsVm3yrAD2Za/bJfbripa2uyoVIWQ=";
+      rev = "6eb2e5e7b32c321d373d2954199f4510be804713";
+      hash = "sha256-QToy41+7UAKYtWRUkAtqBgvHc9vrQyRg+vXSDceYD6g=";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -22682,12 +22682,12 @@ final: prev: {
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2.5.1-unstable-2026-03-22";
+    version = "2.5.1-unstable-2026-03-29";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "d13dab9d32ff45d8018f1eadbd8163c152b1900c";
-      hash = "sha256-b+lGz89l6vyt4w9Mi5S1+UlZgLR3q2KyEftfR965CRQ=";
+      rev = "9b2eacd9c97c0bb547f6f3a27e8b5b7a70ad4d03";
+      hash = "sha256-mnG9yzlLThwsqh+siGfhVV0h1k4EvSCVrcjN1ndhFUg=";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
     meta.hydraPlatforms = [ ];
@@ -22813,12 +22813,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2026-03-04";
+    version = "2.17-unstable-2026-03-30";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "82d2305ff71dfb3bd91602534cc9bb9a195bcb38";
-      hash = "sha256-rBe8FivGH4I7uRlbrMu+9GYFA2TQ2yoyOPNcZwBLVho=";
+      rev = "9306903316c3ddd250676b7cf97c84a84c9c8f99";
+      hash = "sha256-i4FrJRBT4PSFmEfRxIvilaudpRph7lNe3fr5P+u0/3k=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -22982,12 +22982,12 @@ final: prev: {
 
   webapi-vim = buildVimPlugin {
     pname = "webapi-vim";
-    version = "0.3-unstable-2026-03-20";
+    version = "0.3-unstable-2026-03-26";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "webapi-vim";
-      rev = "35d93310604140a62e3ed96ec1e8135bd937a2fd";
-      hash = "sha256-GY5ZD2YgI7yjdMuV+Vgj2zMWLaa4E8qpqBPr7m+JJsU=";
+      rev = "c7eec04aad31e1665164d8292d0ec8b5c3cc5a57";
+      hash = "sha256-d8d5XhvVwQCoN+MZkmxv7lFpAkhJTOpVqHBsqhRKVPA=";
     };
     meta.homepage = "https://github.com/mattn/webapi-vim/";
     meta.hydraPlatforms = [ ];
@@ -23086,12 +23086,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "0.11-unstable-2026-03-08";
+    version = "0.11-unstable-2026-03-26";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "2acd05d2f1e5bb0fb094621a865879982c87a9cf";
-      hash = "sha256-3xHpwxFqNQsO53EtXLw0fufYPNj5wpkLi4lpBRYNBfI=";
+      rev = "44f266fc8ed6f8fbc6bae47ee1ca6ba32e5995f8";
+      hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk=";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.hydraPlatforms = [ ];
@@ -23255,12 +23255,12 @@ final: prev: {
 
   wrapping-nvim = buildVimPlugin {
     pname = "wrapping.nvim";
-    version = "2.1.3-unstable-2026-02-12";
+    version = "2.1.3-unstable-2026-04-02";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "wrapping.nvim";
-      rev = "6cdc793511ccccee2ddd5322d640a17b7b255504";
-      hash = "sha256-lZdg4xWTbfSs9Cu6Bvzy3+Kc0K4bBkUAiLIoirhuBXY=";
+      rev = "ef6daf9fcceac8e7a99a155bf7b153488aefdd61";
+      hash = "sha256-TKkeg5NGH4wvDIISn21MLkxaHr4ZK1jhifSgk3a2Vak=";
     };
     meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/";
     meta.hydraPlatforms = [ ];
@@ -23346,12 +23346,12 @@ final: prev: {
 
   y9nika-nvim = buildVimPlugin {
     pname = "y9nika.nvim";
-    version = "0-unstable-2026-03-14";
+    version = "0-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "y9san9";
       repo = "y9nika.nvim";
-      rev = "f170bbb31aea7aedceb4c9ec101ca639585afcb2";
-      hash = "sha256-L5CjZg3mOxhy2wC491RIN9XgnO6k+8LYlNIIzg26GPc=";
+      rev = "15e12e8669268ade38095babfa6894779da34542";
+      hash = "sha256-YvuORQasmf3fyeZAau5ph/ZfTuUVrqnQHbuiIlkP374=";
     };
     meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
     meta.hydraPlatforms = [ ];
@@ -23385,7 +23385,7 @@ final: prev: {
 
   yank-path-nvim = buildVimPlugin {
     pname = "yank-path.nvim";
-    version = "0-unstable-2025-12-11";
+    version = "0-unstable-2025-12-10";
     src = fetchFromGitHub {
       owner = "ywpkwon";
       repo = "yank-path.nvim";
@@ -23425,12 +23425,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "13.1.5-unstable-2026-03-25";
+    version = "13.1.5-unstable-2026-04-03";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "22e6d9bb4f4043fe8f003385e0e207a31043ef0e";
-      hash = "sha256-lAj9+m8uQIFPLQd9Xg+7/2JF1zkLJFEJ/3rXzLY01FY=";
+      rev = "88b5826ac57ccf172e1e7d9d0762faa9c2505a69";
+      hash = "sha256-UavdiqIrxorcGPTP1y1rh2UJOISDlHdWIKYX/6UJgcc=";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -23440,12 +23440,12 @@ final: prev: {
     pname = "yescapsquit.vim";
     version = "0.1-unstable-2022-08-31";
     src = fetchFromGitHub {
-      owner = "lucasew";
+      owner = "lucasew-graveyard";
       repo = "yescapsquit.vim";
       rev = "68290b5869bebe093ccc87ee80d15688ac2b104d";
       hash = "sha256-awtWWuaAoUz3MqgNb608bwFdvZ/jxBx5ijmE8H6uHfM=";
     };
-    meta.homepage = "https://github.com/lucasew/yescapsquit.vim/";
+    meta.homepage = "https://github.com/lucasew-graveyard/yescapsquit.vim/";
     meta.hydraPlatforms = [ ];
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index c8885bfbfba7..762a54b2f36b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -867,6 +867,7 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
       # Test mismatch of directory because of nix generated path
+      "conjure-spec.client.clojure.nrepl.server_spec"
       "conjure-spec.client.common-lisp.swank_spec"
       "conjure-spec.client.fennel.nfnl_spec"
       "conjure-spec.client.guile.socket_spec"
@@ -1536,6 +1537,11 @@ assertNoAdditions {
     ];
   };
 
+  hotpot-nvim = super.hotpot-nvim.overrideAttrs {
+    # NOTE: Vim:E919: Directory not found in 'packpath': "pack/*/opt/hotpot-fennel-update"
+    doCheck = false;
+  };
+
   hover-nvim = super.hover-nvim.overrideAttrs {
     # Single provider issue with reading from config
     # /lua/hover/providers/fold_preview.lua:27: attempt to index local 'config' (a nil value)

From 02d83af6e39fb3403514ab5eb0c0b34368da4ad9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 3 Apr 2026 15:21:15 -0500
Subject: [PATCH 103/138] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 74841e663c39..f2f6ca228063 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1800,7 +1800,7 @@ https://github.com/ywpkwon/yank-path.nvim/,HEAD,
 https://github.com/gbprod/yanky.nvim/,HEAD,
 https://github.com/HerringtonDarkholme/yats.vim/,,
 https://github.com/mikavilpas/yazi.nvim/,HEAD,
-https://github.com/lucasew/yescapsquit.vim/,HEAD,
+https://github.com/lucasew-graveyard/yescapsquit.vim/,HEAD,
 https://github.com/elkowar/yuck.vim/,HEAD,
 https://github.com/fsharp/zarchive-vim-fsharp/,,
 https://github.com/KabbAmine/zeavim.vim/,,

From 8e98b5e1a17948a5ade923980eee2613fc60c672 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 3 Apr 2026 15:21:29 -0500
Subject: [PATCH 104/138] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 134 ++++++++++--------
 1 file changed, 74 insertions(+), 60 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 5ff13153818e..31f159c32118 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -158,12 +158,12 @@
     };
     beancount = buildGrammar {
       language = "beancount";
-      version = "0.0.0+rev=d7a03a7";
+      version = "0.0.0+rev=429cff8";
       src = fetchFromGitHub {
         owner = "polarmutex";
         repo = "tree-sitter-beancount";
-        rev = "d7a03a7506fbbbc4b16a9a2054ff7c2b337744b8";
-        hash = "sha256-vPQpAw27NkmpPB67girPXF7y87TsH7hE946m36/e7UQ=";
+        rev = "429cff869513cf9e34a2cf604fbfaaedc467e809";
+        hash = "sha256-UJ8bswQJB7UYspNKLWaEXMOR4XlKVHfd7rvV5iaA5Tw=";
       };
       meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
     };
@@ -1126,12 +1126,12 @@
     };
     gotmpl = buildGrammar {
       language = "gotmpl";
-      version = "0.0.0+rev=04270cd";
+      version = "0.0.0+rev=aa71f63";
       src = fetchFromGitHub {
         owner = "ngalaiko";
         repo = "tree-sitter-go-template";
-        rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
-        hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
+        rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac";
+        hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y=";
       };
       meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
     };
@@ -1269,23 +1269,23 @@
     };
     heex = buildGrammar {
       language = "heex";
-      version = "0.0.0+rev=3968d6e";
+      version = "0.0.0+rev=5842537";
       src = fetchFromGitHub {
         owner = "connorlay";
         repo = "tree-sitter-heex";
-        rev = "3968d6e20b3c4cc234f339eddd6b7d118516e281";
-        hash = "sha256-HHsyiUxkUqKGs3kH/dIW8b89umD7+28M0sfXIt9PuQ8=";
+        rev = "5842537f734d7c12685bf27d6005313e3e5a47a0";
+        hash = "sha256-1p2drpkA+5o+WSH5cv+zPVx30lNhQ9bqX5JHA0YSS2Y=";
       };
       meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
     };
     helm = buildGrammar {
       language = "helm";
-      version = "0.0.0+rev=04270cd";
+      version = "0.0.0+rev=aa71f63";
       src = fetchFromGitHub {
         owner = "ngalaiko";
         repo = "tree-sitter-go-template";
-        rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
-        hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
+        rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac";
+        hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y=";
       };
       location = "dialects/helm";
       meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
@@ -1408,12 +1408,12 @@
     };
     idl = buildGrammar {
       language = "idl";
-      version = "0.0.0+rev=57c4ba0";
+      version = "0.0.0+rev=fb65762";
       src = fetchFromGitHub {
         owner = "cathaysia";
         repo = "tree-sitter-idl";
-        rev = "57c4ba057415ebe8e184fb11716c985dc3545e5e";
-        hash = "sha256-Y5HGPM2Dbqp+zLBq/SJt5ikdnJGfKujYRfjygpcpSmI=";
+        rev = "fb65762a13538b397e41a5fc1e9564c9df841410";
+        hash = "sha256-CDbE9TxcxZWhyv6DPgw/ygvY5fayNF4usTlZPGp/KjM=";
       };
       meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
     };
@@ -1488,12 +1488,12 @@
     };
     javadoc = buildGrammar {
       language = "javadoc";
-      version = "0.0.0+rev=42c9bc3";
+      version = "0.0.0+rev=e2f56b4";
       src = fetchFromGitHub {
         owner = "rmuir";
         repo = "tree-sitter-javadoc";
-        rev = "42c9bc340c90ec15ed96eb4314269e8249376be9";
-        hash = "sha256-ww8U9Ro8lbwojxzWgW4C4ggQW9B0NaYIctNFmXN5r5Q=";
+        rev = "e2f56b4d0df08f6ed5df8bae266f9e75b340a9ab";
+        hash = "sha256-31HnXUtuimS9gr71r6Rs3VZYmiR8N8iuNNWsbe7Sz48=";
       };
       meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
     };
@@ -1510,12 +1510,12 @@
     };
     jinja = buildGrammar {
       language = "jinja";
-      version = "0.0.0+rev=7bd0422";
+      version = "0.0.0+rev=413dba9";
       src = fetchFromGitHub {
         owner = "cathaysia";
         repo = "tree-sitter-jinja";
-        rev = "7bd0422c6a57aaabfee8603502d7708d0a536f5f";
-        hash = "sha256-ZRAgY8W9FN6TRD9aFgypVd2X+pXs8oNp9qCB9qen9DY=";
+        rev = "413dba9fea354b62f6adada1815b2f504e32ffb5";
+        hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM=";
       };
       location = "tree-sitter-jinja";
       passthru.requires = [
@@ -1525,16 +1525,27 @@
     };
     jinja_inline = buildGrammar {
       language = "jinja_inline";
-      version = "0.0.0+rev=7bd0422";
+      version = "0.0.0+rev=413dba9";
       src = fetchFromGitHub {
         owner = "cathaysia";
         repo = "tree-sitter-jinja";
-        rev = "7bd0422c6a57aaabfee8603502d7708d0a536f5f";
-        hash = "sha256-ZRAgY8W9FN6TRD9aFgypVd2X+pXs8oNp9qCB9qen9DY=";
+        rev = "413dba9fea354b62f6adada1815b2f504e32ffb5";
+        hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM=";
       };
       location = "tree-sitter-jinja_inline";
       meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
     };
+    jjdescription = buildGrammar {
+      language = "jjdescription";
+      version = "0.0.0+rev=v1.0.3";
+      src = fetchFromGitHub {
+        owner = "ribru17";
+        repo = "tree-sitter-jjdescription";
+        tag = "v1.0.3";
+        hash = "sha256-3v/SiIQIR8ptUnzzRVTaqcznw3kXqdWlS2Ua/f6npDU=";
+      };
+      meta.homepage = "https://github.com/ribru17/tree-sitter-jjdescription";
+    };
     jq = buildGrammar {
       language = "jq";
       version = "0.0.0+rev=c204e36";
@@ -1603,12 +1614,12 @@
     };
     just = buildGrammar {
       language = "just";
-      version = "0.0.0+rev=d9da862";
+      version = "0.0.0+rev=5685543";
       src = fetchFromGitHub {
         owner = "IndianBoy42";
         repo = "tree-sitter-just";
-        rev = "d9da862c156020c1a83d3c6ccdda32be6d8a5d4a";
-        hash = "sha256-YV+vab/QqGHVPV1e3wjd0w1nFskJEIU4ukq/yIlojk0=";
+        rev = "5685543a6e64f66335e25518c9ae8ffa1dae3d01";
+        hash = "sha256-lrW5E+HIqrDSWZ4+KOjIc80/wYm/WV9ZOfdLXxPIbX4=";
       };
       meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
     };
@@ -1669,12 +1680,12 @@
     };
     kotlin = buildGrammar {
       language = "kotlin";
-      version = "0.0.0+rev=802fd92";
+      version = "0.0.0+rev=93bfeee";
       src = fetchFromGitHub {
         owner = "fwcd";
         repo = "tree-sitter-kotlin";
-        rev = "802fd920c153b02b9d266369a3ef061622f2bbf0";
-        hash = "sha256-q7HTLFw/W1E6GXV2VMuPFKqDvJBv5OHeUK23zuTzZ0s=";
+        rev = "93bfeee1555d2b1442d68c44b0afde2a3b069e46";
+        hash = "sha256-9kNYaT0A9/B5/Vzg2d02XRYORlQpI9zK0e8E26FEEDg=";
       };
       meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
     };
@@ -1758,12 +1769,12 @@
     };
     liquid = buildGrammar {
       language = "liquid";
-      version = "0.0.0+rev=fa11c7b";
+      version = "0.0.0+rev=9566ca7";
       src = fetchFromGitHub {
         owner = "hankthetank27";
         repo = "tree-sitter-liquid";
-        rev = "fa11c7ba45038b61e03a8a00ad667fb5f3d72088";
-        hash = "sha256-zDBaW8Tb5MgdLJTIJmZzkR0KqAqmEortAI6jbEspgqE=";
+        rev = "9566ca79911052919fce09d26f1f655b5e093857";
+        hash = "sha256-KUp/uqTV8C98TLJ4VDtbB9Dygq4DQNv1VInzTtYS/BA=";
       };
       meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
     };
@@ -1931,12 +1942,12 @@
     };
     mlir = buildGrammar {
       language = "mlir";
-      version = "0.0.0+rev=90d41fd";
+      version = "0.0.0+rev=96fa0ad";
       src = fetchFromGitHub {
         owner = "artagnon";
         repo = "tree-sitter-mlir";
-        rev = "90d41fd327a8a6ded2fb366909ea86d8e31392ea";
-        hash = "sha256-efwVQGp3FR9xtViyfF/ChGg2eBPnm6bf2inmP0nOO+g=";
+        rev = "96fa0adc3028cc6a9d281370c9f213a457c4a2d0";
+        hash = "sha256-6zXWbcwptKfJxZzx9txteVS1LSTSD9XUs3B4JsJLZlk=";
       };
       generate = true;
       meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2081,24 +2092,24 @@
     };
     ocaml = buildGrammar {
       language = "ocaml";
-      version = "0.0.0+rev=3ef7c00";
+      version = "0.0.0+rev=5a979b3";
       src = fetchFromGitHub {
         owner = "tree-sitter";
         repo = "tree-sitter-ocaml";
-        rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
-        hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
+        rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45";
+        hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw=";
       };
       location = "grammars/ocaml";
       meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
     };
     ocaml_interface = buildGrammar {
       language = "ocaml_interface";
-      version = "0.0.0+rev=3ef7c00";
+      version = "0.0.0+rev=5a979b3";
       src = fetchFromGitHub {
         owner = "tree-sitter";
         repo = "tree-sitter-ocaml";
-        rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
-        hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
+        rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45";
+        hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw=";
       };
       location = "grammars/interface";
       passthru.requires = [
@@ -2225,12 +2236,12 @@
     };
     pkl = buildGrammar {
       language = "pkl";
-      version = "0.0.0+rev=7c8a0d1";
+      version = "0.0.0+rev=f5beed1";
       src = fetchFromGitHub {
         owner = "apple";
         repo = "tree-sitter-pkl";
-        rev = "7c8a0d15d83c1a436e91277d5023340f1ae5726b";
-        hash = "sha256-C4ArUeydTyd1eyC2auVAW7k0mqHM6tIxkjjjvPHb3eA=";
+        rev = "f5beed1da8e5fc856a1a11e29a929d0b7cdcfe3c";
+        hash = "sha256-q0K+q8GEOiwbgFjA/jiY/Hg6kPlgqMUvH8g+GdEDU3I=";
       };
       meta.homepage = "https://github.com/apple/tree-sitter-pkl";
     };
@@ -2247,12 +2258,12 @@
     };
     pod = buildGrammar {
       language = "pod";
-      version = "0.0.0+rev=4559a97";
+      version = "0.0.0+rev=57c606a";
       src = fetchFromGitHub {
         owner = "tree-sitter-perl";
         repo = "tree-sitter-pod";
-        rev = "4559a9767eb15d757dce24107b840b137f673d33";
-        hash = "sha256-yTmPjiR5Gf2oAruRjQp3tiVze8UwksY6t4L8Dvuh00U=";
+        rev = "57c606aa3373ba876d44113d13fe7bdc2c060723";
+        hash = "sha256-HE4jwqAn4jfyonFkUzA0n+MZxWa7LuV8Cfq5wgrDwjI=";
       };
       generate = true;
       meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod";
@@ -2730,12 +2741,12 @@
     };
     rust = buildGrammar {
       language = "rust";
-      version = "0.0.0+rev=8a1ccae";
+      version = "0.0.0+rev=77a3747";
       src = fetchFromGitHub {
         owner = "tree-sitter";
         repo = "tree-sitter-rust";
-        rev = "8a1ccae7aaccdc11b04dbd803453e3e9cfd9159b";
-        hash = "sha256-nx7FiGQ2ybaq6YSuToQSQbH6Vj+JNWSXacuPumHGV/Q=";
+        rev = "77a3747266f4d621d0757825e6b11edcbf991ca5";
+        hash = "sha256-Ls6tB6IxXDQDWwx0BJ7RgbheelC4MH8z97E7wwhkDcY=";
       };
       meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
     };
@@ -3011,12 +3022,12 @@
     };
     supercollider = buildGrammar {
       language = "supercollider";
-      version = "0.0.0+rev=e2d1480";
+      version = "0.0.0+rev=2b03ff4";
       src = fetchFromGitHub {
         owner = "madskjeldgaard";
         repo = "tree-sitter-supercollider";
-        rev = "e2d1480de0a62cd53f81645cb39bc1f3fa2dce5a";
-        hash = "sha256-7vmL+o/WdvDntwOHg+ETdsRn77BegSqG0s84yLTNRx8=";
+        rev = "2b03ff49dd19b046add072d0861c4d1ca8a384c8";
+        hash = "sha256-ED33VmoSMR0NbrBaw4v19k98r4mJ7S1hDJLmU5vFa14=";
       };
       meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
     };
@@ -3354,12 +3365,12 @@
     };
     typoscript = buildGrammar {
       language = "typoscript";
-      version = "0.0.0+rev=1811c76";
+      version = "0.0.0+rev=b5d0162";
       src = fetchFromGitHub {
         owner = "Teddytrombone";
         repo = "tree-sitter-typoscript";
-        rev = "1811c767f3f72be669891b524a07c58b1eb0db87";
-        hash = "sha256-Eu7YMaMH1Xz2H3lmpYOqG42MA29Decaw27bpIwP5I/0=";
+        rev = "b5d0162b328ec52cf300054a8a23d47f84f55cb4";
+        hash = "sha256-wO5f7iwfpPABNSjjQvF5422awARL84czN142EcxX7kA=";
       };
       meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
     };
@@ -3646,12 +3657,12 @@
     };
     yuck = buildGrammar {
       language = "yuck";
-      version = "0.0.0+rev=e877f6a";
+      version = "0.0.0+rev=6c60112";
       src = fetchFromGitHub {
         owner = "tree-sitter-grammars";
         repo = "tree-sitter-yuck";
-        rev = "e877f6ade4b77d5ef8787075141053631ba12318";
-        hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI=";
+        rev = "6c60112b3b3e739fb1ca4a8ea4bea2b6ffe11318";
+        hash = "sha256-ZbUN9lv2nGgpQ0rU+H38gSCdCSav//47ESHXDMuQX7c=";
       };
       meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck";
     };
@@ -4171,6 +4182,9 @@
     jinja_inline = buildQueries {
       language = "jinja_inline";
     };
+    jjdescription = buildQueries {
+      language = "jjdescription";
+    };
     jq = buildQueries {
       language = "jq";
     };

From fbd4198c07325b466a61066a73f9465bacfc28aa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 18:43:12 +0200
Subject: [PATCH 105/138] python3Packages.sqlmodel: 0.0.37 -> 0.0.38

Diff: https://github.com/tiangolo/sqlmodel/compare/0.0.37...0.0.38

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

diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix
index e71fe153fa52..74b44d0945e8 100644
--- a/pkgs/development/python-modules/sqlmodel/default.nix
+++ b/pkgs/development/python-modules/sqlmodel/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sqlmodel";
-  version = "0.0.37";
+  version = "0.0.38";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "sqlmodel";
     tag = finalAttrs.version;
-    hash = "sha256-Ir0bWLdWF1h9Hr83QAbn5GiA9dh06Zrinltv54IKaM0=";
+    hash = "sha256-GjTqsZVvuTIYxzs7d0bFE6mKPQR4ZlZywGguzOVwHnk=";
   };
 
   build-system = [ pdm-backend ];

From ee3858917e5c9bc7e3a03a2629da853a12da82d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 16:54:33 +0000
Subject: [PATCH 106/138] reaper: 7.66 -> 7.67

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

diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index e424d9fa9fe7..cba74eed9242 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -40,17 +40,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "reaper";
-  version = "7.66";
+  version = "7.67";
 
   src = fetchurl {
     url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch;
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-I+nZtcOhzlrX0xLJBxB6DE1ZtYNgMRHuutOW6MVZuMc="
+        "sha256-obsp3zSJ71nfmY8TEnFrs1v545klBSUZcruIb39/BnM="
       else
         {
-          x86_64-linux = "sha256-GMNtVql069snZzvaUrw0SEygbbnafS20HSzLdQDC6yU=";
-          aarch64-linux = "sha256-imoVxmC9oPzcl8dDtrs93/ADEB9NQFCThHZlxb8FIac=";
+          x86_64-linux = "sha256-VZSt3epsSvqBSiYjK0JIX0kWLTagxbcEBBk2t0b6WXI=";
+          aarch64-linux = "sha256-XYMeykqf9QCzD6jHU/9Lrx266A3pBq3YePKDP2Sjfhc=";
         }
         .${stdenv.hostPlatform.system};
   };

From 8d4031b8599095313ce21560bd7264b3406b5533 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 17:01:41 +0000
Subject: [PATCH 107/138] terraform-providers.buildkite_buildkite: 1.31.4 ->
 1.32.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 89de589dda40..2677b29593d4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -128,11 +128,11 @@
     "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
   "buildkite_buildkite": {
-    "hash": "sha256-RNWcVLpgBmwcHuopPRy0NkXXjmFUcWLn+GJy504J0ZA=",
+    "hash": "sha256-/Bg9Dym8mdcsjnTzlBs8iw6z4JpGBRvDo2kJeFJQ2MY=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
     "owner": "buildkite",
     "repo": "terraform-provider-buildkite",
-    "rev": "v1.31.4",
+    "rev": "v1.32.0",
     "spdx": "MIT",
     "vendorHash": "sha256-CdaYWCQQ0L1LprQ5G/aXoA5GCQWCxOkkiDbMd20r7rs="
   },

From 0f5eab3cd66268517fd30e9dc5c60184ff574cef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 17:26:09 +0000
Subject: [PATCH 108/138] bngblaster: 0.9.31 -> 0.9.33

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

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 51453baafe34..e2d77c8cb443 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.31";
+  version = "0.9.33";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-/HGgC+I67sksc60gJD1G1FtUnTZrXct/aclcfCuS5wk=";
+    hash = "sha256-8Ka+fLDQdSadxXGd/xMt7qurdnSFE6jdi8bGnTH+mPQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From fef839d0837897d6a77fa764aeb38558a0b6633a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 17:34:41 +0000
Subject: [PATCH 109/138] evcc: 0.303.2 -> 0.304.0

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

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index c8c8bb8a6a66..70be3472aef2 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.303.2";
+  version = "0.304.0";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-Z8kDC0dtKnsgIvjHFrLShwfKDqE5pkM/TSacadiOPa8=";
+    hash = "sha256-zT/V3b0SQbstUk/dLmCN7bufQ7NsS5UTHIzmQsnaHIU=";
   };
 
-  vendorHash = "sha256-FFI3zVAISX1+r15yPxIto2GX//DQVHWajERPSwLbOSM=";
+  vendorHash = "sha256-7Uz/VYuVnRjpDHvwPO2LLif9iWrGDvxdsre0fENBiwU=";
 
   commonMeta = {
     license = lib.licenses.mit;
@@ -52,7 +52,7 @@ buildGo126Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-3YKYuwr6r0zgQvlrEZjhIDYmueWCAimjJF4YgeVa8WY=";
+    hash = "sha256-/M/htYm3T5DJfNKLMudItfKKQ179mrUWdL/EVGSt2ss=";
   };
 
   nativeBuildInputs = [

From 5bdb01b2baff9b278591b691bcc9c48388b6958b Mon Sep 17 00:00:00 2001
From: Jhony Elmer Angulo Fabian <leohjaf@gmail.com>
Date: Sat, 4 Apr 2026 13:21:03 -0500
Subject: [PATCH 110/138] tree-sitter-grammars.tree-sitter-vue: add jeafleohj
 as maintainer

---
 .../tools/parsing/tree-sitter/grammars/grammar-sources.nix     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 688460ca8199..5ff6ccc19b64 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -2874,6 +2874,9 @@
     hash = "sha256-pCoyDRuRCpfpJh7vQIM8yZz5aPcqrdYlTJGM/K5oQFs=";
     meta = {
       license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        jeafleohj
+      ];
     };
   };
 

From ccbb7532f0919b06649d7eea0bb43dd6d4330062 Mon Sep 17 00:00:00 2001
From: Zirconium419122 <rasmus@liaskar.net>
Date: Sat, 4 Apr 2026 20:43:38 +0200
Subject: [PATCH 111/138] llama-cpp: 8548 -> 8664

---
 pkgs/by-name/ll/llama-cpp/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 5dea11ea470e..f0a8a26cb4a7 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -78,7 +78,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "8548";
+  version = "8664";
 
   outputs = [
     "out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-DBsTZBkngCnPbSZzs9zqWgIN1+tn8xTJ8EkNYg3xaLE=";
+    hash = "sha256-JTQg8A+8S7O/GSnRTDmvQuwDSuss+ydv6JDrNxWNeK8=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -99,10 +99,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   patches = [ ];
 
-  postPatch = ''
-    rm tools/server/public/index.html.gz
-  '';
-
   nativeBuildInputs = [
     cmake
     installShellFiles

From bd89140d1a315dba8a4310b784f6b35afa91890c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 18:51:21 +0000
Subject: [PATCH 112/138] python3Packages.arcam-fmj: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index 8605bff8ca6c..b9e6da21963c 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "arcam-fmj";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "arcam_fmj";
     tag = version;
-    hash = "sha256-qcSqsfbA5maGDTf07fz4dwlrMUF5wnWPsWcYWbsFiwQ=";
+    hash = "sha256-Oa/uCktLITzh3ZNW8RSCt6lYax0VmbAGW+coGnoiTpo=";
   };
 
   build-system = [ setuptools ];

From 1da7f49e8014ce636468c729a09b3ca385e9f2ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:08:01 +0000
Subject: [PATCH 113/138] qobuz-player: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/by-name/qo/qobuz-player/package.nix b/pkgs/by-name/qo/qobuz-player/package.nix
index f5f795c9b229..aafcf615b6d2 100644
--- a/pkgs/by-name/qo/qobuz-player/package.nix
+++ b/pkgs/by-name/qo/qobuz-player/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qobuz-player";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "SofusA";
     repo = "qobuz-player";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qAGaosIsS7IodzIJL/7kd5MNC/CW2fY7iYD6CrYSdmw=";
+    hash = "sha256-uslU/HQognLMNz/w9hMdtpzby2neE+VC8Y+RV2XMd7Q=";
   };
 
-  cargoHash = "sha256-428sWFx+DYyf8RrsY6hzytGmtmO7lmIJIoS2TfnGoh4=";
+  cargoHash = "sha256-vcII4SDE5zOgzS83CCLhffc7OEksmcMtXYb76r6M1JM=";
 
   nativeBuildInputs = [
     pkg-config

From c2fd19f8aab79ee8e71d5a452e5854097428bcf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:12:49 +0000
Subject: [PATCH 114/138] models-dev: 0-unstable-2026-03-26 ->
 0-unstable-2026-04-04

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 8d25a5c9bc0d..bf378df29fe7 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-03-26";
+  version = "0-unstable-2026-04-04";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "62015086c67bd76ebeb29cecb468834c9e17b938";
-    hash = "sha256-fIqUY3usE8pf10Q0SmLUZ9VB6TXeyiXcX4j97NRS4u4=";
+    rev = "1eb0b8c8e17ffddd89f53b2a3e426777dc560542";
+    hash = "sha256-KICnZDxBt6eo4sVJCpp2gBJgzht7+qB6i9pykXze7AY=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 8a74a9b4b26451aff4ccc67db9ac70a31a4846f9 Mon Sep 17 00:00:00 2001
From: Minegame YTB <53137994+minegameYTB@users.noreply.github.com>
Date: Sat, 4 Apr 2026 21:16:33 +0200
Subject: [PATCH 115/138] Revert "deezer-enhanced: 1.4.2 -> 1.5.0"

This reverts commit e6d24699f55eaa53b29bb144a3aad64a6d022ad2.
---
 pkgs/by-name/de/deezer-enhanced/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix
index 0a87591c5723..5f850f2cdd27 100644
--- a/pkgs/by-name/de/deezer-enhanced/package.nix
+++ b/pkgs/by-name/de/deezer-enhanced/package.nix
@@ -34,11 +34,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deezer-enhanced";
-  version = "1.5.0";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
-    hash = "sha256-UN+Jdtx6Zgt1c4Phc2mVmvL2fCw208vltzPPD8zpHBc=";
+    hash = "sha256-PRq5R0AXCsW+cEuf1EU+o7g6oa8K5jGAphoNC8cSNFw=";
   };
 
   nativeBuildInputs = [

From d79160badda71e67bccff0a06b8f667b29dc14ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:18:19 +0000
Subject: [PATCH 116/138] serverpod_cli: 3.4.4 -> 3.4.5

---
 pkgs/by-name/se/serverpod_cli/package.nix     |  4 +-
 .../se/serverpod_cli/pubspec.lock.json        | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix
index 63e593fb49b4..3898da8f9d94 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.4";
+  version = "3.4.5";
 
   # Fetch the whole monorepo
   src = fetchFromGitHub {
     owner = "serverpod";
     repo = "serverpod";
     tag = version;
-    hash = "sha256-c/JsEUNGsa55slbJ33ZMr72+UelhiWKls5d2dUumJ+A=";
+    hash = "sha256-hxZ5s4VZWFyNdhVpBU/SZyFYuB6Xh4YBYzE9amduOTo=";
   };
 
   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 82ee37832b4c..c2c976256d38 100644
--- a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json
+++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json
@@ -44,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -74,11 +74,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.4"
+      "version": "8.12.5"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -514,51 +514,51 @@
       "dependency": "transitive",
       "description": {
         "name": "serverpod_client",
-        "sha256": "e7aecd8fb0a4ad86fcb931fb411f6e408b65c0fbcdb046940530cdaef8dea2db",
+        "sha256": "bb927f4880cfb982c198426818d09cd3b07830f6232e25169dfc0ab443fc83a7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.4"
+      "version": "3.4.5"
     },
     "serverpod_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "serverpod_lints",
-        "sha256": "ad270a1d5315f1edd4f7474a00dc937b4e3a8043d59c15c19cf5bdd0272183ca",
+        "sha256": "04ce1b4023c12499351b7945884ee5dce69ebe8edd7f5787673a53ef941b976f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.4"
+      "version": "3.4.5"
     },
     "serverpod_serialization": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_serialization",
-        "sha256": "6b087d9e6075dec0973c31220b0ba09f67d31d79cb691f689a704e4b7f8343a3",
+        "sha256": "be8f84c9409bafe35d1ab65abeaa5c2f7d92116155059e489366c7fdedcca55f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.4"
+      "version": "3.4.5"
     },
     "serverpod_service_client": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_service_client",
-        "sha256": "2d81f988f25ce136f3695f53564836853dca822fd01bf12065b9bab5b566306c",
+        "sha256": "beb5f12f095b880bd12676648fd6733c9c3afbaa922aa4f1364d4e97b4b4b664",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.4"
+      "version": "3.4.5"
     },
     "serverpod_shared": {
       "dependency": "direct main",
       "description": {
         "name": "serverpod_shared",
-        "sha256": "8ebb1107e7a8f5bae35228a93f6a7701067d4dab4f340b4e34b010786668c46f",
+        "sha256": "de25d8bfe73f43544f120ae7584fefe37d47f713bf98d2af4a784d89cccadc2d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.4"
+      "version": "3.4.5"
     },
     "shelf": {
       "dependency": "transitive",
@@ -684,31 +684,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.30.0"
+      "version": "1.31.0"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.16"
+      "version": "0.6.17"
     },
     "test_descriptor": {
       "dependency": "direct dev",

From 831a44127a67c020a498431543a3898339e0dc0d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:19:53 +0200
Subject: [PATCH 117/138] python3Packages.cyclopts: 4.10.0 -> 4.10.1

Diff: https://github.com/BrianPugh/cyclopts/compare/v4.10.0...v4.10.1

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

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 5b481604f95a..5cda15428217 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyclopts";
-  version = "4.10.0";
+  version = "4.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wUNqysXUP0vzQBgb6EOVBh/3/bJf2Tgf5lHeNXucyPk=";
+    hash = "sha256-LgpnpE1Hyx4o2Pi9zXmPLlV7K2wTX5PiNlYD+7333dQ=";
   };
 
   build-system = [

From 3bc16fa44e492f977612a729ea9bfdb0a24f06eb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:23:04 +0200
Subject: [PATCH 118/138] python3Packages.garth: 0.7.11 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index 42b06244fdd5..d31003362640 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "garth";
-  version = "0.7.11";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-xB9cdbKppo+ULEwoata3RA9w2y0XLE1JSt0M/PPa1n8=";
+    hash = "sha256-9y7fvv4YwQgeWJjKj8FlSKc6CfyrQ2S4SSIXzjP3SeM=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From 66026e7f86af46521d32677e54d438a54af52bee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:24:52 +0200
Subject: [PATCH 119/138] python3Packages.goodwe: 0.4.9 -> 0.4.10

Changelog: https://github.com/marcelblijleven/goodwe/releases/tag/v0.4.10
---
 pkgs/development/python-modules/goodwe/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index 1ccd37adc044..0cf36da8a8f9 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -2,31 +2,22 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pytestCheckHook,
   setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "goodwe";
-  version = "0.4.9";
+  version = "0.4.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "marcelblijleven";
     repo = "goodwe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WHLvfAlwhcA0JFSWfwUPsJ9dWmadIjyonXEP3Bb6WKE=";
+    hash = "sha256-2wnfc+W1lhUgvWa1iwHxJu4WGZHaXvmxgtBAkTJHJ3E=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "python-3.14.patch";
-      url = "https://github.com/marcelblijleven/goodwe/commit/3a1e57109e61860f59a03626a7e21ee44bbb3639.patch";
-      hash = "sha256-ZYmEdWpOjrU61HAyhNG04oTrSH8F+LUEUskxKkoufu4=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From cd6f3ce0e8887152bfab36a74f78e1bee4dab02e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:26:51 +0200
Subject: [PATCH 120/138] python3Packages.playwright-stealth: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/playwright-stealth/default.nix b/pkgs/development/python-modules/playwright-stealth/default.nix
index 18032f8b0b0e..597c733cf8e4 100644
--- a/pkgs/development/python-modules/playwright-stealth/default.nix
+++ b/pkgs/development/python-modules/playwright-stealth/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "playwright-stealth";
-  version = "2.0.2";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "playwright_stealth";
     inherit (finalAttrs) version;
-    hash = "sha256-rFflGHMZDaXmU+A3IOlIyPCj0GsJjx1WdjED0j7kgUM=";
+    hash = "sha256-HY5Ij73Y8ZDxJp6oz11X0U3zqfGvEAHEHuNYiyqsMTM=";
   };
 
   build-system = [ poetry-core ];

From f97ec51411e7c0aac113429abc7fe8f68ccfef16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:30:23 +0200
Subject: [PATCH 121/138] sigma-cli: 2.0.1 -> 2.0.2

Diff: https://github.com/SigmaHQ/sigma-cli/compare/v2.0.1...v2.0.2

Changelog: https://github.com/SigmaHQ/sigma-cli/releases/tag/v2.0.2
---
 pkgs/by-name/si/sigma-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 7abe96e34cc9..4b197c6ff833 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigma-cli";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${version}";
-    hash = "sha256-ZYWkQguoTmGo+kuyPSByyukdA2EMdWKjHddYsML9JwA=";
+    hash = "sha256-Gd41uNARH9RbyRkTDiXmP9gWTMpS9zlkb4rPF3ikRc8=";
   };
 
   pythonRelaxDeps = [ "click" ];

From 32c0818088d74bfa2eccbedbef92bb5153741046 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Apr 2026 21:33:38 +0200
Subject: [PATCH 122/138] python3Packages.tplink-omada-client: 1.5.6 -> 1.5.7

Changelog: https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv1.5.7
---
 .../python-modules/tplink-omada-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix
index f82d81c1c3ad..20d681ec3ce1 100644
--- a/pkgs/development/python-modules/tplink-omada-client/default.nix
+++ b/pkgs/development/python-modules/tplink-omada-client/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tplink-omada-client";
-  version = "1.5.6";
+  version = "1.5.7";
   pyproject = true;
 
   src = fetchPypi {
     pname = "tplink_omada_client";
     inherit (finalAttrs) version;
-    hash = "sha256-1euKLSj+nctsk8oY8cKGoCpxEsdfNlINsMeHpvXGhks=";
+    hash = "sha256-sl6E6HJ8hrMW4IHoOZ16bQTPHuc96noY4LsyI5NkO/Y=";
   };
 
   build-system = [ hatchling ];

From d0448fa3beec7764fe1c833b7017ec0e7068cc58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:33:56 +0000
Subject: [PATCH 123/138] cli-tips: 0-unstable-2025-06-13 ->
 0-unstable-2026-03-29

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

diff --git a/pkgs/by-name/cl/cli-tips/package.nix b/pkgs/by-name/cl/cli-tips/package.nix
index df70e999ec21..06bf92100b15 100644
--- a/pkgs/by-name/cl/cli-tips/package.nix
+++ b/pkgs/by-name/cl/cli-tips/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "cli-tips";
-  version = "0-unstable-2025-06-13";
+  version = "0-unstable-2026-03-29";
 
   src = fetchFromGitHub {
     owner = "cli-stuff";
     repo = "cli-tips";
-    rev = "be62dcd3fef8a32166775d90c5538a18bf7fed94";
-    hash = "sha256-irl9TXk+8ME8dXQmsYR13uIlqFyZyUgREXROxeX65VY=";
+    rev = "0268e0e3a8eddf21a61a4d21be3b5b81629b14b4";
+    hash = "sha256-Pjb3p2EIM+7fz83t9QTjSeFoxbvDYWTYoxtJ0MAMB2s=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6dae518a5f99b55ae7ad0341dbcfefed310be488 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:42:24 +0000
Subject: [PATCH 124/138] libretro.beetle-pce-fast: 0-unstable-2026-03-13 ->
 0-unstable-2026-04-03

---
 .../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 9223d36b3a71..20af0a29d446 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-03-13";
+  version = "0-unstable-2026-04-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "0fa44d2500ebc9bf96d2808209be27a69006df79";
-    hash = "sha256-NBL506+aaLRQh9XawvvynNRunWDPqxrt7ngy6FCmiIQ=";
+    rev = "15f6b56912df40593261b369d8c7f45911c9e11d";
+    hash = "sha256-w74AV9OLEht3nMDfT9OuDN3jEpfxGsKHLyJ14lhwEZc=";
   };
 
   makefile = "Makefile";

From 9738d1065c39d68391777302933464a8b7d6daf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 19:50:18 +0000
Subject: [PATCH 125/138] cliamp: 1.27.8 -> 1.34.0

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

diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index 4980ae13b897..a84bc540338a 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,16 +16,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.27.8";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-htgNQTOiT4JwkpXy27tTColbVgvJA2qmm1giNbr3P7M=";
+    hash = "sha256-0WT3DRII4o58KFK+7UW0QgrJwrJwmPkKmTQeVXmtoZ0=";
   };
 
-  vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM=";
+  vendorHash = "sha256-+uh+4ZYvnlKmRSIvZFlnfBPqU0CFFe/Op1Gr9hjIr4U=";
 
   nativeBuildInputs = [
     pkg-config

From 1940674cb414fbda5b742906b40c0cd17f9d99b6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 4 Apr 2026 15:57:34 -0400
Subject: [PATCH 126/138] mimir: fix escape

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

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 34ac67835220..2b1fe31974d0 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
     updateScript = nix-update-script {
       extraArgs = [
         "--version-regex"
-        "mimir-(3\.[0-9.]+)"
+        "mimir-(3\\.[0-9.]+)"
       ];
     };
     tests = {

From da6f4f59bd170ccd1a2e23570d35d7a50ceaea8c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 3 Apr 2026 18:38:49 -0400
Subject: [PATCH 127/138] Reapply "ci: update pinned"

This reverts commit fd925917b825c58ac1b7afe92347a9741e6ad5f3, reversing
changes made to 1d8a939046244fc63f47a314c1d364bc7c2b2b18.
---
 .github/zizmor.yml |  2 ++
 ci/pinned.json     | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/zizmor.yml b/.github/zizmor.yml
index f1b71580ebca..b8bd704b9ff4 100644
--- a/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -10,3 +10,5 @@
 rules:
   dangerous-triggers:
     disable: true
+  secrets-outside-env:
+    disable: true
diff --git a/ci/pinned.json b/ci/pinned.json
index 9e039136a160..5f4203d1ffa2 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "bde09022887110deb780067364a0818e89258968",
-      "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz",
-      "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l"
+      "revision": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
+      "url": "https://github.com/NixOS/nixpkgs/archive/106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f.tar.gz",
+      "hash": "0wyyhddz2mqhmq938d337223675jpd83dd5lsks2nhz0hs4r3jha"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
-      "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz",
-      "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb"
+      "revision": "75925962939880974e3ab417879daffcba36c4a3",
+      "url": "https://github.com/numtide/treefmt-nix/archive/75925962939880974e3ab417879daffcba36c4a3.tar.gz",
+      "hash": "118zlbyzmh21x6rad2vrxjkdfyicd8lx3s0if8b791n51hz1r9ns"
     }
   },
   "version": 5

From 8adaa85a7c56da9e1d3fa28075f9c827300f677e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 3 Apr 2026 19:16:19 -0400
Subject: [PATCH 128/138] actions/checkout: log disk usage after checkout,
 don't use tmpfs on MacOS

We run out of disk on the latest pinned version on MacOS only, because by
default this allocates 50% of memory for the tmpfs, which is 3.5GB on MacOS
(and 4GB on Linux).

We can't increase to 4GB, though, because we get the error
"Desired memsize 4294967296 too large - defaulting to 3758096384 bytes"
if we do.

The logging I add would have saved me a lot of trouble figuring this out.
---
 .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 ec878ba389f9..1c0ca74cc31a 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -95,15 +95,12 @@ runs:
           // This would fail without --refetch, because the we had a partial clone before, but changed it above.
           await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
 
-          // Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
+          // On Linux, checking out onto tmpfs takes 1s and is faster by at least 10x.
+          // Currently, on Darwin we can only allocate 3.5GB, which isn't enough.
+          // See https://github.com/NixOS/nixpkgs/pull/506437
           await run('mkdir', 'nixpkgs')
-          switch (process.env.RUNNER_OS) {
-            case 'macOS':
-              await run('sudo', 'mount_tmpfs', 'nixpkgs')
-              break
-            case 'Linux':
-              await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
-              break
+          if (process.env.RUNNER_OS === 'Linux') {
+            await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
           }
 
           // Create all worktrees in parallel.
@@ -134,3 +131,6 @@ runs:
               await rm('pin-bump.patch')
             }
           }
+
+          console.log('final disk usage:')
+          await run('df', '-h')

From 569d5de453252970c6d060d50f66d294a8761d6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 21:01:25 +0000
Subject: [PATCH 129/138] terraform-providers.ibm-cloud_ibm: 1.89.0 -> 2.0.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 89de589dda40..ee1374093d0e 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-AUXroRfQMbfmRGUpu4SoTjPfZq2yOQncKVaNIyaEpA4=",
+    "hash": "sha256-0zJuYzNU4Q6RSzl6qNglRiJ4fcj9QA3wF/9UPBRx49c=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.89.0",
+    "rev": "v2.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-WFYO8S8AwXd7fOqFJ27LQ/OzweBiTK03a8zUDjsFInY="
+    "vendorHash": "sha256-0J10Nz6o12NuUJBkluiHWb8BElfuuz1wEKEQUb6epo0="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

From 3bdc867a840f14892dbb57e80a2ef5a754762f68 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 01:34:28 +0300
Subject: [PATCH 130/138] stdenv, trivial-builders: replace `// optionalAttrs`
 with nullable attr names

Follow-up to #430969. Replace remaining `// optionalAttrs` patterns with
`${if cond then "name" else null} = value;` to avoid per-derivation
closure allocations and `//` merge operations.

Changes:
- make-derivation.nix: inline Darwin, Windows, outputChecks blocks and
  the `env'`/`__structuredAttrs` patterns in mkDerivationSimple
- trivial-builders: inline optionalAttrs in runCommandWith and symlinkJoin
---
 .../trivial-builders/default.nix              |  14 +-
 pkgs/stdenv/generic/make-derivation.nix       | 399 +++++++++---------
 2 files changed, 214 insertions(+), 199 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 13cc1fdf77ef..6e812fe8f756 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -80,8 +80,8 @@ rec {
         inherit buildCommand name;
         passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or [ ]);
       }
-      // lib.optionalAttrs (!derivationArgs ? meta) {
-        pos =
+      // {
+        ${if !derivationArgs ? meta then "pos" else null} =
           let
             args = builtins.attrNames derivationArgs;
           in
@@ -89,11 +89,9 @@ rec {
             builtins.unsafeGetAttrPos (builtins.head args) derivationArgs
           else
             null;
+        ${if runLocal then "preferLocalBuild" else null} = true;
+        ${if runLocal then "allowSubstitutes" else null} = false;
       }
-      // (lib.optionalAttrs runLocal {
-        preferLocalBuild = true;
-        allowSubstitutes = false;
-      })
       // removeAttrs derivationArgs [ "passAsFile" ]
     );
 
@@ -567,8 +565,8 @@ rec {
           ${postBuild}
         '';
       }
-      // lib.optionalAttrs (!args ? meta) {
-        pos =
+      // {
+        ${if !args ? meta then "pos" else null} =
           if args ? pname then
             builtins.unsafeGetAttrPos "pname" args
           else
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 5177b2245f1b..4406bef8f908 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -1,3 +1,11 @@
+# PERF: This file is evaluated for every derivation in the build closure.
+# Avoid `// optionalAttrs` — each call allocates a closure, an intermediate
+# attrset, and a `//` merge.  Use nullable attribute names instead:
+#
+#   ${if cond then "name" else null} = value;
+#
+# See https://github.com/NixOS/nixpkgs/pull/430969 for measurements.
+
 { lib, config }:
 
 stdenv:
@@ -28,7 +36,6 @@ let
     mapAttrs
     mapNullable
     optional
-    optionalAttrs
     optionalString
     optionals
     pipe
@@ -530,220 +537,228 @@ let
           ]
         ];
 
-        derivationArg =
-          removeAttrs attrs removedOrReplacedAttrNames
-          // {
-            ${if (attrs ? name || (attrs ? pname && attrs ? version)) then "name" else null} =
-              let
-                # Indicate the host platform of the derivation if cross compiling.
-                # Fixed-output derivations like source tarballs shouldn't get a host
-                # suffix. But we have some weird ones with run-time deps that are
-                # just used for their side-affects. Those might as well since the
-                # hash can't be the same. See #32986.
-                hostSuffix = optionalString (!dontAddHostSuffix) stdenvHostSuffix;
+        derivationArg = removeAttrs attrs removedOrReplacedAttrNames // {
+          ${if (attrs ? name || (attrs ? pname && attrs ? version)) then "name" else null} =
+            let
+              # Indicate the host platform of the derivation if cross compiling.
+              # Fixed-output derivations like source tarballs shouldn't get a host
+              # suffix. But we have some weird ones with run-time deps that are
+              # just used for their side-affects. Those might as well since the
+              # hash can't be the same. See #32986.
+              hostSuffix = optionalString (!dontAddHostSuffix) stdenvHostSuffix;
 
-                # Disambiguate statically built packages. This was originally
-                # introduce as a means to prevent nix-env to get confused between
-                # nix and nixStatic. This should be also achieved by moving the
-                # hostSuffix before the version, so we could contemplate removing
-                # it again.
-                staticMarker = stdenvStaticMarker;
-              in
-              lib.strings.sanitizeDerivationName (
-                if attrs ? name then
-                  attrs.name + hostSuffix
-                else
-                  # we cannot coerce null to a string below
-                  assert assertMsg (
-                    attrs ? version && attrs.version != null
-                  ) "The `version` attribute cannot be null.";
-                  "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
-              );
-
-            builder = attrs.realBuilder or stdenvShell;
-            args =
-              attrs.args or [
-                "-e"
-                ./source-stdenv.sh
-                (attrs.builder or ./default-builder.sh)
-              ];
-            inherit stdenv;
-
-            # The `system` attribute of a derivation has special meaning to Nix.
-            # Derivations set it to choose what sort of machine could be used to
-            # execute the build, The build platform entirely determines this,
-            # indeed more finely than Nix knows or cares about. The `system`
-            # attribute of `buildPlatform` matches Nix's degree of specificity.
-            # exactly.
-            system = buildPlatformSystem;
-
-            inherit userHook;
-            __ignoreNulls = true;
-            inherit __structuredAttrs strictDeps;
-
-            depsBuildBuild = elemAt (elemAt dependencies 0) 0;
-            nativeBuildInputs = elemAt (elemAt dependencies 0) 1;
-            depsBuildTarget = elemAt (elemAt dependencies 0) 2;
-            depsHostHost = elemAt (elemAt dependencies 1) 0;
-            buildInputs = elemAt (elemAt dependencies 1) 1;
-            depsTargetTarget = elemAt (elemAt dependencies 2) 0;
-
-            depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0;
-            propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1;
-            depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2;
-            depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0;
-            propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
-            depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
-
-            # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
-            configureFlags =
-              configureFlags
-              ++ (
-                if configurePlatforms == defaultConfigurePlatforms then
-                  defaultConfigurePlatformsFlags
-                else
-                  optional (elem "build" configurePlatforms) buildPlatformConfigureFlag
-                  ++ optional (elem "host" configurePlatforms) hostPlatformConfigureFlag
-                  ++ optional (elem "target" configurePlatforms) targetPlatformConfigureFlag
-              );
-
-            inherit patches;
-
-            inherit doCheck doInstallCheck;
-
-            inherit outputs;
-
-            # When the derivations is content addressed provide default values
-            # for outputHashMode and outputHashAlgo because most people won't
-            # care about these anyways
-            ${if __contentAddressed then "__contentAddressed" else null} = __contentAddressed;
-            ${if __contentAddressed then "outputHashAlgo" else null} = attrs.outputHashAlgo or "sha256";
-            ${if __contentAddressed then "outputHashMode" else null} = attrs.outputHashMode or "recursive";
-
-            ${if enableParallelBuilding then "enableParallelBuilding" else null} = enableParallelBuilding;
-            ${if enableParallelBuilding then "enableParallelChecking" else null} =
-              attrs.enableParallelChecking or true;
-            ${if enableParallelBuilding then "enableParallelInstalling" else null} =
-              attrs.enableParallelInstalling or true;
-
-            ${
-              if (hardeningDisable != [ ] || hardeningEnable != [ ] || isMusl) then
-                "NIX_HARDENING_ENABLE"
+              # Disambiguate statically built packages. This was originally
+              # introduce as a means to prevent nix-env to get confused between
+              # nix and nixStatic. This should be also achieved by moving the
+              # hostSuffix before the version, so we could contemplate removing
+              # it again.
+              staticMarker = stdenvStaticMarker;
+            in
+            lib.strings.sanitizeDerivationName (
+              if attrs ? name then
+                attrs.name + hostSuffix
               else
-                null
-            } =
-              lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable))
-                "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future."
-                (builtins.concatStringsSep " " enabledHardeningOptions);
+                # we cannot coerce null to a string below
+                assert assertMsg (
+                  attrs ? version && attrs.version != null
+                ) "The `version` attribute cannot be null.";
+                "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
+            );
 
-            # TODO: remove platform condition
-            # Enabling this check could be a breaking change as it requires to edit nix.conf
-            # NixOS module already sets gccarch, unsure of nix installers and other distributions
-            ${if requiredSystemFeaturesShouldBeSet then "requiredSystemFeatures" else null} =
-              attrs.requiredSystemFeatures or [ ] ++ gccArchFeature;
-          }
-          // optionalAttrs buildIsDarwin (
+          builder = attrs.realBuilder or stdenvShell;
+          args =
+            attrs.args or [
+              "-e"
+              ./source-stdenv.sh
+              (attrs.builder or ./default-builder.sh)
+            ];
+          inherit stdenv;
+
+          # The `system` attribute of a derivation has special meaning to Nix.
+          # Derivations set it to choose what sort of machine could be used to
+          # execute the build, The build platform entirely determines this,
+          # indeed more finely than Nix knows or cares about. The `system`
+          # attribute of `buildPlatform` matches Nix's degree of specificity.
+          # exactly.
+          system = buildPlatformSystem;
+
+          inherit userHook;
+          __ignoreNulls = true;
+          inherit __structuredAttrs strictDeps;
+
+          depsBuildBuild = elemAt (elemAt dependencies 0) 0;
+          nativeBuildInputs = elemAt (elemAt dependencies 0) 1;
+          depsBuildTarget = elemAt (elemAt dependencies 0) 2;
+          depsHostHost = elemAt (elemAt dependencies 1) 0;
+          buildInputs = elemAt (elemAt dependencies 1) 1;
+          depsTargetTarget = elemAt (elemAt dependencies 2) 0;
+
+          depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0;
+          propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1;
+          depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2;
+          depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0;
+          propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
+          depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
+
+          # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
+          configureFlags =
+            configureFlags
+            ++ (
+              if configurePlatforms == defaultConfigurePlatforms then
+                defaultConfigurePlatformsFlags
+              else
+                optional (elem "build" configurePlatforms) buildPlatformConfigureFlag
+                ++ optional (elem "host" configurePlatforms) hostPlatformConfigureFlag
+                ++ optional (elem "target" configurePlatforms) targetPlatformConfigureFlag
+            );
+
+          inherit patches;
+
+          inherit doCheck doInstallCheck;
+
+          inherit outputs;
+
+          # When the derivations is content addressed provide default values
+          # for outputHashMode and outputHashAlgo because most people won't
+          # care about these anyways
+          ${if __contentAddressed then "__contentAddressed" else null} = __contentAddressed;
+          ${if __contentAddressed then "outputHashAlgo" else null} = attrs.outputHashAlgo or "sha256";
+          ${if __contentAddressed then "outputHashMode" else null} = attrs.outputHashMode or "recursive";
+
+          ${if enableParallelBuilding then "enableParallelBuilding" else null} = enableParallelBuilding;
+          ${if enableParallelBuilding then "enableParallelChecking" else null} =
+            attrs.enableParallelChecking or true;
+          ${if enableParallelBuilding then "enableParallelInstalling" else null} =
+            attrs.enableParallelInstalling or true;
+
+          ${
+            if (hardeningDisable != [ ] || hardeningEnable != [ ] || isMusl) then
+              "NIX_HARDENING_ENABLE"
+            else
+              null
+          } =
+            lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable))
+              "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future."
+              (builtins.concatStringsSep " " enabledHardeningOptions);
+
+          # TODO: remove platform condition
+          # Enabling this check could be a breaking change as it requires to edit nix.conf
+          # NixOS module already sets gccarch, unsure of nix installers and other distributions
+          ${if requiredSystemFeaturesShouldBeSet then "requiredSystemFeatures" else null} =
+            attrs.requiredSystemFeatures or [ ] ++ gccArchFeature;
+
+          # -- Darwin-specific attrs --
+          ${if buildIsDarwin then "__darwinAllowLocalNetworking" else null} = __darwinAllowLocalNetworking;
+          ${if buildIsDarwin then "__sandboxProfile" else null} =
             let
               allDependencies = concatLists (concatLists dependencies);
               allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
-
               computedSandboxProfile = concatMap (input: input.__propagatedSandboxProfile or [ ]) (
                 extraNativeBuildInputs ++ extraBuildInputs ++ allDependencies
               );
-
               computedPropagatedSandboxProfile = concatMap (
                 input: input.__propagatedSandboxProfile or [ ]
               ) allPropagatedDependencies;
-
+              profiles = [
+                extraSandboxProfile
+              ]
+              ++ computedSandboxProfile
+              ++ computedPropagatedSandboxProfile
+              ++ [
+                propagatedSandboxProfile
+                sandboxProfile
+              ];
+            in
+            # TODO: remove `unique` once nix has a list canonicalization primitive
+            concatStringsSep "\n" (filter (x: x != "") (unique profiles));
+          ${if buildIsDarwin then "__propagatedSandboxProfile" else null} =
+            let
+              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
+              computedPropagatedSandboxProfile = concatMap (
+                input: input.__propagatedSandboxProfile or [ ]
+              ) allPropagatedDependencies;
+            in
+            unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
+          ${if buildIsDarwin then "__impureHostDeps" else null} =
+            let
+              allDependencies = concatLists (concatLists dependencies);
+              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
               computedImpureHostDeps = unique (
                 concatMap (input: input.__propagatedImpureHostDeps or [ ]) (
                   extraNativeBuildInputs ++ extraBuildInputs ++ allDependencies
                 )
               );
-
               computedPropagatedImpureHostDeps = unique (
                 concatMap (input: input.__propagatedImpureHostDeps or [ ]) allPropagatedDependencies
               );
             in
-            {
-              inherit __darwinAllowLocalNetworking;
-              # TODO: remove `unique` once nix has a list canonicalization primitive
-              __sandboxProfile =
-                let
-                  profiles = [
-                    extraSandboxProfile
-                  ]
-                  ++ computedSandboxProfile
-                  ++ computedPropagatedSandboxProfile
-                  ++ [
-                    propagatedSandboxProfile
-                    sandboxProfile
-                  ];
-                  final = concatStringsSep "\n" (filter (x: x != "") (unique profiles));
-                in
-                final;
-              __propagatedSandboxProfile = unique (
-                computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]
+            computedImpureHostDeps
+            ++ computedPropagatedImpureHostDeps
+            ++ __propagatedImpureHostDeps
+            ++ __impureHostDeps
+            ++ __extraImpureHostDeps
+            ++ [
+              "/dev/zero"
+              "/dev/random"
+              "/dev/urandom"
+              "/bin/sh"
+            ];
+          ${if buildIsDarwin then "__propagatedImpureHostDeps" else null} =
+            let
+              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
+              computedPropagatedImpureHostDeps = unique (
+                concatMap (input: input.__propagatedImpureHostDeps or [ ]) allPropagatedDependencies
               );
-              __impureHostDeps =
-                computedImpureHostDeps
-                ++ computedPropagatedImpureHostDeps
-                ++ __propagatedImpureHostDeps
-                ++ __impureHostDeps
-                ++ __extraImpureHostDeps
-                ++ [
-                  "/dev/zero"
-                  "/dev/random"
-                  "/dev/urandom"
-                  "/bin/sh"
-                ];
-              __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
-            }
-          )
-          // optionalAttrs (isWindows || isCygwin) {
-            allowedImpureDLLs =
-              allowedImpureDLLs
-              ++ lib.optionals isCygwin [
-                "KERNEL32.dll"
-              ];
-          }
-          // (
+            in
+            computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
+
+          # -- Windows/Cygwin-specific attrs --
+          ${if isWindows || isCygwin then "allowedImpureDLLs" else null} =
+            allowedImpureDLLs
+            ++ lib.optionals isCygwin [
+              "KERNEL32.dll"
+            ];
+
+          # -- Output reference checks --
+          ${if !__structuredAttrs && attrs ? disallowedReferences then "disallowedReferences" else null} =
+            map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
+          ${if !__structuredAttrs && attrs ? disallowedRequisites then "disallowedRequisites" else null} =
+            map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
+          ${if !__structuredAttrs && attrs ? allowedReferences then "allowedReferences" else null} =
+            mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
+          ${if !__structuredAttrs && attrs ? allowedRequisites then "allowedRequisites" else null} =
+            mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
+          ${if __structuredAttrs then "outputChecks" else null} =
             let
               attrsOutputChecks = makeOutputChecks attrs;
               attrsOutputChecksFiltered = filterAttrs (_: v: v != null) attrsOutputChecks;
             in
-            if !__structuredAttrs then
-              attrsOutputChecks
-            else
-              {
-                outputChecks = builtins.listToAttrs (
-                  map (name: {
-                    inherit name;
-                    value =
-                      let
-                        raw = zipAttrsWith (_: builtins.concatLists) [
-                          attrsOutputChecksFiltered
-                          (makeOutputChecks attrs.outputChecks.${name} or { })
-                        ];
-                      in
-                      # separateDebugInfo = true will put all sorts of files in
-                      # the debug output which could carry references, but
-                      # that's "normal". Notably it symlinks to the source.
-                      # So disable reference checking for the debug output
-                      if separateDebugInfo' && name == "debug" then
-                        removeAttrs raw [
-                          "allowedReferences"
-                          "allowedRequisites"
-                          "disallowedReferences"
-                          "disallowedRequisites"
-                        ]
-                      else
-                        raw;
-                  }) outputs
-                );
-              }
-          );
-
+            builtins.listToAttrs (
+              map (name: {
+                inherit name;
+                value =
+                  let
+                    raw = zipAttrsWith (_: builtins.concatLists) [
+                      attrsOutputChecksFiltered
+                      (makeOutputChecks attrs.outputChecks.${name} or { })
+                    ];
+                  in
+                  # separateDebugInfo = true will put all sorts of files in
+                  # the debug output which could carry references, but
+                  # that's "normal". Notably it symlinks to the source.
+                  # So disable reference checking for the debug output
+                  if separateDebugInfo' && name == "debug" then
+                    removeAttrs raw [
+                      "allowedReferences"
+                      "allowedRequisites"
+                      "disallowedReferences"
+                      "disallowedRequisites"
+                    ]
+                  else
+                    raw;
+              }) outputs
+            );
+        };
       in
       derivationArg;
 
@@ -806,7 +821,9 @@ let
 
     let
       mainProgram = meta.mainProgram or null;
-      env' = env // lib.optionalAttrs (mainProgram != null) { NIX_MAIN_PROGRAM = mainProgram; };
+      env' = env // {
+        ${if mainProgram != null then "NIX_MAIN_PROGRAM" else null} = mainProgram;
+      };
 
       derivationArg = makeDerivationArgument (
         removeAttrs attrs [
@@ -815,8 +832,8 @@ let
           "pos"
           "env"
         ]
-        // lib.optionalAttrs __structuredAttrs { env = checkedEnv; }
         // {
+          ${if __structuredAttrs then "env" else null} = checkedEnv;
           cmakeFlags = makeCMakeFlags attrs;
           mesonFlags = makeMesonFlags attrs;
         }

From 4cde62e1657a84f72c67eca4d987cfa510bfd594 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 22:58:12 +0000
Subject: [PATCH 131/138] pvz-portable-unwrapped: 0.1.19 -> 0.1.20

---
 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 1b860fb96813..fb0d219f7bea 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.19";
+  version = "0.1.20";
 
   src = fetchFromGitHub {
     owner = "wszqkzqk";
     repo = "PvZ-Portable";
     tag = finalAttrs.version;
-    hash = "sha256-G+otMVg/RYpRSEGSvMYocMyN27ixJW9w+bNXCU9Otl0=";
+    hash = "sha256-8E23G3x97E/J0MNomi5vvrua9+S2zzoTOtyVp4YsqO8=";
   };
 
   nativeBuildInputs = [

From 9867f7f1385b437101288c18fc8ecf212ff709ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 23:00:31 +0000
Subject: [PATCH 132/138] pvzge: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/by-name/pv/pvzge/package.nix b/pkgs/by-name/pv/pvzge/package.nix
index 36280da99b38..8fd5d34e0ea5 100644
--- a/pkgs/by-name/pv/pvzge/package.nix
+++ b/pkgs/by-name/pv/pvzge/package.nix
@@ -14,13 +14,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pvzge";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "Gzh0821";
     repo = "pvzge_web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IZaJBbliudkVLOEgOwxXkUn9aET+NJrgdPi8FAA7HCE=";
+    hash = "sha256-juo+kM7IK+e3qPHH+V+/1D0NqQiZfXYEtvX940dLarQ=";
   };
 
   iconSrc = fetchurl {

From 88fe12887ef410acf611181213dc51be005c894f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Apr 2026 23:20:03 +0000
Subject: [PATCH 133/138] obs-do: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix
index 4b2f8c83d024..4c28a26cd582 100644
--- a/pkgs/by-name/ob/obs-do/package.nix
+++ b/pkgs/by-name/ob/obs-do/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "obs-do";
-  version = "0.1.12";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "obs-do";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BYZI8XirNon7P2ckyXaLkFiU4OuwK2y9eLccj0D/2W4=";
+    hash = "sha256-GDCz6PfRf1dhVzBTHoVyctkWduQiGcMpGHRg/EbiImU=";
   };
 
-  cargoHash = "sha256-V5j+zi7ogwxs2kCMRjDD7pF8yBWE6p7J2UAOXeJGbFw=";
+  cargoHash = "sha256-28t4sKSjVn+Ao7cbdmSjQbj2E/CZ4eTeoH4Tj9YRlo8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 88778e92065a54fabdb0d735154f2562ffc44538 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 30 Nov 2025 20:52:43 +0100
Subject: [PATCH 134/138] python3Packages.watchfiles: modernize

---
 .../python-modules/watchfiles/default.nix          | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index 0a85d55898a0..8f9e0e42cdd3 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -1,15 +1,13 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  rustPlatform,
   anyio,
-
-  # tests
+  buildPythonPackage,
   dirty-equals,
+  fetchFromGitHub,
   pytest-mock,
   pytest-timeout,
   pytestCheckHook,
+  rustPlatform,
   versionCheckHook,
 }:
 
@@ -35,9 +33,7 @@ buildPythonPackage rec {
     rustPlatform.maturinBuildHook
   ];
 
-  dependencies = [
-    anyio
-  ];
+  dependencies = [ anyio ];
 
   # Tests need these permissions in order to use the FSEvents API on macOS.
   sandboxProfile = ''
@@ -66,7 +62,7 @@ buildPythonPackage rec {
   meta = {
     description = "File watching and code reload";
     homepage = "https://watchfiles.helpmanual.io/";
-    changelog = "https://github.com/samuelcolvin/watchfiles/releases/tag/v${version}";
+    changelog = "https://github.com/samuelcolvin/watchfiles/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "watchfiles";

From 1ffaf86c793f5638ecbe2d25496987489d10cb2c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Feb 2026 13:22:05 +0100
Subject: [PATCH 135/138] python3Packages.watchfiles: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index 8f9e0e42cdd3..d784a0c0ea86 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -11,7 +11,7 @@
   versionCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "watchfiles";
   version = "1.1.1";
   pyproject = true;
@@ -19,12 +19,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = "watchfiles";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UlQnCYSNU9H4x31KenSfYExGun94ekrOCwajORemSco=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname src version;
+    inherit (finalAttrs) pname src version;
     hash = "sha256-6sxtH7KrwAWukPjLSMAebguPmeAHbC7YHOn1QiRPigs=";
   };
 
@@ -62,9 +62,9 @@ buildPythonPackage rec {
   meta = {
     description = "File watching and code reload";
     homepage = "https://watchfiles.helpmanual.io/";
-    changelog = "https://github.com/samuelcolvin/watchfiles/releases/tag/${src.tag}";
+    changelog = "https://github.com/samuelcolvin/watchfiles/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "watchfiles";
   };
-}
+})

From c356f7c8bdaa995d889853038e82c166edf33a9b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 24 Mar 2026 01:06:08 +0100
Subject: [PATCH 136/138] python3Packages.dynd: drop

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

diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
deleted file mode 100644
index e3a9a8425fcb..000000000000
--- a/pkgs/development/python-modules/dynd/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  cython,
-  numpy,
-  libdynd,
-  fetchpatch,
-  cmake,
-  fetchFromGitHub,
-  pythonAtLeast,
-}:
-
-buildPythonPackage rec {
-  version = "0.7.2";
-  format = "setuptools";
-  pname = "dynd";
-
-  disabled = pythonAtLeast "3.11";
-
-  src = fetchFromGitHub {
-    owner = "libdynd";
-    repo = "dynd-python";
-    rev = "v${version}";
-    sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
-  };
-
-  patches = [
-    # Fix numpy compatibility
-    # https://github.com/libdynd/dynd-python/issues/746
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/numpy-compatibility.patch?h=python-dynd&id=e626acabd041069861311f314ac3dbe9e6fd24b7";
-      sha256 = "sha256-oA/3G8CGeDhiYXbNX+G6o3QSb7rkKItuCDCbnK3Rt10=";
-      name = "numpy-compatibility.patch";
-    })
-  ];
-
-  # setup.py invokes git on build but we're fetching a tarball, so
-  # can't retrieve git version. We hardcode:
-  preConfigure = ''
-    substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
-    substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
-  '';
-
-  dontUseCmakeConfigure = true;
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    cython
-    libdynd.dev
-  ];
-
-  propagatedBuildInputs = [
-    libdynd
-    numpy
-  ];
-
-  #  ModuleNotFoundError: No module named 'dynd.config'
-  doCheck = false;
-
-  pythonImportsCheck = [ "dynd" ];
-
-  meta = {
-    homepage = "http://libdynd.org";
-    license = lib.licenses.bsd2;
-    description = "Python exposure of dynd";
-    maintainers = with lib.maintainers; [ teh ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index dd93153c605a..070b98284fbf 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -185,6 +185,7 @@ mapAliases {
   dogpile_cache = throw "'dogpile_cache' has been renamed to/replaced by 'dogpile-cache'"; # Converted to throw 2025-10-29
   duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
   dukpy = throw "'dukpy' was removed as the only consumer pyload-ng was removed"; # added 2026-03-21
+  dynd = throw "'dynd' has been removed due to lack of maintenance"; # added 2026-03-24
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08
   EasyProcess = throw "'EasyProcess' has been renamed to/replaced by 'easyprocess'"; # Converted to throw 2025-10-29
   editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d08f34e023de..33992b7ce72a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4819,8 +4819,6 @@ self: super: with self; {
 
   dynalite-panel = callPackage ../development/python-modules/dynalite-panel { };
 
-  dynd = callPackage ../development/python-modules/dynd { };
-
   e2b = callPackage ../development/python-modules/e2b { };
 
   e2b-code-interpreter = callPackage ../development/python-modules/e2b-code-interpreter { };

From 5e877cb93d35c249f8fee2d55b0bedb77d68104f Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 24 Mar 2026 01:06:12 +0100
Subject: [PATCH 137/138] libdynd: drop

---
 pkgs/by-name/li/libdynd/package.nix | 50 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/li/libdynd/package.nix

diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix
deleted file mode 100644
index 204b1fc3f956..000000000000
--- a/pkgs/by-name/li/libdynd/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libdynd";
-  version = "0.7.2";
-
-  src = fetchFromGitHub {
-    owner = "libdynd";
-    repo = "libdynd";
-    rev = "v${finalAttrs.version}";
-    sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
-  };
-
-  cmakeFlags = [
-    "-DDYND_BUILD_BENCHMARKS=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    # added to fix build with gcc7+
-    "-Wno-error=implicit-fallthrough"
-    "-Wno-error=nonnull"
-    "-Wno-error=tautological-compare"
-    "-Wno-error=class-memaccess"
-    "-Wno-error=parentheses"
-    "-Wno-error=deprecated-copy"
-    # Needed with GCC 12
-    "-Wno-error=deprecated-declarations"
-    "-Wno-error=maybe-uninitialized"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-  outputDoc = "dev";
-
-  meta = {
-    description = "C++ dynamic ndarray library, with Python exposure";
-    homepage = "http://libdynd.org";
-    license = lib.licenses.bsd2;
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2754e3bae31e..c4a2c5e9bdc5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1041,6 +1041,7 @@ mapAliases {
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
+  libdynd = throw "'libdynd' has been removed due to lack of maintenance"; # Added 2026-03-24
   libertine-g = warnAlias "'libertine-g' has been renamed to 'linux-libertine-g'" linux-libertine-g; # Added 2026-02-20
   libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libfakeXinerama = warnAlias "'libfakeXinerama' has been renamed to 'libfakexinerama'" libfakexinerama; # Added 2026-02-08

From 041596c64a57ba6658ab2a3ec57ae2a0c7291a9c Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 2 Apr 2026 12:36:24 -0400
Subject: [PATCH 138/138] python3Packages.pyzotero: init at 1.11.0

GitHub: https://github.com/urschrei/pyzotero
Homepage: https://pyzotero.readthedocs.io/en/latest/

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/pyzotero/default.nix       | 69 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyzotero/default.nix

diff --git a/pkgs/development/python-modules/pyzotero/default.nix b/pkgs/development/python-modules/pyzotero/default.nix
new file mode 100644
index 000000000000..939c59bc1c24
--- /dev/null
+++ b/pkgs/development/python-modules/pyzotero/default.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  uv-build,
+
+  # dependencies
+  bibtexparser,
+  feedparser,
+  httpx,
+  whenever,
+  pytest-asyncio,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+  python-dateutil,
+  pytz,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyzotero";
+  version = "1.11.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "urschrei";
+    repo = "pyzotero";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8K9Lg9Ehl0QARU2tAidMyynorPIMGtxDXzshmbpb6So=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.8.14,<0.9.0" "uv-build"
+  '';
+
+  build-system = [
+    uv-build
+  ];
+
+  dependencies = [
+    bibtexparser
+    feedparser
+    httpx
+    whenever
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+    python-dateutil
+    pytz
+  ];
+
+  pythonImportsCheck = [ "pyzotero" ];
+
+  meta = {
+    description = "Python client for the Zotero API";
+    homepage = "https://pyzotero.readthedocs.io/en/latest/";
+    downloadPage = "https://pyzotero.readthedocs.io/en/latest/";
+    changelog = "https://github.com/urschrei/pyzotero/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.blueOak100;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fd93bc07c70d..8d3eec0850b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16305,6 +16305,8 @@ self: super: with self; {
 
   pyzmq = callPackage ../development/python-modules/pyzmq { };
 
+  pyzotero = callPackage ../development/python-modules/pyzotero { };
+
   pyzstd = callPackage ../development/python-modules/pyzstd { zstd-c = pkgs.zstd; };
 
   pyzx = callPackage ../development/python-modules/pyzx { };