From b5f59f805bdab8d74c1a5ec0b9f06e740e6981d2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 14:24:34 +0200
Subject: [PATCH 001/238] auto-rebase: add -f to the filter-branch invocation

...because it tells me to do so:

    + git filter-branch --parent-filter 'sed '\''s/2140bf39e41767f25a395d20fb0d5698b8934b33/374e6bcc403e02a35e07b650463c01a52b13a7c8/'\''' --tree-filter 'nix-shell --run treefmt' 374e6bcc403e02a35e07b650463c01a52b13a7c8..HEAD
    Cannot create a new backup.
    A previous backup already exists in refs/original/
    Force overwriting the backup with -f
---
 maintainers/scripts/auto-rebase/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/auto-rebase/run.sh b/maintainers/scripts/auto-rebase/run.sh
index 1a8ad98c3723..65b7a9d16fb3 100755
--- a/maintainers/scripts/auto-rebase/run.sh
+++ b/maintainers/scripts/auto-rebase/run.sh
@@ -45,7 +45,7 @@ for line in "${autoLines[@]}"; do
     #   commit is unchanged. This is why the following is also necessary:
     # - The tree filter runs the command on each of our own commits,
     #   effectively reapplying it.
-    FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch \
+    FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f \
         --parent-filter "sed 's/$parent/$autoCommit/'" \
         --tree-filter "$autoCmd" \
         "$autoCommit"..HEAD

From 1a105443c9324aa9f7ed81b0456b64c242110e31 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 22 Jan 2026 22:22:03 +0100
Subject: [PATCH 002/238] config: add recursionMode

This makes it possible to change the recursion of attrsets
depending on if we are evaling for search, hydra or eval
---
 pkgs/top-level/all-packages.nix    | 48 ++++++++++++++++++++++++++++++
 pkgs/top-level/config.nix          | 15 ++++++++++
 pkgs/top-level/packages-config.nix |  1 +
 pkgs/top-level/release.nix         |  1 +
 4 files changed, 65 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2a4cf1f5871..cf1c5c8ea614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -108,6 +108,54 @@ with pkgs;
   gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
   clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
 
+  /**
+    Recurse into an attribute set depending on which `config.recursionMode` is set.
+
+    This function only affects a single attribute set;
+    it does not apply itself recursively for nested attribute sets.
+
+    # Inputs
+    `modes`
+    : An attribute set containg keys from `config.recursionMode` defaulting to true.
+    `attrs`
+    : An attribute set to scan for derivations.
+
+    # Type
+    ```
+    recurseIntoAttrsWith :: AttrSet -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+    :::{.example}
+    ## `pkgs.recurseIntoAttrsWith` usage example
+    ```nix
+    { pkgs ? import <nixpkgs> {} }:
+    {
+      myTools = pkgs.recurseIntoAttrsWith { } {
+        inherit (pkgs) hello figlet;
+      };
+    }
+    ```
+    :::
+  */
+  recurseIntoAttrsWith =
+    {
+      hydra ? true,
+      eval ? true,
+      search ? true,
+    }:
+    attrs:
+    attrs
+    // {
+      recurseForDerivations =
+        let
+          modes = {
+            inherit hydra eval search;
+          };
+        in
+        modes.${config.recursionMode};
+    };
+
   ### Evaluating the entire Nixpkgs naively will likely fail, make failure fast
   AAAAAASomeThingsFailToEvaluate = throw ''
     This pseudo-package is likely not the only part of Nixpkgs that fails to evaluate.
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 757274fd1dc7..eac1c9bac3e7 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -369,6 +369,21 @@ let
       '';
     };
 
+    recursionMode = mkOption {
+      type = types.uniq (
+        types.enum [
+          "hydra"
+          "eval"
+          "search"
+        ]
+      );
+      default = "eval";
+      description = ''
+        In which way to recurse through Nixpkgs. In most cases you want keep this as the default.
+        You can use this to emulate how `hydra` and `search` are going through Nixpkgs.
+      '';
+    };
+
     hashedMirrors = mkOption {
       type = types.listOf types.str;
       default = [ "https://tarballs.nixos.org" ];
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index f35ec01ceb09..4f18dee51d75 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -3,6 +3,7 @@
   # Ensures no aliases are in the results.
   allowAliases = false;
   allowVariants = false;
+  recursionMode = "search";
 
   # Enable recursion into attribute sets that nix-env normally doesn't look into
   # so that we can get a more complete picture of the available packages for the
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2ff584588835..7b152393ae88 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -40,6 +40,7 @@
       allowAliases = false;
       allowUnfree = false;
       inHydra = true;
+      recursionMode = "hydra";
       # Exceptional unsafe packages that we still build and distribute,
       # so users choosing to allow don't have to rebuild them every time.
       permittedInsecurePackages = [

From 1e1115a8c78d2a3e4f92277aebcbaadb281b9d3b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 22 Jan 2026 22:30:07 +0100
Subject: [PATCH 003/238] tests: make use of recurseIntoAttrsWith

---
 pkgs/top-level/all-packages.nix    | 3 ++-
 pkgs/top-level/packages-config.nix | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf1c5c8ea614..2b2c0cae9d32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -162,7 +162,8 @@ with pkgs;
     You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
-  tests = recurseIntoAttrs (callPackages ../test { });
+  # Tests should not appear in search results
+  tests = recurseIntoAttrsWith { search = false; } (callPackages ../test { });
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 4f18dee51d75..aea086786a44 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -25,8 +25,5 @@
       # show up in search results or repository tracking services that consume our
       # packages.json https://github.com/NixOS/nixpkgs/issues/244966
       minimal-bootstrap = { };
-
-      # This makes it so that tests are not appering on search.nixos.org
-      tests = { };
     };
 }

From b5cec4415b610261186edf546d71f9ebdb4c1338 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 22 Jan 2026 22:32:56 +0100
Subject: [PATCH 004/238] minimal-bootstrap: make use of recurseIntoAttrsWith

---
 pkgs/top-level/all-packages.nix    | 7 ++++++-
 pkgs/top-level/packages-config.nix | 6 ------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b2c0cae9d32..a0bd7dff116a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9532,7 +9532,12 @@ with pkgs;
   };
 
   mdadm = mdadm4;
-  minimal-bootstrap = recurseIntoAttrs (
+
+  # minimal-bootstrap packages aren't used for anything but bootstrapping our
+  # stdenv. They should not be used for any other purpose and therefore not
+  # show up in search results or repository tracking services that consume our
+  # packages.json https://github.com/NixOS/nixpkgs/issues/244966
+  minimal-bootstrap = recurseIntoAttrsWith { search = false; } (
     import ../os-specific/linux/minimal-bootstrap {
       inherit (stdenv) buildPlatform hostPlatform;
       inherit lib config;
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index aea086786a44..519c2e87a42f 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -19,11 +19,5 @@
       # emacsPackages is an alias for emacs.pkgs
       # Re-introduce emacsPackages here so that emacs.pkgs can be searched.
       emacsPackages = emacs.pkgs;
-
-      # minimal-bootstrap packages aren't used for anything but bootstrapping our
-      # stdenv. They should not be used for any other purpose and therefore not
-      # show up in search results or repository tracking services that consume our
-      # packages.json https://github.com/NixOS/nixpkgs/issues/244966
-      minimal-bootstrap = { };
     };
 }

From 9dc126bc2460619d39645c76e59570d31d03b209 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 22 Jan 2026 22:36:29 +0100
Subject: [PATCH 005/238] emacsPackages: make use of recurseIntoAttrsWith

---
 pkgs/top-level/all-packages.nix    | 8 +++++---
 pkgs/top-level/packages-config.nix | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0bd7dff116a..342dabdd6615 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10305,9 +10305,11 @@ with pkgs;
       pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
     };
 
-  # emacsPackages is exposed on search.nixos.org.
-  # Also see pkgs/top-level/packages-config.nix
-  emacsPackages = dontRecurseIntoAttrs emacs.pkgs;
+  # We want emacsPackages to be visible in search but not be build on hydra
+  emacsPackages = recurseIntoAttrsWith {
+    hydra = false;
+    eval = false;
+  } emacs.pkgs;
 
   espeak-classic = callPackage ../applications/audio/espeak { };
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 519c2e87a42f..094e7e50658e 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -15,9 +15,5 @@
       inherit (super)
         rPackages
         ;
-
-      # emacsPackages is an alias for emacs.pkgs
-      # Re-introduce emacsPackages here so that emacs.pkgs can be searched.
-      emacsPackages = emacs.pkgs;
     };
 }

From 9f1ea8601a3d908ade1c40538204de39a80a5293 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 22 Jan 2026 22:41:50 +0100
Subject: [PATCH 006/238] rPackages: make use of recurseIntoAttrsWith

---
 pkgs/top-level/all-packages.nix    | 16 +++++++++++-----
 pkgs/top-level/packages-config.nix | 12 ------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 342dabdd6615..326ec908bc36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8542,11 +8542,17 @@ with pkgs;
 
   rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; };
 
-  rPackages = dontRecurseIntoAttrs (
-    callPackage ../development/r-modules {
-      overrides = (config.rPackageOverrides or (_: { })) pkgs;
-    }
-  );
+  rPackages =
+    recurseIntoAttrsWith
+      {
+        hydra = false;
+        eval = false;
+      }
+      (
+        callPackage ../development/r-modules {
+          overrides = (config.rPackageOverrides or (_: { })) pkgs;
+        }
+      );
 
   ### SERVERS
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 094e7e50658e..0137e02abfb0 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -4,16 +4,4 @@
   allowAliases = false;
   allowVariants = false;
   recursionMode = "search";
-
-  # Enable recursion into attribute sets that nix-env normally doesn't look into
-  # so that we can get a more complete picture of the available packages for the
-  # purposes of the index.
-  packageOverrides =
-    super:
-    with super;
-    lib.mapAttrs (_: set: lib.recurseIntoAttrs set) {
-      inherit (super)
-        rPackages
-        ;
-    };
 }

From ca83a8ced9c26b3f9f727eb802806901f364a16b Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Mon, 16 Feb 2026 21:30:50 +0100
Subject: [PATCH 007/238] mautrix-discord: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix
index c6d5939c2221..1b1704a13209 100644
--- a/pkgs/by-name/ma/mautrix-discord/package.nix
+++ b/pkgs/by-name/ma/mautrix-discord/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "mautrix-discord";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "discord";
     rev = "v${version}";
-    hash = "sha256-puYPsHahXdKYR16hPnvYCrSGqnWc7sZ8HmmPlkysvs0=";
+    hash = "sha256-qpyySoYX+JMEKDf7Iv5WSZFOxkrmd3ihAaAXAKcZs9Q=";
   };
 
-  vendorHash = "sha256-ffdR5OymFO7di4eOmL3zn6BvHgaLFBsmBkC4LKnw8Qg=";
+  vendorHash = "sha256-ZjY2+1M1LP/zBVG5+zfX4T8Lyjx/tpDwSxLlpsBG3iA=";
 
   ldflags = [
     "-s"

From 9e58ee7f7b3422cc376466701eebdead17c16b8d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 22 Jul 2025 20:28:19 +0200
Subject: [PATCH 008/238] perl540Packages.ExtUtilsH2PM: init at 0.11

---
 pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 942dc19f5172..6c0952a20586 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12628,6 +12628,23 @@ with self;
     };
   };
 
+  ExtUtilsH2PM = buildPerlPackage {
+    pname = "ExtUtils-H2PM";
+    version = "0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-H2PM-0.11.tar.gz";
+      hash = "sha256-RrSuyafSxXSSVtCdz3ukwtAM3dQRAUgkme2Ix2bp6No=";
+    };
+    buildInputs = [ ModuleBuild ];
+    meta = {
+      description = "Automatically generate perl modules to wrap C header files";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   ExtUtilsInstall = buildPerlPackage {
     pname = "ExtUtils-Install";
     version = "2.22";

From f1c48bcc6a7ea7bbe287db573cc50ed24003b236 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 22 Jul 2025 20:28:56 +0200
Subject: [PATCH 009/238] perl540Packages.SocketNetlink: init at 0.05

---
 pkgs/top-level/perl-packages.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6c0952a20586..20acce3357c8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -30833,6 +30833,28 @@ with self;
     };
   };
 
+  SocketNetlink = buildPerlPackage {
+    pname = "Socket-Netlink";
+    version = "0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Socket-Netlink-0.05.tar.gz";
+      hash = "sha256-2EfbWbFI0I1A/gndoswlfvcvsetaDWgVX77csfWF2L0=";
+    };
+    buildInputs = [
+      ExtUtilsCChecker
+      ExtUtilsH2PM
+      TestHexString
+      ModuleBuild
+    ];
+    meta = {
+      description = "Interface to Linux's C<PF_NETLINK> socket family";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   SoftwareLicense = buildPerlPackage {
     pname = "Software-License";
     version = "0.104004";

From bff2752ec79e9f9a28375da4437783145238f838 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Nov 2025 10:51:20 +0100
Subject: [PATCH 010/238] audit.testsuite: init at 0-unstable-2025-08-30

---
 pkgs/by-name/au/audit/package.nix   |   2 +
 pkgs/by-name/au/audit/testsuite.nix | 150 ++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 pkgs/by-name/au/audit/testsuite.nix

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 236234cee014..e9109b4bf04a 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -26,6 +26,7 @@
   nixosTests,
   pkgsStatic ? { }, # CI has allowVariants = false, in which case pkgsMusl would not be passed. So, instead add a default here.
   pkgsMusl ? { },
+  callPackage,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
@@ -151,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = nix-update-script { };
+    testsuite = callPackage ./testsuite.nix { };
     tests = {
       musl = pkgsMusl.audit or null;
       static = pkgsStatic.audit or null;
diff --git a/pkgs/by-name/au/audit/testsuite.nix b/pkgs/by-name/au/audit/testsuite.nix
new file mode 100644
index 000000000000..1acf9bbb523f
--- /dev/null
+++ b/pkgs/by-name/au/audit/testsuite.nix
@@ -0,0 +1,150 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  unstableGitUpdater,
+  audit,
+  liburing,
+  nmap,
+  psmisc,
+  glibc,
+  perlPackages,
+  makeWrapper,
+  iptables,
+  coreutils,
+  writeShellApplication,
+  systemd,
+  iproute2,
+  inetutils,
+}:
+let
+  perlEnv =
+    with perlPackages;
+    makeFullPerlPath [
+      FileWhich
+      TestMockTimeHiRes
+      SocketNetlink
+    ];
+  testEnv = lib.makeBinPath [
+    iptables
+    iproute2 # ip
+    inetutils # ping6
+  ];
+
+  # syscall_socketcall: 32-bit tests are pain to build
+  # filter_exclude: relies on SELinux being enabled (`id -Z`)
+  # field_compare: weirdly flaky
+  disabledTests = [
+    "syscall_socketcall"
+    "filter_exclude"
+    "field_compare"
+  ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "audit-testsuite";
+  version = "0-unstable-2025-08-30";
+
+  src = fetchFromGitHub {
+    owner = "linux-audit";
+    repo = "audit-testsuite";
+    rev = "25296c6623e95312437a58f76bb771ba31187bed";
+    hash = "sha256-DeKcNOJVGhLSm7ZHYa6bOG2oSsbs3SH5UCLrbqzy+m4=";
+  };
+
+  patches = [
+    # https://github.com/linux-audit/audit-testsuite/pull/125
+    (fetchpatch {
+      url = "https://github.com/tweag/audit-testsuite/commit/bd3f8b612ce3290d86a82170e69ac510818d52e3.patch";
+      hash = "sha256-rsSQ9uTjTEnDnB1Wlt2/Of2HmS+ajCIX7Iw/FRA4Fng=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace tests/Makefile ${
+      lib.concatMapStringsSep " " (t: "--replace-fail '${t}' ''") disabledTests
+    }
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  buildInputs = [
+    perlPackages.perl
+    liburing
+    audit
+    nmap
+    psmisc
+    glibc
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  doCheck = false; # Can't run checks in the build sandbox, these checks are meant to run in a full VM
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    pushd tests
+    find . -type f -executable -exec install -Dm755 "{}" $out/"{}" \;
+    popd
+
+    rm -rf $out/{${lib.concatMapStringsSep "," lib.escapeShellArg disabledTests}}
+
+    runHook postInstall
+  '';
+
+  # adapted from tests/Makefile
+  fixupPhase = ''
+    patchShebangs $out/runtests.pl
+    wrapProgram $out/runtests.pl \
+      --set PERL5LIB ${perlEnv} \
+      --set MODE ${toString stdenv.hostPlatform.parsed.cpu.bits} \
+      --set ATS_DEBUG 1 \
+      --set DISTRO nixos \
+      --set TESTS "$(find $out -maxdepth 1 -mindepth 1 -type d -printf '%f\n' | sort | paste -sd' ')" \
+      --prefix PATH : ${testEnv}
+  '';
+
+  passthru.runner = writeShellApplication {
+    name = "audit-testsuite-runner";
+    runtimeInputs = [
+      coreutils
+      systemd
+    ];
+    text = ''
+      # log to journal for easier introspection in a VM test
+      exec &> >(tee >(systemd-cat -t audit-testsuite))
+      testdir=$(mktemp -d)
+      export testdir
+      # test directory needs to be writable
+      cp -r ${finalAttrs.finalPackage}/* "$testdir"
+      cd "$testdir"
+      chmod +w -R .
+
+      # exec_name test expects coreutils to be actual binaries in an absolute real path,
+      # no symlinks to /nix/store/<hash>-coreutils/bin/coreutils
+      # fix: copy coreutils to a temporary path where the actual binary can exist under that name
+      # https://github.com/linux-audit/audit-testsuite/blob/5a10451642ac1ba2fa4b31c06a21cf9aa2d38b66/tests/exec_name/test#L28-L47
+      mkdir coreutils
+      for util in id echo ls ; do
+        cp "$(realpath "$(which "$util")")" coreutils/"$util"
+      done
+      sed -iE "s@/usr/bin/@$(pwd)/coreutils/@g" exec_name/test
+
+      exec ./runtests.pl
+    '';
+  };
+
+  meta = {
+    description = "A simple, self-contained regression test suite for the Linux Kernel's audit subsystem";
+    homepage = "https://github.com/linux-audit/audit-testsuite";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ grimmauld ];
+    mainProgram = "audit-testsuite";
+    platforms = lib.platforms.all;
+  };
+})

From bb62fa7c88576cf3407820b4841db874a815907d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 27 Nov 2025 10:51:42 +0100
Subject: [PATCH 011/238] nixos/tests/audit-testsuite: init

---
 nixos/tests/all-tests.nix         |  1 +
 nixos/tests/audit-testsuite.nix   | 45 +++++++++++++++++++++++++++++++
 pkgs/by-name/au/audit/package.nix |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/audit-testsuite.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7892274095aa..5aabe8634c1c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -253,6 +253,7 @@ in
   atuin = runTest ./atuin.nix;
   audiobookshelf = runTest ./audiobookshelf.nix;
   audit = runTest ./audit.nix;
+  audit-testsuite = runTest ./audit-testsuite.nix;
   auth-mysql = runTest ./auth-mysql.nix;
   authelia = runTest ./authelia.nix;
   auto-cpufreq = runTest ./auto-cpufreq.nix;
diff --git a/nixos/tests/audit-testsuite.nix b/nixos/tests/audit-testsuite.nix
new file mode 100644
index 000000000000..7c45de00544f
--- /dev/null
+++ b/nixos/tests/audit-testsuite.nix
@@ -0,0 +1,45 @@
+{ lib, ... }:
+{
+  # https://github.com/linux-audit/audit-testsuite
+  # This test is meant to *only* run the audit regression testsuite.
+  # The test mutates the audit rules on the system it runs on, and can not run in the nix build sandbox.
+  # Thus a dedicated VM test makes sense.
+
+  name = "audit-testsuite";
+
+  meta = {
+    maintainers = with lib.maintainers; [ grimmauld ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      # https://github.com/linux-audit/audit-testsuite/blob/5a10451642ac1ba2fa4b31c06a21cf9aa2d38b66/tests/amcast_joinpart/test#L86
+      # tests use LC_TIME=en_DK.utf8 to force ISO 8601 date format
+      i18n.extraLocales = [ "en_DK.UTF-8/UTF-8" ];
+
+      security.polkit.enable = true; # needed for run0
+
+      security.audit.backlogLimit = 8192;
+
+      security.auditd = {
+        enable = true;
+        plugins.af_unix.active = true;
+        settings = {
+          num_logs = 4;
+          disk_full_action = "rotate";
+        };
+      };
+
+      environment.systemPackages = [ pkgs.audit.testsuite.runner ];
+    };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("auditd.service")
+    machine.wait_for_unit("network.target") # netfilter test requires network to be up
+
+    # we need a valid session to which we can send commands, so we use run0
+    machine.succeed("run0 --pty audit-testsuite-runner")
+  '';
+}
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index e9109b4bf04a..49e6849c2a2d 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
       musl = pkgsMusl.audit or null;
       static = pkgsStatic.audit or null;
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      audit = nixosTests.audit;
+      inherit (nixosTests) audit audit-testsuite;
       # Broken on a hardened kernel
       package = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
         pname = previousAttrs.pname + "-test";

From 7a5dabd9c8f9bd6748a6356f4c76a8f43f0b8aee Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Fri, 27 Feb 2026 14:55:52 +0000
Subject: [PATCH 012/238] listenbrainz-mpd: add Kladki as maintainer

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

diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index 53a3e91947be..5dcab5b52be9 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -66,7 +66,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${finalAttrs.version}/CHANGELOG.md";
     description = "ListenBrainz submission client for MPD";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ DeeUnderscore ];
+    maintainers = with lib.maintainers; [
+      DeeUnderscore
+      Kladki
+    ];
     mainProgram = "listenbrainz-mpd";
   };
 })

From 220d68729d426309b96932caa40d8ea036b89bd0 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Fri, 27 Feb 2026 14:56:18 +0000
Subject: [PATCH 013/238] listenbrainz-mpd: add updateScript

---
 pkgs/by-name/li/listenbrainz-mpd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index 5dcab5b52be9..d2eca95e2eb8 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -9,6 +9,7 @@
   sqlite,
   installShellFiles,
   asciidoctor,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -61,6 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installManPage listenbrainz-mpd.1
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd";
     changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${finalAttrs.version}/CHANGELOG.md";

From 9efdfbcd7630f24f433f7059502c5d6beb01b493 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 3 Mar 2026 15:04:02 +0800
Subject: [PATCH 014/238] i2p: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix
index 86adad7c1306..08966315466b 100644
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@@ -26,12 +26,13 @@ let
       "java.security.jgss"
       "java.sql"
       "java.xml"
+      "jdk.zipfs"
     ];
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "i2p";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchzip {
     urls = [
@@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
       "https://files.i2p-projekt.de/"
       "https://download.i2p2.no/releases/"
     ]);
-    hash = "sha256-Ogok7s5sawG27ucstG+NYiIAF66Pb3ExOYsL8mfNav8=";
+    hash = "sha256-NDiE3HhY18zZKLu1zkp3omwf8zmTJ9JPRIq34rDdpGc=";
   };
 
   strictDeps = true;

From f704ec835eae9023496b1a05e312e2c34221d96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 8 Mar 2026 17:06:20 +0100
Subject: [PATCH 015/238] linuxPackages.xpadneo: 0.9.8 -> 0.10.0

Changelog: https://github.com/atar-axis/xpadneo/releases/tag/v0.10
---
 pkgs/os-specific/linux/xpadneo/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 37e2709776d8..62bf02ca80f8 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.9.8";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C4hBVr/8KM3uw5RF9PyN2uQvsWnb1thXDF5VMVD2SCQ=";
+    hash = "sha256-jIY7NzjVZMlJ+2EY4hrka1MBUalQiNWzQgW2aiNi7WU=";
   };
 
   setSourceRoot = ''
@@ -46,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Advanced Linux driver for Xbox One wireless controllers";
     homepage = "https://atar-axis.github.io/xpadneo";
     changelog = "https://github.com/atar-axis/xpadneo/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.gpl3Only;
+    license = with lib.licenses; [
+      gpl2Only
+      gpl3Plus
+    ];
     maintainers = with lib.maintainers; [ kira-bruneau ];
     platforms = lib.platforms.linux;
   };

From 05a2c0ef9caa0f959cbe1b43c1f8d895fb991097 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Sun, 15 Mar 2026 12:51:35 -0400
Subject: [PATCH 016/238] rustup: 1.28.2 -> 1.29.0

Release announcement: https://blog.rust-lang.org/2026/03/12/Rustup-1.29.0/
Changelog: https://github.com/rust-lang/rustup/blob/1.29.0/CHANGELOG.md

We also switch from `export NIX_BUILD_CORES=1` in `preCheck` to
`dontUseCargoParallelTests`, to make compiling test crates slightly
faster while still running them serially to avoid the failures that
parallel tests originally caused.
---
 .../0001-dynamically-patchelf-binaries.patch     | 16 ++++++++--------
 pkgs/development/tools/rust/rustup/default.nix   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
index 59fcf039795c..edb83da77139 100644
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@@ -1,16 +1,16 @@
 diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
-index dfccc661..85233f3b 100644
+index dc545d4b62..4dd8ade86e 100644
 --- a/src/dist/component/package.rs
 +++ b/src/dist/component/package.rs
-@@ -113,6 +113,7 @@ impl Package for DirectoryPackage {
+@@ -130,6 +130,7 @@
                      } else {
                          builder.move_file(path.clone(), &src_path)?
                      }
 +                    nix_patchelf_if_needed(&target.prefix().path().join(path.clone()))
                  }
-                 "dir" => {
+                 ComponentPartKind::Dir => {
                      if self.copy {
-@@ -135,6 +136,176 @@ impl Package for DirectoryPackage {
+@@ -152,6 +153,176 @@
      }
  }
  
@@ -31,7 +31,7 @@ index dfccc661..85233f3b 100644
 +        .parent()
 +        .ok_or(anyhow!("failed to get parent directory"))?
 +        .with_file_name("nix-support");
-+    let mut file = std::fs::File::create(dest_lld_path)?;
++    let mut file = fs::File::create(dest_lld_path)?;
 +    ld_wrapper_path.push("ld-wrapper.sh");
 +
 +    let wrapped_script = format!(
@@ -184,6 +184,6 @@ index dfccc661..85233f3b 100644
 +    }
 +}
 +
- #[derive(Debug)]
- pub(crate) struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);
- 
+ /// Handle the async result of io operations
+ /// Replaces op.result with Ok(())
+ fn filter_result(op: &mut CompletedIo) -> io::Result<()> {
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 43d1860bb03b..e191a9b2e151 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -25,16 +25,16 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustup";
-  version = "1.28.2";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustup";
     tag = finalAttrs.version;
-    hash = "sha256-iX5hEaQwCW9MuyafjXml8jV3EDnxRNUlOoy3Cur/Iyw=";
+    hash = "sha256-jbB0nmXtc95Ac+YfmyELh6n5OTRMmeDPT4OFIlJNrZc=";
   };
 
-  cargoHash = "sha256-KljaAzYHbny7KHOO51MotdmNpHCKWdt6kc/FIpFN6c0=";
+  cargoHash = "sha256-m/KoXNJh00zYKZo7MIJsBvo4zldfKdofrUh8AItJqXI=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
@@ -78,9 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # TODO: Investigate this.
   doCheck = !stdenv.hostPlatform.isDarwin;
   # Random failures when running tests in parallel.
-  preCheck = ''
-    export NIX_BUILD_CORES=1
-  '';
+  dontUseCargoParallelTests = true;
 
   # skip failing tests
   checkFlags = [
@@ -89,7 +87,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=suite::cli_exact::check_updates_some"
     "--skip=suite::cli_exact::check_updates_with_update"
     # rustup-init is not used in nix rustup
-    "--skip=suite::cli_ui::rustup_init_ui_doc_text_tests"
+    "--skip=suite::cli_rustup_init_ui"
+    # reaches out to the network to test TLS roots, which can't be done in the
+    # build sandbox
+    "--skip=suite::static_roots::store_static_roots"
   ];
 
   postInstall = ''

From bd4d6368fc7c2a164486396cb57ebbe496400693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2026 15:20:33 +0000
Subject: [PATCH 017/238] openrazer-daemon: 3.11.0 -> 3.12.0

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

diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index a2ab448303e8..cb93df1f0d69 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "3.11.0";
+  version = "3.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
     tag = "v${version}";
-    hash = "sha256-pk3nghd16jhdf7zokwMzBGwGtBU7ta4nSHsOoGxjD4w=";
+    hash = "sha256-Sgn+7DABsTnRTx/lh/++JPmfsQ7dM6frkyzG0F5k2gA=";
   };
 
   meta = {

From 524ca256cfa83a85bbdc61ba404552a9f254bbf7 Mon Sep 17 00:00:00 2001
From: kilyanni <github@nkilian.org>
Date: Wed, 11 Mar 2026 07:30:24 +0100
Subject: [PATCH 018/238] burn-central-cli: init at 0.4.0

---
 pkgs/by-name/bu/burn-central-cli/package.nix | 54 ++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/bu/burn-central-cli/package.nix

diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix
new file mode 100644
index 000000000000..f4a9270dbc68
--- /dev/null
+++ b/pkgs/by-name/bu/burn-central-cli/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  zlib,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "burn-central-cli";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "tracel-ai";
+    repo = "burn-central-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gZ92DFZPox6s4+EKPQ/uxWNV5+F7kYhSnv/Mtpur3Vo=";
+  };
+
+  buildAndTestSubdir = "crates/burn-central-cli";
+
+  cargoHash = "sha256-kUCjkkIog+xXFMTw8LAoHE/D6aBPR6S7Mtqg/Hjuw+o=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    # Pulled in by flate2
+    zlib
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command-line tool for interacting with Burn Central";
+    longDescription = ''
+      The Burn Central CLI (burn) is the command-line tool for interacting
+      with Burn Central, the centralized platform for experiment tracking,
+      model sharing, and deployment for Burn users.
+    '';
+    homepage = "https://github.com/tracel-ai/burn-central-cli";
+    changelog = "https://github.com/tracel-ai/burn-central-cli/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ kilyanni ];
+    mainProgram = "burn";
+  };
+})

From 37245a63b555a01579d0555710f4694886f0ca12 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Thu, 19 Mar 2026 13:18:00 -0400
Subject: [PATCH 019/238] uppaal: fix blank window on Wayland

---
 pkgs/by-name/up/uppaal/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/uppaal/package.nix b/pkgs/by-name/up/uppaal/package.nix
index a2ef8f764987..ad8f57da5c36 100644
--- a/pkgs/by-name/up/uppaal/package.nix
+++ b/pkgs/by-name/up/uppaal/package.nix
@@ -64,7 +64,8 @@ stdenvNoCC.mkDerivation rec {
     makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \
       --set JAVA_HOME ${jdk17} \
       --set PATH $out/lib/uppaal:$PATH \
-      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
+      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \
+      --set _JAVA_AWT_WM_NONREPARENTING 1 # Java Swing renders a blank window on Wayland without this
 
     runHook postInstall
   '';

From b6d5bd536ed3a874b231974db7cf1375d168aad3 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 20 Mar 2026 13:51:15 -0500
Subject: [PATCH 020/238] ory-hydra: 25.4.0 -> 26.2.0

* changelog: https://github.com/ory/hydra/releases/tag/v26.2.0
* diff: https://github.com/ory/hydra/compare/v25.4.0...v26.2.0
---
 pkgs/by-name/or/ory-hydra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/or/ory-hydra/package.nix b/pkgs/by-name/or/ory-hydra/package.nix
index 97b54a394e3d..14ab16c90129 100644
--- a/pkgs/by-name/or/ory-hydra/package.nix
+++ b/pkgs/by-name/or/ory-hydra/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "hydra";
-  version = "25.4.0";
+  version = "26.2.0";
 
   src = fetchFromGitHub {
     owner = "ory";
     repo = "hydra";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vcbJiwWoq7WA7K5WpD68za1VecNwdzqfyXuPfUpa1QU=";
+    hash = "sha256-LnF1k/C9uPRY4xXeBCJPSQ8gxwwZx0N1e1s+Rhop5ic=";
   };
 
-  vendorHash = "sha256-ADS1kBqSJXDwmCS4CCfiMvmlzzL39E0G4J2UEKXy2Qs=";
+  vendorHash = "sha256-KVCoDATyt5Qp0r3vGwdXqkjh0FEdNyKi6mXk99D6HD8=";
 
   # `json1` not needed (see: https://github.com/ory/hydra/commit/93edc9ad894771c67f46ae2c57ee7e50382d73cd)
   # `sqlite_omit_load_extension` consistency with upstream (see: https://github.com/ory/hydra/blob/master/.docker/Dockerfile-local-build#L20C58-L20C84). Will disable sqlite runtime extension loading (see: https://sqlite.org/loadext.html)

From a07a83a6e57de3c62be84f192d82552ec86a74a5 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 20 Mar 2026 13:59:06 -0500
Subject: [PATCH 021/238] kratos: 25.4.0 -> 26.2.0

* changelog: https://github.com/ory/kratos/releases/tag/v26.2.0
* diff: https://github.com/ory/kratos/compare/v25.4.0...v26.2.0
---
 pkgs/by-name/kr/kratos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix
index 12b444b5c5f5..02b095a09925 100644
--- a/pkgs/by-name/kr/kratos/package.nix
+++ b/pkgs/by-name/kr/kratos/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kratos";
-  version = "25.4.0";
+  version = "26.2.0";
 
   src = fetchFromGitHub {
     owner = "ory";
     repo = "kratos";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-f/K86B5h7xM7Zsbr5w2rZgsyNlCSemrBkqtMRQq/Xws=";
+    hash = "sha256-u298vFFD/zc7ScdQ5rmvcHqkMMenMVIRC9GChfukml8=";
   };
 
-  vendorHash = "sha256-ayL3V8TQ+9Tk2Wkhvn+Tft9AqxiFegznKXD0eBkFbhs=";
+  vendorHash = "sha256-qnG8hdWazKlIFfNPz2z5F7hhgZaTTttUBbg59T+N5OI=";
 
   subPackages = [ "." ];
 

From 47f346ef6fe6dd58d8f825a899b77584c6682ac2 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:03:10 -0500
Subject: [PATCH 022/238] kratos: add debtquity to maintainers

* add self as maintainer
---
 pkgs/by-name/kr/kratos/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix
index 02b095a09925..9680d6b3989a 100644
--- a/pkgs/by-name/kr/kratos/package.nix
+++ b/pkgs/by-name/kr/kratos/package.nix
@@ -48,6 +48,9 @@ buildGoModule (finalAttrs: {
     description = "API-first Identity and User Management system that is built according to cloud architecture best practices";
     homepage = "https://www.ory.sh/kratos/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ mrmebelman ];
+    maintainers = with lib.maintainers; [
+      mrmebelman
+      debtquity
+    ];
   };
 })

From 690e0232535c2acc25d58688b06154833b625e5b Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:07:54 -0500
Subject: [PATCH 023/238] keto: 25.4.0 -> 26.2.0

* changelog: https://github.com/ory/keto/releases/tag/v26.2.0
* diff: https://github.com/ory/keto/compare/v25.4.0...v26.2.0
---
 pkgs/by-name/ke/keto/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix
index 582bae643c67..2c65e602a957 100644
--- a/pkgs/by-name/ke/keto/package.nix
+++ b/pkgs/by-name/ke/keto/package.nix
@@ -5,8 +5,8 @@
 }:
 let
   pname = "keto";
-  version = "25.4.0";
-  commit = "f5635433a56324f266ea414727bf7395bb2da429";
+  version = "26.2.0";
+  commit = "e4393662cd2e744deeb79de77669e07b6ccf51f3";
 in
 buildGoModule {
   inherit pname version commit;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "ory";
     repo = "keto";
     rev = "v${version}";
-    hash = "sha256-2DktCLYOj2azYBAhMVuqfU7QQ+eC3qDLtcp+fPljFAg=";
+    hash = "sha256-wRtz4RvJ7LxVnSLmXVZFGa9QXjcPnDNJxHKosbyTed0=";
   };
 
-  vendorHash = "sha256-+zHvIf3CBMMqKVmQYzMRGQg9iGf9Khnhpgt95lA0BBA=";
+  vendorHash = "sha256-B27aC4yXS36eOoq53+RWp0vq1Oqw2aR+gOjv0m+b/I4=";
 
   tags = [
     "sqlite"

From 148bd87563903dad18e994e341a459e6e3512275 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 21 Mar 2026 13:03:06 +0100
Subject: [PATCH 024/238] openexr_2: Replace meta.insecure with
 meta.knownVulnerabilities

The former never did anything to warn users about this package being insecure.
---
 pkgs/development/libraries/openexr/2.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openexr/2.nix b/pkgs/development/libraries/openexr/2.nix
index f17381c9c9b1..aca401ee32c9 100644
--- a/pkgs/development/libraries/openexr/2.nix
+++ b/pkgs/development/libraries/openexr/2.nix
@@ -75,6 +75,20 @@ stdenv.mkDerivation rec {
     homepage = "https://www.openexr.com/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    insecure = true;
+    knownVulnerabilities = [
+      "CVE-2021-3598: ImfDeepScanLineInputFile Out-of-Bounds Read"
+      "CVE-2021-3605: rleUncompress Out-of-Bounds Read"
+      "CVE-2021-3933: Integer Overflow Vulnerability in File Processing on 32-bit Systems"
+      "CVE-2021-23169: copyIntoFrameBuffer Heap Buffer Overflow Leading to Arbitrary Code Execution"
+      "CVE-2021-23215: DwaCompressor Integer Overflow Leads to Heap Buffer Overflow"
+      "CVE-2021-26260: DwaCompressor Integer Overflow Leading to Heap Buffer Overflow"
+      "CVE-2021-26945: Integer Overflow Leading to Heap Buffer Overflow"
+      "CVE-2023-5841: Heap Overflow in Scanline Deep Data Parsing"
+      "CVE-2024-31047: convert Function Denial of Service"
+      "CVE-2025-12495: EXR File Parsing Heap-based Buffer Overflow Remote Code Execution"
+      "CVE-2025-12839: EXR File Parsing Heap-based Buffer Overflow Remote Code Execution"
+      "CVE-2025-12840: EXR File Parsing Heap-based Buffer Overflow Remote Code Execution"
+      "CVE-2026-27622: CompositeDeepScanLine integer-overflow leads to heap OOB write"
+    ];
   };
 }

From db9e17da82c3f7d7c1a47c989c36844ab6eac518 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 21 Mar 2026 13:06:42 +0100
Subject: [PATCH 025/238] ilmbase: Repalce meta.insecure with
 meta.knownVulnerabilities

The former never did anything to warn users about this package being insecure.

Uses openexr_2's src, so I assume there may be shared vulnerabilities.
---
 pkgs/by-name/il/ilmbase/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix
index 465bd610b3a8..82f387fb0ec1 100644
--- a/pkgs/by-name/il/ilmbase/package.nix
+++ b/pkgs/by-name/il/ilmbase/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     homepage = "https://www.openexr.com/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    insecure = true;
+    inherit (openexr_2.meta) knownVulnerabilities;
   };
 }

From 4b7353eeb5bb6d456a862d01105b66a419f8d0b2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 21 Mar 2026 13:07:38 +0100
Subject: [PATCH 026/238] gegl: Switch to openexr v3

openexr v2 has been known-insecure for years.
---
 pkgs/by-name/ge/gegl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gegl/package.nix b/pkgs/by-name/ge/gegl/package.nix
index a59ce0cf13d6..d1da3ad9284f 100644
--- a/pkgs/by-name/ge/gegl/package.nix
+++ b/pkgs/by-name/ge/gegl/package.nix
@@ -29,7 +29,7 @@
   gexiv2,
   libwebp,
   luajit,
-  openexr_2,
+  openexr,
   suitesparse,
   withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit,
   gimp,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     libraw
     libwebp
     gexiv2
-    openexr_2
+    openexr
     suitesparse
   ]
   ++ lib.optionals stdenv.cc.isClang [

From 16ffd4ed5183bc28a7562a065fd5fff54f095af9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 22 Mar 2026 21:01:24 +0100
Subject: [PATCH 027/238] nixosTests.lomiri-clock-app: Fix OCR further

Localised strings still struggle to be found consistently. Issue seems to be that the app has a somewhat small
horizontal max size, leaving more than half of the screen at the same colour as the app's text. Set IceWM's
background colour to #FFFFFF to fix that discrepancy in background colours.
---
 nixos/tests/lomiri-clock-app.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix
index 6b607cfff5f2..07e8db615ebd 100644
--- a/nixos/tests/lomiri-clock-app.nix
+++ b/nixos/tests/lomiri-clock-app.nix
@@ -18,6 +18,12 @@
         variables = {
           UITK_ICON_THEME = "suru";
         };
+
+        # App has a somewhat small horizontal max size and a white background, while we configure IceWM to have a black background.
+        # Makes OCR less reliable, often completely fails to find the localised text. Force background to be white instead.
+        etc."icewm/prefoverride".text = ''
+          DesktopBackgroundColor=#FFFFFF
+        '';
       };
 
       i18n.supportedLocales = [ "all" ];

From d73eb261c4ca1cd256e7b5c486bfc1eae2b6df14 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 23 Mar 2026 17:37:05 -0400
Subject: [PATCH 028/238] eslint: 10.0.3 -> 10.1.0

Changelog: https://github.com/eslint/eslint/blob/v10.1.0/CHANGELOG.md
---
 pkgs/by-name/es/eslint/package-lock.json | 1818 ++++++++++++++--------
 pkgs/by-name/es/eslint/package.nix       |    6 +-
 2 files changed, 1208 insertions(+), 616 deletions(-)

diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json
index 1ffd79a6b676..53836bbee137 100644
--- a/pkgs/by-name/es/eslint/package-lock.json
+++ b/pkgs/by-name/es/eslint/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "eslint",
-  "version": "10.0.3",
+  "version": "10.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "eslint",
-      "version": "10.0.3",
+      "version": "10.1.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
         "@eslint/config-array": "^0.23.3",
-        "@eslint/config-helpers": "^0.5.2",
+        "@eslint/config-helpers": "^0.5.3",
         "@eslint/core": "^1.1.1",
         "@eslint/plugin-kit": "^0.6.1",
         "@humanfs/node": "^0.16.6",
@@ -25,7 +25,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^9.1.2",
         "eslint-visitor-keys": "^5.0.1",
-        "espree": "^11.1.1",
+        "espree": "^11.2.0",
         "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -49,13 +49,12 @@
         "@babel/preset-env": "^7.4.3",
         "@cypress/webpack-preprocessor": "^6.0.2",
         "@eslint/eslintrc": "^3.3.5",
-        "@eslint/json": "^0.14.0",
-        "@trunkio/launcher": "^1.3.4",
+        "@eslint/json": "^1.2.0",
         "@types/esquery": "^1.5.4",
         "@types/node": "^22.13.14",
         "@typescript-eslint/parser": "^8.56.0",
         "babel-loader": "^8.0.5",
-        "c8": "^7.12.0",
+        "c8": "^11.0.0",
         "chai": "^4.0.1",
         "cheerio": "^0.22.0",
         "common-tags": "^1.8.0",
@@ -81,6 +80,7 @@
         "lint-staged": "^11.0.0",
         "markdown-it": "^12.2.0",
         "markdown-it-container": "^3.0.0",
+        "markdownlint-cli2": "^0.21.0",
         "marked": "^4.0.8",
         "metascraper": "^5.25.7",
         "metascraper-description": "^5.25.7",
@@ -91,7 +91,7 @@
         "mocha": "^11.7.1",
         "node-polyfill-webpack-plugin": "^1.0.3",
         "npm-license": "^0.3.3",
-        "prettier": "3.5.3",
+        "prettier": "3.8.1",
         "progress": "^2.0.3",
         "proxyquire": "^2.0.1",
         "recast": "^0.23.0",
@@ -267,7 +267,6 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -1819,11 +1818,14 @@
       }
     },
     "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/@braidai/lang": {
       "version": "1.1.2",
@@ -1931,7 +1933,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20.19.0"
       },
@@ -1972,7 +1973,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20.19.0"
       }
@@ -2346,46 +2346,19 @@
       }
     },
     "node_modules/@eslint/json": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@eslint/json/-/json-0.14.0.tgz",
-      "integrity": "sha512-rvR/EZtvUG3p9uqrSmcDJPYSH7atmWr0RnFWN6m917MAPx82+zQgPUmDu0whPFG6XTyM0vB/hR6c1Q63OaYtCQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/json/-/json-1.2.0.tgz",
+      "integrity": "sha512-CEFEyNgvzu8zn5QwVYDg3FaG+ZKUeUsNYitFpMYJAqoAlnw68EQgNbUfheSmexZr4n0wZPrAkPLuvsLaXO6wRw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.17.0",
-        "@eslint/plugin-kit": "^0.4.1",
+        "@eslint/core": "^1.1.1",
+        "@eslint/plugin-kit": "^0.6.1",
         "@humanwhocodes/momoa": "^3.3.10",
         "natural-compare": "^1.4.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/json/node_modules/@eslint/core": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
-      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/json/node_modules/@eslint/plugin-kit": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
-      "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@eslint/core": "^0.17.0",
-        "levn": "^0.4.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/object-schema": {
@@ -3145,6 +3118,19 @@
         "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
+      "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
@@ -3208,24 +3194,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@trunkio/launcher": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@trunkio/launcher/-/launcher-1.3.4.tgz",
-      "integrity": "sha512-4LCsFVvZtKht7EkbOq5gDsRLIBOH05ycNxm1Vrv+YzY+uOK2HueLBcLU8oejV9v01LTtWjfLJxonIgTSo7lwng==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "semver": "^7.5.4",
-        "tar": "^6.2.0",
-        "yaml": "^2.2.0"
-      },
-      "bin": {
-        "trunk": "trunk.js"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@tybys/wasm-util": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
@@ -3250,6 +3218,16 @@
         "@types/responselike": "^1.0.0"
       }
     },
+    "node_modules/@types/debug": {
+      "version": "4.1.13",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz",
+      "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -3314,6 +3292,13 @@
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "license": "MIT"
     },
+    "node_modules/@types/katex": {
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.16.8.tgz",
+      "integrity": "sha512-trgaNyfU+Xh2Tc+ABIb44a5AYUpicB3uwirOioeOkNPPbmgRNtcWyDeeFRzjPZENO9Vq8gvVqfhaaXWLlevVwg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
@@ -3324,24 +3309,23 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/node": {
       "version": "22.19.15",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz",
       "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
     },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
-      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
@@ -3373,6 +3357,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/unist": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
@@ -3390,7 +3381,6 @@
       "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.1",
         "@typescript-eslint/types": "8.56.1",
@@ -3777,7 +3767,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3836,7 +3825,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
       "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4189,7 +4177,6 @@
       "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^2.0.4",
@@ -4549,7 +4536,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -4614,13 +4600,13 @@
       "license": "MIT"
     },
     "node_modules/builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.0.0.tgz",
+      "integrity": "sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=18.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -4634,30 +4620,99 @@
       "license": "MIT"
     },
     "node_modules/c8": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz",
-      "integrity": "sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-11.0.0.tgz",
+      "integrity": "sha512-e/uRViGHSVIJv7zsaDKM7VRn2390TgHXqUSvYwPHBQaU6L7E9L0n9JbdkwdYPvshDT0KymBmmlwSpms3yBaMNg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
+        "@bcoe/v8-coverage": "^1.0.1",
         "@istanbuljs/schema": "^0.1.3",
         "find-up": "^5.0.0",
-        "foreground-child": "^2.0.0",
+        "foreground-child": "^3.1.1",
         "istanbul-lib-coverage": "^3.2.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-reports": "^3.1.4",
-        "rimraf": "^3.0.2",
-        "test-exclude": "^6.0.0",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-reports": "^3.1.6",
+        "test-exclude": "^8.0.0",
         "v8-to-istanbul": "^9.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^20.2.9"
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "c8": "bin/c8.js"
       },
       "engines": {
-        "node": ">=10.12.0"
+        "node": "20 || >=22"
+      },
+      "peerDependencies": {
+        "monocart-coverage-reports": "^2"
+      },
+      "peerDependenciesMeta": {
+        "monocart-coverage-reports": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/c8/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/c8/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/c8/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/c8/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/cacache": {
@@ -4907,6 +4962,13 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/change-case": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
+      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/char-regex": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
@@ -4917,6 +4979,39 @@
         "node": ">=10"
       }
     },
+    "node_modules/character-entities": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-reference-invalid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz",
+      "integrity": "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/check-error": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
@@ -5117,16 +5212,6 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/chrome-trace-event": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
@@ -5919,6 +6004,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/decode-named-character-reference": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.3.0.tgz",
+      "integrity": "sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/decompress-response": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -6023,6 +6122,16 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/des.js": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
@@ -6034,6 +6143,20 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/dezalgo": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -6661,184 +6784,60 @@
       }
     },
     "node_modules/eslint-plugin-unicorn": {
-      "version": "52.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-52.0.0.tgz",
-      "integrity": "sha512-1Yzm7/m+0R4djH0tjDjfVei/ju2w3AzUGjG6q8JnuNIL5xIwsflyCooW5sfBvQp2pMYQFSWWCFONsjCax1EHng==",
+      "version": "63.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-63.0.0.tgz",
+      "integrity": "sha512-Iqecl9118uQEXYh7adylgEmGfkn5es3/mlQTLLkd4pXkIk9CTGrAbeUux+YljSa2ohXCBmQQ0+Ej1kZaFgcfkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.4",
-        "ci-info": "^4.0.0",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@eslint-community/eslint-utils": "^4.9.0",
+        "change-case": "^5.4.4",
+        "ci-info": "^4.3.1",
         "clean-regexp": "^1.0.0",
-        "core-js-compat": "^3.34.0",
-        "esquery": "^1.5.0",
-        "indent-string": "^4.0.0",
-        "is-builtin-module": "^3.2.1",
-        "jsesc": "^3.0.2",
+        "core-js-compat": "^3.46.0",
+        "find-up-simple": "^1.0.1",
+        "globals": "^16.4.0",
+        "indent-string": "^5.0.0",
+        "is-builtin-module": "^5.0.0",
+        "jsesc": "^3.1.0",
         "pluralize": "^8.0.0",
-        "read-pkg-up": "^7.0.1",
         "regexp-tree": "^0.1.27",
-        "regjsparser": "^0.10.0",
-        "semver": "^7.5.4",
-        "strip-indent": "^3.0.0"
+        "regjsparser": "^0.13.0",
+        "semver": "^7.7.3",
+        "strip-indent": "^4.1.1"
       },
       "engines": {
-        "node": ">=16"
+        "node": "^20.10.0 || >=21.0.0"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
       },
       "peerDependencies": {
-        "eslint": ">=8.56.0"
+        "eslint": ">=9.38.0"
       }
     },
-    "node_modules/eslint-plugin-unicorn/node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/eslint-plugin-unicorn/node_modules/indent-string": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-unicorn/node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
-      "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
     "node_modules/eslint-plugin-unicorn/node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.1.1.tgz",
+      "integrity": "sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -7449,6 +7448,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/find-up-simple": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz",
+      "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/flat": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
@@ -7516,17 +7528,33 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^3.0.2"
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/forever-agent": {
@@ -7673,6 +7701,19 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
+      "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-func-name": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
@@ -7866,23 +7907,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/glob/node_modules/foreground-child": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.6",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/glob/node_modules/minimatch": {
       "version": "9.0.9",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
@@ -7899,19 +7923,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/global-dirs": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
@@ -7941,6 +7952,50 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby": {
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.0.tgz",
+      "integrity": "sha512-+A4Hq7m7Ze592k9gZRy4gJ27DrXRNnC1vPjxTt1qQxEY8RxagBkBxivkCwg7FxSTG0iLLEMaUx13oOr0R2/qcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "fast-glob": "^3.3.3",
+        "ignore": "^7.0.5",
+        "is-path-inside": "^4.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/globby/node_modules/is-path-inside": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
+      "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/globrex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
@@ -8520,6 +8575,32 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-alphabetical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz",
+      "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-alphanumerical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz",
+      "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-alphabetical": "^2.0.0",
+        "is-decimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-arguments": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
@@ -8545,16 +8626,16 @@
       "license": "MIT"
     },
     "node_modules/is-builtin-module": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz",
+      "integrity": "sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "builtin-modules": "^3.3.0"
+        "builtin-modules": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=18.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -8609,6 +8690,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-decimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz",
+      "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -8670,6 +8762,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-hexadecimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",
+      "integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
@@ -9244,6 +9347,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jsonfile": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
@@ -9290,6 +9400,33 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/katex": {
+      "version": "0.16.40",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.40.tgz",
+      "integrity": "sha512-1DJcK/L05k1Y9Gf7wMcyuqFOL6BiY3vY0CFcAM/LPRN04NALxcl6u7lOWNsp3f/bCHWxigzQl6FbR95XJ4R84Q==",
+      "dev": true,
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^8.3.0"
+      },
+      "bin": {
+        "katex": "cli.js"
+      }
+    },
+    "node_modules/katex/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -9910,13 +10047,162 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/markdownlint": {
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.40.0.tgz",
+      "integrity": "sha512-UKybllYNheWac61Ia7T6fzuQNDZimFIpCg2w6hHjgV1Qu0w1TV0LlSgryUGzM0bkKQCBhy2FDhEELB73Kb0kAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark": "4.0.2",
+        "micromark-core-commonmark": "2.0.3",
+        "micromark-extension-directive": "4.0.0",
+        "micromark-extension-gfm-autolink-literal": "2.1.0",
+        "micromark-extension-gfm-footnote": "2.1.0",
+        "micromark-extension-gfm-table": "2.1.1",
+        "micromark-extension-math": "3.1.0",
+        "micromark-util-types": "2.0.2",
+        "string-width": "8.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/DavidAnson"
+      }
+    },
+    "node_modules/markdownlint-cli2": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.21.0.tgz",
+      "integrity": "sha512-DzzmbqfMW3EzHsunP66x556oZDzjcdjjlL2bHG4PubwnL58ZPAfz07px4GqteZkoCGnBYi779Y2mg7+vgNCwbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "globby": "16.1.0",
+        "js-yaml": "4.1.1",
+        "jsonc-parser": "3.3.1",
+        "markdown-it": "14.1.1",
+        "markdownlint": "0.40.0",
+        "markdownlint-cli2-formatter-default": "0.0.6",
+        "micromatch": "4.0.8"
+      },
+      "bin": {
+        "markdownlint-cli2": "markdownlint-cli2-bin.mjs"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/DavidAnson"
+      }
+    },
+    "node_modules/markdownlint-cli2-formatter-default": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.6.tgz",
+      "integrity": "sha512-VVDGKsq9sgzu378swJ0fcHfSicUnMxnL8gnLm/Q4J/xsNJ4e5bA6lvAz7PCzIl0/No0lHyaWdqVD2jotxOSFMQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/DavidAnson"
+      },
+      "peerDependencies": {
+        "markdownlint-cli2": ">=0.0.4"
+      }
+    },
+    "node_modules/markdownlint-cli2/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/markdownlint-cli2/node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
+    "node_modules/markdownlint-cli2/node_modules/markdown-it": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
+      "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/markdownlint-cli2/node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/markdownlint-cli2/node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/markdownlint/node_modules/string-width": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
+      "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/markdownlint/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/marked": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
       "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -10301,6 +10587,542 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/micromark": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
+      "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz",
+      "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-factory-destination": "^2.0.0",
+        "micromark-factory-label": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-title": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-html-tag-name": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-directive": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-directive/-/micromark-extension-directive-4.0.0.tgz",
+      "integrity": "sha512-/C2nqVmXXmiseSSuCdItCMho7ybwwop6RrrRPk0KbOHW21JKoCldC+8rFOaundDoRBUWBnJJcxeA/Kvi34WQXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "parse-entities": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
+      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
+      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-math": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-math/-/micromark-extension-math-3.1.0.tgz",
+      "integrity": "sha512-lvEqd+fHjATVs+2v/8kg9i5Q0AP2k85H0WUOwpIVvUML8BapsMvh1XAogmQjOCsLpoKRCVQqEkQBB3NhVBcsOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/katex": "^0.16.0",
+        "devlop": "^1.0.0",
+        "katex": "^0.16.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-factory-destination": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz",
+      "integrity": "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-label": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz",
+      "integrity": "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz",
+      "integrity": "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz",
+      "integrity": "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-chunked": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz",
+      "integrity": "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-classify-character": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz",
+      "integrity": "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-combine-extensions": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz",
+      "integrity": "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-numeric-character-reference": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz",
+      "integrity": "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-html-tag-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz",
+      "integrity": "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-normalize-identifier": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz",
+      "integrity": "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-resolve-all": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz",
+      "integrity": "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-subtokenize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz",
+      "integrity": "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -10415,16 +11237,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -11503,6 +12315,26 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/parse-entities": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.2.tgz",
+      "integrity": "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "character-entities-legacy": "^3.0.0",
+        "character-reference-invalid": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "is-alphanumerical": "^2.0.0",
+        "is-decimal": "^2.0.0",
+        "is-hexadecimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/parse-imports-exports": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz",
@@ -11896,9 +12728,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -12045,6 +12877,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/punycode2": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/punycode2/-/punycode2-1.0.1.tgz",
@@ -12165,7 +13007,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "install-artifact-from-github": "^1.4.0",
         "nan": "^2.25.0",
@@ -12282,106 +13123,6 @@
         "node": "*"
       }
     },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -12726,76 +13467,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ripemd160": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.3.tgz",
@@ -13423,6 +14094,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/slice-ansi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -13879,88 +14563,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-      "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/terser": {
       "version": "5.46.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
@@ -14020,7 +14622,6 @@
       "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -14080,71 +14681,53 @@
       "license": "MIT"
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-8.0.0.tgz",
+      "integrity": "sha512-ZOffsNrXYggvU1mDGHk54I96r26P8SyMjO5slMKSc7+IWmtB/MQKnEC2fP51imB3/pT6YK5cT5E8f+Dd9KdyOQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "glob": "^13.0.6",
+        "minimatch": "^10.2.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/test-exclude/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "node": "20 || >=22"
       }
     },
     "node_modules/test-exclude/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
       "engines": {
-        "node": "*"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+    "node_modules/test-exclude/node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": "*"
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/thenify": {
@@ -14497,7 +15080,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -14610,6 +15192,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.4.0.tgz",
+      "integrity": "sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unique-filename": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-5.0.0.tgz",
@@ -14908,7 +15503,6 @@
       "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -14958,7 +15552,6 @@
       "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^1.2.0",
@@ -15049,7 +15642,6 @@
       "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -15699,7 +16291,7 @@
         "eslint-plugin-jsdoc": "^62.7.0",
         "eslint-plugin-n": "^17.11.1",
         "eslint-plugin-regexp": "^2.10.0",
-        "eslint-plugin-unicorn": "^52.0.0"
+        "eslint-plugin-unicorn": "^63.0.0"
       },
       "devDependencies": {
         "@arethetypeswrong/cli": "^0.18.0",
diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix
index 410ae5983819..44e322920b0f 100644
--- a/pkgs/by-name/es/eslint/package.nix
+++ b/pkgs/by-name/es/eslint/package.nix
@@ -6,13 +6,13 @@
 }:
 buildNpmPackage rec {
   pname = "eslint";
-  version = "10.0.3";
+  version = "10.1.0";
 
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
     tag = "v${version}";
-    hash = "sha256-f9RgM+N6wAM3asLBAl7B0MaggX19PEoTWa6db6ToizM=";
+    hash = "sha256-VO7Q+3utTp9+Z/EcN4jwNafbOwdeeCCJb8dtPMcvyjE=";
   };
 
   # NOTE: Generating lock-file
@@ -24,7 +24,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-/dOfQbP9c+gdec/TUTuxrma0nOWdRFoBLDL3tNAQZ5k=";
+  npmDepsHash = "sha256-AXUh8KPqsv4tHGCHvdxjqVV+PRCtkyOuGtWSpoBwKX0=";
   npmInstallFlags = [ "--omit=dev" ];
 
   dontNpmBuild = true;

From 07199b02834e4be583cc47ea857f0b19a5d11b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Wed, 25 Mar 2026 22:56:39 +1100
Subject: [PATCH 029/238] re-plistbuddy: init at 1.1.0

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

diff --git a/pkgs/by-name/re/re-plistbuddy/package.nix b/pkgs/by-name/re/re-plistbuddy/package.nix
new file mode 100644
index 000000000000..8e51a23b8378
--- /dev/null
+++ b/pkgs/by-name/re/re-plistbuddy/package.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "re-plistbuddy";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "viraptor";
+    repo = "re-plistbuddy";
+    tag = version;
+    hash = "sha256-Iumrj0JLpdrS3cg3jAj/Wrbx7PthlCnTuRMYsYdywyw=";
+  };
+
+  cargoHash = "sha256-RyHM6CMxdhDJrg6mGt8jQCDLVjt0BiLYswelOHoellw=";
+
+  meta = {
+    description = "Open reimplementation of Apple's PlistBuddy and plutil";
+    homepage = "https://github.com/viraptor/re-plistbuddy";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.darwin;
+  };
+}

From d9f25fb687190f933af0af4e5c2939044a605e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Wed, 25 Mar 2026 22:58:45 +1100
Subject: [PATCH 030/238] betterdisplay,cyberduck,enpass-mac: use re-plistbuddy
 instead of xcbuild

---
 pkgs/by-name/be/betterdisplay/package.nix | 4 ++--
 pkgs/by-name/cy/cyberduck/package.nix     | 7 +++----
 pkgs/by-name/en/enpass-mac/package.nix    | 7 +++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
index fa2c511d2b8c..275f7652af3c 100644
--- a/pkgs/by-name/be/betterdisplay/package.nix
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
   versionCheckHook,
   writeShellScript,
-  xcbuild,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1"
+    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1"
   '';
   versionCheckProgramArg = [
     "${placeholder "out"}/Applications/BetterDisplay.app/Contents/Info.plist"
diff --git a/pkgs/by-name/cy/cyberduck/package.nix b/pkgs/by-name/cy/cyberduck/package.nix
index 8ec704005524..fb23195c4578 100644
--- a/pkgs/by-name/cy/cyberduck/package.nix
+++ b/pkgs/by-name/cy/cyberduck/package.nix
@@ -6,8 +6,7 @@
   makeBinaryWrapper,
   versionCheckHook,
   writeShellScript,
-  coreutils,
-  xcbuild,
+  re-plistbuddy,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cyberduck";
@@ -36,8 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
-    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
+    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")
+    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")
 
     echo $marketing_version.$build_version
   '';
diff --git a/pkgs/by-name/en/enpass-mac/package.nix b/pkgs/by-name/en/enpass-mac/package.nix
index ecc81914c6a7..b1ee0150ace4 100644
--- a/pkgs/by-name/en/enpass-mac/package.nix
+++ b/pkgs/by-name/en/enpass-mac/package.nix
@@ -12,8 +12,7 @@
   common-updater-scripts,
   versionCheckHook,
   writeShellScript,
-  coreutils,
-  xcbuild,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -71,8 +70,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
-    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
+    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")
+    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")
 
     echo $marketing_version.$build_version
   '';

From a94383053c4a1b7e70973178acf5fa82e51acf32 Mon Sep 17 00:00:00 2001
From: April John <aprl@acab.dev>
Date: Wed, 25 Mar 2026 14:09:00 +0100
Subject: [PATCH 031/238] ffmpreg: init at 0.1.2-unstable-2026-03-25

---
 pkgs/by-name/ff/ffmpreg/package.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/ff/ffmpreg/package.nix

diff --git a/pkgs/by-name/ff/ffmpreg/package.nix b/pkgs/by-name/ff/ffmpreg/package.nix
new file mode 100644
index 000000000000..6d2161b71e7a
--- /dev/null
+++ b/pkgs/by-name/ff/ffmpreg/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "ffmpreg";
+  version = "0.1.2-unstable-2026-03-25";
+
+  src = fetchFromGitHub {
+    owner = "yazaldefilimone";
+    repo = "ffmpreg";
+    rev = "a6fca970b98357ccd275acd797673ef7cf4ca02f";
+    hash = "sha256-p2dtNmJ7fXFzgsfg32Tmr6xr1wuZAHziNgMeUOfyjgw=";
+  };
+
+  cargoHash = "sha256-GxUBhFWoAq6zCDHWTiZ/pC6BWu4JcW71Sh9Du2H36wg=";
+
+  meta = {
+    description = "Experimental safe Rust-native multimedia toolkit for decoding, transforming, and encoding audio and video";
+    homepage = "https://github.com/yazaldefilimone/ffmpreg";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aprl ];
+    mainProgram = "ffmpreg";
+  };
+}

From 9f86c9e8cf9435a32567ce32ab8ef17d6248eed3 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 26 Mar 2026 16:46:43 +0100
Subject: [PATCH 032/238] nextcloudPackages: update

---
 pkgs/servers/nextcloud/packages/32.json | 24 ++++++++++++------------
 pkgs/servers/nextcloud/packages/33.json | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index 153d6547356a..50e5aa83d923 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-BYgY9kC91ftpw/eXlFT5ryNhjz138pzPoIh89k46GZ8=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.1.0/collectives-4.1.0.tar.gz",
-    "version": "4.1.0",
+    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
+    "version": "4.2.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -420,9 +420,9 @@
     ]
   },
   "twofactor_admin": {
-    "hash": "sha256-tZG2NCd4WxnPwf1KJq5mBX7Zfy0rDjigJGOw2qypUlU=",
-    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.0/twofactor_admin-v4.11.0.tar.gz",
-    "version": "4.11.0",
+    "hash": "sha256-dx8bEsC/rSAKN9rwP2hf3d8G3f3J1RzCrSqU6BbcvRY=",
+    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.1/twofactor_admin-v4.11.1.tar.gz",
+    "version": "4.11.1",
     "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
     "homepage": "",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-Xl35Ss/P6PvK6pvm7i/J+0EHJaLPbOCffR8ZT5c3XA4=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.6.1/user_oidc-v8.6.1.tar.gz",
-    "version": "8.6.1",
+    "hash": "sha256-wAAooaPTsCjCS6UCzUuFeSJ6EUnXPYo3TK6jXLs/Lfk=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.7.0/user_oidc-v8.7.0.tar.gz",
+    "version": "8.7.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,9 +470,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-oezyc/YXOG1vlw8kNLfVkhA7/WVWfTnL/hb1KSY78ho=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.3/user_saml-v7.1.3.tar.gz",
-    "version": "7.1.3",
+    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
+    "version": "7.1.4",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json
index 593f7afdd3ad..3e1d2e1abfb6 100644
--- a/pkgs/servers/nextcloud/packages/33.json
+++ b/pkgs/servers/nextcloud/packages/33.json
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-BYgY9kC91ftpw/eXlFT5ryNhjz138pzPoIh89k46GZ8=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.1.0/collectives-4.1.0.tar.gz",
-    "version": "4.1.0",
+    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
+    "version": "4.2.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -420,9 +420,9 @@
     ]
   },
   "twofactor_admin": {
-    "hash": "sha256-tZG2NCd4WxnPwf1KJq5mBX7Zfy0rDjigJGOw2qypUlU=",
-    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.0/twofactor_admin-v4.11.0.tar.gz",
-    "version": "4.11.0",
+    "hash": "sha256-dx8bEsC/rSAKN9rwP2hf3d8G3f3J1RzCrSqU6BbcvRY=",
+    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.1/twofactor_admin-v4.11.1.tar.gz",
+    "version": "4.11.1",
     "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
     "homepage": "",
     "licenses": [
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-Xl35Ss/P6PvK6pvm7i/J+0EHJaLPbOCffR8ZT5c3XA4=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.6.1/user_oidc-v8.6.1.tar.gz",
-    "version": "8.6.1",
+    "hash": "sha256-wAAooaPTsCjCS6UCzUuFeSJ6EUnXPYo3TK6jXLs/Lfk=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.7.0/user_oidc-v8.7.0.tar.gz",
+    "version": "8.7.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,9 +470,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-oezyc/YXOG1vlw8kNLfVkhA7/WVWfTnL/hb1KSY78ho=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.3/user_saml-v7.1.3.tar.gz",
-    "version": "7.1.3",
+    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
+    "version": "7.1.4",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [

From e47d43c4c1c137ad8d107b42bc5087d9b773f322 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 26 Mar 2026 17:28:20 +0100
Subject: [PATCH 033/238] nextcloud32: 32.0.6 -> 32.0.7

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 6b21667d761d..9147cec754b5 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -53,8 +53,8 @@ let
 in
 {
   nextcloud32 = generic {
-    version = "32.0.6";
-    hash = "sha256-RLwz/A4xplC7UguxI8CqplGbf3uThhM9Vhred+U/cTA=";
+    version = "32.0.7";
+    hash = "sha256-RQtPKybIO+TXuGgiKafYaOKAL9VK6PPuY2dhiZVjenY=";
     packages = nextcloud32Packages;
   };
 

From f4e5d5bb8297ad50417534b3122a125ae2d43e48 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 26 Mar 2026 17:28:34 +0100
Subject: [PATCH 034/238] nextcloud33: 33.0.0 -> 33.0.1

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 9147cec754b5..73408318ef7d 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ in
   };
 
   nextcloud33 = generic {
-    version = "33.0.0";
-    hash = "sha256-b3cwkCJpyHn58q1KoKInyxa1QI7kbwk/aL0yYz90Gr8=";
+    version = "33.0.1";
+    hash = "sha256-0D8V3p36Zq1zjjfFDnek8BfCaAzcuYQlwg2rQwjQ+Ms=";
     packages = nextcloud33Packages;
   };
 

From 261719a2d4a2899b17bd035ba9ec80da8d04cce0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Mar 2026 17:59:37 +0100
Subject: [PATCH 035/238] {libsForQt5.libqtdbustest,libsForQt5.libqtdbusmock}:
 Rename from {libqtdbustest,libqtdbusmock}

For future Qt6 builds of these, to be used in Qt6 Lomiri builds.
---
 pkgs/by-name/ay/ayatana-indicator-display/package.nix | 6 ++----
 pkgs/by-name/ay/ayatana-indicator-sound/package.nix   | 6 ++----
 pkgs/top-level/aliases.nix                            | 2 ++
 pkgs/top-level/all-packages.nix                       | 8 --------
 pkgs/top-level/qt5-packages.nix                       | 8 ++++++++
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index 83adddf1ae61..c13451700809 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -15,8 +15,6 @@
   intltool,
   libayatana-common,
   libgudev,
-  libqtdbusmock,
-  libqtdbustest,
   librda,
   libsForQt5,
   lomiri,
@@ -91,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkInputs = [
     gtest
-    libqtdbusmock
-    libqtdbustest
+    libsForQt5.libqtdbusmock
+    libsForQt5.libqtdbustest
     properties-cpp
   ];
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index 142aefe75ad6..623925635e97 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -16,8 +16,6 @@
   libgee,
   libnotify,
   libpulseaudio,
-  libqtdbusmock,
-  libqtdbustest,
   libsForQt5,
   libxml2,
   lomiri,
@@ -99,8 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-test-runner
     gtest
     libsForQt5.qtbase
-    libqtdbusmock
-    libqtdbustest
+    libsForQt5.libqtdbusmock
+    libsForQt5.libqtdbustest
     lomiri.gmenuharness
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9718610bf171..9690224d617f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1066,6 +1066,8 @@ mapAliases {
   libpthreadstubs = libpthread-stubs; # Added 2025-02-04
   libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27
   libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27
+  libqtdbusmock = warnAlias "'libqtdbusmock' has been renamed to 'libsForQt5.libqtdbusmock'"; # Added 2026-03-10
+  libqtdbustest = warnAlias "'libqtdbustest' has been renamed to 'libsForQt5.libqtdbustest'"; # Added 2026-03-10
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
   LibreArp = throw "'LibreArp' has been renamed to/replaced by 'librearp'"; # Converted to throw 2025-10-27
   LibreArp-lv2 = throw "'LibreArp-lv2' has been renamed to/replaced by 'librearp-lv2'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75de0d300208..00d5c1f4f8a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6724,14 +6724,6 @@ with pkgs;
   inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5;
   libliftoff = libliftoff_0_5;
 
-  libqtdbusmock = libsForQt5.callPackage ../development/libraries/libqtdbusmock {
-    inherit (lomiri) cmake-extras;
-  };
-
-  libqtdbustest = libsForQt5.callPackage ../development/libraries/libqtdbustest {
-    inherit (lomiri) cmake-extras;
-  };
-
   libretranslate = with python3.pkgs; toPythonApplication libretranslate;
 
   librsb = callPackage ../development/libraries/librsb {
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 58c73a157878..570f96850641 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -116,6 +116,14 @@ makeScopeWithSplicing' {
 
         libqofono = callPackage ../development/libraries/libqofono { };
 
+        libqtdbusmock = callPackage ../development/libraries/libqtdbusmock {
+          inherit (pkgs.lomiri) cmake-extras;
+        };
+
+        libqtdbustest = callPackage ../development/libraries/libqtdbustest {
+          inherit (pkgs.lomiri) cmake-extras;
+        };
+
         libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
 
         libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };

From 5c1a7e1ad207a1a373e6dd4e5e937b51db80fef9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 26 Mar 2026 13:50:17 +0100
Subject: [PATCH 036/238] libsForQt5.qmenumodel: Rename from qmenumodel

For future Qt6 build of this, to be used in Qt6 Lomiri packages.
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 ----
 pkgs/top-level/qt5-packages.nix | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9690224d617f..eeb1064b9fd3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1681,6 +1681,7 @@ mapAliases {
   qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27
   qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01
   qMasterPassword-wayland = warnAlias "'qMasterPassword-wayland' has been renamed to/replaced by 'qmasterpassword-wayland'" qmasterpassword-wayland; # Added 2026-02-01
+  qmenumodel = warnAlias "'qmenumodel' has been renamed to 'libsForQt5.qmenumodel'"; # Added 2026-03-26
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
   qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00d5c1f4f8a1..09f968c47c25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7280,10 +7280,6 @@ with pkgs;
 
   qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
 
-  qmenumodel = libsForQt5.callPackage ../development/libraries/qmenumodel {
-    inherit (lomiri) cmake-extras;
-  };
-
   quarto = callPackage ../development/libraries/quarto { };
 
   quartoMinimal = callPackage ../development/libraries/quarto {
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 570f96850641..0daf7f661e54 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -169,6 +169,10 @@ makeScopeWithSplicing' {
 
         qjson = callPackage ../development/libraries/qjson { };
 
+        qmenumodel = callPackage ../development/libraries/qmenumodel {
+          inherit (pkgs.lomiri) cmake-extras;
+        };
+
         qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
 
         qoauth = callPackage ../development/libraries/qoauth { };

From eeffabacd0ac09ab0c91eee859b13306576d5782 Mon Sep 17 00:00:00 2001
From: Mistyttm <contact@mistyttm.dev>
Date: Sun, 1 Mar 2026 18:02:54 +1000
Subject: [PATCH 037/238] tdarr: fix update script to handle non-ASCII zip
 entries

nix-prefetch-url --unpack uses libarchive which fails on zip files
containing non-ASCII filenames. Replace with curl + unzip + nix hash path
to avoid the locale issue.
---
 pkgs/tools/misc/tdarr/update-hashes.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/tdarr/update-hashes.sh b/pkgs/tools/misc/tdarr/update-hashes.sh
index 822ff243d9ca..9e50086ca940 100755
--- a/pkgs/tools/misc/tdarr/update-hashes.sh
+++ b/pkgs/tools/misc/tdarr/update-hashes.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq unzip
 set -euo pipefail
 
 # Updates tdarr packages to the latest version
@@ -20,11 +21,12 @@ fi
 
 echo "Latest version: $LATEST_VERSION" >&2
 
-# Check current version in common.nix
-CURRENT_VERSION=$(grep -oP '(?<=version = ")[^"]+' "$COMMON_FILE" 2>/dev/null)
+# Use the current version injected by update.nix, falling back to grepping common.nix for standalone use
+CURRENT_VERSION="${UPDATE_NIX_OLD_VERSION:-$(grep -oP '(?<=version = ")[^"]+' "$COMMON_FILE")}"
 
 if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then
     echo "Tdarr packages are already on the latest version ($LATEST_VERSION)" >&2
+    echo "[]"
     exit 0
 fi
 
@@ -32,7 +34,14 @@ echo "Updating from $CURRENT_VERSION to $LATEST_VERSION..." >&2
 
 fetch_and_convert() {
     local url=$1
-    nix-prefetch-url --unpack "$url" 2>/dev/null | xargs nix hash convert --hash-algo sha256 --to sri
+    local tmpdir
+    tmpdir=$(mktemp -d)
+    # Clean up temp directory on return
+    trap "rm -rf '$tmpdir'" RETURN
+
+    curl -sSL -o "$tmpdir/archive.zip" "$url" || { echo "Error: failed to download $url" >&2; return 1; }
+    unzip -q "$tmpdir/archive.zip" -d "$tmpdir/unpacked" || { echo "Error: failed to unzip $url" >&2; return 1; }
+    nix hash path "$tmpdir/unpacked"
 }
 
 # Fetch all hashes for both server and node

From 860da1ba421e76681fa8fdd986912c610ba8d55d Mon Sep 17 00:00:00 2001
From: Mistyttm <contact@mistyttm.dev>
Date: Sun, 1 Mar 2026 18:04:12 +1000
Subject: [PATCH 038/238] tdarr: 2.58.02 -> 2.66.01

---
 pkgs/tools/misc/tdarr/common.nix | 7 ++-----
 pkgs/tools/misc/tdarr/node.nix   | 8 ++++----
 pkgs/tools/misc/tdarr/server.nix | 8 ++++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix
index dd08fb81adde..6ef7469c2308 100644
--- a/pkgs/tools/misc/tdarr/common.nix
+++ b/pkgs/tools/misc/tdarr/common.nix
@@ -100,7 +100,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "2.58.02";
+  version = "2.66.01";
 
   src = fetchzip {
     url = "https://storage.tdarr.io/versions/${finalAttrs.version}/${platform}/${componentName}.zip";
@@ -160,9 +160,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     makeWrapper $out/share/${pname}/${componentName} $out/bin/${pname} ${commonWrapperArgs}
-  ''
-  # TODO: Check on each update to see if the Tdarr_Node_tray gets re-added to the aarch64-linux build. Reach out to upstream?
-  + lib.optionalString (stdenv.hostPlatform.system != "aarch64-linux") ''
     makeWrapper $out/share/${pname}/${componentTrayName} $out/bin/${pname}-tray ${commonWrapperArgs}
   ''
   + lib.optionalString installIcons ''
@@ -177,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + "";
 
-  desktopItems = lib.optionals (stdenv.isLinux && stdenv.hostPlatform.system != "aarch64-linux") [
+  desktopItems = lib.optionals stdenv.isLinux [
     (makeDesktopItem {
       desktopName = "Tdarr ${componentUpper} Tray";
       name = "Tdarr ${componentUpper} Tray";
diff --git a/pkgs/tools/misc/tdarr/node.nix b/pkgs/tools/misc/tdarr/node.nix
index 45c910ba00e4..869ac289ce23 100644
--- a/pkgs/tools/misc/tdarr/node.nix
+++ b/pkgs/tools/misc/tdarr/node.nix
@@ -5,9 +5,9 @@ callPackage ./common.nix { } {
   component = "node";
 
   hashes = {
-    linux_x64 = "sha256-+vD5oaoYh/bOCuk/Bxc8Fsm9UnFICownSKvg9i726nk=";
-    linux_arm64 = "sha256-2uPtEno0dSdVBg5hCiUuvBCB5tuTOcpeU2BuXPiqdUU=";
-    darwin_x64 = "sha256-8O5J1qFpQxD6fzojxjWnbkS4XQoCZauxCtbl/drplfI=";
-    darwin_arm64 = "sha256-oA+nTkO4LDAX5/cGkjNOLnPu0Rss9el+4JF8PBEfsPQ=";
+    linux_x64 = "sha256-3dd8ouRfThm481rDJDnxxUuSkqNlFR+2aywPzyy7xrw=";
+    linux_arm64 = "sha256-LD/cQECal9dLZY/FQSFztOVzd7MaeHL1rdbMUJ2DPNY=";
+    darwin_x64 = "sha256-icgzoHqZ+P6gXJ8jQTau3O2D6uRvET4MtNoWJI/JnvM=";
+    darwin_arm64 = "sha256-Rw478IpDLLe+Ek3Jt5Duaq1sHL1D3pE0HkVqk+v1ECE=";
   };
 }
diff --git a/pkgs/tools/misc/tdarr/server.nix b/pkgs/tools/misc/tdarr/server.nix
index 96e40e403508..65c17f87598b 100644
--- a/pkgs/tools/misc/tdarr/server.nix
+++ b/pkgs/tools/misc/tdarr/server.nix
@@ -5,10 +5,10 @@ callPackage ./common.nix { } {
   component = "server";
 
   hashes = {
-    linux_x64 = "sha256-+nxwSGAkA+BPf481N6KHW7s0iJzoGFPWp0XCbsVEwrI=";
-    linux_arm64 = "sha256-tA5VX27XmH3C4Bkll2mJlr1BYz5V7PPvzbJeaDht7uI=";
-    darwin_x64 = "sha256-jgHEezqtzUWTIvmxsmV1VgaXY9wHePkg6bQO16eSSGI=";
-    darwin_arm64 = "sha256-pcPpqFbqYsXf5Og9uC+eF/1kOQ1ZiletDzkk3qavPS0=";
+    linux_x64 = "sha256-YbEFgvOEAY5HGyTZw9vr4SC85zLQHUQKq++Qbsg1+5A=";
+    linux_arm64 = "sha256-PGguxjOGVUPV5CW3iAtoehnxqGkTe9UA6Vu+7bf6DlQ=";
+    darwin_x64 = "sha256-Gya1DmrLM5UCChwocEwdjYxSWECOl5Ew/e8LpmPQB7M=";
+    darwin_arm64 = "sha256-RJYQZ4L49WTwgMj+vZYFd5Kl3gX1DrkR+fF5E7L9fVs=";
   };
 
   includeInPath = [ ccextractor ];

From 5f79952ff1003ab9bbcbc8c0ead99f8e17e838bc Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 27 Mar 2026 17:13:22 +0100
Subject: [PATCH 039/238] nixos/mosquitto: write ACL files to StateDirectory
 instead of /etc

The ACL file was placed in /etc via environment.etc with owner=mosquitto
and mode=0400. This breaks when system.etc.overlay.enable is set,
because the file ownership doesn't map into the service's PrivateUsers
namespace and mosquitto can't read it.

Install the ACL file into StateDirectory during preStart instead,
alongside the password files. The file ends up owned by the mosquitto
user with mode 0700, satisfying mosquitto's permission checks.

Fixes #474135
---
 .../modules/services/networking/mosquitto.nix | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 9ac643706d40..fd16442ad185 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -378,11 +378,22 @@ let
     ++ userAsserts prefix listener.users
     ++ lib.imap0 (i: v: authAsserts "${prefix}.authPlugins.${toString i}" v) listener.authPlugins;
 
+  makeACLFile =
+    idx: listener:
+    pkgs.writeText "mosquitto-acl-${toString idx}.conf" (
+      lib.concatStringsSep "\n" (
+        lib.flatten [
+          listener.acl
+          (lib.mapAttrsToList (n: u: [ "user ${n}" ] ++ map (t: "topic ${t}") u.acl) listener.users)
+        ]
+      )
+    );
+
   formatListener =
     idx: listener:
     [
       "listener ${toString listener.port} ${toString listener.address}"
-      "acl_file /etc/mosquitto/acl-${toString idx}.conf"
+      "acl_file ${cfg.dataDir}/acl-${toString idx}.conf"
     ]
     ++ lib.optional (!listener.omitPasswordAuth) "password_file ${cfg.dataDir}/passwd-${toString idx}"
     ++ formatFreeform { } listener.settings
@@ -762,32 +773,13 @@ in
         UMask = "0077";
       };
       preStart = lib.concatStringsSep "\n" (
-        lib.imap0 (
-          idx: listener:
-          makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}"
-        ) cfg.listeners
+        lib.imap0 (idx: listener: ''
+          ${makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}"}
+          install -m 0700 ${makeACLFile idx listener} ${cfg.dataDir}/acl-${toString idx}.conf
+        '') cfg.listeners
       );
     };
 
-    environment.etc = lib.listToAttrs (
-      lib.imap0 (idx: listener: {
-        name = "mosquitto/acl-${toString idx}.conf";
-        value = {
-          user = config.users.users.mosquitto.name;
-          group = config.users.users.mosquitto.group;
-          mode = "0400";
-          text = (
-            lib.concatStringsSep "\n" (
-              lib.flatten [
-                listener.acl
-                (lib.mapAttrsToList (n: u: [ "user ${n}" ] ++ map (t: "topic ${t}") u.acl) listener.users)
-              ]
-            )
-          );
-        };
-      }) cfg.listeners
-    );
-
     users.users.mosquitto = {
       description = "Mosquitto MQTT Broker Daemon owner";
       group = "mosquitto";

From 7ee7837876fa7474cb6507d8df9a3fa997ed9c0a Mon Sep 17 00:00:00 2001
From: Nazar Vinnichuk <nazar@vinnich.uk>
Date: Sat, 7 Mar 2026 15:05:23 +0200
Subject: [PATCH 040/238] maintainers: add Kharacternyk

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08392e400e6e..5ee426d17ee4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13956,6 +13956,12 @@
     githubId = 1778670;
     name = "Austin Horstman";
   };
+  Kharacternyk = {
+    email = "nazar@vinnich.uk";
+    github = "Kharacternyk";
+    githubId = 43315801;
+    name = "Nazar Vinnichuk";
+  };
   khaser = {
     email = "a-horohorin@mail.ru";
     github = "khaser";

From ad63ee173cc16ff7e334fb90ea6a83a25723955c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 07:22:56 +0000
Subject: [PATCH 041/238] gelly: 0.19.0 -> 1.0.0

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

diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix
index d42e743c8517..472bd8dd2bc5 100644
--- a/pkgs/by-name/ge/gelly/package.nix
+++ b/pkgs/by-name/ge/gelly/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gelly";
-  version = "0.19.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "Fingel";
     repo = "gelly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pxyO5CVNfLHMrTKamyEBUj8QTg2bPTfS5FZ3YTmkkQk=";
+    hash = "sha256-ZmtofGQYC32pz9WWTvENTU1qSVOXDu+CneyX/YelvZU=";
   };
 
-  cargoHash = "sha256-ZKeVAgQsBOhhNbqdHYRTtpq6+z+xa1Be4eFnrY71f+s=";
+  cargoHash = "sha256-dlMC+nUStrrjYlwxG+NVoqFOuTMcdaUL5a20dN3G5HQ=";
 
   nativeBuildInputs = [
     pkg-config

From 7352614f89412140f31a27ab35c84c53112fdb28 Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Sun, 29 Mar 2026 10:55:19 +0200
Subject: [PATCH 042/238] hentai-at-home: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/by-name/he/hentai-at-home/package.nix b/pkgs/by-name/he/hentai-at-home/package.nix
index b94b3f0eeba5..7dfb5ac2f0db 100644
--- a/pkgs/by-name/he/hentai-at-home/package.nix
+++ b/pkgs/by-name/he/hentai-at-home/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hentai-at-home";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchzip {
     url = "https://repo.e-hentai.org/hath/HentaiAtHome_${finalAttrs.version}_src.zip";
-    hash = "sha512-dcHWZiU0ySLlEhZeK1n2T/dyO6Wk9eS7CpZRSfzY3KvHrPBthQnaFrarSopPXJan1+zWROu1pEff1WSr5+HO4Q==";
+    hash = "sha512-oKyvzHZTPwSTcjsNOQ0LIl6rV+b7JDnuWbYKFogWWkyKcR/xDcNPNhUrKv8QLH6a1AQ2T8DYkxcJYnjhgsaovA==";
     stripRoot = false;
   };
 

From 2334c8e9a96248ea2144f6670c492ee2d8cafb66 Mon Sep 17 00:00:00 2001
From: nitinbhat972 <nitinbhat972@gmail.com>
Date: Sun, 29 Mar 2026 11:22:26 +0530
Subject: [PATCH 043/238] cwal: 0.7.0 -> 0.8.2

---
 pkgs/by-name/cw/cwal/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cw/cwal/package.nix b/pkgs/by-name/cw/cwal/package.nix
index 38201bede418..b535acffaa57 100644
--- a/pkgs/by-name/cw/cwal/package.nix
+++ b/pkgs/by-name/cw/cwal/package.nix
@@ -7,17 +7,18 @@
   imagemagick,
   libimagequant,
   lua,
+  makeWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cwal";
-  version = "0.7.0";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "nitinbhat972";
     repo = "cwal";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2COw5YBa16XzB4h5dfTLDF6LYjb10UC3+hCgTavnnVo=";
+    hash = "sha256-CvC7I0/Obn/IEXmbr8Hs7YqUk6NPgduJpDCNCHwU8lA=";
   };
 
   strictDeps = true;
@@ -25,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
@@ -33,12 +35,17 @@ stdenv.mkDerivation (finalAttrs: {
     lua
   ];
 
+  postFixup = ''
+    wrapProgram $out/bin/cwal \
+      --prefix XDG_DATA_DIRS : $out/share
+  '';
+
   meta = {
     description = "Blazing-fast pywal-like color palette generator written in C";
     homepage = "https://github.com/nitinbhat972/cwal";
     license = lib.licenses.gpl3Only;
     mainProgram = "cwal";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ gustlik501 ];
   };
 })

From a718a67d98d13f06114490aebdec4302c43327d5 Mon Sep 17 00:00:00 2001
From: nitinbhat972 <nitinbhat972@gmail.com>
Date: Sun, 29 Mar 2026 13:13:14 +0530
Subject: [PATCH 044/238] maintainers: add nitinbhat972

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08392e400e6e..2fc5a8884fb5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19448,6 +19448,12 @@
     github = "Nishimara";
     githubId = 59232119;
   };
+  nitinbhat972 = {
+    email = "nitinbhat972@gmail.com";
+    github = "nitinbhat972";
+    githubId = 80189191;
+    name = "Nitin Bhat";
+  };
   nitsky = {
     name = "nitsky";
     github = "nitsky";

From 8ec9d015d5fc0b66bcabfb3cf001b1f24d23157f Mon Sep 17 00:00:00 2001
From: nitinbhat972 <nitinbhat972@gmail.com>
Date: Sun, 29 Mar 2026 13:13:29 +0530
Subject: [PATCH 045/238] cwal: add nitinbhat972 as maintainer

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

diff --git a/pkgs/by-name/cw/cwal/package.nix b/pkgs/by-name/cw/cwal/package.nix
index b535acffaa57..87e6ebfd2b89 100644
--- a/pkgs/by-name/cw/cwal/package.nix
+++ b/pkgs/by-name/cw/cwal/package.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Only;
     mainProgram = "cwal";
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ gustlik501 ];
+    maintainers = with lib.maintainers; [
+      gustlik501
+      nitinbhat972
+    ];
   };
 })

From 9a082436fa80095fc52ce42f4d02c016bd491f28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 16:43:08 +0000
Subject: [PATCH 046/238] peergos: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index 040abc8ce358..850192c2131b 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -41,12 +41,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "1.21.0";
+  version = "1.22.0";
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
     rev = "v${version}";
-    hash = "sha256-8wklL5qVqpMeDN72oJ7hRm8d9qP63zM64VJJmyCWPJQ=";
+    hash = "sha256-0/kLWX3IbVH5FnffIER/VK2PJpJXOyBECc1upvEcWHI=";
     fetchSubmodules = true;
   };
 

From 2905b200ffaf116d0be3ab39630635289866080e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 29 Mar 2026 22:44:16 +0200
Subject: [PATCH 047/238] devenv: fix version mismatch (2.0.7 reported instead
 of 2.0.6)

Upstream tagged v2.0.6 with the workspace Cargo.toml already bumped to
2.0.7, causing the binary to report the wrong version. This also breaks
devenv.lock version checks for users.

Fixes https://github.com/cachix/devenv/issues/2682

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkgs/by-name/de/devenv/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 15bde47de803..170f35405d86 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -53,6 +53,11 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-p5kI7HlG6RVxCCEb/J0L2gh36jkm/atAV98ny3h4vqo=";
 
+  # Upstream tagged v2.0.6 with Cargo.toml already bumped to 2.0.7
+  postPatch = ''
+    substituteInPlace Cargo.toml --replace-fail 'version = "2.0.7"' 'version = "${version}"'
+  '';
+
   env = {
     RUSTFLAGS = "--cfg tracing_unstable";
     LIBSQLITE3_SYS_USE_PKG_CONFIG = "1";

From 6d2ca74e34c0b0b441de0c5b3ca1813876d3d067 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 01:43:20 +0000
Subject: [PATCH 048/238] libremines: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/by-name/li/libremines/package.nix b/pkgs/by-name/li/libremines/package.nix
index 29747c8becd3..cd6ae4629834 100644
--- a/pkgs/by-name/li/libremines/package.nix
+++ b/pkgs/by-name/li/libremines/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libremines";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Bollos00";
     repo = "libremines";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DscpRqXho+bZnXDLyii/cZjuL4MRTAQOuX6PUfwXCx8=";
+    hash = "sha256-bV7k0RhOLqyX7kKbISTo8gRiMVGx3Y2EdmihpdtIWz4=";
   };
 
   nativeBuildInputs = [

From f48d7d38c6f30b3c9834f155920b9d18ed730445 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 02:08:54 +0000
Subject: [PATCH 049/238] pragtical: 3.8.2 -> 3.8.3

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

diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix
index a4f9a0ac7fa5..ba823b5ba91d 100644
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pragtical";
-  version = "3.8.2";
+  version = "3.8.3";
   pluginManagerVersion = "1.4.7.1";
   linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42";
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       find subprojects -type d -name .git -prune -execdir rm -r {} +
     '';
 
-    hash = "sha256-qdOiwn9ThF5LXFNVzvr3MXVRax57bB5T5jDkm/NpgkA=";
+    hash = "sha256-/rCDtUSBQaNsmzcIwWy+VBuMJHEbVXpn+a1Gz3bC6DU=";
   };
 
   strictDeps = true;

From e39436afefeb732d75cbefe02b46617bce2ba2e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 03:17:41 +0000
Subject: [PATCH 050/238] railway: 4.33.0 -> 4.35.0

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

diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index f73b99035024..53d0936cca28 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "railway";
-  version = "4.33.0";
+  version = "4.35.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6klEaZyxA6Oy8Xw8i7G9Xz11lwz+PBOp1z04nIVLVA4=";
+    hash = "sha256-l4cicdFMP2qSWYpVfqY+TfLKTvIW4ikTEKfSQum2aQo=";
   };
 
-  cargoHash = "sha256-HQPKpDyBdJh+15bY1QJd9dT97qKafQ+bzRSNt3HokHE=";
+  cargoHash = "sha256-pgaTJ2eus3LIMjUSCjNhn1duD+j9CSzzrRK/WO64Ho8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From f552a6af832ea0ccb94ba7fb84e74141ad334a6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 03:35:56 +0000
Subject: [PATCH 051/238] python3Packages.google-cloud-websecurityscanner:
 1.19.0 -> 1.20.0

---
 .../google-cloud-websecurityscanner/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 48acb120d814..2f4a547acf5b 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.19.0";
+  version = "1.20.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_websecurityscanner";
     inherit version;
-    hash = "sha256-ZNPoAbzhytetU1XauosOQ4jpjJd+AkEZC70gPfnZ6OY=";
+    hash = "sha256-6u7VvENhWk25oIFFyeV/9JRYVUnQSeyc5G3sWR4DBF4=";
   };
 
   build-system = [ setuptools ];

From ef36169f1721b485af8c651964c9f401e0ccc2e3 Mon Sep 17 00:00:00 2001
From: Nitin Bhat <80189191+nitinbhat972@users.noreply.github.com>
Date: Mon, 30 Mar 2026 11:34:44 +0530
Subject: [PATCH 052/238] cwal: use makeBinaryWrapper instead of makeWrapper

Co-authored-by: Yiyu Zhou <yiyuzhou19@gmail.com>
---
 pkgs/by-name/cw/cwal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cw/cwal/package.nix b/pkgs/by-name/cw/cwal/package.nix
index 87e6ebfd2b89..75fc2f7b1692 100644
--- a/pkgs/by-name/cw/cwal/package.nix
+++ b/pkgs/by-name/cw/cwal/package.nix
@@ -7,7 +7,7 @@
   imagemagick,
   libimagequant,
   lua,
-  makeWrapper,
+  makeBinaryWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    makeWrapper
+    makeBinaryWrapper
   ];
 
   buildInputs = [

From f8fedea71baaec4e0092655c190ea138fd583315 Mon Sep 17 00:00:00 2001
From: albe2669 <albert@risenielsen.dk>
Date: Mon, 30 Mar 2026 10:28:15 +0200
Subject: [PATCH 053/238] goland: 2025.3.4 -> 2026.1

---
 .../editors/jetbrains/ides/goland.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index 5797ad63fce4..a058837e8e65 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2025.3.4.tar.gz";
-      hash = "sha256-S8IRWe+viRxtLrnCgQPR0J8QrOSr5yvtcOpwsjkq9DY=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.tar.gz";
+      hash = "sha256-+TORnDso307j+WwFspoQRZ8IN2TFyy5uUvLyjiNhHiY=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2025.3.4-aarch64.tar.gz";
-      hash = "sha256-yUI3hURv5jdQ2CrALp7wLShL7pGFa2d7BUSstwFd2mo=";
+      url = "https://download.jetbrains.com/go/goland-2026.1-aarch64.tar.gz";
+      hash = "sha256-inAjJw9xzpGjdo4pgoqQwM+ZyEnvLQZggPt4S/LGFxg=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2025.3.4.dmg";
-      hash = "sha256-e9CC9bZ02mxHr788w9SKB6VvhMJ02UbZn0K4IDLTgjw=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.dmg";
+      hash = "sha256-zFAjXSdOaf3C2zQDDriOK9F2xOxGTrAyacVHUh0Sqck=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2025.3.4-aarch64.dmg";
-      hash = "sha256-9XW909OrBLhWuMX/doFFxychU97vP5uAC3bgTs2FaLg=";
+      url = "https://download.jetbrains.com/go/goland-2026.1-aarch64.dmg";
+      hash = "sha256-Zo48RMtVUweV541ImYxtQTBp4L4ZhyTDxFFwK+YyrZk=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ in
   product = "Goland";
 
   # update-script-start: version
-  version = "2025.3.4";
-  buildNumber = "253.32098.60";
+  version = "2026.1";
+  buildNumber = "261.22158.291";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From cb77c4fa57cc416a1a775e7ee99852816189e7db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 08:41:08 +0000
Subject: [PATCH 054/238] goreleaser: 2.14.3 -> 2.15.0

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

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index c290c94dad01..20de5b683a4a 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "goreleaser";
-  version = "2.14.3";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2zG7B6d+NZ1XJrObCfgBZyin5JDv6hKlvZ8C4ckAJ8Q=";
+    hash = "sha256-IoNa4D3OM0B+/6KNS/n0T1uQwDK34aFE/I6tsavKhVQ=";
   };
 
-  vendorHash = "sha256-ImjoPvxkg35Fn4XdhTFLT2o4cDCjuyEOn1mDkMTjksk=";
+  vendorHash = "sha256-Yx0K3/6WuWRpP3sLoo+xnMDoJN+OtVZGtBbNaroMRy8=";
 
   ldflags = [
     "-s"

From b94d72d6caed37af077c19f3ad4bfef8cad1722d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 09:34:56 +0000
Subject: [PATCH 055/238] openboard: 1.7.6 -> 1.7.7

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

diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index 34264ff9a92f..c68a6034eb91 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openboard";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchFromGitHub {
     owner = "OpenBoard-org";
     repo = "OpenBoard";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Jx6UKPOkFucmeeWx3XR0p2bAvRG6VNlVGU/YNLu4NEY=";
+    hash = "sha256-MjUbfv+3o3f4qsLPxLDeUn+/h5YupMMhC/SecwmCR8Q=";
   };
 
   postPatch = ''

From a7335cc381df96993360c3bd85945ca68cc11524 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 09:44:38 +0000
Subject: [PATCH 056/238] codebuff: 1.0.633 -> 1.0.635

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 3d99317a7029..1b1fcc76e8df 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.633"
+        "codebuff": "^1.0.635"
       }
     },
     "node_modules/@isaacs/fs-minipass": {
@@ -30,9 +30,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.633",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.633.tgz",
-      "integrity": "sha512-eReGZRg8zr2vABWfoGz1J5l8YKa7M21mP3b0sDlx0wh3aNcCfmHcUZuHTrhRAjw+MsfHWqBHB49vp4qno4oNtg==",
+      "version": "1.0.635",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.635.tgz",
+      "integrity": "sha512-WjryNPaDPLKZ22vspoib6B5q9S9AIIxqJjbrB3kBj5e7vLx+BDlxMqwbvw4ywzzO/7+P62vOyJ99WFA7l86SNw==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index 3c0395ba5e81..babbc5fd0093 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.633";
+  version = "1.0.635";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-IsIPBXC3DabO6yKV+0u0Gplr6uQ7Ye3XLVlPOab1M7w=";
+    hash = "sha256-IKo/00XmqRvKq3OHc3Fu0/r3fvecKB+E2syuA5jw3Cc=";
   };
 
-  npmDepsHash = "sha256-zORSb24tzUpsqwe4QBtCSkOGTI/Ley849+YyZss1oLY=";
+  npmDepsHash = "sha256-u1xkAQjSeVg6M/1hyDAl0LGjUdu91O9gk95svipy7pw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 30dafa9b7f870336513f7d9167033bf9faf9be8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 12:29:40 +0000
Subject: [PATCH 057/238] eksctl: 0.224.0 -> 0.225.0

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

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index fc2ec2a9f20c..876be808c087 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "eksctl";
-  version = "0.224.0";
+  version = "0.225.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "eksctl";
     rev = finalAttrs.version;
-    hash = "sha256-VjrR5jm4tpUz5mrW4dyTqkzPvJ0Z+zTuwSofddN3aD0=";
+    hash = "sha256-aGIn6/CHC/0RGgVQJbye09V5cT2gXYhvihUv4J/1l6g=";
   };
 
-  vendorHash = "sha256-y23zOfe8Y+ysFP/zRS6T6+BwafdLUv0mSlpp50U8WUc=";
+  vendorHash = "sha256-6f/w++wQdedkzvwkktDvpmpkR5eCJvG2twCSKxY49ZQ=";
 
   doCheck = false;
 

From 9295301922179f2527518e8ecfe609936e94a211 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 30 Mar 2026 14:51:48 +0200
Subject: [PATCH 058/238] lomiri.lomiri-ui-toolkit: 1.3.5903 -> 1.3.5904

---
 pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 36aac994b024..e359a9f87689 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-toolkit";
-  version = "1.3.5903";
+  version = "1.3.5904";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-toolkit";
     rev = finalAttrs.version;
-    hash = "sha256-NdEYXv1LVblUgOu/P8z+vYnd/jNDS+/LFsh63ojJ2KA=";
+    hash = "sha256-lrytLk7+RpD3V4g9m7JruqOfLggJO9sGLzt5UrGbs/Q=";
   };
 
   outputs = [

From 51d71a622f9dd0fcc471f49b31b2b181887d7cd8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:14:33 +0100
Subject: [PATCH 059/238] lomiri-qt6: init

---
 pkgs/desktops/lomiri/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index fda0ef24c3f6..740e21bb7f4a 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -3,16 +3,21 @@
   lib,
   pkgs,
   ayatana-indicator-datetime,
+  useQt6 ? false,
   libsForQt5,
+  qt6Packages,
 }:
 
 let
+  qtPackages = if useQt6 then qt6Packages else libsForQt5;
   packages =
     self:
     let
       inherit (self) callPackage;
     in
     {
+    }
+    // lib.optionalAttrs (!useQt6) {
       #### Core Apps
       lomiri = callPackage ./applications/lomiri { };
       lomiri-calculator-app = callPackage ./applications/lomiri-calculator-app { };
@@ -74,8 +79,8 @@ let
       mediascanner2 = callPackage ./services/mediascanner2 { };
     };
 in
-lib.makeScope libsForQt5.newScope packages
-// lib.optionalAttrs config.allowAliases {
+lib.makeScope qtPackages.newScope packages
+// lib.optionalAttrs (config.allowAliases && !useQt6) {
   content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
   history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11
   lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09f968c47c25..cc34036fb119 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11434,6 +11434,7 @@ with pkgs;
   gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
 
   lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });
+  lomiri-qt6 = recurseIntoAttrs (callPackage ../desktops/lomiri { useQt6 = true; });
 
   lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
 

From 061dd162bd8cb9941c510c26603e566c95659b1e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:16:50 +0100
Subject: [PATCH 060/238] lomiri-qt6.cmake-extras: init at 1.9

---
 pkgs/desktops/lomiri/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 740e21bb7f4a..2610b67bc14e 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -16,6 +16,8 @@ let
       inherit (self) callPackage;
     in
     {
+      #### Development tools / libraries
+      cmake-extras = callPackage ./development/cmake-extras { };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -43,7 +45,6 @@ let
       suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
-      cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
       geonames = callPackage ./development/geonames { };
       gmenuharness = callPackage ./development/gmenuharness { };

From 2c6c5230d5a1cc75ed7c077e3d7e5caf241807ab Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Mar 2026 18:05:18 +0100
Subject: [PATCH 061/238] qt6Packages.libqtdbustest: init at 0.4.0

---
 pkgs/development/libraries/libqtdbustest/default.nix | 9 ++++++++-
 pkgs/top-level/qt6-packages.nix                      | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix
index 67535a59c0a3..dd40f9066d4a 100644
--- a/pkgs/development/libraries/libqtdbustest/default.nix
+++ b/pkgs/development/libraries/libqtdbustest/default.nix
@@ -16,6 +16,9 @@
   qtbase,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqtdbustest";
   version = "0.4.0";
@@ -79,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
+  ];
+
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   enableParallelChecking = false;
@@ -104,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.lomiri ];
     mainProgram = "qdbus-simple-test-runner";
     pkgConfigModules = [
-      "libqtdbustest-1"
+      "libqtdbustest-${if withQt6 then "qt6" else "1"}"
     ];
   };
 })
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 42d87e0f4d62..1e5f1c312dde 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -75,6 +75,10 @@ makeScopeWithSplicing' {
 
       libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
 
+      libqtdbustest = callPackage ../development/libraries/libqtdbustest {
+        inherit (pkgs.lomiri-qt6) cmake-extras;
+      };
+
       libquotient = callPackage ../development/libraries/libquotient { };
       mlt = pkgs.mlt.override {
         qt = qt6;

From ea83efa04ea96dc3c7ee6c41cb3b389dfa3cc5cd Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Mar 2026 18:08:32 +0100
Subject: [PATCH 062/238] qt6Packages.libqtdbusmock: init at 0.10.0

---
 pkgs/development/libraries/libqtdbusmock/default.nix | 7 +++++--
 pkgs/top-level/qt6-packages.nix                      | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix
index 6beeda70e863..f78387b40594 100644
--- a/pkgs/development/libraries/libqtdbusmock/default.nix
+++ b/pkgs/development/libraries/libqtdbusmock/default.nix
@@ -16,6 +16,9 @@
   qtbase,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqtdbusmock";
   version = "0.10.0";
@@ -68,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
   ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -95,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.lomiri ];
     pkgConfigModules = [
-      "libqtdbusmock-1"
+      "libqtdbusmock${lib.optionalString withQt6 "-qt6"}-1"
     ];
   };
 })
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 1e5f1c312dde..d424a7168b75 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -75,6 +75,10 @@ makeScopeWithSplicing' {
 
       libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
 
+      libqtdbusmock = callPackage ../development/libraries/libqtdbusmock {
+        inherit (pkgs.lomiri-qt6) cmake-extras;
+      };
+
       libqtdbustest = callPackage ../development/libraries/libqtdbustest {
         inherit (pkgs.lomiri-qt6) cmake-extras;
       };

From a3425454edd5853733ea4bef670f3d4239dcd699 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:18:16 +0100
Subject: [PATCH 063/238] lomiri-qt6.deviceinfo: init at 0.2.4

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 2610b67bc14e..4be80a170bbb 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -18,6 +18,7 @@ let
     {
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
+      deviceinfo = callPackage ./development/deviceinfo { };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -45,7 +46,6 @@ let
       suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
-      deviceinfo = callPackage ./development/deviceinfo { };
       geonames = callPackage ./development/geonames { };
       gmenuharness = callPackage ./development/gmenuharness { };
       gsettings-qt = callPackage ./development/gsettings-qt { };

From 1313995f1cf0f40663d86d90969107bfc19f5329 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:19:39 +0100
Subject: [PATCH 064/238] lomiri-qt6.lomiri-schemas: init at 0.1.10

---
 pkgs/desktops/lomiri/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 4be80a170bbb..d9ae6ddc1277 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -16,6 +16,9 @@ let
       inherit (self) callPackage;
     in
     {
+      #### Data
+      lomiri-schemas = callPackage ./data/lomiri-schemas { };
+
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
@@ -39,7 +42,6 @@ let
       teleports = callPackage ./applications/teleports { };
 
       #### Data
-      lomiri-schemas = callPackage ./data/lomiri-schemas { };
       lomiri-session = callPackage ./data/lomiri-session { };
       lomiri-sounds = callPackage ./data/lomiri-sounds { };
       lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { };

From a2155efca1e93d3297c598964369270fb57c5e05 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:20:28 +0100
Subject: [PATCH 065/238] lomiri-qt6.suru-icon-theme: init at 2025.05.0

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index d9ae6ddc1277..d74ae15b9e94 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -18,6 +18,7 @@ let
     {
       #### Data
       lomiri-schemas = callPackage ./data/lomiri-schemas { };
+      suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
@@ -45,7 +46,6 @@ let
       lomiri-session = callPackage ./data/lomiri-session { };
       lomiri-sounds = callPackage ./data/lomiri-sounds { };
       lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { };
-      suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
       geonames = callPackage ./development/geonames { };

From c26bb58fe8ae3f03013ae4e75879cf67433c94e0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:21:05 +0100
Subject: [PATCH 066/238] lomiri-qt6.lomiri-sounds: init at 25.01

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index d74ae15b9e94..478391dd883b 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -18,6 +18,7 @@ let
     {
       #### Data
       lomiri-schemas = callPackage ./data/lomiri-schemas { };
+      lomiri-sounds = callPackage ./data/lomiri-sounds { };
       suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
@@ -44,7 +45,6 @@ let
 
       #### Data
       lomiri-session = callPackage ./data/lomiri-session { };
-      lomiri-sounds = callPackage ./data/lomiri-sounds { };
       lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { };
 
       #### Development tools / libraries

From 3114c8400248edc3b56c8ea9979688daff660c4a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 14:21:31 +0100
Subject: [PATCH 067/238] lomiri-qt6.lomiri-wallpapers: init at 20.04.0

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 478391dd883b..8b5b2933b22d 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -19,6 +19,7 @@ let
       #### Data
       lomiri-schemas = callPackage ./data/lomiri-schemas { };
       lomiri-sounds = callPackage ./data/lomiri-sounds { };
+      lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { };
       suru-icon-theme = callPackage ./data/suru-icon-theme { };
 
       #### Development tools / libraries
@@ -45,7 +46,6 @@ let
 
       #### Data
       lomiri-session = callPackage ./data/lomiri-session { };
-      lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { };
 
       #### Development tools / libraries
       geonames = callPackage ./development/geonames { };

From 9e988b6cf1d8977178bf0b18bfb3083d10e19148 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 16:38:18 +0100
Subject: [PATCH 068/238] lomiri-qt6.lomiri-ui-toolkit: init at 1.3.5904

---
 pkgs/desktops/lomiri/default.nix              |   4 +-
 .../2002-Nixpkgs-versioned-QML-path.patch.in  |  25 +--
 .../lomiri/qml/lomiri-ui-toolkit/default.nix  | 170 ++++++++++++------
 3 files changed, 126 insertions(+), 73 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 8b5b2933b22d..eb79ed55135c 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -25,6 +25,9 @@ let
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
+
+      #### QML / QML-related
+      lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -64,7 +67,6 @@ let
       lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
-      lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
       qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
 
       #### Services
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in
index d2e83baf98ae..065b670f4b46 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in
@@ -1,29 +1,20 @@
-From ca4c52a80532732243067eb00ec12b4ef84010a6 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Tue, 30 Jan 2024 19:46:09 +0100
-Subject: [PATCH] Nixpkgs versioned QML path
-
----
- src/LomiriToolkit/uctheme.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/LomiriToolkit/uctheme.cpp b/src/LomiriToolkit/uctheme.cpp
-index a10c89344..4b0653589 100644
---- a/src/LomiriToolkit/uctheme.cpp
-+++ b/src/LomiriToolkit/uctheme.cpp
-@@ -180,6 +180,12 @@ QStringList themeSearchPath()
+diff '--color=auto' -ruN a/src/LomiriToolkit/uctheme.cpp b/src/LomiriToolkit/uctheme.cpp
+--- a/src/LomiriToolkit/uctheme.cpp	2025-12-04 00:43:06.543074583 +0100
++++ b/src/LomiriToolkit/uctheme.cpp	2025-12-04 00:45:35.424986792 +0100
+@@ -192,6 +192,16 @@
          pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
      }
 
 +    // append versioned QML import path from Nixpkgs
 +    const QString nixpkgsQmlImportPath = QString::fromLocal8Bit(getenv("NIXPKGS_QT@qtVersion@_QML_IMPORT_PATH"));
 +    if (!nixpkgsQmlImportPath.isEmpty()) {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 +        pathList << nixpkgsQmlImportPath.split(':', QString::SkipEmptyParts);
++#else
++        pathList << nixpkgsQmlImportPath.split(':', Qt::SkipEmptyParts);
++#endif
 +    }
 +
      // append QML import path(s); we must explicitly support env override here
      const QString qml2ImportPath = QString::fromLocal8Bit(getenv("QML2_IMPORT_PATH"));
      if (!qml2ImportPath.isEmpty()) {
---
-2.42.0
-
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index e359a9f87689..6593044e6e60 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -5,10 +5,14 @@
   gitUpdater,
   replaceVars,
   testers,
+  bluez,
+  cmake,
   dbus-test-runner,
   dpkg,
   gdb,
   glib,
+  kdePackages,
+  libevdev,
   lttng-ust,
   mesa,
   perl,
@@ -17,13 +21,15 @@
   qmake,
   qtbase,
   qtdeclarative,
-  qtfeedback,
-  qtgraphicaleffects,
-  qtpim,
-  qtquickcontrols2,
+  qtfeedback ? null,
+  qtgraphicaleffects ? null,
+  qtpim ? null,
+  qtquickcontrols2 ? null,
   qtsvg,
-  qtsystems,
+  qtsystems ? null,
   qttools,
+  qt5compat ? null,
+  spirv-tools,
   suru-icon-theme,
   validatePkgConfig,
   wrapQtAppsHook,
@@ -31,17 +37,30 @@
 }:
 
 let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
   listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
-  qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [
-    qtbase
-    qtpim
-    qtsvg
-  ];
-  qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [
-    qtdeclarative
-    qtfeedback
-    qtgraphicaleffects
-  ];
+  qtPluginPaths = listToQtVar qtbase.qtPluginPrefix (
+    [
+      qtbase
+      qtsvg
+    ]
+    ++ lib.optionals (!withQt6) [
+      # Will prolly want this in the future, but needs porting to Qt6
+      qtpim
+    ]
+  );
+  qtQmlPaths = listToQtVar qtbase.qtQmlPrefix (
+    [
+      qtdeclarative
+    ]
+    ++ lib.optionals (!withQt6) [
+      # Deprecated in Qt6
+      qtgraphicaleffects
+
+      # Will prolly want this in the future, but needs porting to Qt6
+      qtfeedback
+    ]
+  );
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-toolkit";
@@ -57,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+  ]
+  ++ lib.optionals (!withQt6) [
     "doc"
   ];
 
@@ -71,23 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs documentation/docs.sh tests/
 
-    for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
-      substituteInPlace $subproject/$subproject.pro \
-        --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
-        --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
-    done
-
-    # Install apicheck tool into bin
-    substituteInPlace apicheck/apicheck.pro \
-      --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
-
-    substituteInPlace documentation/documentation.pro \
-      --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
-      --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
-
-    # Causes redefinition error with our own fortify hardening
-    sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
-
     # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues,
     # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being
     # used in a single application (lomiri-system-settings), that's of not much use either.
@@ -113,19 +117,50 @@ stdenv.mkDerivation (finalAttrs: {
       tests/unit/visual/tst_icon.{11,13}.qml \
       tests/unit/visual/tst_imageprovider.11.qml \
       --replace-fail '/usr/share' '${suru-icon-theme}/share'
+  ''
+  + lib.optionalString (!withQt6) ''
+    for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
+      substituteInPlace $subproject/$subproject.pro \
+        --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
+        --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
+    done
+
+    # Install apicheck tool into bin
+    substituteInPlace apicheck/apicheck.pro \
+      --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+
+    substituteInPlace documentation/documentation.pro \
+      --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
+      --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
+
+    # Causes redefinition error with our own fortify hardening
+    sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
+  ''
+  + lib.optionalString withQt6 ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/plugins" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}"
   '';
 
-  # With strictDeps, QMake only picks up Qt dependencies from nativeBuildInputs
+  # With strictDeps
+  # - QMake only picks up Qt dependencies from nativeBuildInputs
+  # - Qt6's CMake module seems to struggle with picking up other Qt modules from buildInputs
   strictDeps = false;
 
   nativeBuildInputs = [
     perl
     pkg-config
     python3
-    qmake
     qttools # qdoc, qhelpgenerator
     validatePkgConfig
     wrapQtAppsHook
+  ]
+  ++ lib.optionals withQt6 [
+    cmake
+    spirv-tools
+  ]
+  ++ lib.optionals (!withQt6) [
+    qmake
   ];
 
   buildInputs = [
@@ -133,15 +168,34 @@ stdenv.mkDerivation (finalAttrs: {
     lttng-ust
     qtbase
     qtdeclarative
-    qtpim
+  ]
+  ++ lib.optionals (!withQt6) [
+    # Folded into qtdeclarative in Qt6
     qtquickcontrols2
+
+    # Will prolly want this in the future, but needs porting to Qt6
+    qtpim
     qtsystems
+  ]
+  ++ lib.optionals withQt6 [
+    bluez
+    kdePackages.extra-cmake-modules
+    libevdev
   ];
 
   propagatedBuildInputs = [
-    qtfeedback
-    qtgraphicaleffects
     qtsvg
+  ]
+  ++ lib.optionals withQt6 [
+    # Qt5Compat.GraphicalEffects
+    qt5compat
+  ]
+  ++ lib.optionals (!withQt6) [
+    # Deprecated in Qt6
+    qtgraphicaleffects
+
+    # Will prolly want this in the future, but needs porting to Qt6
+    qtfeedback
   ];
 
   nativeCheckInputs = [
@@ -152,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
   ];
 
-  qmakeFlags = [
+  qmakeFlags = lib.optionals (!withQt6) [
     # Ubuntu UITK compatibility, for older / not-yet-migrated applications
     "CONFIG+=ubuntu-uitk-compat"
     "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}"
@@ -180,12 +234,14 @@ stdenv.mkDerivation (finalAttrs: {
 
     export UITK_BUILD_ROOT=$PWD
 
-    tests/xvfb.sh make check ''${enableParallelChecking:+-j''${NIX_BUILD_CORES}}
+    ${lib.optionalString withQt6 "../"}tests/xvfb.sh make ${
+      if withQt6 then "test" else "check"
+    } ''${enableParallelChecking:+-j''${NIX_BUILD_CORES}}
 
     runHook postCheck
   '';
 
-  preInstall = ''
+  preInstall = lib.optionalString (!withQt6) ''
     # wrapper script calls qmlplugindump, crashes due to lack of minimal platform plugin
     # Could not find the Qt platform plugin "minimal" in ""
     # Available platform plugins are: wayland-egl, wayland, wayland-xcomposite-egl, wayland-xcomposite-glx.
@@ -198,20 +254,24 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  postInstall = ''
-    # Code loads Qt's qt_module.prf, which force-overrides all QMAKE_PKGCONFIG_* variables except PREFIX for QMake-generated pkg-config files
-    for pcFile in Lomiri{Gestures,Metrics,Toolkit}.pc; do
-      substituteInPlace $out/lib/pkgconfig/$pcFile \
-        --replace-fail "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \
-        --replace-fail "${lib.getDev qtbase}/include" "\''${prefix}/include"
-    done
-
-    # These are all dev-related tools, but declaring a bin output also moves around the QML modules
-    moveToOutput "bin" "$dev"
-  '';
+  postInstall =
+    lib.optionalString (!withQt6) ''
+      # Code loads Qt's qt_module.prf, which force-overrides all QMAKE_PKGCONFIG_* variables except PREFIX for QMake-generated pkg-config files
+      for pcFile in Lomiri{Gestures,Metrics,Toolkit}${lib.optionalString withQt6 "-Qt6"}.pc; do
+        substituteInPlace $out/lib/pkgconfig/$pcFile \
+          --replace-fail "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \
+          --replace-fail "${lib.getDev qtbase}/include" "\''${prefix}/include"
+      done
+    ''
+    + ''
+      # These are all dev-related tools, but declaring a bin output also moves around the QML modules
+      moveToOutput "bin" "$dev"
+    '';
 
   postFixup = ''
-    for qtBin in $dev/bin/{apicheck,lomiri-ui-toolkit-launcher}; do
+    for qtBin in ${
+      if withQt6 then "$out/libexec/lomiri-ui-toolkit/qt6" else "$dev/bin"
+    }/apicheck $dev/bin/lomiri-ui-toolkit-launcher${lib.optionalString withQt6 "-qt6"}; do
       wrapQtApp $qtBin
     done
   '';
@@ -246,9 +306,9 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "LomiriGestures"
-      "LomiriMetrics"
-      "LomiriToolkit"
+      "LomiriGestures${lib.optionalString withQt6 "-Qt6"}"
+      "LomiriMetrics${lib.optionalString withQt6 "-Qt6"}"
+      "LomiriToolkit${lib.optionalString withQt6 "-Qt6"}"
     ];
   };
 })

From bb733fc0ad9343eb6a4d2fa204c4e6d17fbb489d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 16:37:46 +0100
Subject: [PATCH 069/238] lomiri-qt6.lomiri-ui-extras: init at 0.8.0

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index eb79ed55135c..693fa37f758b 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -27,6 +27,7 @@ let
       deviceinfo = callPackage ./development/deviceinfo { };
 
       #### QML / QML-related
+      lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
     }
     // lib.optionalAttrs (!useQt6) {
@@ -66,7 +67,6 @@ let
       lomiri-notifications = callPackage ./qml/lomiri-notifications { };
       lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
-      lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
 
       #### Services

From 7ac36d7200728c69dca55dc6d273edf1bb207ed6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 15:58:41 +0100
Subject: [PATCH 070/238] lomiri-qt6.lomiri-api: init at 0.3.0

---
 pkgs/desktops/lomiri/default.nix              |  2 +-
 .../lomiri/development/lomiri-api/default.nix | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 693fa37f758b..73a1559fbf32 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -25,6 +25,7 @@ let
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
+      lomiri-api = callPackage ./development/lomiri-api { };
 
       #### QML / QML-related
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
@@ -56,7 +57,6 @@ let
       gmenuharness = callPackage ./development/gmenuharness { };
       gsettings-qt = callPackage ./development/gsettings-qt { };
       libusermetrics = callPackage ./development/libusermetrics { };
-      lomiri-api = callPackage ./development/lomiri-api { };
       lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
       qtmir = callPackage ./development/qtmir { };
       trust-store = callPackage ./development/trust-store { };
diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
index 903e8da48645..3fa57e8c820c 100644
--- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix
+++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
@@ -17,8 +17,12 @@
   python3,
   qtbase,
   qtdeclarative,
+  withDocumentation ? true,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-api";
   version = "0.3.0";
@@ -33,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+  ]
+  ++ lib.optionals withDocumentation [
     "doc"
   ];
 
@@ -53,10 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    doxygen
-    graphviz
     pkg-config
     qtdeclarative
+  ]
+  ++ lib.optionals withDocumentation [
+    doxygen
+    graphviz
   ];
 
   buildInputs = [
@@ -76,7 +84,8 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
+    (lib.cmakeBool "NO_TESTS" (!finalAttrs.finalPackage.doCheck))
   ];
 
   env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
@@ -95,7 +104,10 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    # https://gitlab.com/ubports/development/core/lomiri-api/-/issues/5
+    tests = lib.optionalAttrs (!withQt6) {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
     updateScript = gitUpdater { };
   };
 
@@ -113,10 +125,10 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     pkgConfigModules = [
       "liblomiri-api"
-      "lomiri-shell-api"
-      "lomiri-shell-application"
-      "lomiri-shell-launcher"
-      "lomiri-shell-notifications"
+      "lomiri-shell-api${lib.optionalString withQt6 "-qt6"}"
+      "lomiri-shell-application${lib.optionalString withQt6 "-qt6"}"
+      "lomiri-shell-launcher${lib.optionalString withQt6 "-qt6"}"
+      "lomiri-shell-notifications${lib.optionalString withQt6 "-qt6"}"
     ];
   };
 })

From db3a44c51fa22134a19f6b0735ddb9b752b2c980 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 19:34:31 +0100
Subject: [PATCH 071/238] lomiri-qt6.lomiri-action-api: init at 1.2.1

---
 pkgs/desktops/lomiri/default.nix              |  5 +++-
 .../lomiri/qml/lomiri-action-api/default.nix  | 29 +++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 73a1559fbf32..b1ab1a8b68e5 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -28,6 +28,10 @@ let
       lomiri-api = callPackage ./development/lomiri-api { };
 
       #### QML / QML-related
+      lomiri-action-api = callPackage ./qml/lomiri-action-api {
+        # The dependency target "qmldoc" of target "doc" does not exist.
+        withDocumentation = !useQt6;
+      };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
     }
@@ -63,7 +67,6 @@ let
       u1db-qt = callPackage ./development/u1db-qt { };
 
       #### QML / QML-related
-      lomiri-action-api = callPackage ./qml/lomiri-action-api { };
       lomiri-notifications = callPackage ./qml/lomiri-notifications { };
       lomiri-push-qml = callPackage ./qml/lomiri-push-qml { };
       lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index 97005ae77345..e327a297e33a 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   testers,
   cmake,
@@ -13,8 +14,12 @@
   qtdeclarative,
   qttools,
   validatePkgConfig,
+  withDocumentation ? true,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-action-api";
   version = "1.2.1";
@@ -26,9 +31,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-pwHvbiUvkAi7/XgpNfgrqcp3znFKSXlAAacB2XsHQkg=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "0001-lomiri-action-api-fix-qt6-unit-tests.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-action-api/-/commit/8fadb3d75938403aca2dc0e9392370c0d9b45c3e.patch";
+      hash = "sha256-qqgFgw2YY6cPEbzGKI7r4fk/CgR9NRe1ZY2HUsKLNlo=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"
+  ]
+  ++ lib.optionals withDocumentation [
     "doc"
   ];
 
@@ -46,11 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    doxygen
     pkg-config
     qtdeclarative
-    qttools # qdoc
     validatePkgConfig
+  ]
+  ++ lib.optionals withDocumentation [
+    doxygen
+    qttools # qdoc
   ];
 
   buildInputs = [
@@ -64,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
-    (lib.cmakeBool "GENERATE_DOCUMENTATION" true)
+    (lib.cmakeBool "GENERATE_DOCUMENTATION" withDocumentation)
     # Use vendored libhud2, TODO package libhud2 separately?
     (lib.cmakeBool "use_libhud2" false)
   ];
@@ -92,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
-    pkgConfigModules = [ "lomiri-action-qt-1" ];
+    pkgConfigModules = [
+      "lomiri-action-qt${lib.optionalString withQt6 "6"}-1"
+    ];
   };
 })

From 5c123a480dacaa833ae777b17f5d3fdcd1d5438a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 19:34:51 +0100
Subject: [PATCH 072/238] lomiri-qt6.lomiri-download-manager: init at 0.3.0

---
 pkgs/desktops/lomiri/default.nix                    |  7 ++++++-
 .../services/lomiri-download-manager/default.nix    | 13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index b1ab1a8b68e5..dc4950a8dd9e 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -34,6 +34,12 @@ let
       };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
+
+      #### Services
+      lomiri-download-manager = callPackage ./services/lomiri-download-manager {
+        # Check for working qdoc: not found
+        withDocumentation = !useQt6;
+      };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -76,7 +82,6 @@ let
       biometryd = callPackage ./services/biometryd { };
       lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
-      lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index cd2dc035498a..7d73afde6502 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -21,12 +21,16 @@
   python3,
   qtbase,
   qtdeclarative,
+  qtscxml,
   qttools,
   validatePkgConfig,
   wrapQtAppsHook,
   xvfb-run,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
   version = "0.3.0";
@@ -72,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
     wrapQtAppsHook
   ]
+  ++ lib.optionals withQt6 [
+    qtscxml
+  ]
   ++ lib.optionals withDocumentation [
     doxygen
     graphviz
@@ -98,9 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
   checkInputs = [ gtest ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_DOC" withDocumentation)
-    (lib.cmakeBool "ENABLE_WERROR" true)
+    (lib.cmakeBool "ENABLE_WERROR" (!withQt6))
   ];
 
   makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
@@ -129,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
-    pkgConfigModules = [
+    pkgConfigModules = map (pc: pc + lib.optionalString withQt6 "-qt6") [
       "ldm-common"
       "lomiri-download-manager-client"
       "lomiri-download-manager-common"

From 858ef0c2aec941b4a26f1f11e2638a1004b4960a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 15:59:42 +0100
Subject: [PATCH 073/238] lomiri-qt6.gsettings-qt: init at 1.1.1

---
 pkgs/desktops/lomiri/default.nix                 |  2 +-
 .../lomiri/development/gsettings-qt/default.nix  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index dc4950a8dd9e..592d91c03889 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -25,6 +25,7 @@ let
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
+      gsettings-qt = callPackage ./development/gsettings-qt { };
       lomiri-api = callPackage ./development/lomiri-api { };
 
       #### QML / QML-related
@@ -65,7 +66,6 @@ let
       #### Development tools / libraries
       geonames = callPackage ./development/geonames { };
       gmenuharness = callPackage ./development/gmenuharness { };
-      gsettings-qt = callPackage ./development/gsettings-qt { };
       libusermetrics = callPackage ./development/libusermetrics { };
       lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
       qtmir = callPackage ./development/qtmir { };
diff --git a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix
index 285af24eedec..8a6f97977ff5 100644
--- a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix
+++ b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix
@@ -7,11 +7,15 @@
   cmake,
   cmake-extras,
   glib,
+  libglvnd,
   pkg-config,
   qtbase,
   qtdeclarative,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gsettings-qt";
   version = "1.1.1";
@@ -39,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cmake-extras
     glib
+  ]
+  ++ lib.optionals withQt6 [
+    libglvnd
   ];
 
   # Library
@@ -60,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     + ''
       substituteInPlace GSettings/CMakeLists.txt \
         --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+    ''
+    # Need QtQuick.Window in QML2_IMPORT_PATH
+    + ''
+      substituteInPlace tests/CMakeLists.txt \
+        --replace-fail 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}:'
     '';
 
   preBuild =
@@ -69,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_WERROR" true)
   ];
 
@@ -96,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "gsettings-qt"
+      "gsettings-qt${lib.optionalString withQt6 "6"}"
     ];
   };
 })

From 08dae344a14b52e607c553e55dd487543b27cca6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 16:36:45 +0100
Subject: [PATCH 074/238] lomiri-qt6.lomiri-app-launch: init at 0.1.12

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 592d91c03889..b7b7c68807f7 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -27,6 +27,7 @@ let
       deviceinfo = callPackage ./development/deviceinfo { };
       gsettings-qt = callPackage ./development/gsettings-qt { };
       lomiri-api = callPackage ./development/lomiri-api { };
+      lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
 
       #### QML / QML-related
       lomiri-action-api = callPackage ./qml/lomiri-action-api {
@@ -67,7 +68,6 @@ let
       geonames = callPackage ./development/geonames { };
       gmenuharness = callPackage ./development/gmenuharness { };
       libusermetrics = callPackage ./development/libusermetrics { };
-      lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
       qtmir = callPackage ./development/qtmir { };
       trust-store = callPackage ./development/trust-store { };
       u1db-qt = callPackage ./development/u1db-qt { };

From d7c18078839048f2db10f0efb8d0d3e8bbeb4381 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 14 Dec 2025 16:33:49 +0100
Subject: [PATCH 075/238] lomiri-qt6.lomiri-content-hub: init at 2.2.2

---
 pkgs/desktops/lomiri/default.nix              |  5 +-
 .../services/lomiri-content-hub/default.nix   | 61 ++++++++++++++-----
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index b7b7c68807f7..97614c9f68d5 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -38,6 +38,10 @@ let
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
 
       #### Services
+      lomiri-content-hub = callPackage ./services/lomiri-content-hub {
+        # Check for working qdoc: not found
+        withDocumentation = !useQt6;
+      };
       lomiri-download-manager = callPackage ./services/lomiri-download-manager {
         # Check for working qdoc: not found
         withDocumentation = !useQt6;
@@ -80,7 +84,6 @@ let
 
       #### Services
       biometryd = callPackage ./services/biometryd { };
-      lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index 36194fe15587..d135f1380474 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -23,14 +23,18 @@
   properties-cpp,
   qtbase,
   qtdeclarative,
-  qtfeedback,
-  qtgraphicaleffects,
+  qtfeedback ? null,
+  qtgraphicaleffects ? null,
   qttools,
   validatePkgConfig,
   wrapGAppsHook3,
   xvfb-run,
+  withDocumentation ? true,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-content-hub";
   version = "2.2.2";
@@ -45,8 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
-    "doc"
     "examples"
+  ]
+  ++ lib.optionals withDocumentation [
+    "doc"
   ];
 
   patches = [
@@ -69,6 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
     # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption
     substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \
       --replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' ""
+  ''
+  # Need QtQuick.Window on QML2_IMPORT_PATH
+  + ''
+    substituteInPlace tests/qml6-tests/CMakeLists.txt \
+      --replace-fail 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}:'
   '';
 
   strictDeps = true;
@@ -78,9 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     pkg-config
     qtdeclarative # qmlplugindump
-    qttools # qdoc
     validatePkgConfig
     wrapGAppsHook3
+  ]
+  ++ lib.optionals withDocumentation [
+    qttools # qdoc
   ];
 
   buildInputs = [
@@ -96,8 +109,13 @@ stdenv.mkDerivation (finalAttrs: {
     properties-cpp
     qtbase
     qtdeclarative
-    qtfeedback
+  ]
+  ++ lib.optionals (!withQt6) [
+    # Deprecated in Qt6
     qtgraphicaleffects
+
+    # Will prolly want this in the future, but needs porting to Qt6
+    qtfeedback
   ];
 
   nativeCheckInputs = [
@@ -112,11 +130,13 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "GSETTINGS_COMPILE" true)
     (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-    (lib.cmakeBool "ENABLE_DOC" true)
-    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it
-    (lib.cmakeBool "ENABLE_WERROR" true)
+    (lib.cmakeBool "ENABLE_DOC" withDocumentation)
+    # in case something still depends on it
+    # no longer available in the Qt6 build
+    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!withQt6))
+    (lib.cmakeBool "ENABLE_WERROR" (!withQt6)) # Known issues on Qt6
   ];
 
   preBuild =
@@ -128,12 +148,19 @@ stdenv.mkDerivation (finalAttrs: {
       # Executes qmlplugindump
       export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
       export QML2_IMPORT_PATH=${
-        listToQtVar [
-          qtdeclarative
-          lomiri-ui-toolkit
-          qtfeedback
-          qtgraphicaleffects
-        ] qtbase.qtQmlPrefix
+        listToQtVar (
+          [
+            qtdeclarative
+            lomiri-ui-toolkit
+          ]
+          ++ lib.optionals (!withQt6) [
+            # Deprecated in Qt6
+            qtgraphicaleffects
+
+            # Will prolly want this in the future, but needs porting to Qt6
+            qtfeedback
+          ]
+        ) qtbase.qtQmlPrefix
       }
     '';
 
@@ -160,6 +187,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = {
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    }
+    // lib.optionalAttrs (!withQt6) {
       # Tests content-hub functionality, up to the point where one app receives a content exchange request
       # from another and changes into a mode to pick the content to send
       vm = nixosTests.lomiri.desktop-appinteractions;
@@ -183,7 +212,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "liblomiri-content-hub"
+      "liblomiri-content-hub${lib.optionalString withQt6 "-qt6"}"
       "liblomiri-content-hub-glib"
     ];
   };

From beef8b9c1d796ed5d81919fa21186e9e992269f1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Feb 2026 21:29:26 +0100
Subject: [PATCH 076/238] lomiri-qt6.morph-browser: init at 1.99.3

---
 .../applications/morph-browser/default.nix    | 45 +++++++++++++++----
 pkgs/desktops/lomiri/default.nix              |  7 ++-
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index 7b0b9d732ce4..f09374ba3f96 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -15,18 +15,21 @@
   lomiri-ui-toolkit,
   mesa,
   pkg-config,
-  qqc2-suru-style,
+  qqc2-suru-style ? null,
+  qt5compat ? null,
   qtbase,
   qtdeclarative,
-  qtquickcontrols2,
-  qtsystems,
+  qtquickcontrols2 ? null,
+  qtsystems ? null,
   qttools,
   qtwebengine,
   wrapQtAppsHook,
   xvfb-run,
+  withDocumentation ? true,
 }:
 
 let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
   listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+  ]
+  ++ lib.optionals withDocumentation [
     "doc"
   ];
 
@@ -55,16 +60,22 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace doc/CMakeLists.txt \
       --replace-fail 'COMMAND ''${QDOC_BIN} -qt5' 'COMMAND ''${QDOC_BIN}'
+  ''
+  + lib.optionalString (!withDocumentation) ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(doc)' 'message(WARNING "[Nix] Not building documentation")'
   '';
 
-  strictDeps = true;
+  strictDeps = !withQt6;
 
   nativeBuildInputs = [
     cmake
     gettext
     pkg-config
-    qttools # qdoc
     wrapQtAppsHook
+  ]
+  ++ lib.optionals withDocumentation [
+    qttools # qdoc
   ];
 
   buildInputs = [
@@ -79,9 +90,20 @@ stdenv.mkDerivation (finalAttrs: {
     lomiri-content-hub
     lomiri-ui-extras
     lomiri-ui-toolkit
+  ]
+  ++ lib.optionals (!withQt6) [
+    # Not ported to Qt6 yet, explicitly disabled in the Qt6 build
+    # https://gitlab.com/ubports/development/core/morph-browser/-/blob/4f20c943e78694818d1b80b5563bd89901230e75/src/app/browserapplication.cpp#L196
     qqc2-suru-style
+
+    # Folded into qtdeclarative in Qt6
     qtquickcontrols2
+
+    # Will prolly want this in the future, but needs porting to Qt6
     qtsystems
+  ]
+  ++ lib.optionals withQt6 [
+    qt5compat
   ];
 
   nativeCheckInputs = [
@@ -92,11 +114,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "CLICK_MODE" false)
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
-    (lib.cmakeBool "WERROR" true)
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
+    (lib.cmakeBool "WERROR" (!withQt6)) # Porting WIP
   ];
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  doCheck =
+    stdenv.buildPlatform.canExecute stdenv.hostPlatform
+    # Hard dependency on Qt5 still
+    && (!withQt6);
 
   disabledTests = [
     # Don't care about linter failures
@@ -115,6 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
           lomiri-ui-toolkit
           qtwebengine
           qtdeclarative
+        ]
+        ++ lib.optionals (!withQt6) [
           qtquickcontrols2
           qtsystems
         ]
@@ -132,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { };
-    tests = {
+    tests = lib.optionalAttrs (!withQt6) {
       # Test of morph-browser itself
       standalone = nixosTests.morph-browser;
 
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 97614c9f68d5..032c15476d72 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -16,6 +16,12 @@ let
       inherit (self) callPackage;
     in
     {
+      #### Core Apps
+      morph-browser = callPackage ./applications/morph-browser {
+        # get_target_property() called with non-existent target "Qt6::qdoc".
+        withDocumentation = !useQt6;
+      };
+
       #### Data
       lomiri-schemas = callPackage ./data/lomiri-schemas { };
       lomiri-sounds = callPackage ./data/lomiri-sounds { };
@@ -62,7 +68,6 @@ let
       lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };
       lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { };
       lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { };
-      morph-browser = callPackage ./applications/morph-browser { };
       teleports = callPackage ./applications/teleports { };
 
       #### Data

From 6ed37bcdd3e4b2f86a9e4f7d39826eb97e4e677b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 7 Mar 2026 18:15:53 +0100
Subject: [PATCH 077/238] nixosTests.morph-browser: Turn into attrset of Qt5 &
 Qt6 variant tests

---
 nixos/tests/all-tests.nix                     |   2 +-
 nixos/tests/morph-browser.nix                 | 119 ++++++++++--------
 .../applications/morph-browser/default.nix    |   7 +-
 3 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 638afcb5f721..3e475b242b9a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -992,7 +992,7 @@ in
   moonraker = runTest ./moonraker.nix;
   moosefs = runTest ./moosefs.nix;
   mopidy = runTest ./mopidy.nix;
-  morph-browser = runTest ./morph-browser.nix;
+  morph-browser = discoverTests (import ./morph-browser.nix);
   mosquitto = runTest ./mosquitto.nix;
   movim = import ./web-apps/movim {
     inherit runTest;
diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix
index 04857ceeeb10..03d338e96817 100644
--- a/nixos/tests/morph-browser.nix
+++ b/nixos/tests/morph-browser.nix
@@ -1,64 +1,81 @@
-{ pkgs, lib, ... }:
-{
-  name = "morph-browser-standalone";
-  meta.maintainers = lib.teams.lomiri.members;
-
-  nodes.machine =
-    { config, pkgs, ... }:
+let
+  makeTest = import ./make-test-python.nix;
+  generic =
     {
-      imports = [
-        ./common/x11.nix
-      ];
+      withQt6,
+    }:
+    makeTest (
+      { pkgs, lib, ... }:
+      {
+        name = "morph-browser-${if withQt6 then "qt6" else "qt5"}-standalone";
+        meta.maintainers = lib.teams.lomiri.members;
 
-      services.xserver.enable = true;
+        nodes.machine =
+          {
+            config,
+            pkgs,
+            ...
+          }:
+          {
+            imports = [
+              ./common/x11.nix
+            ];
 
-      environment = {
-        systemPackages = with pkgs.lomiri; [
-          suru-icon-theme
-          morph-browser
-        ];
-        variables = {
-          UITK_ICON_THEME = "suru";
-        };
-      };
+            services.xserver.enable = true;
 
-      i18n.supportedLocales = [ "all" ];
+            environment = {
+              systemPackages = with (if withQt6 then pkgs.lomiri-qt6 else pkgs.lomiri); [
+                suru-icon-theme
+                morph-browser
+              ];
+              variables = {
+                UITK_ICON_THEME = "suru";
+              };
+            };
 
-      fonts.packages = with pkgs; [
-        # Intended font & helps with OCR
-        ubuntu-classic
-      ];
-    };
+            i18n.supportedLocales = [ "all" ];
 
-  enableOCR = true;
+            fonts.packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
 
-  testScript = ''
-    machine.wait_for_x()
+        enableOCR = true;
 
-    with subtest("morph browser launches"):
-        machine.succeed("morph-browser >&2 &")
-        machine.sleep(10)
-        machine.send_key("alt-f10")
-        machine.sleep(5)
-        machine.wait_for_text(r"Web Browser|New|sites|Bookmarks")
-        machine.screenshot("morph_open")
+        testScript = ''
+          machine.wait_for_x()
 
-    with subtest("morph browser displays HTML"):
-        machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n")
-        machine.wait_for_text("Valgrind Documentation")
-        machine.screenshot("morph_htmlcontent")
+          with subtest("morph browser launches"):
+              machine.succeed("morph-browser >&2 &")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text(r"Web Browser|New|sites|Bookmarks")
+              machine.screenshot("morph_open")
 
-    machine.succeed("pkill -f morph-browser")
+          with subtest("morph browser displays HTML"):
+              machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n")
+              machine.wait_for_text("Valgrind Documentation")
+              machine.screenshot("morph_htmlcontent")
 
-    # Get rid of saved tabs, to show localised start page
-    machine.succeed("rm -r /root/.local/share/morph-browser")
+          machine.succeed("pkill -f morph-browser")
 
-    with subtest("morph browser localisation works"):
-        machine.succeed("env LANG=de_DE.UTF-8 morph-browser >&2 &")
-        machine.sleep(10)
-        machine.send_key("alt-f10")
-        machine.sleep(5)
-        machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen")
-        machine.screenshot("morph_localised")
-  '';
+          # Get rid of saved tabs, to show localised start page
+          machine.succeed("rm -r /root/.local/share/morph-browser")
+
+          with subtest("morph browser localisation works"):
+              machine.succeed("env LANG=de_DE.UTF-8 morph-browser >&2 &")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen")
+              machine.screenshot("morph_localised")
+        '';
+      }
+    );
+in
+{
+  qt5 = generic { withQt6 = false; };
+  qt6 = generic { withQt6 = true; };
 }
diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index f09374ba3f96..8653a7f99ef5 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -159,10 +159,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { };
-    tests = lib.optionalAttrs (!withQt6) {
+    tests = {
       # Test of morph-browser itself
-      standalone = nixosTests.morph-browser;
-
+      standalone = if withQt6 then nixosTests.morph-browser.qt6 else nixosTests.morph-browser.qt5;
+    }
+    // lib.optionalAttrs (!withQt6) {
       # Interactions between the Lomiri ecosystem and this browser
       inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;
     };

From 8d4eb711842a430feabacc1712c06950cf182929 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Mar 2026 18:25:37 +0100
Subject: [PATCH 078/238] nixos/lomiri: Add Qt6 Morph Browser

---
 nixos/modules/services/desktop-managers/lomiri.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 1f40afb3732a..a05923fd82b5 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -99,6 +99,10 @@ in
             libayatana-common
             ubports-click
           ])
+          # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067
+          ++ (with pkgs.lomiri-qt6; [
+            morph-browser
+          ])
           ++ (with pkgs.lomiri; [
             hfd-service
             libusermetrics
@@ -125,10 +129,6 @@ in
             lomiri-thumbnailer
             lomiri-url-dispatcher
             mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
-            # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067
-            # morph-browser
-            # Adding another browser that is known-working until Morph Browser can migrate to Qt6
-            pkgs.epiphany
             qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
             teleports
           ]);

From 7f002233edf4340f6a0a70342e96d6d9ee8471d2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Mar 2026 20:00:34 +0100
Subject: [PATCH 079/238] nixosTests.lomiri.desktop-basics: Re-enable Morph
 check

---
 nixos/tests/lomiri.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index b548288c62c6..8d1f7ddb6bf6 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -507,16 +507,15 @@ in
               machine.send_key("alt-f4")
 
           # Morph is how we go online
-          # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067
-          # with subtest("morph browser works"):
-          #     open_starter()
-          #     machine.send_chars("Morph\n")
-          #     wait_for_text(r"(Bookmarks|address|site|visited any)")
-          #     machine.screenshot("morph_open")
-          #
-          #     # morph-browser has a separate VM test to test its basic functionalities
-          #
-          #     machine.send_key("alt-f4")
+          with subtest("morph browser works"):
+              open_starter()
+              machine.send_chars("Morph\n")
+              wait_for_text(r"(Bookmarks|address|site|visited any)")
+              machine.screenshot("morph_open")
+
+              # morph-browser has a separate VM test to test its basic functionalities
+
+              machine.send_key("alt-f4")
 
           # LSS provides DE settings
           with subtest("system settings open"):

From 5dee41c88be93700d08881df1b342f65a1c94826 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 24 Mar 2026 19:20:33 +0100
Subject: [PATCH 080/238] nixosTests.lomiri.desktop-appinteractions: Adjust to
 re-enabled Morph

Gallery entry is somewhere else now.
---
 nixos/tests/lomiri.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 8d1f7ddb6bf6..68254fbeeb35 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -688,7 +688,7 @@ in
               machine.screenshot("settings_lomiri-content-hub_peers")
 
               # Select Gallery as content source
-              mouse_click(460, 80)
+              mouse_click(540, 80)
 
               # Expect Gallery to be brought into the foreground, with its sharing page open
               wait_for_text("Photos")

From a0a61ccf8c2d5f51f5ea3b2dcbbb902a58e8fd51 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 26 Mar 2026 21:55:33 +0100
Subject: [PATCH 081/238] {lomiri,lomiri-qt6}.morph-browser: Flip VM tests to
 being Qt6-specific

The tests now use the Qt6 build, so flip the condition here.
---
 pkgs/desktops/lomiri/applications/morph-browser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index 8653a7f99ef5..4e5b38564e40 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
       # Test of morph-browser itself
       standalone = if withQt6 then nixosTests.morph-browser.qt6 else nixosTests.morph-browser.qt5;
     }
-    // lib.optionalAttrs (!withQt6) {
+    // lib.optionalAttrs withQt6 {
       # Interactions between the Lomiri ecosystem and this browser
       inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;
     };

From 4a456d9796ff06ce8bf72f2c68400fa913655750 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 24 Mar 2026 19:39:54 +0100
Subject: [PATCH 082/238] lomiri-qt6.biometryd: init at 0.4.0

---
 pkgs/desktops/lomiri/default.nix                  |  2 +-
 .../lomiri/services/biometryd/default.nix         | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 032c15476d72..2b2d4cd6a6ea 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -44,6 +44,7 @@ let
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
 
       #### Services
+      biometryd = callPackage ./services/biometryd { };
       lomiri-content-hub = callPackage ./services/lomiri-content-hub {
         # Check for working qdoc: not found
         withDocumentation = !useQt6;
@@ -88,7 +89,6 @@ let
       qqc2-suru-style = callPackage ./qml/qqc2-suru-style { };
 
       #### Services
-      biometryd = callPackage ./services/biometryd { };
       hfd-service = callPackage ./services/hfd-service { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix
index 40fcd228444e..cff11cdafc6d 100644
--- a/pkgs/desktops/lomiri/services/biometryd/default.nix
+++ b/pkgs/desktops/lomiri/services/biometryd/default.nix
@@ -23,6 +23,11 @@
   validatePkgConfig,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+  listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
+  qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [ qtdeclarative ];
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "biometryd";
   version = "0.4.0";
@@ -60,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace data/biometryd.pc.in \
       --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
       --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' \
+
+    # Suffix our QML2_IMPORT_PATH
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail \
+        'QML2_IMPORT_PATH=''${CMAKE_BINARY_DIR}/src/biometry/qml;' \
+        'QML2_IMPORT_PATH=''${CMAKE_BINARY_DIR}/src/biometry/qml:${qtQmlPaths};'
   ''
   + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
     sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
@@ -96,14 +107,14 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_WERROR" true)
     (lib.cmakeBool "WITH_HYBRIS" false)
   ];
 
   preBuild = ''
     # Generating plugins.qmltypes (also used in checkPhase?)
-    export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]}
   '';
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

From 061f89bb5fc0bae38c59b581456bbd2c8eb1b3b4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 27 Mar 2026 14:38:44 +0100
Subject: [PATCH 083/238] lomiri-qt6.lomiri-url-dispatcher: init at 0.1.4

---
 pkgs/desktops/lomiri/default.nix                   |  2 +-
 .../services/lomiri-url-dispatcher/default.nix     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 2b2d4cd6a6ea..f008c66c4332 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -53,6 +53,7 @@ let
         # Check for working qdoc: not found
         withDocumentation = !useQt6;
       };
+      lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -96,7 +97,6 @@ let
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
       lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
       lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
-      lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
       mediascanner2 = callPackage ./services/mediascanner2 { };
     };
 in
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index d28de698e310..d9a7435ec4ee 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -28,6 +28,9 @@
   wrapQtAppsHook,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-url-dispatcher";
   version = "0.1.4";
@@ -93,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     libapparmor
     lomiri-app-launch
     lomiri-ui-toolkit
-    qtdeclarative
     sqlite
     systemd
     libxkbcommon
@@ -128,13 +130,19 @@ stdenv.mkDerivation (finalAttrs: {
 
     wrapProgram $out/bin/lomiri-url-dispatcher-dump \
       --prefix PATH : ${lib.makeBinPath [ sqlite ]}
-
+  ''
+  # https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/work_items/13
+  + lib.optionalString withQt6 ''
+    rm $out/bin/lomiri-url-dispatcher-gui
+    rm -r $out/share/lomiri-url-dispatcher/gui
+  ''
+  + lib.optionalString (!withQt6) ''
     mkdir -p $out/share/icons/hicolor/scalable/apps
     ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/
 
     # Calls qmlscene from PATH, needs Qt plugins & QML components
     qtWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]}
+      --prefix PATH : ${lib.makeBinPath [ (if withQt6 then qtdeclarative.out else qtdeclarative.dev) ]}
     )
     wrapQtApp $out/bin/lomiri-url-dispatcher-gui
   '';

From b5e4eb8319e80e323008db992586562186795b30 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 27 Mar 2026 14:56:07 +0100
Subject: [PATCH 084/238] lomiri-qt6.lomiri-indicator-network: init at 1.2.0

Lacking the actual indicator so far, just the connectivity API. Still needed for other packages though.
---
 pkgs/desktops/lomiri/default.nix              |  2 +-
 .../lomiri-indicator-network/default.nix      | 62 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index f008c66c4332..a4872027f911 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -53,6 +53,7 @@ let
         # Check for working qdoc: not found
         withDocumentation = !useQt6;
       };
+      lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
     }
     // lib.optionalAttrs (!useQt6) {
@@ -93,7 +94,6 @@ let
       hfd-service = callPackage ./services/hfd-service { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
-      lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
       lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
       lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
index 60dd87c0753a..0c1a030d237b 100644
--- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
@@ -12,11 +12,11 @@
   doxygen,
   gettext,
   glib,
-  gmenuharness,
+  gmenuharness ? null, # not ported to Qt6 yet
   gtest,
   intltool,
   libsecret,
-  libqofono,
+  libqofono ? null, # not ported to Qt6 yet
   libqtdbusmock,
   libqtdbustest,
   lomiri-api,
@@ -25,12 +25,15 @@
   ofono,
   pkg-config,
   python3,
-  qtdeclarative,
   qtbase,
+  qtdeclarative,
   qttools,
   validatePkgConfig,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-indicator-network";
   version = "1.2.0";
@@ -45,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out"
     "dev"
+  ]
+  ++ lib.optionals (!withQt6) [
     "doc"
   ];
 
@@ -59,26 +64,33 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    doxygen
     gettext
-    intltool
     pkg-config
     qtdeclarative
-    qttools # qdoc
     validatePkgConfig
+  ]
+  ++ lib.optionals (!withQt6) [
+    doxygen
+    intltool
+    qttools # qdoc
   ];
 
   buildInputs = [
     cmake-extras
+    lomiri-api
+    qtbase
+  ]
+  ++ lib.optionals withQt6 [
+    qtdeclarative
+  ]
+  ++ lib.optionals (!withQt6) [
     dbus
     glib
     libqofono
     libsecret
-    lomiri-api
     lomiri-url-dispatcher
     networkmanager
     ofono
-    qtbase
   ];
 
   nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ];
@@ -93,37 +105,45 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_DOC" true)
-    (lib.cmakeBool "BUILD_LIBCONNECTIVITY_ONLY" false)
+    (lib.cmakeBool "BUILD_DOC" (!withQt6))
+    # Indicator is not ported to Qt6 yet
+    (lib.cmakeBool "BUILD_LIBCONNECTIVITY_ONLY" withQt6)
     (lib.cmakeBool "ENABLE_COVERAGE" false)
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!lib.strings.versionAtLeast qtbase.version "6"))
-    (lib.cmakeBool "GSETTINGS_COMPILE" true)
-    (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
-    (lib.cmakeBool "USE_SYSTEMD" true)
+    (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!withQt6))
+    (lib.cmakeBool "GSETTINGS_COMPILE" (!withQt6))
+    (lib.cmakeBool "GSETTINGS_LOCALINSTALL" (!withQt6))
+    (lib.cmakeBool "USE_SYSTEMD" (!withQt6))
   ];
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  doCheck =
+    stdenv.buildPlatform.canExecute stdenv.hostPlatform
+    # Indicator is not ported to Qt6 yet, tests only cover indicator
+    && !withQt6;
 
   # Multiple tests spin up & speak to D-Bus, avoid cross-talk causing failures
   enableParallelChecking = false;
 
-  postInstall = ''
+  postInstall = lib.optionalString (!withQt6) ''
     substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \
       --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}'
   '';
 
   passthru = {
-    ayatana-indicators = {
-      lomiri-indicator-network = [ "lomiri" ];
-    };
     tests = {
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    }
+    // lib.optionalAttrs (!withQt6) {
       startup = nixosTests.ayatana-indicators;
       lomiri = nixosTests.lomiri.desktop-ayatana-indicator-network;
     };
     updateScript = gitUpdater { };
+  }
+  // lib.optionalAttrs (!withQt6) {
+    ayatana-indicators = {
+      lomiri-indicator-network = [ "lomiri" ];
+    };
   };
 
   meta = {
@@ -135,6 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
-    pkgConfigModules = [ "lomiri-connectivity-qt1" ];
+    pkgConfigModules = [ "lomiri-connectivity-qt${if withQt6 then "6" else "1"}" ];
   };
 })

From 1539da8e5a06ad26a47e44adb6129b63a382aad1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 14:52:04 +0000
Subject: [PATCH 085/238] crowdsec: 1.7.6 -> 1.7.7

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

diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index 82615f81051b..3289a53dbc82 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crowdsec";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = "crowdsec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qd5EHn7G7bTV+S4bVXfHytoCI5L/gHxAKB9emeKoSLc=";
+    hash = "sha256-TG9YRKzht9OAnlDNxLNP8060v0klee6GY7vJCu6MugM=";
   };
 
-  vendorHash = "sha256-txiZmUd/GQQu7XiI4iE25aCmOLe2sC0uQ8Gne76cw+Q=";
+  vendorHash = "sha256-BjkTMBrQPv8uZzme02WFdobuYdbe1RvRkZ8RjHGubo8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6bff80746993f8806faa96a5226103f7f6c01733 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Mon, 30 Mar 2026 16:32:51 +0100
Subject: [PATCH 086/238] listenbrainz-mpd: 2.3.9 -> 2.5.1

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

diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index d2eca95e2eb8..2351a7809ae6 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "listenbrainz-mpd";
-  version = "2.3.9";
+  version = "2.5.1";
 
   src = fetchFromCodeberg {
     owner = "elomatreb";
     repo = "listenbrainz-mpd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-j9MlvE2upocwC5xxroms3am6tqJX30sSw7PFNw8Ofog=";
+    hash = "sha256-087+l3calge6hKu3h84C98mIpW6qFAZwRMe4lkQCU4o=";
   };
 
-  cargoHash = "sha256-1x3F2TqNlqwfPUvLwU8ac4aEeEwpIy5gEyxRBC0Q5YM=";
+  cargoHash = "sha256-SxXEathWAGqdgeJmIn5h9Zvv7Z3DGXa4htkODf/ANRQ=";
 
   nativeBuildInputs = [
     pkg-config

From 5dcf2249ad7c6ca80b2fc3e8c35b62cfc6609e48 Mon Sep 17 00:00:00 2001
From: David Isaksson <davidisaksson93@gmail.com>
Date: Sun, 16 Nov 2025 19:16:35 +0100
Subject: [PATCH 087/238] maintainers: add Granddave

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2cd35cd6768b..1211f9e16168 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9981,6 +9981,12 @@
     githubId = 66037909;
     name = "Graham J. Norris";
   };
+  granddave = {
+    email = "davidisaksson93@gmail.com";
+    github = "Granddave";
+    githubId = 13297896;
+    name = "David Isaksson";
+  };
   gravndal = {
     email = "gaute.ravndal+nixos@gmail.com";
     github = "gravndal";

From 83ccb95b820179a891ac11e6c40672231cb97e4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 15:49:00 +0000
Subject: [PATCH 088/238] cockpit-machines: 349.1 -> 351

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

diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix
index 403b5af808c4..579061932ba3 100644
--- a/pkgs/by-name/co/cockpit-machines/package.nix
+++ b/pkgs/by-name/co/cockpit-machines/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-machines";
-  version = "349.1";
+  version = "351";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-machines";
     tag = finalAttrs.version;
-    hash = "sha256-SJ8osQKbzK/4mioqYbBf2t/2Me1an2Ex1SaGiVilNng=";
+    hash = "sha256-zZ1R6DE7Y+kKnYQFIDGLdwn7ELq4kIvGvtQXaSxxdKI=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From c3d9c16d0522c307c5a49918cf6276dbf30b6c63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 15:49:30 +0000
Subject: [PATCH 089/238] cockpit-files: 37 -> 39

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

diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix
index 5cb5ce0bc2b4..24a424fc3d4e 100644
--- a/pkgs/by-name/co/cockpit-files/package.nix
+++ b/pkgs/by-name/co/cockpit-files/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-files";
-  version = "37";
+  version = "39";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-files";
     tag = finalAttrs.version;
-    hash = "sha256-C3NKdMqy9sL0nSZ+XNODYrNS0KrQsfPG85ZqaEto0Rc=";
+    hash = "sha256-RoAlZ3PIJHdF2kBnrBnbJqnwl7/C7po7pvI3xmsRFQc=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From 2ad52c4f14172f98b077fb4a10c5554d176eef93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 15:50:12 +0000
Subject: [PATCH 090/238] cockpit-podman: 122 -> 124

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

diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix
index 4d307716ef70..2b2630de8f5c 100644
--- a/pkgs/by-name/co/cockpit-podman/package.nix
+++ b/pkgs/by-name/co/cockpit-podman/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-podman";
-  version = "122";
+  version = "124";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-podman";
     tag = finalAttrs.version;
-    hash = "sha256-NQFWlapbHOrzr5U6KDUIUPJPcCxfEk1VGVm4ChCHcpI=";
+    hash = "sha256-20dGvEJraTxJlj5Z9HbPWtWN96XPVwbCkHGzX4uiDmk=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From 6ab57d621e61f64fa2c863af3078f7ab4f086be5 Mon Sep 17 00:00:00 2001
From: David Isaksson <davidisaksson93@gmail.com>
Date: Sun, 16 Nov 2025 19:16:48 +0100
Subject: [PATCH 091/238] aegis-rs: init at 0.5.0

---
 pkgs/by-name/ae/aegis-rs/package.nix | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/ae/aegis-rs/package.nix

diff --git a/pkgs/by-name/ae/aegis-rs/package.nix b/pkgs/by-name/ae/aegis-rs/package.nix
new file mode 100644
index 000000000000..353dad556495
--- /dev/null
+++ b/pkgs/by-name/ae/aegis-rs/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "aegis-rs";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "Granddave";
+    repo = "aegis-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-V6b9CDLjpyRb/MlbAswQ2kJFGeYDu9r2Y/8lBB+kLGc=";
+  };
+  cargoHash = "sha256-QYTmTJiwqslFM1VT+B+HtA8idvhKOPY4+ip/FqQGZ34=";
+
+  passthru.updateScript = nix-update-script { };
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Aegis compatible OTP generator for the CLI";
+    homepage = "https://github.com/Granddave/aegis-rs";
+    changelog = "https://github.com/Granddave/aegis-rs/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ granddave ];
+    mainProgram = "aegis-rs";
+  };
+})

From 541f88cb717d7b1915e83ba0f6e949cc43542063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 09:40:59 -0700
Subject: [PATCH 092/238] python3Packages.habiticalib: 0.4.6 -> 0.4.7

Diff: https://github.com/tr4nt0r/habiticalib/compare/v0.4.6...v0.4.7

Changelog: https://github.com/tr4nt0r/habiticalib/releases/tag/v0.4.7
---
 .../python-modules/habiticalib/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix
index f4093c11ac3a..38ec61bf89f1 100644
--- a/pkgs/development/python-modules/habiticalib/default.nix
+++ b/pkgs/development/python-modules/habiticalib/default.nix
@@ -4,7 +4,6 @@
   aioresponses,
   buildPythonPackage,
   fetchFromGitHub,
-  habitipy,
   hatch-regex-commit,
   hatchling,
   mashumaro,
@@ -19,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "habiticalib";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -28,7 +27,7 @@ buildPythonPackage rec {
     owner = "tr4nt0r";
     repo = "habiticalib";
     tag = "v${version}";
-    hash = "sha256-Z3VJ0AaB4HeCOffV5B2WFIvGJXoCn1isNPMnERoUrp0=";
+    hash = "sha256-ZZY7UnA4d4JNHGLMtaEGobAgzAwYDgL2SUGfxGABxTs=";
   };
 
   build-system = [
@@ -36,9 +35,12 @@ buildPythonPackage rec {
     hatchling
   ];
 
+  pythonRelaxDeps = [
+    "orjson"
+  ];
+
   dependencies = [
     aiohttp
-    habitipy
     mashumaro
     orjson
     pillow
@@ -52,8 +54,6 @@ buildPythonPackage rec {
     syrupy
   ];
 
-  pytestFlags = [ "--snapshot-update" ];
-
   pythonImportsCheck = [ "habiticalib" ];
 
   disabledTests = [

From 6637cb8e5a3b9ce7c145112f8a528c35805fe26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 09:46:06 -0700
Subject: [PATCH 093/238] python3Packages.pydrawise: 2025.9.0 -> 2026.3.0

Diff: https://github.com/dknowles2/pydrawise/compare/2025.9.0...2026.3.0

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

diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix
index 06de33708cb2..04623dcd79a7 100644
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pydrawise";
-  version = "2025.9.0";
+  version = "2026.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dknowles2";
     repo = "pydrawise";
     tag = version;
-    hash = "sha256-eHy3pdzgN5CvKfsoa5ZdT9lor4AiZr8K1g/8qyzP3eo=";
+    hash = "sha256-h91J8gcc5qiBCYvOeFhSDtvdMKfuWUTys6uw5wmLehI=";
   };
 
   build-system = [

From d73d2bd74e9becc162007be90be5ecbadb5b8621 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 18:08:51 +0000
Subject: [PATCH 094/238] python3Packages.mcstatus: 12.2.1 -> 13.0.1

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

diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index ec76fdc9e934..1eeb2ea73ccc 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mcstatus";
-  version = "12.2.1";
+  version = "13.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = "mcstatus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-twgFGeJfeKZSWbBui/zmtF/7aZ5Kw8k1K81Bj3Nm2ZY=";
+    hash = "sha256-Btnv5caqZXh7aLGHH7WBduX4CJ+OhcCKgvD0uLC0mPg=";
   };
 
   build-system = [

From 5dfbe3ff1f97ed76faaa32d8fd11a01b0148a363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 11:14:10 -0700
Subject: [PATCH 095/238] libdeltachat: 2.47.0 -> 2.48.0

Diff: https://github.com/chatmail/core/compare/v2.47.0...v2.48.0

Changelog: https://github.com/chatmail/core/blob/v2.48.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 8d6b8d14e1a7..46fc20e3b867 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeltachat";
-  version = "2.47.0";
+  version = "2.48.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EF86Jl6rP46UMlWCPJ607akWZYDictH6vGptAuSc6NQ=";
+    hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-slzAUiOmCsUv9yGhFMeEyZ6+kmPNUOsiwZXiF0j+Roc=";
+    hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38=";
   };
 
   nativeBuildInputs = [

From b84fba128b85d8f8f157f272ad448b095329d34f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 18:45:34 +0000
Subject: [PATCH 096/238] trillian: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index 0d6ff5e3bd22..eba2bd270803 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "trillian";
-  version = "1.7.2";
-  vendorHash = "sha256-5SG9CVugHIkDcpjGuZb5wekYzCj5fKyC/YxzmeptkR4=";
+  version = "1.7.3";
+  vendorHash = "sha256-PomzPYtLEDx0mjTTidfp9dlvnW4mcVIka5AekPNYU2g=";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "trillian";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-DFSG67MMpGzTlvQlW9DttLqqDkS8d8wMkeOlLQuElxU=";
+    sha256 = "sha256-QOR98Xpf2iwGpqzEuB58gMsbYITiksMX4JmfqiKjeVw=";
   };
 
   subPackages = [

From 5acc9572d1da1c6d6d888d2118cd32153393cd3f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 30 Mar 2026 14:48:10 -0400
Subject: [PATCH 097/238] elephant: 2.20.2 -> 2.20.3

Changelog: https://github.com/abenz1267/elephant/releases/tag/v2.20.3
---
 pkgs/by-name/el/elephant/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix
index aad099a93348..1629406617d5 100644
--- a/pkgs/by-name/el/elephant/package.nix
+++ b/pkgs/by-name/el/elephant/package.nix
@@ -74,16 +74,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "elephant";
-  version = "2.20.2";
+  version = "2.20.3";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "elephant";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=";
+    hash = "sha256-5PLTPbnbtK0iDbsB9yFeHr5y/pv6/XzoVm/CDeXXt/c=";
   };
 
-  vendorHash = "sha256-tO+5x2FIY1UBvWl9x3ZSpHwTWUlw1VNDTi9+2uY7xdU=";
+  vendorHash = "sha256-EWXZ+9/QDRpidpVHBcfJgp0xoc3YtRsiC/UTk1R+FSY=";
 
   buildInputs = [ protobuf ];
   nativeBuildInputs = [

From ae298616dbee6a532ee3086e47410f390f88a568 Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Mon, 30 Mar 2026 21:14:38 +0200
Subject: [PATCH 098/238] prosody: bump community modules to ce716e5e0fee

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

diff --git a/pkgs/by-name/pr/prosody/package.nix b/pkgs/by-name/pr/prosody/package.nix
index 6132bb9f901e..a84c062d03ec 100644
--- a/pkgs/by-name/pr/prosody/package.nix
+++ b/pkgs/by-name/pr/prosody/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   # version.
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "83355cfcad1d";
-    hash = "sha256-v8o2FMUY2dQEQ+G81Ec4RJ7J5Mz5CkXc4iabAAb13L4=";
+    rev = "ce716e5e0fee";
+    hash = "sha256-jjsHL9+lLwhFXO61h6SmQjwEdRJQ/zKgc1PDnH+wHxs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 674faa5faac7926a3c60ce7936e4b556f67e3f26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 19:39:06 +0000
Subject: [PATCH 099/238] lightwalletd: 0.4.18 -> 0.4.19

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

diff --git a/pkgs/by-name/li/lightwalletd/package.nix b/pkgs/by-name/li/lightwalletd/package.nix
index 4f74a5b774ac..ef642d238272 100644
--- a/pkgs/by-name/li/lightwalletd/package.nix
+++ b/pkgs/by-name/li/lightwalletd/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "lightwalletd";
-  version = "0.4.18";
+  version = "0.4.19";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "lightwalletd";
     rev = "v${version}";
-    hash = "sha256-YmSQjfqwTZC3NkPH6k7gwHcaYRURive5rc0MVOKWCi8=";
+    hash = "sha256-93zR2rVRrV09rflfJbT3JMYmqyx0Lp0Acbs2ohhUL8Y=";
   };
 
-  vendorHash = "sha256-jAsX+BhVYbD/joCMT2vdDdRLqZOG9AfXmbRPJcJcQEw=";
+  vendorHash = "sha256-bV1nJ1HUpYdziV42/ug3X+/jAdw3Wq7MdcnX327MD/w=";
 
   ldflags = [
     "-s"

From 20abda145916d37b2f4357201ea3c04699a9b0fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 20:11:49 +0000
Subject: [PATCH 100/238] greenmask: 0.2.17 -> 0.2.18

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

diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index 5c33ad6cee71..5a8d3abae55d 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "greenmask";
-  version = "0.2.17";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pH+e+CXC18jpAq/xLV5CE0BicxgPtLF7kBgUusebWDg=";
+    hash = "sha256-ZFlfX6JgJOaq+8OxSzhulRTkKabGoNsnBxFVpg81RDs=";
   };
 
-  vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek=";
+  vendorHash = "sha256-SB71/Tf9Bw8AlTYGXOaRR8sdiwx8l9wQba93p6vAbAk=";
 
   subPackages = [ "cmd/greenmask/" ];
 

From 6ff39583d67caa013371b260278edf64b9273f3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 20:45:24 +0000
Subject: [PATCH 101/238] phel: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 9d25f9bd8942..432092723df9 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OnqGEK0f8CCzHdl3NPkKheM9FslGU/cVWEX6V4225dQ=";
+    hash = "sha256-qDZNfhBPRWYuL4+SCNTsS/zFwd4Hp8SgyF1+ANkqAA8=";
   };
 
-  vendorHash = "sha256-X0lLTEFsRXFx7ZXNdSsGL7Hiszlu6V3AWqNsyt6W32U=";
+  vendorHash = "sha256-/sG8h6Kk6tPkgNkyPytjFVavbochSllAkMQ40oSTdtA=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 134fc2b7ad1d6c3ce134e1bde498a2e20c4bbb0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 20:53:38 +0000
Subject: [PATCH 102/238] deadbranch: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/by-name/de/deadbranch/package.nix b/pkgs/by-name/de/deadbranch/package.nix
index c377eb337e93..6fb65f0445cb 100644
--- a/pkgs/by-name/de/deadbranch/package.nix
+++ b/pkgs/by-name/de/deadbranch/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deadbranch";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "armgabrielyan";
     repo = "deadbranch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8KNo/6hdeBY8RbLlXt2gpLCk2DfvSuoeXJ0oh2NDX2s=";
+    hash = "sha256-ub06sn3CUlbU9LkDCbZJmoZ7CQef97HeXhRdW6ESw1U=";
   };
 
-  cargoHash = "sha256-iY39RBA0fl/BpX6mlCH2bHuN+XsLdq4f7CTzjHz9Ots=";
+  cargoHash = "sha256-9AhTTvSv0HGQxglifmcEU0ApZuCIng7gFgfCMQLXpLo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a249e403984ad2b99f49ec4321e5de2371e80b6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:04:49 +0000
Subject: [PATCH 103/238] circleci-cli: 0.1.34770 -> 0.1.34950

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

diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index df8b17f1c26a..fc3a77e54a9a 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "circleci-cli";
-  version = "0.1.34770";
+  version = "0.1.34950";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = "circleci-cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-UTlwpAraM7Q4pEtB3i8h0uDpGG64wYm+2a+47q7R7UA=";
+    sha256 = "sha256-WUfmOTVuSh/y+Tg36eJWo0AAZwpudIqte3LUZlczkVQ=";
   };
 
   vendorHash = "sha256-GRWo9oq8M7zJoWCg6iNLbR+DPXvMXF3v+YRU2BBH5+8=";

From 8d20b5c5d5b13610bf779dc7a0a0e1dad13c35b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:10:56 +0000
Subject: [PATCH 104/238] actionlint: 1.7.11 -> 1.7.12

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

diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix
index 949a1915166e..06008b257a97 100644
--- a/pkgs/by-name/ac/actionlint/package.nix
+++ b/pkgs/by-name/ac/actionlint/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "actionlint";
-  version = "1.7.11";
+  version = "1.7.12";
 
   subPackages = [ "cmd/actionlint" ];
 
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     owner = "rhysd";
     repo = "actionlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oBl+9vHynm6I3I4sF2ZyszogOxKh5kiDsdHwgWjVhVI=";
+    hash = "sha256-mACSb3sYQtkijzk10mPi2ndy3zakonW1jlU7D/DV+SM=";
   };
 
-  vendorHash = "sha256-cUeGRwPiqeO3BGjWbbD5YtGC/B4v00/hKu09uDETMm8=";
+  vendorHash = "sha256-bPhjeC6xcemV4KZx+Kc/Wbdz6Be6WsiolFTrJ7TURA0=";
 
   nativeBuildInputs = [
     makeWrapper

From f04e9e47e99c22734a0bbe4bb0be4efaf11b6a84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:11:35 +0000
Subject: [PATCH 105/238] b3sum: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix
index 3d56435dfd86..7cad907eabd7 100644
--- a/pkgs/by-name/b3/b3sum/package.nix
+++ b/pkgs/by-name/b3/b3sum/package.nix
@@ -7,14 +7,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "b3sum";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchCrate {
     inherit (finalAttrs) version pname;
-    hash = "sha256-mU2r5xbYf6A1RibWqhow/637YxybCFMT3UzYcUMjhdg=";
+    hash = "sha256-xqR2BPtuAhsVvLY2DXfmgRF3tLix+H8lcD9GSZh9pUg=";
   };
 
-  cargoHash = "sha256-w9l8dn4Ahck3NXuN4Ph9qmGoS767/mQRBgO9AT0CH3Y=";
+  cargoHash = "sha256-h/M9SOyl9Dj9QNvKyxtg0L0mNYBhH7Q4Yke5n20SSSs=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From ed99d76eadbcc6f7bf1f51e2458c25777179adb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:27:54 +0000
Subject: [PATCH 106/238] wayshot: 1.4.5 -> 1.4.6

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

diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix
index 861453201317..bdb701fd0a9c 100644
--- a/pkgs/by-name/wa/wayshot/package.nix
+++ b/pkgs/by-name/wa/wayshot/package.nix
@@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayshot";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "waycrate";
     repo = "wayshot";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Xw3UN0linKp0jcAYYE0eX7x/bQ97gIQPDCIY9tlEhN4=";
+    hash = "sha256-RaOe00+Dy+zgdEkfF5hJrJ/lSA2vrsZWVoDsTc3uwpw=";
   };
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libGL
     wayland
   ];
-  cargoHash = "sha256-z5cqpC+Yt0PsEj9iab+7buO+OudbtzNYJulEUE10eZY=";
+  cargoHash = "sha256-zuRl0WxS9MyyRsCpbFlVKN+5FasIbfkXutaM3Gmic04=";
 
   passthru.updateScript = nix-update-script { };
 

From dabae94bd3f900f9e582dd56e631e96dab989280 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:32:30 +0000
Subject: [PATCH 107/238] python3Packages.eth-utils: 5.3.1 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 1b3815a5d9f1..de900bd0fe23 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "eth-utils";
-  version = "5.3.1";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-utils";
     tag = "v${version}";
-    hash = "sha256-uyUsX9jX2KumrERrIc6nXloH0G+rQeKzFMwex+Mh3eM=";
+    hash = "sha256-U1RSKaLw/gDg4lMjkTwR/Wfb5wqQctML9CDZBILMBys=";
   };
 
   build-system = [ setuptools ];

From 93564f18f8439a0fa230725863323bb17a6c6214 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 21:59:00 +0000
Subject: [PATCH 108/238] euphonica: 0.99.1-beta -> 0.99.2-beta

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

diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 8a94d84040b9..d784e0bc5c3a 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "euphonica";
-  version = "0.99.1-beta";
+  version = "0.99.2-beta";
 
   src = fetchFromGitHub {
     owner = "htkhiem";
     repo = "euphonica";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7CD7OqQ5/znVSEXVibjoNfi6bTwoUdbsLHlKCAB284Y=";
+    hash = "sha256-AlS3bxoF64AsYwFkMSFR5/LXjTMXww+DNmx9KXJr3FE=";
     fetchSubmodules = true;
   };
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-PaeVFxFzb0qyqMPw2KwhyT2rpJhdotC2ptd5oDNb6xk=";
+    hash = "sha256-f/9C0RDrRLI0E/1ffajT9YxAyh0ZMCqjWni1cQFNxBc=";
   };
 
   mesonBuildType = "release";

From 31cbe253e9aac37db23808132114b625908b2db0 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Mon, 30 Mar 2026 23:48:22 +0200
Subject: [PATCH 109/238] luarocks-packages.csv: fix unsupported comment

it was confusing the lua updater
---
 maintainers/scripts/luarocks-packages.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 7478ab45b9df..76a7469e3ee9 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -65,7 +65,6 @@ lua-resty-jwt,,,,,,
 lua-resty-openidc,,,,,,
 lua-resty-openssl,,,,,,
 lua-resty-session,,,,,,
-# we have to set url because luarocks.org lua-rtoml is squatted by another package
 lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/eb89439070c72ccf05efb8576abae7643abab354/lua-rtoml-0.3-0.rockspec,,,,,lblasc
 lua-subprocess,https://raw.githubusercontent.com/0x0ade/lua-subprocess/master/subprocess-scm-1.rockspec,,,,5.1,scoder12
 lua-term,,,,,,

From 18bee823a48b0dca1de7576b3c47e04cfb3be04b Mon Sep 17 00:00:00 2001
From: Chris Seufert <chris@seufert.id.au>
Date: Mon, 30 Mar 2026 22:25:10 +1100
Subject: [PATCH 110/238] phpstorm: 2025.3.4 -> 2026.1

---
 .../editors/jetbrains/ides/phpstorm.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index a0d8b42686d5..8fc96148791c 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.4.tar.gz";
-      hash = "sha256-rUFOzut21nrAoKq88W8naa61Y/ncA7pn0MO3rGmuBIY=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.tar.gz";
+      hash = "sha256-OpSc/Xg4nWh9XRpVN8FLaV1Gwz8kbM+S9WVk27jJ7gY=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.4-aarch64.tar.gz";
-      hash = "sha256-wjBhibJGItzDKkRtx4tXqM0Kqn4K8HNGdAVMGalm7Fw=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1-aarch64.tar.gz";
+      hash = "sha256-StoSzSx4fxeeB+PnZB5PCEzPJuWCa+HeY9u6hGGlUHg=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.4.dmg";
-      hash = "sha256-emlgbnHw1yaRHaiFjCL9EBYFffdWWNF7AFWyIERj0QA=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.dmg";
+      hash = "sha256-KN4OVeR7TCA+PigHemh0eIT+y3hRKAGFJlEFmRc45Xg=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.4-aarch64.dmg";
-      hash = "sha256-mxrTc5v4IIDgZzwMtbvdifmetoDacGNEhyVzPiVMSSw=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1-aarch64.dmg";
+      hash = "sha256-V3TQIvaYH3+NmWIDJFyTcO7Zwdd+TPP0TSFmX5pjEhM=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2025.3.4";
-  buildNumber = "253.32098.40";
+  version = "2026.1";
+  buildNumber = "261.22158.283";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From dd1a5e245dc2919ee580fea01c017f54630cfccf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 22:08:55 +0000
Subject: [PATCH 111/238] thruster: 0.1.19 -> 0.1.20

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

diff --git a/pkgs/by-name/th/thruster/package.nix b/pkgs/by-name/th/thruster/package.nix
index 85aeda33fb94..4da5fccd46fc 100644
--- a/pkgs/by-name/th/thruster/package.nix
+++ b/pkgs/by-name/th/thruster/package.nix
@@ -7,13 +7,13 @@
 
 buildGo126Module (finalAttrs: {
   pname = "thruster";
-  version = "0.1.19";
+  version = "0.1.20";
 
   src = fetchFromGitHub {
     owner = "basecamp";
     repo = "thruster";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bavw7w/3AWRqiMVGpsazmVOIGcqkZPAWVBOQRRlnaS0=";
+    hash = "sha256-ze2jNN+JnXrpRKrh/oskO2n6dmj6F6czU2d62NrOJEY=";
   };
 
   vendorHash = "sha256-i5u1quR5V0ceFwRDW0Vym+9/dFUwzp9Wc1JrM0KGgY8=";

From 7e066f7a1041c6f6cc22280f8e6597201f0a1e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 15:35:41 -0700
Subject: [PATCH 112/238] python3Packages.qh3: 1.7.0 -> 1.7.1

Diff: https://github.com/jawah/qh3/compare/v1.7.0...v1.7.1

Changelog: https://github.com/jawah/qh3/blob/v1.7.1/CHANGELOG.rst
---
 pkgs/development/python-modules/qh3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 2d2799ec43d5..70494aaa1bc1 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "qh3";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${version}";
-    hash = "sha256-ACunwdSVSt7yamaoXaW3wc61PnuptbqI1T+cddwNi/8=";
+    hash = "sha256-duZstcheiv3eLPp2IMaZvYo5vq5SMBxcy7HQmBI0SaI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-uSsNR7+ORAGT72axqkc8NjtDj9Ccg0sKLkwSYeSjwoc=";
+    hash = "sha256-BqUofzjfDNUhE27GYcV7CXUK2dT/BQ16Z5aQkHyYUIE=";
   };
 
   nativeBuildInputs = [

From 9dbf4aa82b1c15b2f172f9148ac38ccf5ac4fba9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 22:52:38 +0000
Subject: [PATCH 113/238] pscale: 0.276.0 -> 0.277.0

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

diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index bbd399180cec..d7521ac54ff6 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pscale";
-  version = "0.276.0";
+  version = "0.277.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-J7v281WpKD4WQahfgLtGjKCg1l44scobPnPXpC5SpOs=";
+    sha256 = "sha256-4mNhlwxk7+vliAao/KA6UBosFKkOg6p91EYC+iDfDkY=";
   };
 
-  vendorHash = "sha256-eQtafI1LHm8kRVFHJhjihdy2/KHKGAsyOwzsIzWVspc=";
+  vendorHash = "sha256-vjW8wJoJBtFcKo5TpFRHKwBDh+5Z60EM+3KqyYbcwAc=";
 
   ldflags = [
     "-s"

From 099641782a909f6462d842ae0a89b5945d363eee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 23:44:19 +0000
Subject: [PATCH 114/238] honeycomb-refinery: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index d07b359aa467..b64764432353 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "honeycomb-refinery";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "refinery";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xO+8eiIoFw9CMjtjs9jjfQ8ENrhHVlkv3VVd/kXBwFs=";
+    hash = "sha256-6MrV/MOsMH1PHQkuQg4OgRqhG23xN+If172wUDu1Fek=";
   };
 
   env.NO_REDIS_TEST = true;
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
     "-X main.BuildID=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-eyq4pDZKE6Wmkuo/2PtiQJoYumbLelvcL4Dyb18OnaY=";
+  vendorHash = "sha256-oA9upZD0F7J2AYylohsixy9Wdof2ww2RPDoq3f+HTmc=";
 
   doCheck = true;
 

From 05ecbaa5d0c8e34a3b6b5dc94fab951cec7363d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2026 23:51:08 +0000
Subject: [PATCH 115/238] chatterino2: 2.5.4 -> 2.5.5

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

diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix
index bd4e9cfc18a1..eba997a88934 100644
--- a/pkgs/by-name/ch/chatterino2/package.nix
+++ b/pkgs/by-name/ch/chatterino2/package.nix
@@ -8,13 +8,13 @@
 (callPackage ./common.nix { }).overrideAttrs (
   finalAttrs: _: {
     pname = "chatterino2";
-    version = "2.5.4";
+    version = "2.5.5";
 
     src = fetchFromGitHub {
       owner = "Chatterino";
       repo = "chatterino2";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-eozT3Lfra4i+q3pCxH0Z1v/3Y/FB5yJc/88tA90hTzI=";
+      hash = "sha256-bTf3UECylAdb0l0+tItbhmiyNDSkxY8hgNPJHuOmwtE=";
       fetchSubmodules = true;
       leaveDotGit = true;
       postFetch = ''

From 056c9a0bc44f7544cf8a6c603f3eefe23079c3dd Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 31 Mar 2026 08:26:41 +0800
Subject: [PATCH 116/238] sing-box: 1.13.4 -> 1.13.5

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 90d7ceb8ccb6..3c8132773e1b 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.13.4";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4u1GgIBXkFrorcZ9Z+83peaIlZHmUp6zmsZWC4k9GkY=";
+    hash = "sha256-vHc3j96e5KGGMcTJFaUKSC4dQWlNThRZKirZ/waIYUM=";
   };
 
-  vendorHash = "sha256-mfgCwTXwd6T1mzmHR3tTF4aKtfn4ehztVyeXrtEKDsk=";
+  vendorHash = "sha256-LgwU4l4JvgLcdj8FBazzaJcKIa3X/Poe1+GjE+GTrHw=";
 
   tags = [
     "with_gvisor"

From cb09dde2439d3a85cd600268ad3c7c9b89629825 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 00:32:15 +0000
Subject: [PATCH 117/238] python3Packages.hyponcloud: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/hyponcloud/default.nix b/pkgs/development/python-modules/hyponcloud/default.nix
index 312a7b3508e5..63c64e1713b0 100644
--- a/pkgs/development/python-modules/hyponcloud/default.nix
+++ b/pkgs/development/python-modules/hyponcloud/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hyponcloud";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jcisio";
     repo = "hyponcloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZFolkhyXauUS+6rbCjSp+5Oxfp3Y7oh8fjXHwDi+zKA=";
+    hash = "sha256-EfAML6n/dhvpRVjghJUoAV3deP4YcMFon01UCwhT7Oc=";
   };
 
   build-system = [

From b0d63a15db9cead7b1cd08652a91642576d79db0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 00:37:23 +0000
Subject: [PATCH 118/238] python3Packages.tuya-device-handlers: 0.0.10 ->
 0.0.16

---
 .../python-modules/tuya-device-handlers/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tuya-device-handlers/default.nix b/pkgs/development/python-modules/tuya-device-handlers/default.nix
index 2f8f79435cf5..da795e3d041a 100644
--- a/pkgs/development/python-modules/tuya-device-handlers/default.nix
+++ b/pkgs/development/python-modules/tuya-device-handlers/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tuya-device-handlers";
-  version = "0.0.10";
+  version = "0.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "tuya-device-handlers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W5aSEt8xXxQUcs6+AVVcgXxjm3WppzfCaww8YX+sej0=";
+    hash = "sha256-DuMG0nItXwJYl4c3JprA308+qyFzEemt2QS/sJ8kvlU=";
   };
 
   build-system = [ poetry-core ];

From 56fa9fe400bbdd70d82fec45e3382f93998a3c65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 00:48:11 +0000
Subject: [PATCH 119/238] vscode-extensions.sonarsource.sonarlint-vscode:
 4.45.0 -> 5.0.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ded73dfa672e..01526b2364b3 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4324,8 +4324,8 @@ let
         mktplcRef = {
           publisher = "sonarsource";
           name = "sonarlint-vscode";
-          version = "4.45.0";
-          hash = "sha256-itrjHAA3gseflNzOd8UKB8DbhwJ/cWkGuuopLOD83GM=";
+          version = "5.0.0";
+          hash = "sha256-K8EZF7h86ErbIHW05LQSpReXSKa8FTMH6uOD+IczoR4=";
         };
         meta.license = lib.licenses.lgpl3Only;
       };

From 978efcfca4c56f80cf9ad71ec157394a482fa1ba Mon Sep 17 00:00:00 2001
From: Lena Pastwa <lena@lnps.me>
Date: Tue, 31 Mar 2026 03:11:15 +0200
Subject: [PATCH 120/238] tlrc: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index 47306e571d39..6553232a5d2e 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tlrc";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Q0vRrCNpbG6LihCi9+uI25PnpFuPfoY2MZmyB/IN/SQ=";
+    hash = "sha256-wYoxawZ9kfmWt02ONiN8Evq0TqI1XGDnY7vhQixySHo=";
   };
 
-  cargoHash = "sha256-IrRhj3Tv8rLTJki+Wd4Xfmf74OnYInUytMnYuvre7mw=";
+  cargoHash = "sha256-vrbNSow+DFOfJW1P/SSRm7V7Btzml7amWJ08JUXOZfg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 47e8e428bf483336712da34f774f58e3573d4b85 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 30 Mar 2026 19:02:40 -0400
Subject: [PATCH 121/238] workflows/periodic-merge: replace commenting action
 with `gh` cli

Per zizmor's [`superfluous-actions`](https://docs.zizmor.sh/audits/#superfluous-actions)
rule, which is not yet in the pinned version.
---
 .github/workflows/periodic-merge.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 2eb0e347a0c1..66681b2ece3a 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -60,10 +60,10 @@ jobs:
           github_token: ${{ steps.app-token.outputs.token }}
 
       - name: Comment on failure
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
         if: ${{ failure() }}
-        with:
-          issue-number: 105153
-          body: |
+        env:
+          BODY_TEXT: |
             Periodic merge from `${{ inputs.from }}` into [`${{ inputs.into }}`](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }}) has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
-          token: ${{ steps.app-token.outputs.token }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          gh pr comment 105153 --body "$BODY_TEXT"

From 9c6f1cd4c056e2e4071e5c408d059e590f2e351b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 01:45:40 +0000
Subject: [PATCH 122/238] mieru: 3.29.0 -> 3.30.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 3025e4c41136..7e8fec507489 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mieru";
-  version = "3.29.0";
+  version = "3.30.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v08yA01I4W3SVkkRmm38nwTYzfTcESXgW98TrbaeaHA=";
+    hash = "sha256-frSW7qLKhRTJLE2rAaZekoaJUmQWqVECQhCSCsmub/U=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 44a945e9af2a146c4a74b4d8e0e43591e49cfa4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 02:24:12 +0000
Subject: [PATCH 123/238] python3Packages.busylight-core: 2.0.1 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/busylight-core/default.nix b/pkgs/development/python-modules/busylight-core/default.nix
index f6c0add36894..0620ff75e92b 100644
--- a/pkgs/development/python-modules/busylight-core/default.nix
+++ b/pkgs/development/python-modules/busylight-core/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "busylight-core";
-  version = "2.0.1";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "busylight-core";
     tag = "v${version}";
-    hash = "sha256-BJJkuArs7zRvnxVykcMzc/K+MC9r/NYy3wUfAUxrnNE=";
+    hash = "sha256-as2IvaxyMjGKPGlBmz1cntAhbpuW+f3INtnNIcwpWh8=";
   };
 
   postPatch = ''

From d0f631e37b3979c245cbdb3b986ec92c88b4d42b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 02:32:59 +0000
Subject: [PATCH 124/238] python3Packages.ultralytics: 8.4.31 -> 8.4.32

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

diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index e62eace2bc5d..cc9da809e609 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ultralytics";
-  version = "8.4.31";
+  version = "8.4.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i0H7UonQmtwYa7oGqzua7ysNvAN0PCm2SYITdk0ziZY=";
+    hash = "sha256-FLW1LZkWX5EeKo9A1op4p+xdc27xE/CXYgnju+fV2kE=";
   };
 
   build-system = [ setuptools ];

From f445e16b80184648504c86bb109683d42143426b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 30 Mar 2026 22:45:09 -0400
Subject: [PATCH 125/238] cargo-insta: 1.47.1 -> 1.47.2

Diff: https://github.com/mitsuhiko/insta/compare/1.47.1...1.47.2

Changelog: https://github.com/mitsuhiko/insta/blob/1.47.2/CHANGELOG.md
---
 pkgs/by-name/ca/cargo-insta/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index e9c53ffbe6c6..9d89226df0ae 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-insta";
-  version = "1.47.1";
+  version = "1.47.2";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "insta";
     tag = finalAttrs.version;
-    hash = "sha256-h13EY3wqx+UgD5HGh2exR7xaQPK7rDanvMklgic4Kco=";
+    hash = "sha256-BQuc/YCUM61Lq0hPF4foETUCC/oTSVwTY4RK+WuRnac=";
   };
 
-  cargoHash = "sha256-6VVcpuTENE+YFn5MoRePseAfWSOKmdiMtanB1h2Swjw=";
+  cargoHash = "sha256-5YnsLfCM64gPlQu9qr7daCdFSZA80PpQVfYE9h237h4=";
 
   postPatch = ''
     substituteInPlace cargo-insta/tests/functional/test_runner_fallback.rs \

From 64d8b3d67ead1f8fc8a8b35fb99dc486ed30c2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 20:14:30 -0700
Subject: [PATCH 126/238] python3Packages.param: 2.3.1 -> 2.3.2

Diff: https://github.com/holoviz/param/compare/v2.3.1...v2.3.2

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

diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 7850cc3c04a4..6dc055369465 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "param";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "holoviz";
     repo = "param";
     tag = "v${version}";
-    hash = "sha256-lC3XIaL1WQJoNaiiXeMvZ2JNMgHF+mAwLpnMu0sa9wY=";
+    hash = "sha256-BqZ4HbYVdmgyOacwzmSia7GinMqz3k6pLyElbST3NTY=";
   };
 
   build-system = [

From 7e5373f9a7e0eeefb3586525855bc8b86ad82dcb Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Tue, 31 Mar 2026 11:21:39 +0800
Subject: [PATCH 127/238] agent-browser: init at 0.23.3

---
 pkgs/by-name/ag/agent-browser/package.nix | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/ag/agent-browser/package.nix

diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix
new file mode 100644
index 000000000000..ca85222631a4
--- /dev/null
+++ b/pkgs/by-name/ag/agent-browser/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+  writableTmpDirAsHomeHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "agent-browser";
+  version = "0.23.3";
+
+  src = fetchFromGitHub {
+    owner = "vercel-labs";
+    repo = "agent-browser";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q02sJr14zRrVrRJ0M30AD0EG7DGkYtafCH6/kI15/xk=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/cli";
+
+  cargoHash = "sha256-smJ+ODr88moz+16G9fXSz/NNiGngWeoTuQtBn21qu1s=";
+
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
+  __darwinAllowLocalNetworking = true;
+
+  # skills/ contains SKILL.md for tools like Claude Code
+  postInstall = ''
+    mkdir -p $out/share/agent-browser
+    cp -r ../skills $out/share/agent-browser/
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Headless browser automation CLI for AI agents";
+    homepage = "https://github.com/vercel-labs/agent-browser";
+    license = lib.licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ codgician ];
+    mainProgram = "agent-browser";
+  };
+})

From c31d183b72e473493c36c1ef297ff5495e345095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 30 Mar 2026 20:40:05 -0700
Subject: [PATCH 128/238] python3Packages.pycrashreport: 1.2.8 -> 2.0.0

Diff: https://github.com/doronz88/pycrashreport/compare/v1.2.8...v2.0.0

Changelog: https://github.com/doronz88/pycrashreport/releases/tag/v2.0.0
---
 .../python-modules/pycrashreport/default.nix         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pycrashreport/default.nix b/pkgs/development/python-modules/pycrashreport/default.nix
index 79153ee52b87..e7401a47f6eb 100644
--- a/pkgs/development/python-modules/pycrashreport/default.nix
+++ b/pkgs/development/python-modules/pycrashreport/default.nix
@@ -1,25 +1,23 @@
 {
   buildPythonPackage,
-  cached-property,
-  click,
   fetchFromGitHub,
-  la-panic,
   lib,
   pytestCheckHook,
   setuptools,
   setuptools-scm,
+  typer,
 }:
 
 buildPythonPackage rec {
   pname = "pycrashreport";
-  version = "1.2.8";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "doronz88";
     repo = "pycrashreport";
     tag = "v${version}";
-    hash = "sha256-CjFMixbnRlCT2tnBgpYjnOXg+SJgUtzsVNazPtNyfYQ=";
+    hash = "sha256-huiPTpcNwRY8IMHe4y4H/OBCdlDWhBiU9u1xTvLSDQk=";
   };
 
   build-system = [
@@ -28,9 +26,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    cached-property
-    click
-    la-panic
+    typer
   ];
 
   pythonImportsCheck = [ "pycrashreport" ];

From 225a45acf4204faf6082a6132ca0bca5bed7078a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 04:11:37 +0000
Subject: [PATCH 129/238] vscode-extensions.leanprover.lean4: 0.0.225 ->
 0.0.226

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

diff --git a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix
index 7f124b280b8a..4f22ee49d2b0 100644
--- a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "lean4";
     publisher = "leanprover";
-    version = "0.0.225";
-    hash = "sha256-JVsOHO2r7YHC4QxvpjoIgT5rZhW2SS24xu3TMnoRQi8=";
+    version = "0.0.226";
+    hash = "sha256-K5zqYX1I3yHLgXzDCPGCnQzChQ4pPCHGriRKSP7ZbGE=";
   };
 
   meta = {

From fb352e63da110aaa61cb1e381f64c0348172681a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 04:24:14 +0000
Subject: [PATCH 130/238] rauc: 1.15.1 -> 1.15.2

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

diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix
index ac51d39444d5..743e4d895ce4 100644
--- a/pkgs/by-name/ra/rauc/package.nix
+++ b/pkgs/by-name/ra/rauc/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rauc";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "rauc";
     repo = "rauc";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-aGJj1Vm1gznZBnoGkfbJlhGAUrP5JAMgEL8L+8UL9LY=";
+    sha256 = "sha256-wWj4tOUFVn+dgt4741YPF0+x85wRb46DM9lGLNon03Q=";
   };
 
   enableParallelBuilding = true;

From 28ff0c81ff653b59fa27aa6002c7b6ccd8f4b902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 04:40:31 +0000
Subject: [PATCH 131/238] spotify-player: 0.22.1 -> 0.23.0

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

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 00dea3d74176..715bb86c87ce 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -49,16 +49,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spotify-player";
-  version = "0.22.1";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fULVQMVF+fDVNXj/qbwjBIG1EHfdlG/gTY+NJTWbwdk=";
+    hash = "sha256-LjQGCE4xbD3+k78827u346/qhC6D8vrhyUq6c+8eWSw=";
   };
 
-  cargoHash = "sha256-12ccf5LT2XAq1SmcG6RnpECDS89ZJ/21MYp8dtBUnL8=";
+  cargoHash = "sha256-mD1UJn3LjX88Ht6QUpPO9lu9WiCec5+qUphtLoCjiXg=";
 
   nativeBuildInputs = [
     pkg-config

From 960ea96c169143367b58f7d17255c92652a3abbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 05:08:10 +0000
Subject: [PATCH 132/238] tscli: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix
index 83e8634babe2..39b25169a38d 100644
--- a/pkgs/by-name/ts/tscli/package.nix
+++ b/pkgs/by-name/ts/tscli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tscli";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "jaxxstorm";
     repo = "tscli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/MHFPFm9+DFh6pmIXbm3wXUCbjyJUDaESpDbvqbyTx8=";
+    hash = "sha256-zOl+AXVEUPJtEcptT1ApIs+3Fq19XZGY3JFVUAGciEg=";
   };
 
-  vendorHash = "sha256-meG/BYuMDBtENIty8I2koTrqGmRtW5BzlEvNOkf5qlE=";
+  vendorHash = "sha256-bH8jYaA/54s2q9KgqEBHaPPwXJg/ch1ksKRvyEiMMmA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 21a107afa75619009ffc5f1f3ac6793992bd26a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 05:09:21 +0000
Subject: [PATCH 133/238] tirith: 0.2.8 -> 0.2.10

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

diff --git a/pkgs/by-name/ti/tirith/package.nix b/pkgs/by-name/ti/tirith/package.nix
index 9817206ce4f5..19b0929b917a 100644
--- a/pkgs/by-name/ti/tirith/package.nix
+++ b/pkgs/by-name/ti/tirith/package.nix
@@ -8,15 +8,15 @@
 }:
 rustPlatform.buildRustPackage (final: {
   pname = "tirith";
-  version = "0.2.8";
+  version = "0.2.10";
   src = fetchFromGitHub {
     owner = "sheeki03";
     repo = "tirith";
     tag = "v${final.version}";
-    hash = "sha256-Kd6Rr8x35COc9DA+zskxEPXwHupP9kGNyvKDPcwP09A=";
+    hash = "sha256-1i2cZt/12tSZAs4rXY2OoBZBShhsT8EMRCf76Zdb2OQ=";
   };
 
-  cargoHash = "sha256-D4jN7M1tWW5s+VNJlMFb2EDQ3zdLDtBwuztNbrLMiCA=";
+  cargoHash = "sha256-ETJoYsG4CueIoj9wCq37TsEJjlUsDnOnc3/Hck/ngxU=";
 
   cargoBuildFlags = [
     "-p"

From f26210b19cf440b325b9366a65876b4eed5e5f2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 06:21:41 +0000
Subject: [PATCH 134/238] openfga: 1.12.1 -> 1.13.1

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

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 5b3eefa1f4c0..0826a2c58aa3 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga";
-  version = "1.12.1";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uIdsHYrVp57HnIrJLv0VtysaehqrZLVTsPfrlJjmBco=";
+    hash = "sha256-fmTb5mRAbJGDfE4lLSFtfHuQv2pQn4fQnX7fTjq7KKs=";
   };
 
-  vendorHash = "sha256-lQeUfLfYpk4HPyhpp/rKWVoWwPzKKyk/sHE1rgtcyxA=";
+  vendorHash = "sha256-sd1kDRicWb5ShEFDCJIjv4kk2dA5XwABH3Ii/P3uVvI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f26aa73d938f60203eeb706cfd1f8dab37de3dc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 06:35:29 +0000
Subject: [PATCH 135/238] plasma-panel-spacer-extended: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
index f9418a3d5095..0297274709c3 100644
--- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-spacer-extended";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-spacer-extended";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1O8JS2yaKWxengyj3Ibuuyy/vCrmKKOp5EPVuSiCnVI=";
+    hash = "sha256-zqdELL7A4pZpPfbgBgyqZnP6HY200rYxRFl3/aIE3Eo=";
   };
 
   nativeBuildInputs = [

From ec81f6c246535bd5d995b11aaeaa8e8e305b00ef Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 31 Mar 2026 08:43:15 +0200
Subject: [PATCH 136/238] claude-code: 2.1.87 -> 2.1.88

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 63733cacc6eb..94a7ff08a3db 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.87",
+  "version": "2.1.88",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.87",
+      "version": "2.1.88",
       "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 76fdd4fe0081..3cb9788cfae6 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.87";
+  version = "2.1.88";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-jorpY6ao1YgkoTgIk1Ae2BQCbqOuEtwzoIG36BP5nG4=";
+    hash = "sha256-LwTZaxp1Wq6BYQ/Los5aMHufGKb3NM7BuuW0Kaxo2QA=";
   };
 
-  npmDepsHash = "sha256-Pr/KFS8RH03CvHvN6EdZf9R4dcAK/EbGd6UAm2s2Saw=";
+  npmDepsHash = "sha256-izy3dQProZIdUF5Z11fvGQOm/TBcWGhDK8GvNs8gG5E=";
 
   strictDeps = true;
 

From a3cbc9234bdc51052b061e42ba7a8f75713199e9 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 31 Mar 2026 08:43:19 +0200
Subject: [PATCH 137/238] claude-code-bin: 2.1.87 -> 2.1.88

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 5451ab94242a..9e3b62babace 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.87",
-  "buildDate": "2026-03-29T01:45:06Z",
+  "version": "2.1.88",
+  "buildDate": "2026-03-30T22:06:06Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "80b51562db1a51bfb654aec1fea6a04106daa0bc1525d88c9c74741ff5d9469a",
-      "size": 196638704
+      "checksum": "fe0d191adb7b0d26badd1e303e95a63d62d526ca1fb5882f53644754e1e9fe95",
+      "size": 196192880
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "c1a4cde29e74e4c3952ead69f90a37a2388aa097d7c567a81ca3669a309e9226",
-      "size": 198132816
+      "checksum": "4036c17c5ebdeaf024f198b041e012e494b8cab8c7dec1bdde567ebbbfc5124d",
+      "size": 197703504
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "193c5e9c091eadde302fa23af46c8d646b7263f74fa06ed32746e504bd09df18",
-      "size": 228461120
+      "checksum": "2ba4ac149b2198c15e45837fc504146c735fc1e82b9fdf717c2a6b9e0f70c02c",
+      "size": 228330048
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "b1a5b89469862adee0e4dc28cab5a8314bc4d0117e19ab26a7b7ff7ce9b59bd5",
-      "size": 228280960
+      "checksum": "ced6cac958fa4425b90e6c9341a26731715fcb1a253d5bc0f51c8d5a3a6ab66e",
+      "size": 228121216
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "38e56d4a62778f429b1caa875a4a6e53db8eda256091f58afb5cf2043e492131",
-      "size": 221579712
+      "checksum": "39fc36357d927750f6b2ef85afd30a50549e4ca7e3cd0887e6e7e76b2db8c56f",
+      "size": 221448640
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "aba2c3a8927c53f981a4ad2b18915b2a1a1511b3b4e3b5e8797d23dbb0bf5eea",
-      "size": 222906816
+      "checksum": "658327a04523e7e9a9578bc061c7c82804846d9fbff04c88177002f2f93cff5f",
+      "size": 222747072
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "c722ff8836e7a90b5c62fd5cb6549887dc314e7e8d9551c01df1718d9198ecdf",
-      "size": 238222496
+      "checksum": "34a248b3f381f27e4adde1f4dc745f6b63aa28ff0c6eee550d47746a4d197ec0",
+      "size": 238212768
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "5c3e5f706685963c83cdc5dd2ec86a89e5a897bd6ec82298311abb43280ffa30",
-      "size": 234785440
+      "checksum": "eee6beba9efb300d097a6fe4151c1d83cb84ea1598555fe358b07d33a434decc",
+      "size": 234668704
     }
   }
 }

From 44e15c7c8aeea71c0dd58472e36cc2cf9a5e7bf4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 31 Mar 2026 08:43:23 +0200
Subject: [PATCH 138/238] vscode-extensions.anthropic.claude-code: 2.1.87 ->
 2.1.88

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 15a9f00ed76f..2b2bc7dea170 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.87";
-    hash = "sha256-0brafiNuo6wRGWlGAOax3My9CrGKiGpDjFswuHFWt4M=";
+    version = "2.1.88";
+    hash = "sha256-iFH8siufDTje1zihRMqb/5CCYo5YHHdCZcuk8Hrj4Uk=";
   };
 
   postInstall = ''

From 0d966335015fe7341c7c76a76c158ae6962dd274 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 12 Oct 2025 00:12:29 +0200
Subject: [PATCH 139/238] python3Packages.scantree: init at 0.0.4

The package is needed by https://github.com/colcon/colcon-clean. It is
also packaged in Debian: https://packages.debian.org/trixie/python3-scantree.
---
 .../python-modules/scantree/default.nix       | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/scantree/default.nix

diff --git a/pkgs/development/python-modules/scantree/default.nix b/pkgs/development/python-modules/scantree/default.nix
new file mode 100644
index 000000000000..f9f8423968e4
--- /dev/null
+++ b/pkgs/development/python-modules/scantree/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  versioneer,
+  attrs,
+  pathspec,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "scantree";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Fb1cskSDsE2yxwZTYE6Oo1IumAh9t+OKuEgvBTmEwKw=";
+  };
+
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
+    attrs
+    pathspec
+  ];
+
+  pythonImportsCheck = [
+    "scantree"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Flexible recursive directory iterator: scandir meets glob(\"**\", recursive=True)";
+    homepage = "https://github.com/andhus/scantree";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wentasah ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bffdd977ba0f..193874bcff95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17221,6 +17221,8 @@ self: super: with self; {
 
   scanpy = callPackage ../development/python-modules/scanpy { };
 
+  scantree = callPackage ../development/python-modules/scantree { };
+
   scapy = callPackage ../development/python-modules/scapy {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };

From faf4ca51b2f7bf5a1827e45f88d1dac0c68d28ab Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 30 Mar 2026 22:28:43 +0700
Subject: [PATCH 140/238] helix-db: 2.1.3 -> 2.3.3

---
 .../by-name/he/helix-db/disable-updates.patch | 36 +++++++++++--------
 pkgs/by-name/he/helix-db/package.nix          |  6 ++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/he/helix-db/disable-updates.patch b/pkgs/by-name/he/helix-db/disable-updates.patch
index e4b26c3265d8..ddc34a2376b8 100644
--- a/pkgs/by-name/he/helix-db/disable-updates.patch
+++ b/pkgs/by-name/he/helix-db/disable-updates.patch
@@ -1,36 +1,44 @@
 diff --git a/helix-cli/src/main.rs b/helix-cli/src/main.rs
-index 18e279fd..a3ec271c 100644
 --- a/helix-cli/src/main.rs
 +++ b/helix-cli/src/main.rs
-@@ -121,13 +121,6 @@ enum Commands {
-         action: MetricsAction,
+@@ -185,13 +185,6 @@
+         action: DashboardAction,
      },
  
 -    /// Update to the latest version
 -    Update {
 -        /// Force update even if already on latest version
--        #[clap(long)]
+-        #[arg(long)]
 -        force: bool,
 -    },
 -
      /// Migrate v1 project to v2 format
      Migrate {
          /// Project directory to migrate (defaults to current directory)
-@@ -253,9 +246,6 @@ async fn main() -> Result<()> {
+@@ -384,9 +377,6 @@
      // Send CLI install event (only first time)
      metrics_sender.send_cli_install_event_if_first_time();
  
 -    // Check for updates before processing commands
--    update::check_for_updates().await?;
+-    let update_available = update::check_for_updates().await?;
 -
      let cli = Cli::parse();
  
+     // Set verbosity level from flags
+@@ -394,7 +384,7 @@
+ 
      let result = match cli.command {
-@@ -280,7 +270,6 @@ async fn main() -> Result<()> {
-         Commands::Prune { instance, all } => commands::prune::run(instance, all).await,
-         Commands::Delete { instance } => commands::delete::run(instance).await,
-         Commands::Metrics { action } => commands::metrics::run(action).await,
--        Commands::Update { force } => commands::update::run(force).await,
-         Commands::Migrate {
-             path,
-             queries_dir,
+         None => {
+-            display_welcome(update_available);
++            display_welcome(None);
+             Ok(())
+         }
+         Some(cmd) => match cmd {
+@@ -432,7 +422,6 @@
+             Commands::Delete { instance } => commands::delete::run(instance).await,
+             Commands::Metrics { action } => commands::metrics::run(action).await,
+             Commands::Dashboard { action } => commands::dashboard::run(action).await,
+-            Commands::Update { force } => commands::update::run(force).await,
+             Commands::Migrate {
+                 path,
+                 queries_dir,
diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix
index b3fd33d74aca..cf9d09237d13 100644
--- a/pkgs/by-name/he/helix-db/package.nix
+++ b/pkgs/by-name/he/helix-db/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "helix-db";
-  version = "2.1.3";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     repo = "helix-db";
     owner = "HelixDB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oy17xutabfTmdkyi3Ak61f4fhd65m+Cwk+1a156K2hQ=";
+    hash = "sha256-Qr6rrZx9wXQm4l7HqmGz3PXRJHuV3lUZMcGMH+sOPDY=";
   };
 
-  cargoHash = "sha256-KrrbQwxhqtO8ISq7WWSo67t58dOuI3gS/9nesVCIq+0=";
+  cargoHash = "sha256-nx4jq+2EChhtUEwCgZeqPIDidfRFZ0i0DZhkLVKapDo=";
 
   patches = [
     #There are no feature yet

From e13e1d96e0a6ae10ec4faf74e40fbcaeb4d0c506 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 07:47:27 +0000
Subject: [PATCH 141/238] beam26Packages.elvis-erlang: 4.2.3 -> 5.0.2

---
 .../beam-modules/elvis-erlang/default.nix            |  4 ++--
 .../beam-modules/elvis-erlang/rebar-deps.nix         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix
index cb80d7e3b3ca..605fd728534a 100644
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@@ -11,12 +11,12 @@
 rebar3Relx rec {
   releaseType = "escript";
   pname = "elvis-erlang";
-  version = "4.2.3";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "inaka";
     repo = "elvis";
-    hash = "sha256-4hStLm76HZmO3vk/RdeRGJPJ3gevUkjVO2jGpVff32Q=";
+    hash = "sha256-QGA9vAWMgRhKHKc0XdoAymssFJSMM/xYDvKY6NC0Yys=";
     tag = version;
   };
 
diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
index 43985a064e84..207c83bf3b74 100644
--- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
@@ -24,11 +24,11 @@ let
     };
     katana_code = builder {
       name = "katana_code";
-      version = "2.4.1";
+      version = "2.4.3";
       src = fetchHex {
         pkg = "katana_code";
-        version = "2.4.1";
-        sha256 = "sha256-WO/GO12dq8giMMq1DN5/eyWSh6aQ7Wmfeaf6gPSbCzo=";
+        version = "2.4.3";
+        sha256 = "sha256-YUxjQ9uqRc7e8n0j6wkBo4PEa/61dwOaXmDK0XGGzO4=";
       };
       beamDeps = [ ];
     };
@@ -44,11 +44,11 @@ let
     };
     elvis_core = builder {
       name = "elvis_core";
-      version = "4.2.3";
+      version = "5.0.2";
       src = fetchHex {
         pkg = "elvis_core";
-        version = "4.2.3";
-        sha256 = "sha256-xy4xinPab51p3uDxh/h5dHH57kbPTdrO36LJ+byxjqA=";
+        version = "5.0.2";
+        sha256 = "sha256-SFa4TuS6ENxtjKBAoS2tZ5yXAuBRFIADvTsfsYUTxdc=";
       };
       beamDeps = [
         katana_code

From 6c59e1d6015fdef1cd0df279a0c98490123e4a14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 07:48:18 +0000
Subject: [PATCH 142/238] nest-cli: 11.0.16 -> 11.0.17

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

diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix
index e44b2a4dcf60..ec301d9d892f 100644
--- a/pkgs/by-name/ne/nest-cli/package.nix
+++ b/pkgs/by-name/ne/nest-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "nest-cli";
-  version = "11.0.16";
+  version = "11.0.17";
 
   src = fetchFromGitHub {
     owner = "nestjs";
     repo = "nest-cli";
     tag = finalAttrs.version;
-    hash = "sha256-naVDl3fjjPdrZhUynoy98ggVIDlmIVgvrEYxdNvwD1Y=";
+    hash = "sha256-TolI/HpC5kEvXrqkIcjcVny2yY96Jz37f5+mw4fHt1M=";
   };
 
-  npmDepsHash = "sha256-eLytaWABoJTFBnkdqt/rIrgeI4Z2gPpUBL/bt6UIduQ=";
+  npmDepsHash = "sha256-y9yjZT7AhXPrKEQo81k5KjX9voIWY7VcuUGY6QuiLcw=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   env = {

From eca95bc2ef14e8421a9ccb9c8da5c6f1e5cd8292 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 31 Mar 2026 10:54:30 +0300
Subject: [PATCH 143/238] python3Packages.freud: readd comment linking to
 #255262

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

diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index aba9138088fd..939e29a6339e 100644
--- a/pkgs/development/python-modules/freud/default.nix
+++ b/pkgs/development/python-modules/freud/default.nix
@@ -80,6 +80,7 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
     sympy
   ];
+  # https://github.com/NixOS/nixpkgs/issues/255262
   preCheck = ''
     rm -rf freud
   '';

From d1b4642ca1e5648ab3a73376ca2d161e64967459 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 07:55:04 +0000
Subject: [PATCH 144/238] vscode-extensions.pkief.material-icon-theme: 5.32.0
 -> 5.33.1

---
 .../vscode/extensions/pkief.material-icon-theme/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
index 58bde2234e71..00982423a806 100644
--- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "material-icon-theme";
     publisher = "PKief";
-    version = "5.32.0";
-    hash = "sha256-0YR3IeVxD7OuYfybDHBdgjQXH0bxz3U9Q8/gQZZB7sM=";
+    version = "5.33.1";
+    hash = "sha256-GWHWEdi2kPkxS0RGAxFcy+njFCl1iiEBu41V/5sHqvc=";
   };
   meta = {
     description = "Material Design Icons for Visual Studio Code";

From 948e7e3ceeb82cb736517ec77fadefdca791812e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 07:59:25 +0000
Subject: [PATCH 145/238] python3Packages.appium-python-client: 5.2.7 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/appium-python-client/default.nix b/pkgs/development/python-modules/appium-python-client/default.nix
index c3f2a0321699..270bfe6d3d1e 100644
--- a/pkgs/development/python-modules/appium-python-client/default.nix
+++ b/pkgs/development/python-modules/appium-python-client/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "appium-python-client";
-  version = "5.2.7";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "appium";
     repo = "python-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H8WBByS/8P8xIM8RmWJFgvrVbEDc5LrFj1rQzxL3174=";
+    hash = "sha256-2lQDGDO7xwNRMErxKcfFkXEMnO96zlDhHyakZkh7pfY=";
   };
 
   build-system = [ hatchling ];

From 604c7dae4824aafdec02eb5dbf43fae1fe69dc51 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 31 Mar 2026 11:01:57 +0300
Subject: [PATCH 146/238] python3Packages.freud: extend comment for
 disabledTests

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

diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index 939e29a6339e..6181840f24f8 100644
--- a/pkgs/development/python-modules/freud/default.nix
+++ b/pkgs/development/python-modules/freud/default.nix
@@ -86,7 +86,11 @@ buildPythonPackage (finalAttrs: {
   '';
 
   disabledTests = [
+    # 4 tests fail with:
+    #
     # AttributeError: module 'scipy.special' has no attribute 'sph_harm'
+    #
+    # See: https://github.com/glotzerlab/freud/issues/1408
     "test_ld"
     "test_multiple_l"
     "test_qlmi"

From b96544c64fd9d4367e676fbed9bf6c3af87f900b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 31 Mar 2026 10:14:21 +0200
Subject: [PATCH 147/238] python3Packages.iamdata: 0.1.202603301 ->
 0.1.202603311

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202603301...v0.1.202603311

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 2a92f7c2d298..2cce1032fab0 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202603301";
+  version = "0.1.202603311";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cJ+CvwbPLyZZazeKVZywBLsIChvZKZ8huQbEh3yIsto=";
+    hash = "sha256-r4BpJJq/2xopL16+JXss7Xj7XgebQTmKdDkc9KeEbU0=";
   };
 
   __darwinAllowLocalNetworking = true;

From 8a268ad44d1f20224e9c31bb6bf41497de9ff6f4 Mon Sep 17 00:00:00 2001
From: Luna Simons <luna@bddvlpr.com>
Date: Tue, 31 Mar 2026 10:16:39 +0200
Subject: [PATCH 148/238] linuxPackages.apfs: 0.3.16 -> 0.3.18

---
 pkgs/os-specific/linux/apfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix
index 19cfc7938799..405ec69e2cdc 100644
--- a/pkgs/os-specific/linux/apfs/default.nix
+++ b/pkgs/os-specific/linux/apfs/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  tag = "0.3.16";
+  tag = "0.3.18";
 in
 stdenv.mkDerivation {
   pname = "apfs";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     owner = "linux-apfs";
     repo = "linux-apfs-rw";
     tag = "v${tag}";
-    hash = "sha256-11ypevJwxNKAmJbl2t+nGXq40hjWbLIdltLqSeTVdHc=";
+    hash = "sha256-cyjaWNND8FIH6NOmLNxk/mYkYgQc4/SMpwXUVFGPe3c=";
   };
 
   hardeningDisable = [ "pic" ];

From 2aa3f9ba2202bb298629e4f2bb6c8604d13ded5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:17:56 +0200
Subject: [PATCH 149/238] python3Packages.tencentcloud-sdk-python: 3.1.64 ->
 3.1.67

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.64...3.1.67

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.67/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 9876d11ecb1b..75ee18c69a44 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.64";
+  version = "3.1.67";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-X8UCnuXhaPsBrtuFz8cLkvag86Fa5aO7YXuPmazZdVA=";
+    hash = "sha256-J5svdEmr8jGq7OstSRk/Sv/QsmwPanm0gemciOyHjHc=";
   };
 
   build-system = [ setuptools ];

From 401c9f14a0c9196fe16c299ee7b74f41fa9587b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:18:39 +0200
Subject: [PATCH 150/238] python3Packages.mypy-boto3-appstream: 1.42.54 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 65d2e841449b..a83eb71a4fa9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -127,8 +127,8 @@ in
       "sha256-Mvf3bBhrRRR+hoAsBPq7p9COJqVxV9LL+GrnikrHX2g=";
 
   mypy-boto3-appstream =
-    buildMypyBoto3Package "appstream" "1.42.54"
-      "sha256-NrR4wQslCosBCvmAkGe7qJ3WNu428hD3+SZUk1Ga870=";
+    buildMypyBoto3Package "appstream" "1.42.79"
+      "sha256-EG6G33/7BTIjlEXxSa0ygnT80WytlAMCM/bAI9jz3Jg=";
 
   mypy-boto3-appsync =
     buildMypyBoto3Package "appsync" "1.42.6"

From 1df36620033a642fc74e4c736adfe5e07db7a46d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:18:41 +0200
Subject: [PATCH 151/238] python3Packages.mypy-boto3-autoscaling: 1.42.33 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a83eb71a4fa9..973bb9ef9022 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -147,8 +147,8 @@ in
       "sha256-jW+LgaUpdeCSJLnpNE13DSio9nFmp0icoLEMwxX44KU=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.42.33"
-      "sha256-F1+6Sd7kaCrZlulXzrFmF3RFUPEmRNvKeB1xQeSGgq4=";
+    buildMypyBoto3Package "autoscaling" "1.42.79"
+      "sha256-izdIT33QiFDXbe+VUes3ErQphuiCL+Q/c32qBjJzyDw=";
 
   mypy-boto3-autoscaling-plans =
     buildMypyBoto3Package "autoscaling-plans" "1.42.3"

From eb65afeae96b96c119f5714d0480df6ce93b52e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:03 +0200
Subject: [PATCH 152/238] python3Packages.mypy-boto3-ecs: 1.42.69 -> 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 973bb9ef9022..0147ca82e344 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -459,8 +459,8 @@ in
       "sha256-syjw4M02YXRXsJpM3e7OikE3sSTl/hIIJ3857PP2BII=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.42.69"
-      "sha256-+ysRw8dohrQWQGdBU5qzHpNr6DF/BcELn90WdUCNPes=";
+    buildMypyBoto3Package "ecs" "1.42.79"
+      "sha256-qNwhq5px+DbifDPRN0VeHk0j7AzWSxgiXkvKovyHIQE=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.42.3"

From 6543eb8303d8948d6cf7cf8d74ba39bb765e1434 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:12 +0200
Subject: [PATCH 153/238] python3Packages.mypy-boto3-gamelift: 1.42.75 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0147ca82e344..d52b8102dbb1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -559,8 +559,8 @@ in
       "sha256-NqNGcL3HfJgx2ScPLKMNNwpVS3bO4Cu7JpYlenSJwJg=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.42.75"
-      "sha256-Iv1OjFAKOny91w2G++yfwZLH8dMREz+1iF7+t8jgM1k=";
+    buildMypyBoto3Package "gamelift" "1.42.79"
+      "sha256-IYvjnVdbVYFkX7Qu3Sr9iaRFMeq/F7njuPW3EBWldlE=";
 
   mypy-boto3-glacier =
     buildMypyBoto3Package "glacier" "1.42.30"

From 4aaa7bbe4c67172071e18f20e6242843b4edc4ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:26 +0200
Subject: [PATCH 154/238] python3Packages.mypy-boto3-lakeformation: 1.42.45 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d52b8102dbb1..1559824c5501 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -762,8 +762,8 @@ in
       "sha256-bCVvuhK3mpTeNDYDYaACVWgQMhKR9mIi9BbbCI0ynCA=";
 
   mypy-boto3-lakeformation =
-    buildMypyBoto3Package "lakeformation" "1.42.45"
-      "sha256-CG1b4lkqvsQLguhkYuJ5CH5Gu0IrC1mbsYYQ2Itjys4=";
+    buildMypyBoto3Package "lakeformation" "1.42.79"
+      "sha256-tMre640822/6JE0YVSHud03xqS4VbgJy9RJsN3eIEhE=";
 
   mypy-boto3-lambda =
     buildMypyBoto3Package "lambda" "1.42.37"

From be9b3aa35ffef7161fb539db084606bdc8b0101c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:30 +0200
Subject: [PATCH 155/238] python3Packages.mypy-boto3-logs: 1.42.77 -> 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1559824c5501..2e23dcd66129 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -806,8 +806,8 @@ in
       "sha256-VGQzgnrUynTDjfYpEk+FR+PrljbULl0UpbeqbaPKqSc=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.42.77"
-      "sha256-2SCge72wHVg5703SucdtTdadJn9fnbnxiz8NhDXAWB0=";
+    buildMypyBoto3Package "logs" "1.42.79"
+      "sha256-CPFaU1Cz1OfBiOSh5jfPWIU64cV4k8Mf5cCM1S7ZlXw=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.42.3"

From b1093d8f0255fb760d666c18ce8b9aada47b3fb0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:40 +0200
Subject: [PATCH 156/238] python3Packages.mypy-boto3-opensearch: 1.42.73 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2e23dcd66129..0a10d7488976 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -966,8 +966,8 @@ in
       "sha256-h0urK602L1j2CtD1xsUOMaXizzc2CxbttMlaSNyQNoM=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.42.73"
-      "sha256-aRXlQy744sPCF4lUZTLaUXIzHtFUJEB9r6xaYQC6Ric=";
+    buildMypyBoto3Package "opensearch" "1.42.79"
+      "sha256-oGczBLqgxxiP+MeOt3p+5qbe32r6YzqRGJfe3CQ7srU=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.42.75"

From d3c81f4454e963149fd0aae260a728076456ab74 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:53 +0200
Subject: [PATCH 157/238] python3Packages.mypy-boto3-s3: 1.42.67 -> 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0a10d7488976..036447e200f2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1158,8 +1158,8 @@ in
       "sha256-4/Q39UsUYaluauoaLm6BOej+Krl2VbO1xKKo1orRIkI=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.42.67"
-      "sha256-OjqRiplJ8tb4Bx1JC4lo3c5jSqGVkGl1N+UYnL3KQD4=";
+    buildMypyBoto3Package "s3" "1.42.79"
+      "sha256-NTwMCEMM3fUVkiYYdeokwq64juVcyiMHLXbbZqkhoYg=";
 
   mypy-boto3-s3control =
     buildMypyBoto3Package "s3control" "1.42.37"

From cfae18ee1377f5820a32b2e44439fa932e8669d7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:19:55 +0200
Subject: [PATCH 158/238] python3Packages.mypy-boto3-sagemaker: 1.42.77 ->
 1.42.79

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 036447e200f2..2aee8a14ee6a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1170,8 +1170,8 @@ in
       "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.42.77"
-      "sha256-gm5z5bnS57ZsNpKroi91/KfYWxnAjgjPwB6IOZ6eSno=";
+    buildMypyBoto3Package "sagemaker" "1.42.79"
+      "sha256-HSSrvBgXk0HwS8ys2e8+euzupPc075axwh7WAduvvR8=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"

From b05bb03256264c33eac53445b7c950212a5544bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 08:20:15 +0000
Subject: [PATCH 159/238] python3Packages.jupyterhub: 5.4.3 -> 5.4.4

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

diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 629e583d2d78..6f6456e96af6 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -48,19 +48,19 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub";
-  version = "5.4.3";
+  version = "5.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "jupyterhub";
     tag = version;
-    hash = "sha256-2LxbLwkEXpMBE5Fy7+3vQGO+CEKM50Ou5vATT6JtA8s=";
+    hash = "sha256-c7xbZvq43YT8EE3rnuJDotIsD/pEgnQvJX8U46q6yq0=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-IlY0dRHXsrEWNfBqUSk7hwU+CmlUfGPtXTPNcOBT8Bw=";
+    hash = "sha256-64FRdLHBpnywpCLjsMoXmWp/tK00+QwNIR9yAoQFIbg=";
   };
 
   postPatch = ''

From 9d58fea37c467363745f16c72e5670e505d8b425 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 10:20:19 +0200
Subject: [PATCH 160/238] python314Packages.boto3-stubs: 1.42.78 -> 1.42.79

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index e102d84f2a11..e5ba8394ff18 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.78";
+  version = "1.42.79";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-QjM1uM6ak15AQFSXhYnNuY2fodS9Rgc9aCG/HD+tjKc=";
+    hash = "sha256-Xx++FvmCk6Z85Zdp5nCThgXVnkRCIcGwijoNeMOVB3s=";
   };
 
   build-system = [ setuptools ];

From 378d871195d00e6dc2ee8d03f74e7c2e403c41e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 08:59:05 +0000
Subject: [PATCH 161/238] python3Packages.google-cloud-iam-logging: 1.6.0 ->
 1.7.0

---
 .../python-modules/google-cloud-iam-logging/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 5cbf3cb10687..41d379d73cd7 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam-logging";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_iam_logging";
     inherit version;
-    hash = "sha256-/D0OLN0NsthrbamI9Sc0SOoCenSEHdezVNjn1OFenIA=";
+    hash = "sha256-p0PEXDzdq+DX88rW7mN9FBK7Nkhi01xubH+qeECr1d4=";
   };
 
   build-system = [ setuptools ];

From 520f0cbbc6ff1c0a8f0fdfa0b6f9426700cc8233 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 09:08:44 +0000
Subject: [PATCH 162/238] snakefmt: 0.11.5 -> 1.0.0

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

diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix
index 4cc485caf0d5..8e9fa4eca7bd 100644
--- a/pkgs/by-name/sn/snakefmt/package.nix
+++ b/pkgs/by-name/sn/snakefmt/package.nix
@@ -8,12 +8,12 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "snakefmt";
-  version = "0.11.5";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-27tt5KlTrpc463j5m6pUz89S6FqIKrtT9PA5EXeC1pM=";
+    hash = "sha256-S6evESaS1IJ3YFn3jjhccNhzkBTFOL9Xt37DuLcDKeI=";
   };
 
   build-system = with python3.pkgs; [ hatchling ];

From 1856b7222204358bcac9a729352cf10ba35e0ff1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 09:27:47 +0000
Subject: [PATCH 163/238] terraform-providers.hashicorp_google-beta: 7.24.0 ->
 7.25.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 44916dd4f2fe..d0d38564f886 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -580,13 +580,13 @@
     "vendorHash": "sha256-znm43JcwFf/NpGIaayyiOazAa7yCStrbuSNnGkyxzFA="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-WOeYK5uti8NYhR3j8BgxwnlybEGOJryIPPTEgM23Fp0=",
+    "hash": "sha256-tEkGG/4KR7tuIJCKpQpW3FGcGyDgalJdw5wFPEkQBhw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.24.0",
+    "rev": "v7.25.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-YZQMUGScsYjBkhAQ4DXYlBpAw805iKgX/iXDMTpRr6c="
+    "vendorHash": "sha256-udSeBMl8hkYTOjcMC0w8j7scyWyRmQ4gTD9jV1yqWYw="
   },
   "hashicorp_helm": {
     "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",

From 95dcb3c8f3da614d4bc007c1d64045927108b07f Mon Sep 17 00:00:00 2001
From: Jan-Niklas Weghorn <jan-niklas.weghorn@wemolo.com>
Date: Tue, 31 Mar 2026 11:31:40 +0200
Subject: [PATCH 164/238] balena-cli: pin to NodeJS 24

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

diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index a46598d869c0..318ee8928b71 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  nodejs_latest,
+  nodejs_24,
   versionCheckHook,
   node-gyp,
   python3,
@@ -13,10 +13,10 @@
 
 let
   buildNpmPackage' = buildNpmPackage.override {
-    nodejs = nodejs_latest;
+    nodejs = nodejs_24;
   };
   node-gyp' = node-gyp.override {
-    nodejs = nodejs_latest;
+    nodejs = nodejs_24;
   };
 in
 buildNpmPackage' rec {

From 8bc58dceaa231193d6dcd88ec16a2b1dff9cc19c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 09:39:15 +0000
Subject: [PATCH 165/238] vscode-extensions.astro-build.astro-vscode: 2.16.13
 -> 2.16.14

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 7dda36009f55..04c54739032e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -396,8 +396,8 @@ let
         mktplcRef = {
           name = "astro-vscode";
           publisher = "astro-build";
-          version = "2.16.13";
-          hash = "sha256-lSYNRq7D/ggdNKO0ccqbIz5gAhsr/LdX2U8S6FsTktY=";
+          version = "2.16.14";
+          hash = "sha256-WuDsYSQ5B2xA3LnU1fiXBx8yqOplGstZO0qYaLtPF0A=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";

From ae658e84b5fdf4e9cc685bcebeed417992f587ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 10:00:35 +0000
Subject: [PATCH 166/238] python3Packages.pygls: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index 76608ac9ee88..cd0501310420 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pygls";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openlawlibrary";
     repo = "pygls";
     tag = "v${version}";
-    hash = "sha256-VXLPtZDbTs59DRvrB9xv1EJshV02K+7983BHR7QKTaE=";
+    hash = "sha256-jxc1nKxfiRenb629a2WCZOzqyIOvT5XU4NrjmKPlDHk=";
   };
 
   nativeBuildInputs = [

From a4701318ff046026a7c1b0b3b0b3eb6f1a4d12f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 10:03:03 +0000
Subject: [PATCH 167/238] python3Packages.google-cloud-translate: 3.24.0 ->
 3.25.0

---
 .../python-modules/google-cloud-translate/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index eb6f622a5131..827493cdd37b 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.24.0";
+  version = "3.25.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;
-    hash = "sha256-LzuLkPjNr2OkNdGOY7IcNlDeMfxPhYYj8tDWm+DNPpo=";
+    hash = "sha256-o0AeIOPRjuq2jhW4D69PmFxsohk0r/6kA4uWHNGTEN4=";
   };
 
   build-system = [ setuptools ];

From d143493f707fc7e82be7387a62549ac4b16c4e2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 10:10:14 +0000
Subject: [PATCH 168/238] pyrefly: 0.57.1 -> 0.58.0

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

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index f99cfdb26e1e..9971ee3ffbb6 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "0.57.1";
+  version = "0.58.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-BOByPz2Ue0AjABvaqii0NJZJotyrOJhRjBpfwBCgdzs=";
+    hash = "sha256-TtmeRAYeClc9v11Hmc8GvpXOt5QlgEHZFjhiWXQU3BQ=";
   };
 
   buildAndTestSubdir = "pyrefly";
-  cargoHash = "sha256-XGiK5tVkgOmwMuBLppQ/QNR2HuVxr4vGLO66WUm8jNs=";
+  cargoHash = "sha256-f6Rfp9ANX8gxKHHY0GL9C+ao0bYUaPCjVGRbf55tC2I=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From 8c21506f2cae7cf8226516e5e018c235bbaca598 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <github@jackr.eu>
Date: Tue, 31 Mar 2026 12:18:15 +0200
Subject: [PATCH 169/238] fosrl-newt: 1.10.3 -> 1.10.4

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

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 547ccf033c97..61c667b1a7f2 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "newt";
-  version = "1.10.3";
+  version = "1.10.4";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = finalAttrs.version;
-    hash = "sha256-b/ZcU4N13+91tVhKMDPBaCGmBW11m5yQNgd1FaTxbsE=";
+    hash = "sha256-Dtzx/Rs7aa2GkG7Qq4pvGN4ghfS7EyVhx7rQh8sRlQU=";
   };
 
   vendorHash = "sha256-vy6Dqjek7pLdASbCrM9snq5Dt9lbwNJ0AuQboy1JWNQ=";

From b34d7e55d644178fb81cc232a1279e547fb93357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 10:31:53 +0000
Subject: [PATCH 170/238] python3Packages.pyoverkiz: 1.20.0 -> 1.20.1

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

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 5c96b8d2324a..aeb3153acd7c 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyoverkiz";
-  version = "1.20.0";
+  version = "1.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H1G85vleaV+ZWbjH3tozI6fvWPKxwrIVRIXiFwsUWOA=";
+    hash = "sha256-PaJ4AC0N82iGTsgP620uI6Iw9l0aHrR7UutWLYxrOYE=";
   };
 
   build-system = [ hatchling ];

From db05e94d2d9f7d4ee055314f343a93c0dedd4b5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 10:43:50 +0000
Subject: [PATCH 171/238] cockpit: 357 -> 359

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

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index 3972a43790b3..e962b1da1466 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -53,13 +53,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "357";
+  version = "359";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-4KckFQmFin0dkq9ouHRXSrkmlmsTRtAcW8Ln/Vjhylc=";
+    hash = "sha256-iYPBGd2G+IH0z8zNoUh4Aw7uMqKOTWa+ozl/SEtsZUY=";
     fetchSubmodules = true;
   };
 

From 16c8bd80278d16ec4b30ca7385016383d740db1f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 31 Mar 2026 10:51:46 +0200
Subject: [PATCH 172/238] python3Packages.construct-classes: 0.2.2 -> 0.2.3

---
 .../python-modules/construct-classes/default.nix    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index e10a7942d489..2f7bab65abb9 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -1,30 +1,25 @@
 {
   lib,
   buildPythonPackage,
+  flit-core,
   construct,
   fetchFromGitHub,
   pytestCheckHook,
-  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "construct-classes";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "matejcik";
     repo = "construct-classes";
     tag = "v${version}";
-    hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4=";
+    hash = "sha256-xRYf6Tg4XyQN+g8uOaws46KKb0abD/M/5Q+SlnzEp/8=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.8.13,<0.9.0" "uv_build>=0.8.13"
-  '';
-
-  build-system = [ uv-build ];
+  build-system = [ flit-core ];
 
   dependencies = [ construct ];
 

From 148c3c2649823f53fd1e2f059d0deacbf29c9beb Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 31 Mar 2026 13:08:58 +0200
Subject: [PATCH 173/238] river: 0.4.1 -> 0.4.2

Changelog: https://codeberg.org/river/river/releases/tag/v0.4.2
Diff: https://codeberg.org/river/river/compare/v0.4.1...v0.4.2
---
 pkgs/by-name/ri/river/build.zig.zon.nix | 6 +++---
 pkgs/by-name/ri/river/package.nix       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index 82218cc8dbfd..9ba533294dc2 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -29,10 +29,10 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wlroots-0.19.4-jmOlcqQMBABhKYH6NMSnoK1sohTbhc97_JP-hGg2UZaK";
+    name = "wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.4.tar.gz";
-      hash = "sha256-g1LOSMMnjGJIS+U7zrx6FAoUyavqwaQ2UrDv6GxCQsY=";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz";
+      hash = "sha256-QblQBVsDV2kSj31jqmVVi4hQUXuv8bsRgRMaCqlNxNM=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index cae1a65d716d..66439a4bff31 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -16,7 +16,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots_0_19,
+  wlroots_0_20,
   xwayland,
   zig_0_15,
   withManpages ? true,
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.4.1";
+  version = "0.4.2";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "river";
     repo = "river";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EGWLJY9VPdoc4LrXkWi8cNLkahorvDeAIfSOc5yDfbU=";
+    hash = "sha256-Nufonz39XphxPW1lERq2acVgE5mGmW+x1yimyS6O4tc=";
   };
 
   strictDeps = true;
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wayland-scanner
-    wlroots_0_19
+    wlroots_0_20
   ]
   ++ lib.optionals xwaylandSupport [
     libx11

From 8209a8480a25eefd2b6a034c7635379c5ef90779 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 11:51:26 +0000
Subject: [PATCH 174/238] mycelium: 0.7.3 -> 0.7.5

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

diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 6bc51e7dd609..93bbe79bedb9 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.3";
+  version = "0.7.5";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WB08dcQiz9byHNKu3ObyiQ99h18osOMeKe5hdvVaeqw=";
+    hash = "sha256-9PjYvzCHSOPlULbElJPVMnLFGTEy/FX56ZaRHUozqvE=";
   };
 
-  cargoHash = "sha256-Wo+J0aVGiS4d1oipvrvV0abdWtHQj8iJozFM7Fj/jNs=";
+  cargoHash = "sha256-LSCa8euuOX4BgEDkNQlOdgiL0QzRRMlCoA9opSnPQbI=";
 
   nativeBuildInputs = [ versionCheckHook ];
 

From db28443b882233e0fa261f06259daa36196171fd Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Tue, 31 Mar 2026 03:42:49 +0200
Subject: [PATCH 175/238] luaPackages: add .editorconfig for
 generated-packages.nix

generated-packages.nix now contains longDescription generated from the
lua rockspecs. We have little control over the description written by
authors, so they contain tabs and trailing spaces that trigger
editorconfig errors.
Ignore them.

bump
---
 pkgs/development/lua-modules/.editorconfig | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/development/lua-modules/.editorconfig

diff --git a/pkgs/development/lua-modules/.editorconfig b/pkgs/development/lua-modules/.editorconfig
new file mode 100644
index 000000000000..7a4cbee6f316
--- /dev/null
+++ b/pkgs/development/lua-modules/.editorconfig
@@ -0,0 +1,4 @@
+[generated-packages.nix]
+charset = unset
+indent_style = unset
+trim_trailing_whitespace = unset

From e7f48bdf4ba283fcc07bba3b95b2aa55148728ed Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Mon, 30 Mar 2026 23:58:42 +0200
Subject: [PATCH 176/238] luarocks-nix: 0-unstable-2024-05-31 ->
 3.13-unstable-2026-03-30

I updated luarocks-nix to work from 5.1 to 5.5 by rebasing it to latest
luarocks
---
 pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index c0f2213da657..9acca73d82e0 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -8,13 +8,13 @@
 
 luarocks_bootstrap.overrideAttrs (old: {
   pname = "luarocks-nix";
-  version = "0-unstable-2024-05-31";
+  version = "nix_v3.5.0-1-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "luarocks-nix";
-    rev = "9d0440da358eac11afdbef392e2cf3272a8c7101";
-    hash = "sha256-9SC+YQ06u35LN3mPohG7Lz0eLXPsMGKG3mhS+0zSO7Y=";
+    rev = "3a9f4bff6cdda670f866fb9f755d548a714f680a";
+    hash = "sha256-6DLy1scf6K1fWDgrORcd1gtymgxtPwwAMIzMG2Bn1Pw=";
   };
 
   propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ [

From 3c2cf57a781d8d47b55e28311e27225acf5ac6cc Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Tue, 31 Mar 2026 00:08:23 +0200
Subject: [PATCH 177/238] luaPackages: update on 2026-03-31

latest luarocks-nix generates longDescription as well
I manually removed "nvim-treesitter-legacy-api" from neorg generated
dependencies since I hope the requirement disappears soon enough.
---
 .../lua-modules/generated-packages.nix        | 973 ++++++++++++++----
 1 file changed, 773 insertions(+), 200 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 61d3b48c0582..a6f688b0a66b 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -39,9 +39,15 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/cheusov/lua-alt-getopt";
-        description = "Process application arguments the same way as getopt_long";
         maintainers = with lib.maintainers; [ arobyn ];
         license.fullName = "MIT/X11";
+        description = "Process application arguments the same way as getopt_long";
+        longDescription = ''
+          alt-getopt is a module for Lua programming language for processing
+          application's arguments the same way BSD/GNU getopt_long(3) functions do.
+          The main goal is compatibility with SUS "Utility Syntax Guidelines"
+          guidelines 3-13.
+        '';
       };
     }
   ) { };
@@ -69,9 +75,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kikito/ansicolors.lua";
-        description = "Library for color Manipulation.";
         maintainers = with lib.maintainers; [ Freed-Wu ];
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Library for color Manipulation.";
+        longDescription = ''
+          Ansicolors is a simple Lua function for printing to the console in color.
+        '';
       };
     }
   ) { };
@@ -101,8 +110,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/luarocks/argparse";
-        description = "A feature-rich command-line argument parser";
         license.fullName = "MIT";
+        description = "A feature-rich command-line argument parser";
+        longDescription = "Argparse supports positional arguments, options, flags, optional arguments, subcommands and more. Argparse automatically generates usage, help, and error messages, and can generate shell completion scripts.";
       };
     }
   ) { };
@@ -130,8 +140,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/aiq/basexx";
-        description = "A base2, base16, base32, base64 and base85 library for Lua";
         license.fullName = "MIT";
+        description = "A base2, base16, base32, base64 and base85 library for Lua";
+        longDescription = "A Lua library which provides base2(bitfield), base16(hex), base32(crockford/rfc), base64(rfc/url), base85(z85) decoding and encoding.";
       };
     }
   ) { };
@@ -162,9 +173,9 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/mikejsavage/lua-bcrypt";
-        description = "A Lua wrapper for bcrypt";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license.fullName = "ISC";
+        description = "A Lua wrapper for bcrypt";
       };
     }
   ) { };
@@ -192,9 +203,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/Tieske/binaryheap.lua";
-        description = "Binary heap implementation in pure Lua";
         maintainers = with lib.maintainers; [ vcunat ];
         license.fullName = "MIT/X11";
+        description = "Binary heap implementation in pure Lua";
+        longDescription = ''
+          Binary heaps are an efficient sorting algorithm. This module
+                implements a plain binary heap (without reverse lookup) and a
+                'unique' binary heap (with unique payloads and reverse lookup).
+        '';
       };
     }
   ) { };
@@ -224,9 +240,13 @@ final: prev: {
 
       meta = {
         homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
-        description = "Lua 5.2 bit manipulation library";
         maintainers = with lib.maintainers; [ lblasc ];
         license.fullName = "MIT";
+        description = "Lua 5.2 bit manipulation library";
+        longDescription = ''
+          bit32 is the native Lua 5.2 bit manipulation library, in the version
+                from Lua 5.3; it is compatible with Lua 5.1, 5.2, 5.3 and 5.4.
+        '';
       };
     }
   ) { };
@@ -275,8 +295,16 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/busted/";
-        description = "Elegant Lua unit testing";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Elegant Lua unit testing";
+        longDescription = ''
+          An elegant, extensible, testing framework.
+              Ships with a large amount of useful asserts,
+              plus the ability to write your own. Output
+              in pretty or plain terminal format, JSON,
+              or TAP for CI integration. Great for TDD
+              and unit, integration, and functional tests.
+        '';
       };
     }
   ) { };
@@ -304,9 +332,15 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hishamhm/busted-htest";
-        description = "A pretty output handler for Busted";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A pretty output handler for Busted";
+        longDescription = ''
+          This is an alternative output handler for Busted,
+                a unit testing framework for Lua.
+                It is based on the gtest output handler that
+                is bundled with Busted.
+        '';
       };
     }
   ) { };
@@ -339,9 +373,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/sile-typesetter/cassowary.lua";
-        description = "The cassowary constraint solver";
         maintainers = with lib.maintainers; [ alerque ];
         license.fullName = "Apache 2";
+        description = "The cassowary constraint solver";
+        longDescription = ''
+          This is a Lua port of the Cassowary constraint solving toolkit.
+                It allows you to use Lua to solve algebraic equations and inequalities
+                and find the values of unknown variables which satisfy those
+                inequalities.'';
       };
     }
   ) { };
@@ -374,9 +413,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/alerque/cldr-lua";
-        description = "Lua interface to Unicode CLDR data";
         maintainers = with lib.maintainers; [ alerque ];
         license.fullName = "MIT/ICU";
+        description = "Lua interface to Unicode CLDR data";
+        longDescription = "Unicode CLDR (Common Locale Data Repository) data and Lua interface.";
       };
     }
   ) { };
@@ -405,9 +445,9 @@ final: prev: {
 
       meta = {
         homepage = "https://linrongbin16.github.io/commons.nvim/";
-        description = "The commons lua library for Neovim plugin project.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "The commons lua library for Neovim plugin project.";
       };
     }
   ) { };
@@ -437,9 +477,15 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-compat-5.3";
-        description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
         maintainers = with lib.maintainers; [ vcunat ];
         license.fullName = "MIT";
+        description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
+        longDescription = ''
+          This is a small module that aims to make it easier to write Lua
+                code in a Lua-5.3-style that runs on Lua 5.1+.
+                It does *not* make Lua 5.2 (or even 5.1) entirely compatible
+                with Lua 5.3, but it brings the API closer to that of Lua 5.3.
+        '';
       };
     }
   ) { };
@@ -470,8 +516,13 @@ final: prev: {
 
       meta = {
         homepage = "http://cosmo.luaforge.net";
-        description = "Safe templates for Lua";
         license.fullName = "MIT/X11";
+        description = "Safe templates for Lua";
+        longDescription = ''
+          Cosmo is a "safe templates" engine. It allows you to fill nested templates,
+          providing many of the advantages of Turing-complete template engines,
+          without without the downside of allowing arbitrary code in the templates.
+        '';
       };
     }
   ) { };
@@ -499,8 +550,13 @@ final: prev: {
 
       meta = {
         homepage = "http://keplerproject.github.io/coxpcall";
-        description = "Coroutine safe xpcall and pcall";
         license.fullName = "MIT/X11";
+        description = "Coroutine safe xpcall and pcall";
+        longDescription = ''
+          Encapsulates the protected calls with a coroutine based loop, so errors can
+           be handled without the usual Lua 5.x pcall/xpcall issues with coroutines
+           yielding inside the call to pcall or xpcall.
+        '';
       };
     }
   ) { };
@@ -528,9 +584,9 @@ final: prev: {
 
       meta = {
         homepage = "http://25thandclement.com/~william/projects/cqueues.html";
-        description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix.";
         maintainers = with lib.maintainers; [ vcunat ];
         license.fullName = "MIT/X11";
+        description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix.";
       };
     }
   ) { };
@@ -569,8 +625,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/teal-language/cyan";
-        description = "A build system for the Teal language";
         license.fullName = "MIT";
+        description = "A build system for the Teal language";
+        longDescription = "A build system for the Teal language along with an api for external tooling to work with Teal";
       };
     }
   ) { };
@@ -601,8 +658,12 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/hishamhm/datafile";
-        description = "A library for handling paths when loading data files";
         license.fullName = "MIT/X11";
+        description = "A library for handling paths when loading data files";
+        longDescription = ''
+          datafile is a library for avoiding hardcoded paths
+                when loading resource files in Lua modules.
+        '';
       };
     }
   ) { };
@@ -639,8 +700,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/astoff/digestif/";
-        description = "A code analyzer for TeX";
         license.fullName = "GPLv3+ and other free licenses";
+        description = "A code analyzer for TeX";
+        longDescription = ''
+          A code analyzer for TeX documents, including LaTeX and BibTeX.  It
+              comes with a Language Server Protocol implementation, so it can
+              run as a plug-in to many different text editors.
+        '';
       };
     }
   ) { };
@@ -669,8 +735,17 @@ final: prev: {
 
       meta = {
         homepage = "https://dkolf.de/dkjson-lua/";
-        description = "David Kolf's JSON module for Lua";
         license.fullName = "MIT/X11";
+        description = "David Kolf's JSON module for Lua";
+        longDescription = ''
+          dkjson is a module for encoding and decoding JSON data. It supports UTF-8.
+
+          JSON (JavaScript Object Notation) is a format for serializing data based
+          on the syntax for JavaScript data structures.
+
+          dkjson is written in Lua without any dependencies, but
+          when LPeg is available dkjson can use it to speed up decoding.
+        '';
       };
     }
   ) { };
@@ -701,9 +776,12 @@ final: prev: {
 
       meta = {
         homepage = "http://leafo.net/lua-enet";
-        description = "A library for doing network communication in Lua";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license.fullName = "MIT";
+        description = "A library for doing network communication in Lua";
+        longDescription = ''
+          Binding to ENet, network communication layer on top of UDP.
+        '';
       };
     }
   ) { };
@@ -734,9 +812,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/leafo/etlua";
-        description = "Embedded templates for Lua";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license.fullName = "MIT";
+        description = "Embedded templates for Lua";
+        longDescription = ''
+          Allows you to render ERB style templates but with Lua. Supports <% %>, <%=
+              %> and <%- %> tags (with optional newline slurping) for embedding code.
+        '';
       };
     }
   ) { };
@@ -767,9 +849,10 @@ final: prev: {
 
       meta = {
         homepage = "https://fennel-lang.org";
-        description = "A lisp that compiles to Lua";
         maintainers = with lib.maintainers; [ misterio77 ];
         license.fullName = "MIT";
+        description = "A lisp that compiles to Lua";
+        longDescription = "Get your parens on--write macros and homoiconic code on the Lua runtime!";
       };
     }
   ) { };
@@ -798,9 +881,18 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/j-hui/fidget.nvim";
-        description = "Extensible UI for Neovim notifications and LSP progress messages.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "Extensible UI for Neovim notifications and LSP progress messages.";
+        longDescription = ''
+          Fidget is an unintrusive window in the corner of your editor that manages its own lifetime.
+          Its goals are:
+          - to provide a UI for Neovim's $/progress handler
+          - to provide a configurable vim.notify() backend
+          - to support basic ASCII animations (Fidget spinners!) to indicate signs of life
+          - to be easy to configure, sane to maintain, and fun to hack on
+          There's only so much information one can stash into the status line.
+          Besides, who doesn't love a little bit of terminal eye candy, as a treat?'';
       };
     }
   ) { };
@@ -826,8 +918,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/fifo.lua";
-        description = "A lua library/'class' that implements a FIFO";
         license.fullName = "MIT/X11";
+        description = "A lua library/'class' that implements a FIFO";
       };
     }
   ) { };
@@ -866,9 +958,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/alerque/fluent-lua";
-        description = "Lua implementation of Project Fluent";
         maintainers = with lib.maintainers; [ alerque ];
         license.fullName = "MIT";
+        description = "Lua implementation of Project Fluent";
+        longDescription = ''
+          A Lua port of Project Fluent, a localization paradigm designed to unleash
+                the entire expressive power of natural language translations.'';
       };
     }
   ) { };
@@ -897,9 +992,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/aikooo7/funnyfiles.nvim";
-        description = "This plugin is a way of creating/deleting files/folders without needing to open a file explorer.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "This plugin is a way of creating/deleting files/folders without needing to open a file explorer.";
       };
     }
   ) { };
@@ -913,24 +1008,24 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2545-1";
+      version = "0.0.2556-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2545-1.rockspec";
-          sha256 = "0hinizjvfw1ana0wkjqvrn8d3nvmcvhczda144jj6kf7y96xwazr";
+          url = "mirror://luarocks/fzf-lua-0.0.2556-1.rockspec";
+          sha256 = "0vr0cx0x1j0pniw5s16fpy5ypzpxb4hz143rgyksiyyrdz366kcc";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/8a79ee54d6216d10b2f153921a12b152be0c1a20.zip";
-        sha256 = "128slx673pgpyf9cpkl58gp0b1bgbv7fc23a8hn74n90r628pg4i";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/c9e7b7bfbd01f949164988ee1684035468e1995c.zip";
+        sha256 = "0bnfw6svi916zpy34i803a9rgjhs566imn0mrgdgmar4kf0qvw5b";
       };
 
       disabled = luaOlder "5.1";
 
       meta = {
         homepage = "https://github.com/ibhagwan/fzf-lua";
-        description = "Improved fzf.vim written in lua";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "AGPL-3.0";
+        description = "Improved fzf.vim written in lua";
       };
     }
   ) { };
@@ -959,9 +1054,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/swarn/fzy-lua";
-        description = "A lua implementation of the fzy fuzzy matching algorithm";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A lua implementation of the fzy fuzzy matching algorithm";
+        longDescription = ''
+          A Lua port of fzy's fuzzy string matching algorithm.
+          This includes both a pure Lua implementation and a compiled C implementation with a Lua wrapper.
+          fzy tries to find the result the user wants by favoring consecutive
+          matches, and matches at the beginnings of words.'';
       };
     }
   ) { };
@@ -975,23 +1075,23 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "gitsigns.nvim";
-      version = "2.0.0-1";
+      version = "2.1.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/gitsigns.nvim-2.0.0-1.rockspec";
-          sha256 = "0k4670aqxa6npyxnw7drsi0jic9vrl5izf5wwpbp2i8v1c702w80";
+          url = "mirror://luarocks/gitsigns.nvim-2.1.0-1.rockspec";
+          sha256 = "13w10vblahrqn3cahcj6f9wz1kcna93825zy01dspl3s058920yj";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/lewis6991/gitsigns.nvim/archive/42d6aed4e94e0f0bbced16bbdcc42f57673bd75e.zip";
-        sha256 = "0vz3y2kx9ljw8rryypq1s59l8q1l5vwmr3b6p6a2qa4fgpv73krg";
+        url = "https://github.com/lewis6991/gitsigns.nvim/archive/a462f416e2ce4744531c6256252dee99a7d34a83.zip";
+        sha256 = "06d7pl9h1y8v7pmlyhlxs21z17pb7ikg4yipjag2i60panp6cd8i";
       };
 
       disabled = luaOlder "5.1";
 
       meta = {
         homepage = "https://github.com/lewis6991/gitsigns.nvim";
-        description = "Git integration for buffers";
         license.fullName = "MIT";
+        description = "Git integration for buffers";
       };
     }
   ) { };
@@ -1020,9 +1120,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/MagicDuck/grug-far.nvim";
-        description = "Find And Replace plugin for neovim";
         maintainers = with lib.maintainers; [ teto ];
         license.fullName = "MIT";
+        description = "Find And Replace plugin for neovim";
       };
     }
   ) { };
@@ -1051,9 +1151,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mrcjkb/haskell-tools.nvim";
-        description = "🦥 Supercharge your Haskell experience in neovim!";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0";
+        description = " 🦥 Supercharge your Haskell experience in neovim!";
+        longDescription = ''
+          This plugin automatically configures the haskell-language-server builtin LSP client
+          and integrates with other Haskell tools. See the README's #features section
+          for more info.'';
       };
     }
   ) { };
@@ -1102,9 +1206,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/lua-http";
-        description = "HTTP library for Lua";
         maintainers = with lib.maintainers; [ vcunat ];
         license.fullName = "MIT";
+        description = "HTTP library for Lua";
       };
     }
   ) { };
@@ -1132,8 +1236,11 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kikito/inspect.lua";
-        description = "Lua table visualizer, ideal for debugging";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Lua table visualizer, ideal for debugging";
+        longDescription = ''
+          inspect will print out your lua tables nicely so you can debug your programs quickly. It sorts keys by type and name and handles recursive tables properly.
+        '';
       };
     }
   ) { };
@@ -1164,8 +1271,11 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kmarius/jsregexp";
-        description = "javascript (ECMA19) regular expressions for lua";
         license.fullName = "MIT";
+        description = "javascript (ECMA19) regular expressions for lua";
+        longDescription = ''
+          Provides ECMAScript regular expressions for Lua 5.1, 5.2, 5.3, 5.4 and LuaJit. Uses libregexp from Fabrice Bellard's QuickJS.
+          	'';
       };
     }
   ) { };
@@ -1197,8 +1307,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/ldbus";
-        description = "A Lua library to access dbus.";
         license.fullName = "MIT/X11";
+        description = "A Lua library to access dbus.";
       };
     }
   ) { };
@@ -1233,8 +1343,14 @@ final: prev: {
 
       meta = {
         homepage = "http://lunarmodules.github.io/ldoc";
-        description = "A Lua Documentation Tool";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "A Lua Documentation Tool";
+        longDescription = ''
+          LDoc is a LuaDoc-compatible documentation generator which can also
+                process C extension source. Markdown may be optionally used to
+                render comments, as well as integrated readme documentation and
+                pretty-printed example files
+        '';
       };
     }
   ) { };
@@ -1265,8 +1381,13 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/pavouk/lgi";
-        description = "Lua bindings to GObject libraries";
         license.fullName = "MIT/X11";
+        description = "Lua bindings to GObject libraries";
+        longDescription = ''
+          Dynamic Lua binding to any library which is introspectable
+          	 using gobject-introspection.  Allows using GObject-based libraries
+          	 directly from Lua.
+        '';
       };
     }
   ) { };
@@ -1290,8 +1411,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-linenoise";
-        description = "A binding for the linenoise command line library";
         license.fullName = "MIT/X11";
+        description = "A binding for the linenoise command line library";
       };
     }
   ) { };
@@ -1319,9 +1440,9 @@ final: prev: {
 
       meta = {
         homepage = "http://www.myriabit.com/ljsyscall/";
-        description = "LuaJIT Linux syscall FFI";
         maintainers = with lib.maintainers; [ lblasc ];
         license.fullName = "MIT";
+        description = "LuaJIT Linux syscall FFI";
       };
     }
   ) { };
@@ -1364,9 +1485,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/jeffzi/llscheck";
-        description = "Human-friendly Lua code analysis powered by Lua Language Server";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "Human-friendly Lua code analysis powered by Lua Language Server";
+        longDescription = ''
+          LLSCheck runs Lua Language Server diagnostics and formats results for humans.
+                Returns non-zero on errors for CI integration. Also usable as a Lua module.
+        '';
       };
     }
   ) { };
@@ -1388,9 +1513,13 @@ final: prev: {
 
       meta = {
         homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmathx";
-        description = "C99 extensions for the math library";
         maintainers = with lib.maintainers; [ alexshpilkin ];
         license.fullName = "Public domain";
+        description = "C99 extensions for the math library";
+        longDescription = ''
+          An extension of the Lua math library with the functions
+                available in C99.
+        '';
       };
     }
   ) { };
@@ -1419,9 +1548,10 @@ final: prev: {
 
       meta = {
         homepage = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.html";
-        description = "Lua API for the GNU MPFR library";
         maintainers = with lib.maintainers; [ alexshpilkin ];
         license.fullName = "LGPL";
+        description = "Lua API for the GNU MPFR library";
+        longDescription = "The MPFR library is a C library for multi-precision floating-point computations with correct rounding. This extension allows the use of the MPFR library from within Lua.";
       };
     }
   ) { };
@@ -1452,9 +1582,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/leafo/loadkit";
-        description = "Loadkit allows you to load arbitrary files within the Lua package path";
         maintainers = with lib.maintainers; [ alerque ];
         license.fullName = "MIT";
+        description = "Loadkit allows you to load arbitrary files within the Lua package path";
+        longDescription = ''
+          Loadkit lets you register new file extension handlers that can be opened
+          		with require, or you can just search for files of any extension using the
+          		current search path.
+        '';
       };
     }
   ) { };
@@ -1482,8 +1617,16 @@ final: prev: {
 
       meta = {
         homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html";
-        description = "Parsing Expression Grammars For Lua";
         license.fullName = "MIT/X11";
+        description = "Parsing Expression Grammars For Lua";
+        longDescription = ''
+          LPeg is a new pattern-matching library for Lua, based on Parsing
+                Expression Grammars (PEGs). The nice thing about PEGs is that it
+                has a formal basis (instead of being an ad-hoc set of features),
+                allows an efficient and simple implementation, and does most things
+                we expect from a pattern-matching library (and more, as we can
+                define entire grammars).
+        '';
       };
     }
   ) { };
@@ -1512,8 +1655,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
-        description = "a collection of LPEG patterns";
         license.fullName = "MIT";
+        description = "a collection of LPEG patterns";
       };
     }
   ) { };
@@ -1541,8 +1684,16 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/sqmedeiros/lpeglabel/";
-        description = "Parsing Expression Grammars For Lua with Labeled Failures";
         license.fullName = "MIT/X11";
+        description = "Parsing Expression Grammars For Lua with Labeled Failures";
+        longDescription = ''
+          LPegLabel is a conservative extension of the LPeg library that provides
+               an implementation of Parsing Expression Grammars (PEGs) with labeled failures.
+               By using labeled failures we can properly report syntactical errors.
+               We can also recover from such errors by describing a grammar rule with
+               the same name of a given label.
+               LPegLabel also reports the farthest failure position in case of an ordinary failure.
+        '';
       };
     }
   ) { };
@@ -1573,8 +1724,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        description = "Regular expression library binding (GNU flavour).";
         license.fullName = "MIT/X11";
+        description = "Regular expression library binding (GNU flavour).";
+        longDescription = ''
+          Lrexlib is a regular expression library for Lua 5.1-5.4, which
+          provides bindings for several regular expression libraries.
+          This rock provides the GNU bindings.'';
       };
     }
   ) { };
@@ -1605,9 +1760,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        description = "Regular expression library binding (oniguruma flavour).";
         maintainers = with lib.maintainers; [ junestepp ];
         license.fullName = "MIT/X11";
+        description = "Regular expression library binding (oniguruma flavour).";
+        longDescription = ''
+          Lrexlib is a regular expression library for Lua 5.1-5.4, which
+          provides bindings for several regular expression libraries.
+          This rock provides the oniguruma bindings.'';
       };
     }
   ) { };
@@ -1638,8 +1797,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        description = "Regular expression library binding (PCRE flavour).";
         license.fullName = "MIT/X11";
+        description = "Regular expression library binding (PCRE flavour).";
+        longDescription = ''
+          Lrexlib is a regular expression library for Lua 5.1-5.4, which
+          provides bindings for several regular expression libraries.
+          This rock provides the PCRE bindings.'';
       };
     }
   ) { };
@@ -1670,8 +1833,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
-        description = "Regular expression library binding (POSIX flavour).";
         license.fullName = "MIT/X11";
+        description = "Regular expression library binding (POSIX flavour).";
+        longDescription = ''
+          Lrexlib is a regular expression library for Lua 5.1-5.4, which
+          provides bindings for several regular expression libraries.
+          This rock provides the POSIX bindings.'';
       };
     }
   ) { };
@@ -1700,9 +1867,9 @@ final: prev: {
 
       meta = {
         homepage = "https://linrongbin16.github.io/lsp-progress.nvim/";
-        description = "A performant lsp progress status for Neovim.";
         maintainers = with lib.maintainers; [ gepbird ];
         license.fullName = "MIT";
+        description = "A performant lsp progress status for Neovim.";
       };
     }
   ) { };
@@ -1732,8 +1899,15 @@ final: prev: {
 
       meta = {
         homepage = "http://lua.sqlite.org/";
-        description = "A binding for Lua to the SQLite3 database library";
         license.fullName = "MIT";
+        description = "A binding for Lua to the SQLite3 database library";
+        longDescription = ''
+          lsqlite3 is a thin wrapper around the public domain SQLite3 database engine. SQLite3 is
+                  dynamically linked to lsqlite3. The statically linked alternative is lsqlite3complete.
+                  The lsqlite3 module supports the creation and manipulation of SQLite3 databases.
+                  Most sqlite3 functions are called via an object-oriented interface to either
+                  database or SQL statement objects.
+        '';
       };
     }
   ) { };
@@ -1764,8 +1938,16 @@ final: prev: {
 
       meta = {
         homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
-        description = "A fast JSON encoding/parsing module";
         license.fullName = "MIT";
+        description = "A fast JSON encoding/parsing module";
+        longDescription = ''
+          The Lua CJSON module provides JSON support for Lua. It features:
+                  - Fast, standards compliant encoding/parsing routines
+                  - Full support for JSON with UTF-8, including decoding surrogate pairs
+                  - Optional run-time support for common exceptions to the JSON specification
+                    (infinity, NaN,..)
+                  - No dependencies on other libraries
+        '';
       };
     }
   ) { };
@@ -1796,8 +1978,8 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/antirez/lua-cmsgpack";
-        description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
         license.fullName = "Two-clause BSD";
+        description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
       };
     }
   ) { };
@@ -1827,8 +2009,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/Lua-cURL";
-        description = "Lua binding to libcurl";
         license.fullName = "MIT/X11";
+        description = "Lua binding to libcurl";
+        longDescription = "";
       };
     }
   ) { };
@@ -1887,8 +2070,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-iconv/";
-        description = "Lua binding to the iconv";
         license.fullName = "MIT/X11";
+        description = "Lua binding to the iconv";
+        longDescription = ''
+          Lua binding to the POSIX 'iconv' library, which converts a sequence of
+               characters from one codeset into a sequence of corresponding characters
+               in another codeset.
+        '';
       };
     }
   ) { };
@@ -1928,8 +2116,19 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/Alloyed/lua-lsp";
-        description = "A Language Server implementation for lua, the language";
         license.fullName = "MIT";
+        description = "A Language Server implementation for lua, the language";
+        longDescription = ''
+          A Language Server for Lua code, written in Lua.
+          It's still a work in progress, but it's usable for day-to-day. It currently
+          supports:
+
+          * Limited autocompletion
+          * Goto definition
+          * As you type linting and syntax checking
+          * Code formatting
+          * Supports Lua 5.1-5.3 and Luajit
+        '';
       };
     }
   ) { };
@@ -1957,8 +2156,13 @@ final: prev: {
 
       meta = {
         homepage = "https://fperrad.frama.io/lua-MessagePack/";
-        description = "a pure Lua implementation of the MessagePack serialization format";
         license.fullName = "MIT/X11";
+        description = "a pure Lua implementation of the MessagePack serialization format";
+        longDescription = ''
+          MessagePack is an efficient binary serialization format.
+
+                  It lets you exchange data among multiple languages like JSON but it's faster and smaller.
+        '';
       };
     }
   ) { };
@@ -1989,9 +2193,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/starwing/lua-protobuf";
-        description = "protobuf data support for Lua";
         maintainers = with lib.maintainers; [ lockejan ];
         license.fullName = "MIT";
+        description = "protobuf data support for Lua";
+        longDescription = ''
+          This project offers a simple C library for basic protobuf wire format encode/decode.
+        '';
       };
     }
   ) { };
@@ -2022,8 +2229,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/ledgetech/lua-resty-http";
-        description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
         license.fullName = "2-clause BSD";
+        description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
       };
     }
   ) { };
@@ -2056,8 +2263,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/cdbattags/lua-resty-jwt";
-        description = "JWT for ngx_lua and LuaJIT.";
         license.fullName = "Apache License Version 2";
+        description = "JWT for ngx_lua and LuaJIT.";
+        longDescription = ''
+          This library requires an nginx build
+              with OpenSSL, the ngx_lua module,
+              the LuaJIT 2.0, the lua-resty-hmac,
+              and the lua-resty-string,
+        '';
       };
     }
   ) { };
@@ -2096,8 +2309,19 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/zmartzone/lua-resty-openidc";
-        description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
         license.fullName = "Apache 2.0";
+        description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
+        longDescription = ''
+          lua-resty-openidc is a library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality.
+
+                  When used as an OpenID Connect Relying Party it authenticates users against an OpenID Connect Provider using OpenID Connect Discovery and the Basic Client Profile (i.e. the Authorization Code flow). When used as an OAuth 2.0 Resource Server it can validate OAuth 2.0 Bearer Access Tokens against an Authorization Server or, in case a JSON Web Token is used for an Access Token, verification can happen against a pre-configured secret/key .
+
+                  It maintains sessions for authenticated users by leveraging lua-resty-session thus offering a configurable choice between storing the session state in a client-side browser cookie or use in of the server-side storage mechanisms shared-memory|memcache|redis.
+
+                  It supports server-wide caching of resolved Discovery documents and validated Access Tokens.
+
+                  It can be used as a reverse proxy terminating OAuth/OpenID Connect in front of an origin server so that the origin server/services can be protected with the relevant standards without implementing those on the server itself.
+        '';
       };
     }
   ) { };
@@ -2125,8 +2349,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/fffonion/lua-resty-openssl";
-        description = "No summary";
         license.fullName = "BSD";
+        description = "No summary";
+        longDescription = "FFI-based OpenSSL binding for LuaJIT.";
       };
     }
   ) { };
@@ -2163,8 +2388,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/bungle/lua-resty-session";
-        description = "Session Library for OpenResty - Flexible and Secure";
         license.fullName = "BSD";
+        description = "Session Library for OpenResty - Flexible and Secure";
+        longDescription = "lua-resty-session is a secure, and flexible session library for OpenResty.";
       };
     }
   ) { };
@@ -2193,9 +2419,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lblasc/lua-rtoml";
-        description = "Lua bindings for the Rust toml crate.";
         maintainers = with lib.maintainers; [ lblasc ];
         license.fullName = "MIT";
+        description = "Lua bindings for the Rust toml crate.";
       };
     }
   ) { };
@@ -2221,9 +2447,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/xlq/lua-subprocess";
-        description = "A Lua module written in C that allows you to create child processes and communicate with them.";
         maintainers = with lib.maintainers; [ scoder12 ];
         license.fullName = "MIT";
+        description = "A Lua module written in C that allows you to create child processes and communicate with them.";
+        longDescription = "A Lua module written in C that allows you to create child processes and communicate with them. The API is based on the Python subprocess module, but is not yet as complete.";
       };
     }
   ) { };
@@ -2245,8 +2472,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-term";
-        description = "Terminal functions for Lua";
         license.fullName = "MIT/X11";
+        description = "Terminal functions for Lua";
       };
     }
   ) { };
@@ -2277,8 +2504,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/jonstoler/lua-toml";
-        description = "toml decoder/encoder for Lua";
         license.fullName = "MIT";
+        description = "toml decoder/encoder for Lua";
+        longDescription = "TOML 0.4.0 compliant Lua library with tests. Serializes TOML into a Lua table, and serlaizes Lua tables into TOML.";
       };
     }
   ) { };
@@ -2307,9 +2535,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorg/lua-utils.nvim";
-        description = "A set of utility functions for Neovim plugins.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A set of utility functions for Neovim plugins.";
+        longDescription = ''
+          This repository contains a small set of nicities for performing repetitive tasks within Neovim.
+          This set may shrink further as the features are included in other, larger "utility kits".
+          The code you see in this repository is primarily used within Neorg.
+          All functions are annotated using LuaCATS.'';
       };
     }
   ) { };
@@ -2340,9 +2573,9 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/brimworks/lua-yajl";
-        description = "Integrate the yajl JSON library with Lua.";
         maintainers = with lib.maintainers; [ pstn ];
         license.fullName = "MIT/X11";
+        description = "Integrate the yajl JSON library with Lua.";
       };
     }
   ) { };
@@ -2373,9 +2606,15 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/brimworks/lua-zlib";
-        description = "Simple streaming interface to zlib for Lua.";
         maintainers = with lib.maintainers; [ koral ];
         license.fullName = "MIT";
+        description = "Simple streaming interface to zlib for Lua.";
+        longDescription = ''
+          Simple streaming interface to zlib for Lua.
+                Consists of two functions: inflate and deflate.
+                Both functions return "stream functions" (takes a buffer of input and returns a buffer of output).
+                This project is hosted on github.
+        '';
       };
     }
   ) { };
@@ -2406,8 +2645,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua_cliargs.git";
-        description = "A command-line argument parsing module for Lua";
         license.fullName = "MIT";
+        description = "A command-line argument parsing module for Lua";
+        longDescription = ''
+          This module adds support for accepting CLI arguments easily using multiple
+                notations and argument types.
+
+                cliargs allows you to define required, optional, and flag arguments.
+        '';
       };
     }
   ) { };
@@ -2434,8 +2679,12 @@ final: prev: {
 
       meta = {
         homepage = "http://bitop.luajit.org/";
-        description = "Lua Bit Operations Module";
         license.fullName = "MIT/X license";
+        description = "Lua Bit Operations Module";
+        longDescription = ''
+          Lua BitOp is a C extension module for Lua 5.1 which adds bitwise operations on numbers. 
+          Lua BitOp is Copyright © 2008 Mike Pall. Lua BitOp is free software, released under the MIT/X license (same license as the Lua core).
+        '';
       };
     }
   ) { };
@@ -2472,8 +2721,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luacheck";
-        description = "A static analyzer and a linter for Lua";
         license.fullName = "MIT";
+        description = "A static analyzer and a linter for Lua";
+        longDescription = ''
+          Luacheck is a command-line tool for linting and static analysis of Lua
+                code. It is able to spot usage of undefined global variables, unused
+                local variables and a few other typical problems within Lua programs.
+        '';
       };
     }
   ) { };
@@ -2505,9 +2759,17 @@ final: prev: {
       propagatedBuildInputs = [ datafile ];
 
       meta = {
-        homepage = "https://lunarmodules.github.io/luacov/";
-        description = "Coverage analysis tool for Lua scripts";
+        homepage = "https://lunarmodules.github.ioluacov/";
         license.fullName = "MIT";
+        description = "Coverage analysis tool for Lua scripts";
+        longDescription = ''
+          LuaCov is a simple coverage analysis tool for Lua scripts.
+                When a Lua script is run with the luacov module, it
+                generates a stats file. The luacov command-line script then
+                processes this file generating a report indicating which code
+                paths were not traversed, which is useful for verifying the
+                effectiveness of a test suite.
+        '';
       };
     }
   ) { };
@@ -2538,9 +2800,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/luacov-reporter-lcov";
-        description = "A luacov reporter for use with lcov";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license.fullName = "MIT";
+        description = "A luacov reporter for use with lcov";
       };
     }
   ) { };
@@ -2572,8 +2834,18 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        description = "Database abstraction layer";
         license.fullName = "MIT/X11";
+        description = "Database abstraction layer";
+        longDescription = ''
+          LuaDBI is a database interface library for Lua. It is designed 
+          		to provide a RDBMS agnostic API for handling database 
+          		operations. LuaDBI also provides support for prepared statement 
+          		handles, placeholders and bind parameters for all database 
+          		operations.
+          		
+          		This rock is the front end DBI module. You will need one or 
+          		more backend DBD drivers to use this software.
+          	'';
       };
     }
   ) { };
@@ -2607,8 +2879,18 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        description = "Database abstraction layer";
         license.fullName = "MIT/X11";
+        description = "Database abstraction layer";
+        longDescription = ''
+          LuaDBI is a database interface library for Lua. It is designed 
+          		to provide a RDBMS agnostic API for handling database 
+          		operations. LuaDBI also provides support for prepared statement 
+          		handles, placeholders and bind parameters for all database 
+          		operations.
+          		
+          		This rock is the MySQL DBD module. You will also need the
+          		base DBI module to use this software.
+          	'';
       };
     }
   ) { };
@@ -2642,8 +2924,18 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        description = "Database abstraction layer";
         license.fullName = "MIT/X11";
+        description = "Database abstraction layer";
+        longDescription = ''
+          LuaDBI is a database interface library for Lua. It is designed 
+          		to provide a RDBMS agnostic API for handling database 
+          		operations. LuaDBI also provides support for prepared statement 
+          		handles, placeholders and bind parameters for all database 
+          		operations.
+          		
+          		This rock is the PostgreSQL DBD module. You will also need the
+          		base DBI module to use this software.
+          	'';
       };
     }
   ) { };
@@ -2677,8 +2969,18 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mwild1/luadbi";
-        description = "Database abstraction layer";
         license.fullName = "MIT/X11";
+        description = "Database abstraction layer";
+        longDescription = ''
+          LuaDBI is a database interface library for Lua. It is designed 
+          		to provide a RDBMS agnostic API for handling database 
+          		operations. LuaDBI also provides support for prepared statement 
+          		handles, placeholders and bind parameters for all database 
+          		operations.
+          		
+          		This rock is the Sqlite3 DBD module. You will also need the
+          		base DBI module to use this software.
+          	'';
       };
     }
   ) { };
@@ -2712,8 +3014,12 @@ final: prev: {
 
       meta = {
         homepage = "http://siffiejoe.github.io/lua-luaepnf/";
-        description = "Extended PEG Notation Format (easy grammars for LPeg)";
         license.fullName = "MIT";
+        description = "Extended PEG Notation Format (easy grammars for LPeg)";
+        longDescription = ''
+          This Lua module provides sugar for writing grammars/parsers using
+              the LPeg library. It simplifies error reporting and AST building.
+        '';
       };
     }
   ) { };
@@ -2741,8 +3047,11 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/harningt/luaevent";
-        description = "libevent binding for Lua";
         license.fullName = "MIT";
+        description = "libevent binding for Lua";
+        longDescription = ''
+          This is a binding of libevent to Lua
+        '';
       };
     }
   ) { };
@@ -2773,12 +3082,16 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/luaexpat";
-        description = "XML Expat parsing";
         maintainers = with lib.maintainers; [
           arobyn
           flosse
         ];
         license.fullName = "MIT/X11";
+        description = "XML Expat parsing";
+        longDescription = ''
+          LuaExpat is a SAX (Simple API for XML) XML parser based on the
+          		Expat library.
+          	'';
       };
     }
   ) { };
@@ -2809,8 +3122,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/facebook/luaffifb";
-        description = "FFI library for calling C functions from lua";
         license.fullName = "BSD";
+        description = "FFI library for calling C functions from lua";
+        longDescription = "";
       };
     }
   ) { };
@@ -2841,9 +3155,15 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luafilesystem";
-        description = "File System Library for the Lua Programming Language";
         maintainers = with lib.maintainers; [ flosse ];
         license.fullName = "MIT/X11";
+        description = "File System Library for the Lua Programming Language";
+        longDescription = ''
+          LuaFileSystem is a Lua library developed to complement the set of
+                functions related to file systems offered by the standard Lua
+                distribution. LuaFileSystem offers a portable way to access the
+                underlying directory structure and file attributes.
+        '';
       };
     }
   ) { };
@@ -2874,9 +3194,16 @@ final: prev: {
 
       meta = {
         homepage = "https://lualdap.github.io/lualdap/";
-        description = "A Lua interface to the OpenLDAP library";
         maintainers = with lib.maintainers; [ aanderse ];
         license.fullName = "MIT";
+        description = "A Lua interface to the OpenLDAP library";
+        longDescription = ''
+          LuaLDAP is a simple interface from Lua to an LDAP client, in
+                 fact it is a bind to OpenLDAP. It enables a Lua program to
+                 connect to an LDAP server; execute any operation (search, add,
+                 compare, delete, modify and rename); retrieve entries and
+                 references of the search result.
+        '';
       };
     }
   ) { };
@@ -2907,8 +3234,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-lualine/lualine.nvim";
-        description = "A blazing fast and easy to configure neovim statusline plugin written in pure lua.";
         license.fullName = "MIT";
+        description = "A blazing fast and easy to configure neovim statusline plugin written in pure lua.";
       };
     }
   ) { };
@@ -2939,8 +3266,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lualogging";
-        description = "A simple API to use logging features";
         license.fullName = "MIT/X11";
+        description = "A simple API to use logging features";
+        longDescription = ''
+          LuaLogging provides a simple API to use logging features in Lua. Its design was
+              based on log4j. LuaLogging currently supports, through the use of appenders,
+              console, file, rolling file, email, socket and SQL outputs.
+        '';
       };
     }
   ) { };
@@ -2966,8 +3298,8 @@ final: prev: {
 
       meta = {
         homepage = "http://25thandclement.com/~william/projects/luaossl.html";
-        description = "Most comprehensive OpenSSL module in the Lua universe.";
         license.fullName = "MIT/X11";
+        description = "Most comprehensive OpenSSL module in the Lua universe.";
       };
     }
   ) { };
@@ -2997,9 +3329,13 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/luaposix/luaposix/";
-        description = "Lua bindings for POSIX";
         maintainers = with lib.maintainers; [ lblasc ];
         license.fullName = "MIT/X11";
+        description = "Lua bindings for POSIX";
+        longDescription = ''
+          A library binding various POSIX APIs. POSIX is the IEEE Portable
+                Operating System Interface standard. luaposix is based on lposix.
+        '';
       };
     }
   ) { };
@@ -3032,9 +3368,41 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/dpapavas/luaprompt";
-        description = "A Lua command prompt with pretty-printing and auto-completion";
         maintainers = with lib.maintainers; [ Freed-Wu ];
         license.fullName = "MIT/X11";
+        description = "A Lua command prompt with pretty-printing and auto-completion";
+        longDescription = ''
+          luaprompt is both an interactive Lua prompt that can be used instead
+          of the official interpreter, as well as module that provides a Lua
+          command prompt that can be embedded in a host application.  As a
+          standalone interpreter it provides many conveniences that are missing
+          from the official Lua interpreter.  As an embedded prompt, it's meant
+          for applications that use Lua as a configuration or interface language
+          and can therefore benefit from an interactive prompt for debugging or
+          regular use.
+
+          luaprompt features:
+
+          * Readline-based input with history and completion: In particular all
+            keywords, global variables and table accesses (with string or
+            integer keys) can be completed in addition to readline's standard
+            file completion.  Module names are also completed, for modules
+            installed in the standard directories, and completed modules can
+            optionally be loaded.
+
+          * Persistent command history (retained across sessions), as well as
+            recording of command results for future reference.
+
+          * Proper value pretty-printing for interactive use: When an expression
+            is entered at the prompt, all returned values are printed
+            (prepending with an equal sign is not required).  Values are printed
+            in a descriptive way that tries to be as readable as possible.  The
+            formatting tries to mimic Lua code (this is done to minimize
+            ambiguities and no guarantees are made that it is valid code).
+            Additionally, each value is stored in a table for future reference.
+
+          * Color highlighting of error messages and variable printouts.
+        '';
       };
     }
   ) { };
@@ -3062,8 +3430,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/hoelzro/lua-repl";
-        description = "A reusable REPL component for Lua, written in Lua";
         license.fullName = "MIT/X11";
+        description = "A reusable REPL component for Lua, written in Lua";
       };
     }
   ) { };
@@ -3091,12 +3459,21 @@ final: prev: {
 
       meta = {
         homepage = "http://www.luarocks.org";
-        description = "A package manager for Lua modules.";
         maintainers = with lib.maintainers; [
           mrcjkb
           teto
         ];
         license.fullName = "MIT";
+        description = "A package manager for Lua modules.";
+        longDescription = ''
+          LuaRocks allows you to install Lua modules as self-contained
+                packages called "rocks", which also contain version dependency
+                information. This information is used both during installation,
+                so that when one rock is requested all rocks it depends on are
+                installed as well, and at run time, so that when a module is
+                required, the correct version is loaded. LuaRocks supports both
+                local and remote repositories, and multiple local rocks trees.
+        '';
       };
     }
   ) { };
@@ -3124,9 +3501,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mlua-rs/luarocks-build-rust-mlua";
-        description = "A LuaRocks build backend for Lua modules written in Rust using mlua";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A LuaRocks build backend for Lua modules written in Rust using mlua";
       };
     }
   ) { };
@@ -3157,9 +3534,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/luarocks-build-treesitter-parser";
-        description = "A luarocks build backend for tree-sitter parsers.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A luarocks build backend for tree-sitter parsers.";
       };
     }
   ) { };
@@ -3190,9 +3567,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/luarocks-build-treesitter-parser-cpp";
-        description = "A luarocks build backend for tree-sitter parsers written in C++.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A luarocks build backend for tree-sitter parsers written in C++.";
       };
     }
   ) { };
@@ -3225,9 +3602,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/brunoos/luasec/wiki";
-        description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
         maintainers = with lib.maintainers; [ flosse ];
         license.fullName = "MIT";
+        description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
+        longDescription = "This version delegates to LuaSocket the TCP connection establishment between the client and server. Then LuaSec uses this connection to start a secure TLS/SSL session.";
       };
     }
   ) { };
@@ -3258,8 +3636,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/L3MON4D3/LuaSnip";
-        description = "Snippet Engine for Neovim written in Lua.";
         license.fullName = "Apache-2.0";
+        description = "Snippet Engine for Neovim written in Lua.";
       };
     }
   ) { };
@@ -3290,8 +3668,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luasocket";
-        description = "Network support for the Lua language";
         license.fullName = "MIT";
+        description = "Network support for the Lua language";
+        longDescription = ''
+          LuaSocket is a Lua extension library composed of two parts: a set of C
+                modules that provide support for the TCP and UDP transport layers, and a
+                set of Lua modules that provide functions commonly needed by applications
+                that deal with the Internet.
+        '';
       };
     }
   ) { };
@@ -3322,8 +3706,13 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/luasql/";
-        description = "Database connectivity for Lua (SQLite3 driver)";
         license.fullName = "MIT/X11";
+        description = "Database connectivity for Lua (SQLite3 driver)";
+        longDescription = ''
+          LuaSQL is a simple interface from Lua to a DBMS. It enables a
+                Lua program to connect to databases, execute arbitrary SQL statements
+                and retrieve results in a row-by-row cursor fashion.
+        '';
       };
     }
   ) { };
@@ -3356,8 +3745,12 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/busted/";
-        description = "Lua assertions extension";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Lua assertions extension";
+        longDescription = ''
+          Adds a framework that allows registering new assertions
+              without compromising builtin assertion functionality.
+        '';
       };
     }
   ) { };
@@ -3388,8 +3781,11 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/luasystem";
-        description = "Platform independent system calls for Lua.";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Platform independent system calls for Lua.";
+        longDescription = ''
+          Adds a Lua API for making platform independent system calls.
+        '';
       };
     }
   ) { };
@@ -3420,8 +3816,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/f4z3r/luatext/tree/main";
-        description = "A small library to print colored text";
         license.fullName = "MIT";
+        description = "A small library to print colored text";
+        longDescription = ''
+          A libary providing an abstaction over ANSI escape codes
+                that allow to print text to terminals in different colors
+                and with various modifiers.
+        '';
       };
     }
   ) { };
@@ -3435,23 +3836,23 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luaunbound";
-      version = "1.0.0-1";
+      version = "1.1.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luaunbound-1.0.0-1.rockspec";
-          sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn";
+          url = "mirror://luarocks/luaunbound-1.1.0-1.rockspec";
+          sha256 = "0d0qybfl309yqnl8h35m6xynj4wnwmvm1cxl31jqrnahym30w5d8";
         }).outPath;
       src = fetchurl {
-        url = "https://code.zash.se/dl/luaunbound/luaunbound-1.0.0.tar.gz";
-        sha256 = "1lsh0ylp5xskygxl5qdv6mhkm1x8xp0vfd5prk5hxkr19jk5mr3d";
+        url = "https://code.zash.se/dl/luaunbound/luaunbound-1.1.0.tar.gz";
+        sha256 = "0i02m7ivbjgj3271yvpac5pvm01nrynsff1pgp6d8qfc3r35jq93";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "https://www.zash.se/luaunbound.html";
-        description = "A binding to libunbound";
         license.fullName = "MIT";
+        description = "A binding to libunbound";
       };
     }
   ) { };
@@ -3466,24 +3867,42 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luaunit";
-      version = "3.4-1";
+      version = "3.5-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luaunit-3.4-1.rockspec";
-          sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n";
+          url = "mirror://luarocks/luaunit-3.5-1.rockspec";
+          sha256 = "0rn0d9ng91rhrhvzq965przpxz5xx9vfyyakscfggf8xhg9g8s9p";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip";
-        sha256 = "0qf07y3229lq3qq1mfkv83gzbc7dgyr67hysqjb5bbk333flv56r";
+        url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_5/rock-luaunit-3.5.zip";
+        sha256 = "0qxk89c14s8gmzm7ka5caxn2qr3y4bxs1jqcni1hwfzkjh5jmyzk";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "http://github.com/bluebird75/luaunit";
-        description = "A unit testing framework for Lua";
         maintainers = with lib.maintainers; [ lockejan ];
         license.fullName = "BSD";
+        description = "A unit testing framework for Lua";
+        longDescription = ''
+          LuaUnit is a popular unit-testing framework for Lua, with an interface typical
+          		of xUnit libraries (Python unittest, Junit, NUnit, ...). It supports 
+          		several output formats (Text, TAP, JUnit, ...) to be used directly or work with Continuous Integration platforms
+          		(Jenkins, Hudson, ...).
+
+          		For simplicity, LuaUnit is contained into a single-file and has no external dependency. 
+
+          		Tutorial and reference documentation is available on
+          		[read-the-docs](http://luaunit.readthedocs.org/en/latest/)
+
+          		LuaUnit may also be used as an assertion library, to validate assertions inside a running program. In addition, it provides
+          		a pretty stringifier which converts any type into a nicely formatted string (including complex nested or recursive tables).
+
+          		To install LuaUnit from LuaRocks, you need at least LuaRocks version 2.4.4 (due to old versions of wget being incompatible
+          		with GitHub https downloading)
+
+          	'';
       };
     }
   ) { };
@@ -3511,9 +3930,12 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/starwing/luautf8";
-        description = "A UTF-8 support module for Lua";
         maintainers = with lib.maintainers; [ pstn ];
         license.fullName = "MIT";
+        description = "A UTF-8 support module for Lua";
+        longDescription = ''
+          This module adds UTF-8 support to Lua. It's compatible with Lua "string" module.
+        '';
       };
     }
   ) { };
@@ -3545,8 +3967,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mpeterv/luazip";
-        description = "Library for reading files inside zip files";
         license.fullName = "MIT";
+        description = "Library for reading files inside zip files";
+        longDescription = ''
+          LuaZip is a lightweight Lua extension library used to read files
+          stored inside zip files. The API is very similar to the standard
+          Lua I/O library API.
+        '';
       };
     }
   ) { };
@@ -3579,8 +4006,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/svermeulen/lusc_luv";
-        description = "Structured Async/Concurrency for Lua using Luv";
         license.fullName = "MIT";
+        description = "Structured Async/Concurrency for Lua using Luv";
+        longDescription = "Structured Async/Concurrency for Lua using Luv";
       };
     }
   ) { };
@@ -3612,9 +4040,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rktjmp/lush.nvim";
-        description = "Define Neovim themes as a DSL in lua, with real-time feedback.";
         maintainers = with lib.maintainers; [ teto ];
         license.fullName = "MIT/X11";
+        description = "Define Neovim themes as a DSL in lua, with real-time feedback.";
+        longDescription = ''
+          Lush is a colorscheme creation aid, written in Lua, for Neovim.
+          	'';
       };
     }
   ) { };
@@ -3643,8 +4074,12 @@ final: prev: {
 
       meta = {
         homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
-        description = "A library for UUID generation";
         license.fullName = "Public domain";
+        description = "A library for UUID generation";
+        longDescription = ''
+          A library for generating universally unique identifiers based on
+                libuuid, which is part of e2fsprogs.
+        '';
       };
     }
   ) { };
@@ -3674,9 +4109,10 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/gvvaughan/lyaml";
-        description = "libYAML binding for Lua";
         maintainers = with lib.maintainers; [ lblasc ];
         license.fullName = "MIT/X11";
+        description = "libYAML binding for Lua";
+        longDescription = "Read and write YAML format files with Lua.";
       };
     }
   ) { };
@@ -3705,9 +4141,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorocks/lz.n";
-        description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2+";
+        description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins.";
+        longDescription = ''
+          It is intended to be used
+          - by users or plugin managers that don't provide a convenient API for lazy-loading.
+          - by plugin managers, to provide a convenient API for lazy-loading.'';
       };
     }
   ) { };
@@ -3736,9 +4176,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/BirdeeHub/lze";
-        description = "A lazy-loading library for neovim, inspired by, but different from, nvim-neorocks/lz.n";
         maintainers = with lib.maintainers; [ birdee ];
         license.fullName = "GPL-2+";
+        description = "A lazy-loading library for neovim, inspired by, but different from, nvim-neorocks/lz.n";
+        longDescription = ''
+          It is intended to be used
+          - by users of plugin managers that don't provide a convenient API for lazy-loading.
+          - by plugin managers, to provide a convenient API for lazy-loading.'';
       };
     }
   ) { };
@@ -3767,9 +4211,10 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/BirdeeHub/lzextras";
-        description = "A collection of utilities and handlers for BirdeeHub/lze";
         maintainers = with lib.maintainers; [ birdee ];
         license.fullName = "GPL-2+";
+        description = "A collection of utilities and handlers for BirdeeHub/lze";
+        longDescription = "A collection of extensions for BirdeeHub/lze";
       };
     }
   ) { };
@@ -3800,9 +4245,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/horriblename/lzn-auto-require";
-        description = "Auto load optional plugins via lua modules with lz.n";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0";
+        description = "Auto load optional plugins via lua modules with lz.n";
       };
     }
   ) { };
@@ -3833,9 +4278,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/leafo/magick.git";
-        description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI";
         maintainers = with lib.maintainers; [ donovanglover ];
         license.fullName = "MIT";
+        description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI";
       };
     }
   ) { };
@@ -3867,8 +4312,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mpeterv/markdown";
-        description = "Markdown text-to-html markup system.";
         license.fullName = "MIT/X11";
+        description = "Markdown text-to-html markup system.";
+        longDescription = "A pure-lua implementation of the Markdown text-to-html markup system.";
       };
     }
   ) { };
@@ -3896,8 +4342,9 @@ final: prev: {
 
       meta = {
         homepage = "http://keplerproject.github.io/md5/";
-        description = "Checksum library";
         license.fullName = "MIT/X11";
+        description = "Checksum library";
+        longDescription = "MD5 offers checksum facilities for Lua 5.X: a hash (digest) function, a pair crypt/decrypt based on MD5 and CFB, and a pair crypt/decrypt based on DES with 56-bit keys.";
       };
     }
   ) { };
@@ -3925,8 +4372,14 @@ final: prev: {
 
       meta = {
         homepage = "http://olivinelabs.com/mediator_lua/";
-        description = "Event handling through channels";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "Event handling through channels";
+        longDescription = ''
+          mediator_lua allows you to subscribe and publish to a central object so
+              you can decouple function calls in your application. It's as simple as
+              mediator:subscribe("channel", function). Supports namespacing, predicates,
+              and more.
+        '';
       };
     }
   ) { };
@@ -3954,8 +4407,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/kikito/middleclass";
-        description = "A simple OOP library for Lua";
         license.fullName = "MIT";
+        description = "A simple OOP library for Lua";
+        longDescription = "It has inheritance, metamethods (operators), class variables and weak mixin support";
       };
     }
   ) { };
@@ -3986,8 +4440,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lunarmodules/lua-mimetypes";
-        description = "A simple library for looking up the MIME types of files.";
         license.fullName = "MIT/X11";
+        description = "A simple library for looking up the MIME types of files.";
+        longDescription = ''
+          This is a simple library for guessing a file's MIME type. It includes
+              a (hopefully) comprehensive database of MIME types, but it allows you
+              to create your own should you have specific requirements. It can
+              guess types both by extension and by the complete filename.
+        '';
       };
     }
   ) { };
@@ -4016,8 +4476,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/echasnovski/mini.test";
-        description = "Test neovim plugins. Part of the mini.nvim suite.";
         license.fullName = "MIT";
+        description = "Test neovim plugins. Part of the mini.nvim suite.";
       };
     }
   ) { };
@@ -4051,9 +4511,10 @@ final: prev: {
 
       meta = {
         homepage = "http://moonscript.org";
-        description = "A programmer friendly language that compiles to Lua";
         maintainers = with lib.maintainers; [ arobyn ];
         license.fullName = "MIT";
+        description = "A programmer friendly language that compiles to Lua";
+        longDescription = "A programmer friendly language that compiles to Lua";
       };
     }
   ) { };
@@ -4075,8 +4536,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/libmpack/libmpack-lua";
-        description = "Lua binding to libmpack";
         license.fullName = "MIT";
+        description = "Lua binding to libmpack";
       };
     }
   ) { };
@@ -4117,9 +4578,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorg/neorg";
-        description = "Modernity meets insane extensibility. The future of organizing your life in Neovim.";
         maintainers = with lib.maintainers; [ GaetanLepage ];
         license.fullName = "GPL-3.0";
+        description = "Modernity meets insane extensibility. The future of organizing your life in Neovim.";
       };
     }
   ) { };
@@ -4150,8 +4611,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/benlubas/neorg-interim-ls";
-        description = "Temporarily providing a limited set of LSP features to neorg";
         license.fullName = "MIT";
+        description = "Temporarily providing a limited set of LSP features to neorg";
       };
     }
   ) { };
@@ -4167,15 +4628,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.13.4-1";
+      version = "5.14.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.13.4-1.rockspec";
-          sha256 = "0rv4m9qjpn6ckaqim49vy932765p9di4r563w684wz0ficdwjch3";
+          url = "mirror://luarocks/neotest-5.14.3-1.rockspec";
+          sha256 = "12hx48pvnxk0i5mwl6w2wzla109n75rbz5rn2cq2dhzxszx3h4rz";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/deadfb1af5ce458742671ad3a013acb9a6b41178.zip";
-        sha256 = "0qiff2cg7dz96mvfihgb9rgmg0zsjf95nvxnfnzw0pnp65ch4bnh";
+        url = "https://github.com/nvim-neotest/neotest/archive/72bc8f1ec62a590fb47368c81f89610e0f353e28.zip";
+        sha256 = "1hlwlp7kyz1navkz4k3fbxgkmqgabr160l8ic6mgnp7f4q0xfhj9";
       };
 
       disabled = luaOlder "5.1";
@@ -4186,9 +4647,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neotest/neotest";
-        description = "An extensible framework for interacting with tests within NeoVim.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "An extensible framework for interacting with tests within NeoVim.";
       };
     }
   ) { };
@@ -4219,9 +4680,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/knyar/nginx-lua-prometheus";
-        description = "Prometheus metric library for Nginx";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license.fullName = "MIT";
+        description = "Prometheus metric library for Nginx";
       };
     }
   ) { };
@@ -4250,9 +4711,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mfussenegger/nlua";
-        description = "Neovim as Lua interpreter";
         maintainers = with lib.maintainers; [ teto ];
         license.fullName = "GPL-3.0";
+        description = "Neovim as Lua interpreter";
+        longDescription = ''
+          Neovim embeds a Lua interpreter, but it doesn't expose the same command line interface as plain lua.
+              nlua is a script which emulates Lua's command line interface, using Neovim's -l option under the hood.
+        '';
       };
     }
   ) { };
@@ -4280,9 +4745,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/MunifTanjim/nui.nvim";
-        description = "UI Component Library for Neovim.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "UI Component Library for Neovim.";
+        longDescription = ''
+          UI Component Library for Neovim.
+        '';
       };
     }
   ) { };
@@ -4301,16 +4769,19 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hrsh7th";
         repo = "nvim-cmp";
-        rev = "da88697d7f45d16852c6b2769dc52387d1ddc45f";
-        hash = "sha256-/jk8pM7VmZ6mr7BspZjslMHNmCGZ8K/csmALo/Cj1hQ=";
+        rev = "a1d504892f2bc56c2e79b65c6faded2fd21f3eca";
+        hash = "sha256-uzfM8DLRKshESsYmUAbSfXtos9COWpe/fVkxNJPIUFw=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";
 
       meta = {
         homepage = "https://github.com/hrsh7th/nvim-cmp";
-        description = "A completion plugin for neovim";
         license.fullName = "MIT";
+        description = "A completion plugin for neovim";
+        longDescription = ''
+          A completion engine plugin for neovim written in Lua. Completion sources are installed from external repositories and "sourced".
+        '';
       };
     }
   ) { };
@@ -4339,9 +4810,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neotest/nvim-nio";
-        description = "A library for asynchronous IO in Neovim";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "A library for asynchronous IO in Neovim";
       };
     }
   ) { };
@@ -4370,8 +4841,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-tree/nvim-web-devicons";
-        description = "Nerd Font icons for neovim";
         license.fullName = "MIT";
+        description = "Nerd Font icons for neovim";
+        longDescription = ''
+          Coloured Nerd Font file icons for neovim.
+          Dark and light background variants.
+          https://www.nerdfonts.com/'';
       };
     }
   ) { };
@@ -4402,8 +4877,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/stevearc/oil.nvim";
-        description = "Neovim file explorer: edit your filesystem like a buffer";
         license.fullName = "MIT";
+        description = "Neovim file explorer: edit your filesystem like a buffer";
       };
     }
   ) { };
@@ -4432,8 +4907,8 @@ final: prev: {
 
       meta = {
         homepage = "https://nvim-orgmode.github.io";
-        description = "Orgmode clone written in Lua for Neovim 0.11.0+.";
         license.fullName = "MIT";
+        description = "Orgmode clone written in Lua for Neovim 0.11.0+.";
       };
     }
   ) { };
@@ -4468,9 +4943,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/jghauser/papis.nvim";
-        description = "Manage your bibliography from within your favourite editor";
         maintainers = with lib.maintainers; [ GaetanLepage ];
         license.fullName = "GPL-3.0";
+        description = "Manage your bibliography from within your favourite editor";
+        longDescription = ''
+          Papis.nvim is a neovim companion plugin for the bibliography manager papis. 
+          It's meant for all those who do academic and other writing in neovim and who 
+          want quick access to their bibliography from within the comfort of their editor.'';
       };
     }
   ) { };
@@ -4501,8 +4980,11 @@ final: prev: {
 
       meta = {
         homepage = "https://pysan3.github.io/pathlib.nvim/";
-        description = "OS Independent, ultimate solution to path handling in neovim.";
         license.fullName = "MPL-2.0";
+        description = "OS Independent, ultimate solution to path handling in neovim.";
+        longDescription = ''
+          This plugin aims to decrease the difficulties of path management across mutliple OSs in neovim.
+          The plugin API is heavily inspired by Python's `pathlib.Path` with tweaks to fit neovim usage.'';
       };
     }
   ) { };
@@ -4533,9 +5015,14 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/penlight";
-        description = "Lua utility libraries loosely based on the Python standard libraries";
         maintainers = with lib.maintainers; [ alerque ];
         license.fullName = "MIT/X11";
+        description = "Lua utility libraries loosely based on the Python standard libraries";
+        longDescription = ''
+          Penlight is a set of pure Lua libraries for making it easier to work with common tasks like
+          iterating over directories, reading configuration files and the like. Provides functional operations
+          on tables and sequences.
+        '';
       };
     }
   ) { };
@@ -4564,8 +5051,11 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/nvim-lua/plenary.nvim";
-        description = "lua functions you don't want to write ";
         license.fullName = "MIT/X11";
+        description = "lua functions you don't want to write ";
+        longDescription = ''
+          plenary: full; complete; entire; absolute; unqualified. All the lua functions I don't want to write twice.
+        '';
       };
     }
   ) { };
@@ -4591,8 +5081,20 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/daurnimator/lua-psl";
-        description = "Bindings to libpsl, a C library that handles the Public Suffix List (PSL)";
         license.fullName = "MIT";
+        description = "Bindings to libpsl, a C library that handles the Public Suffix List (PSL)";
+        longDescription = ''
+          Bindings to libpsl, a C library that handles the Public Suffix List (PSL).
+
+          The PSL is a list of domains where there may be sub-domains outside of the administrator's control.
+          e.g. the administrator of '.com' does not manage 'github.com'.
+
+          This list has found use in many internet technologies including:
+
+            - preventing cross-domain cookie leakage
+            - allowance of issuing wildcard TLS certificates
+
+          More information can be found at https://publicsuffix.org/'';
       };
     }
   ) { };
@@ -4625,8 +5127,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/xpol/lua-rapidjson";
-        description = "Json module based on the very fast RapidJSON.";
         license.fullName = "MIT";
+        description = "Json module based on the very fast RapidJSON.";
+        longDescription = "A json module for Lua 5.1/5.2/5.3 and LuaJIT based on the very fast RapidJSON.";
       };
     }
   ) { };
@@ -4667,9 +5170,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rest-nvim/rest.nvim";
-        description = "A very fast, powerful, extensible and asynchronous Neovim HTTP client written in Lua.";
         maintainers = with lib.maintainers; [ teto ];
         license.fullName = "GPL-3.0";
+        description = "A very fast, powerful, extensible and asynchronous Neovim HTTP client written in Lua.";
+        longDescription = ''
+          A very fast, powerful, extensible and asynchronous Neovim HTTP client written in Lua.
+          rest.nvim by default makes use of its own `curl` wrapper to make requests and a tree-sitter parser to parse http files.'';
       };
     }
   ) { };
@@ -4700,9 +5206,16 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/rocks-config.nvim";
-        description = "Allow rocks.nvim to help configure your plugins.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-3.0";
+        description = "Allow rocks.nvim to help configure your plugins.";
+        longDescription = ''
+          rocks-config.nvim is a rocks.nvim utility module for helping to configure
+          your Neovim setup.
+          Features:
+          - Execute a specific Lua file per plugin
+          - Automatically invoke the setup() function for every installed plugin
+          - Statically configure a plugin using TOML syntax directly from within your rocks.toml'';
       };
     }
   ) { };
@@ -4739,9 +5252,14 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim";
-        description = "A swiss-army knife for testing and developing rocks.nvim modules.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-3.0";
+        description = "A swiss-army knife for testing and developing rocks.nvim modules.";
+        longDescription = ''
+          rocks-dev.nvim is a rocks.nvim utility module, serving as a swiss army knife
+          for developing and testing new rocks.nvim extensions.
+          Features:
+          - Install plugins from the local filesystem'';
       };
     }
   ) { };
@@ -4776,9 +5294,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/rocks-git.nvim";
-        description = "Use rocks.nvim to install plugins from git!";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-3.0";
+        description = "Use rocks.nvim to install plugins from git!";
       };
     }
   ) { };
@@ -4821,9 +5339,23 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/rocks.nvim";
-        description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-3.0";
+        description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks";
+        longDescription = ''
+          rocks.nvim is an all in one solution for installing and managing
+          Neovim plugins through the luarocks package manager.
+          It supports dependency management, build scripts,
+          all defined from a single rocks.toml file.
+          Features:
+          - Cargo-like rocks.toml file for declaring all your plugins.
+          - Name-based installation ("nvim-neorg/neorg" becomes :Rocks install neorg instead).
+          - Automatic dependency and build script management.
+          - True semver versioning!
+          - Minimal, non-intrusive UI.
+          - Async execution.
+          - Extensible, with a Lua API.
+          - Command completions for plugins on luarocks.org.'';
       };
     }
   ) { };
@@ -4852,9 +5384,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorocks/rtp.nvim";
-        description = "Source plugin and ftdetect directories on the Neovim runtimepath.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-3.0";
+        description = "Source plugin and ftdetect directories on the Neovim runtimepath.";
       };
     }
   ) { };
@@ -4883,9 +5415,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.4.zip";
-        description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0-only";
+        description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
       };
     }
   ) { };
@@ -4916,8 +5448,11 @@ final: prev: {
 
       meta = {
         homepage = "https://lunarmodules.github.io/say";
-        description = "Lua string hashing/indexing library";
         license.fullName = "MIT";
+        description = "Lua string hashing/indexing library";
+        longDescription = ''
+          Useful for internationalization.
+        '';
       };
     }
   ) { };
@@ -4949,9 +5484,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/pkulchenko/serpent";
-        description = "Lua serializer and pretty printer";
         maintainers = with lib.maintainers; [ lockejan ];
         license.fullName = "MIT";
+        description = "Lua serializer and pretty printer";
       };
     }
   ) { };
@@ -4993,9 +5528,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/f4z3r/sofa";
-        description = "A command execution engine powered by rofi.";
         maintainers = with lib.maintainers; [ f4z3r ];
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "A command execution engine powered by rofi.";
+        longDescription = ''
+          A tool to organise and execute your commands, so convenient you can
+              run it from your sofa.
+        '';
       };
     }
   ) { };
@@ -5026,8 +5565,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/tami5/sqlite.lua";
-        description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases";
         license.fullName = "MIT";
+        description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases";
       };
     }
   ) { };
@@ -5057,8 +5596,11 @@ final: prev: {
 
       meta = {
         homepage = "http://lua-stdlib.github.io/_debug";
-        description = "Debug Hints Library";
         license.fullName = "MIT/X11";
+        description = "Debug Hints Library";
+        longDescription = ''
+          Manage an overall debug state, and associated hint substates.
+        '';
       };
     }
   ) { };
@@ -5090,8 +5632,16 @@ final: prev: {
 
       meta = {
         homepage = "https://lua-stdlib.github.io/normalize";
-        description = "Normalized Lua Functions";
         license.fullName = "MIT/X11";
+        description = "Normalized Lua Functions";
+        longDescription = ''
+          This module can inject deterministic versions of core Lua
+                functions that do not behave identically across all supported Lua
+                implementations into your module's lexical environment.   Each
+                function is as thin and fast a version as is possible in each Lua
+                implementation, evaluating to the Lua C implementation with no
+                overhead when semantics allow.
+        '';
       };
     }
   ) { };
@@ -5121,8 +5671,9 @@ final: prev: {
 
       meta = {
         homepage = "http://lua-stdlib.github.io/lua-stdlib";
-        description = "General Lua Libraries";
         license.fullName = "MIT/X11";
+        description = "General Lua Libraries";
+        longDescription = "stdlib is a library of modules for common programming tasks, including list, table and functional operations, objects, pickling, pretty-printing and command-line option parsing.";
       };
     }
   ) { };
@@ -5167,8 +5718,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/teal-language/teal-language-server";
-        description = "A language server for the Teal language";
         license.fullName = "MIT";
+        description = "A language server for the Teal language";
+        longDescription = "A language server for the Teal language";
       };
     }
   ) { };
@@ -5199,8 +5751,11 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/mrcjkb/telescope-manix";
-        description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix";
         license.fullName = "GPL-2.0";
+        description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix";
+        longDescription = ''
+          Manix is a fast documentation searcher for nix.
+          This plugin provides a telescope.nvim extension for manix.'';
       };
     }
   ) { };
@@ -5224,8 +5779,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "5255aa27c422de944791318024167ad5d40aad20";
-        hash = "sha256-dOU6nQaq4W3KZrC2o2wv0NJ2LNWJgvuoNyWOYP2i4vo=";
+        rev = "e6cdb4dc528c5dc4ca8da86e83ef4e3c84b0729c";
+        hash = "sha256-eTDW8KdrFAt68ih5Dxn9WgIBW8PjZ+9yBX2HpIPyVJs=";
       };
 
       disabled = lua.luaversion != "5.1";
@@ -5233,8 +5788,13 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-telescope/telescope.nvim";
-        description = "Find, Filter, Preview, Pick. All lua, all the time.";
         license.fullName = "MIT";
+        description = "Find, Filter, Preview, Pick. All lua, all the time.";
+        longDescription = ''
+          A highly extendable fuzzy finder over lists.
+            Built on the latest awesome features from neovim core.
+            Telescope is centered around modularity, allowing for easy customization.
+        '';
       };
     }
   ) { };
@@ -5268,9 +5828,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/gptlang/lua-tiktoken";
-        description = "An experimental port of OpenAI's Tokenizer to lua";
         maintainers = with lib.maintainers; [ natsukium ];
         license.fullName = "MIT";
+        description = "An experimental port of OpenAI's Tokenizer to lua";
+        longDescription = ''
+          The Lua module written in Rust that provides Tiktoken support for Lua.
+        '';
       };
     }
   ) { };
@@ -5305,9 +5868,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/teal-language/tl";
-        description = "Teal, a typed dialect of Lua";
         maintainers = with lib.maintainers; [ mephistophiles ];
         license.fullName = "MIT";
+        description = "Teal, a typed dialect of Lua";
       };
     }
   ) { };
@@ -5338,9 +5901,12 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/lumen-oss/toml-edit.lua";
-        description = "TOML Parser + Formatting and Comment-Preserving Editor";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "TOML Parser + Formatting and Comment-Preserving Editor";
+        longDescription = ''
+          `toml-edit` is a library to parse and edit `.toml` files as if they were lua tables, all while preserving formatting and comments.
+          Based on rust's `toml-edit`.'';
       };
     }
   ) { };
@@ -5371,8 +5937,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/rest-nvim/tree-sitter-http";
-        description = "tree-sitter parser for http";
         license.fullName = "UNKNOWN";
+        description = "tree-sitter parser for http";
       };
     }
   ) { };
@@ -5401,9 +5967,9 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
-        description = "The official tree-sitter parser for Norg documents.";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
+        description = "The official tree-sitter parser for Norg documents.";
       };
     }
   ) { };
@@ -5432,8 +5998,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/nvim-orgmode/tree-sitter-org";
-        description = "A fork of tree-sitter-org, for use with the orgmode Neovim plugin";
         license.fullName = "MIT";
+        description = "A fork of tree-sitter-org, for use with the orgmode Neovim plugin";
       };
     }
   ) { };
@@ -5464,8 +6030,11 @@ final: prev: {
 
       meta = {
         homepage = "http://github.com/starwing/luautf8";
-        description = "A UTF-8 support module for Lua";
         license.fullName = "MIT";
+        description = "A UTF-8 support module for Lua";
+        longDescription = ''
+          This module adds UTF-8 support to Lua. It's compatible with Lua "string" module.
+        '';
       };
     }
   ) { };
@@ -5531,8 +6100,8 @@ final: prev: {
 
       meta = {
         homepage = "https://github.com/notomo/vusted";
-        description = "`busted` wrapper for testing neovim plugin";
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+        description = "`busted` wrapper for testing neovim plugin";
       };
     }
   ) { };
@@ -5563,9 +6132,13 @@ final: prev: {
 
       meta = {
         homepage = "http://manoelcampos.github.io/xml2lua/";
-        description = "An XML Parser written entirely in Lua that works for Lua 5.1+";
         maintainers = with lib.maintainers; [ teto ];
         license.fullName = "MIT";
+        description = "An XML Parser written entirely in Lua that works for Lua 5.1+";
+        longDescription = ''
+          Enables parsing a XML string into a Lua Table and
+             converting a Lua Table to an XML string.
+        '';
       };
     }
   ) { };

From 1ad4b6bfc436063a842fdabe6cc3370ebc43f7cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 12:25:44 +0000
Subject: [PATCH 178/238] xremap: 0.14.18 -> 0.14.19

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

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index 470012be3e07..0df804557fb3 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -58,13 +58,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.14.18";
+  version = "0.14.19";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bn5Qq3pcrxTKUBfMkoK1xtLl4c4tHafe74REMQS+cz8=";
+    hash = "sha256-t/eSUFYTZ41uJJLjmMOWiV9ffYJjDVw+fy0P3XnvJ40=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-MJ41A8hUurevmy9MX1qB32T8J4KaZO/gDA96CmTuIBU=";
+  cargoHash = "sha256-Ypujuqz8TNLNfNB1NizjZoOK2VL+a4MY7c/aGIcCjns=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 

From 327bbfbcf4cf6e15b53942af096ea1f6ab93fe5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 12:41:51 +0000
Subject: [PATCH 179/238] python3Packages.dvc: 3.67.0 -> 3.67.1

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

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 230016648ef1..bce6cec11566 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -64,14 +64,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dvc";
-  version = "3.67.0";
+  version = "3.67.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc";
     tag = finalAttrs.version;
-    hash = "sha256-JNwlZFDW/qRkGuGiXnqmp+Dfp1hod9ZfMwMJgWJ8X00=";
+    hash = "sha256-KzHaR7o3PUHMBrtSDWXvH7/YMPxSafPSGUnS9018XKg=";
   };
 
   pythonRelaxDeps = [

From 835922a4fb357d6455f4f089fdba890eff554a67 Mon Sep 17 00:00:00 2001
From: Antonio Yang <yanganto@gmail.com>
Date: Fri, 23 Jan 2026 20:04:43 +0800
Subject: [PATCH 180/238] fcitx5-array: init at 0.9.6

---
 nixos/modules/i18n/input-method/default.md |  2 +
 pkgs/by-name/fc/fcitx5-array/package.nix   | 48 ++++++++++++++++++++++
 pkgs/tools/inputmethods/fcitx5/update.py   | 41 +++++++++---------
 3 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/fc/fcitx5-array/package.nix

diff --git a/nixos/modules/i18n/input-method/default.md b/nixos/modules/i18n/input-method/default.md
index f2d7934f94fb..c05f8311a0f4 100644
--- a/nixos/modules/i18n/input-method/default.md
+++ b/nixos/modules/i18n/input-method/default.md
@@ -108,6 +108,8 @@ Available extra Fcitx5 addons are:
 
   - Anthy (`fcitx5-anthy`): Anthy is a system for
     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+  - Array (`fcitx5-array`): Array is a Chinese shape-based input method that
+    uses a grid of 30 keys.
   - Chewing (`fcitx5-chewing`): Chewing is an
     intelligent Zhuyin input method. It is one of the most popular input
     methods among Traditional Chinese Unix users.
diff --git a/pkgs/by-name/fc/fcitx5-array/package.nix b/pkgs/by-name/fc/fcitx5-array/package.nix
new file mode 100644
index 000000000000..873b5faad5c3
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-array/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fmt,
+  cmake,
+  extra-cmake-modules,
+  gettext,
+  fcitx5,
+  sqlite,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fcitx5-array";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "ray2501";
+    repo = "fcitx5-array";
+    tag = finalAttrs.version;
+    hash = "sha256-YDFT/CawFiPN3kXzHMpenCzWMJSA1dFUhVe22EDfnU8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    gettext
+  ];
+
+  buildInputs = [
+    fmt
+    fcitx5
+    sqlite
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "Array wrapper for Fcitx5";
+    homepage = "https://github.com/ray2501/fcitx5-array";
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl21Plus
+    ];
+    maintainers = with lib.maintainers; [ yanganto ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py
index 08b8f6938678..5da7d34a51a6 100755
--- a/pkgs/tools/inputmethods/fcitx5/update.py
+++ b/pkgs/tools/inputmethods/fcitx5/update.py
@@ -5,24 +5,27 @@ import requests
 import subprocess
 
 REPOS = [
-        "libime",
-        "xcb-imdkit",
+        ( "fcitx", "libime" ),
+        ( "fcitx", "xcb-imdkit"),
 
-        "fcitx5",
-        "fcitx5-anthy",
-        "fcitx5-chewing",
-        "fcitx5-chinese-addons",
-        "fcitx5-configtool",
-        "fcitx5-gtk",
-        "fcitx5-hangul",
-        "fcitx5-lua",
-        "fcitx5-m17n",
-        "fcitx5-qt",
-        "fcitx5-rime",
-        "fcitx5-skk",
-        "fcitx5-table-extra",
-        "fcitx5-table-other",
-        "fcitx5-unikey"
+        ( "fcitx", "fcitx5" ),
+        ( "fcitx", "fcitx5-anthy" ),
+        ( "fcitx", "fcitx5-chewing" ),
+        ( "fcitx", "fcitx5-chinese-addons" ),
+        ( "fcitx", "fcitx5-configtool" ),
+        ( "fcitx", "fcitx5-gtk" ),
+        ( "fcitx", "fcitx5-hangul" ),
+        ( "fcitx", "fcitx5-lua" ),
+        ( "fcitx", "fcitx5-m17n" ),
+        ( "fcitx", "fcitx5-qt" ),
+        ( "fcitx", "fcitx5-rime" ),
+        ( "fcitx", "fcitx5-skk" ),
+        ( "fcitx", "fcitx5-table-extra" ),
+        ( "fcitx", "fcitx5-table-other" ),
+        ( "fcitx", "fcitx5-unikey" ),
+        ( "fcitx", "fcitx5-unikey" )
+
+        ( "ray2501", "fcitx5-array" )
         ]
 
 OWNER = "fcitx"
@@ -32,8 +35,8 @@ def get_latest_tag(repo, owner=OWNER):
     return r.json()[0].get("name")
 
 def main():
-    for repo in REPOS:
-        rev = get_latest_tag(repo)
+    for (owner, repo) in REPOS:
+        rev = get_latest_tag(repo, owner)
         if repo == "fcitx5-qt":
             subprocess.run(["nix-update", "--commit", "--version", rev, "qt6Packages.{}".format(repo)])
         else:

From 86c8131dcc141377c63b607deece4501e6661578 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 13:04:34 +0000
Subject: [PATCH 181/238] libretro.o2em: 0-unstable-2024-10-21 ->
 0-unstable-2026-03-31

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

diff --git a/pkgs/applications/emulators/libretro/cores/o2em.nix b/pkgs/applications/emulators/libretro/cores/o2em.nix
index 0af8242cee2f..bce4470721ca 100644
--- a/pkgs/applications/emulators/libretro/cores/o2em.nix
+++ b/pkgs/applications/emulators/libretro/cores/o2em.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "o2em";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-o2em";
-    rev = "3ba4231c1dc8dcdf487428712856b790d2e4b8f3";
-    hash = "sha256-HhTkFm9Jte4wDPxTcXRgCg2tCfdQvo0M3nHRhlPmz/w=";
+    rev = "dee1076eb70c728d4ff47186aea9cd1c11ce7638";
+    hash = "sha256-djj7sEkUIoze1sZaZciIw7PdYDb1wETuZd4CFdZTiUM=";
   };
 
   makefile = "Makefile";

From 776656d769a7eadf81a21f324698106269b871c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 13:31:20 +0000
Subject: [PATCH 182/238] nuclei-templates: 10.4.0 -> 10.4.1

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 3017c65cd548..e5a65e3394db 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nuclei-templates";
-  version = "10.4.0";
+  version = "10.4.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XhzaBVNIKJ5khNNER69tqBYCMzc7G+pDiibgyNRWwEA=";
+    hash = "sha256-JHnHntfa1CPj3v0mlu7cLsOhmw+eFcd13jWU9E17mRY=";
   };
 
   installPhase = ''

From efb71688a7b2121a79bbcf713790b82c026e1861 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 31 Mar 2026 15:35:49 +0200
Subject: [PATCH 183/238] claude-code-acp: add alias

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e802736b7cab..8319be4e0881 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -497,6 +497,7 @@ mapAliases {
   clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clashmi = throw "'clashmi' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31
   clasp = throw "'clasp' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
+  claude-code-acp = warnAlias "'claude-code-acp' has been renamed to 'claude-agent-acp'" claude-agent-acp; # Added 2026-03-31
   clearlyU = clearly-u; # Added 2026-02-08
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01

From ce16811f2687655ade4bee7d374f3a7323295696 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 13:55:03 +0000
Subject: [PATCH 184/238] oniux: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix
index d84e74976219..7b024b54b4ea 100644
--- a/pkgs/by-name/on/oniux/package.nix
+++ b/pkgs/by-name/on/oniux/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oniux";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
     owner = "tpo/core";
     repo = "oniux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IfCUq2TnG6y5zC2qT4wU5Pq9PLuPsi4Qd8ts4uib4f0=";
+    hash = "sha256-ys6RjLyfhoAIiIlf8pv971txPubobY627jhk84HZhsw=";
   };
 
-  cargoHash = "sha256-bSBl+IBuBfqU6QowikS7Gan2k3o1OqK7shGB4gCvPRw=";
+  cargoHash = "sha256-4sXCZ2P4HFsW3g/CSIB2gwBMSddNXzdIav1tSWWOO9A=";
 
   nativeBuildInputs = [
     perl

From 8daef7a28a2dc05ff8c0dac4a9baccf7f876912e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 14:01:25 +0000
Subject: [PATCH 185/238] gitea-actions-runner: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix
index acc6a49f91ec..592b027064ef 100644
--- a/pkgs/by-name/gi/gitea-actions-runner/package.nix
+++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitea-actions-runner";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "act_runner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-D2b0m3XEEEugjnrEzpYGxwD8hzpoPzIW9lNrCbgmKVc=";
+    hash = "sha256-D3/vJUQuNAgUWNyfL9QWmByZ9A/F4+pfA6GR0SDcMpQ=";
   };
 
-  vendorHash = "sha256-EqU+YJrwKtA9LHa7DkRJ6er5GNocR8Gbhjjx72mPhqE=";
+  vendorHash = "sha256-XRXoChH2ApQS65xnzeGP4NIUL0RKovLWvVIAnBncT7Y=";
 
   ldflags = [
     "-s"

From be5d62b45781858769037ac4647ac17ce3214d88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 14:33:07 +0000
Subject: [PATCH 186/238] python3Packages.google-cloud-texttospeech: 2.34.0 ->
 2.35.0

---
 .../python-modules/google-cloud-texttospeech/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index bc3c93f61df6..af0a3d19880f 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-texttospeech";
-  version = "2.34.0";
+  version = "2.35.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_texttospeech";
     inherit (finalAttrs) version;
-    hash = "sha256-ZYN8O8co83KQAJ2++JLfh+rkWtgJBVWQltEQeCIHT2I=";
+    hash = "sha256-tipe7KQQvKqwNlMorvuLoSBuQnYK5AjAQgobfa7ttbo=";
   };
 
   build-system = [ setuptools ];

From 46ebe8e4598ea99d65e9c532f6ede95772da35ba Mon Sep 17 00:00:00 2001
From: Luna Simons <luna@bddvlpr.com>
Date: Tue, 31 Mar 2026 16:37:18 +0200
Subject: [PATCH 187/238] opencode{,-desktop}: 1.3.7 -> 1.3.10

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index e13b41819e8c..b5f3dda285dd 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.3.7";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DL/3AFyYevK4SD3pC+goTHLrlD29dRoyL0QAlxZDLcU=";
+    hash = "sha256-/pVesY9fyfeAheT1gMvoVCaO9GlRHQB0H4HIB56pwnE=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-//yE+ngjobja2Y5yIcvW0oEVSu85nqNAvjWu5OyISGU=";
+    outputHash = "sha256-Q7eyK6GNYE5dBYooDHbIQSkfe4fs6L7tzCfbsIlYY7o=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 53e50e0374b288910b43ff6fd997e74ce3b08dfd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 14:42:35 +0000
Subject: [PATCH 188/238] libretro.same_cdi: 0-unstable-2025-01-31 ->
 0-unstable-2026-03-31

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

diff --git a/pkgs/applications/emulators/libretro/cores/same_cdi.nix b/pkgs/applications/emulators/libretro/cores/same_cdi.nix
index d0ee91f77bbb..d8527523a885 100644
--- a/pkgs/applications/emulators/libretro/cores/same_cdi.nix
+++ b/pkgs/applications/emulators/libretro/cores/same_cdi.nix
@@ -12,13 +12,13 @@
 }:
 mkLibretroCore {
   core = "same_cdi";
-  version = "0-unstable-2025-01-31";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "same_cdi";
-    rev = "7ee1d8e9cb4307b7cd44ee1dd757e9b3f48f41d5";
-    hash = "sha256-EGE3NuO0gpZ8MKPypH8rFwJiv4QsdKuIyLKVuKTcvws=";
+    rev = "2184aa6d87a31fb6c64534b9b7b2d26e36bae757";
+    hash = "sha256-8QJtAyVF6KQmWSzQ6t5s4qmSVT8CmRx5uulq4c3LDRo=";
   };
 
   patches = [

From 626b4ccda92763a47e6a00ed943507ed1e1d9b68 Mon Sep 17 00:00:00 2001
From: nescias <nescias@posteo.de>
Date: Tue, 31 Mar 2026 14:33:51 +0000
Subject: [PATCH 189/238] sequoia-git: init at 0.5.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/se/sequoia-git/package.nix | 60 +++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/se/sequoia-git/package.nix

diff --git a/pkgs/by-name/se/sequoia-git/package.nix b/pkgs/by-name/se/sequoia-git/package.nix
new file mode 100644
index 000000000000..252e82f07553
--- /dev/null
+++ b/pkgs/by-name/se/sequoia-git/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  openssl,
+  nettle,
+  sqlite,
+  pkg-config,
+  installShellFiles,
+  gnupg,
+  gitMinimal,
+  libfaketime,
+  ...
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "sequoia-git";
+  version = "0.5.0";
+
+  src = fetchFromGitLab {
+    owner = "sequoia-pgp";
+    repo = "sequoia-git";
+    rev = "v${version}";
+    hash = "sha256-7ynaz48j/ebQAZ2QxeWwkf7kFP70HKtHCv4/wGxxaVY=";
+  };
+
+  cargoHash = "sha256-+sIH4zFLewNNkpd42co2B0rLrIsde5gsBDsqSSc0HZQ=";
+
+  buildInputs = [
+    openssl.dev
+    nettle.dev
+    sqlite.dev
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+    installShellFiles
+  ];
+
+  nativeCheckInputs = [
+    gnupg
+    gitMinimal
+    libfaketime
+  ];
+
+  env.ASSET_OUT_DIR = "target";
+
+  postInstall = ''
+    installManPage ${env.ASSET_OUT_DIR}/man-pages/*.1
+    installShellCompletion --bash ${env.ASSET_OUT_DIR}/shell-completions/${meta.mainProgram}.bash
+    installShellCompletion --zsh ${env.ASSET_OUT_DIR}/shell-completions/_${meta.mainProgram}
+    installShellCompletion --fish ${env.ASSET_OUT_DIR}/shell-completions/${meta.mainProgram}.fish
+  '';
+
+  meta = {
+    homepage = "https://sequoia-pgp.gitlab.io/sequoia-git";
+    license = lib.licenses.lgpl2Plus;
+    mainProgram = "sq-git";
+  };
+}

From f0da8c0e9d61146f2d33de53a9dde4f46c0c1b20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 14:58:40 +0000
Subject: [PATCH 190/238] python3Packages.google-cloud-workstations: 0.7.0 ->
 0.8.0

---
 .../python-modules/google-cloud-workstations/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index efad3ceffba4..68692799c173 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-workstations";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_workstations";
     inherit (finalAttrs) version;
-    hash = "sha256-poGhvPGpD+qOFacXsSqwaki5EZaTMQpAoXh7X0kqUsc=";
+    hash = "sha256-wuFFlOxCyTK0n39LB3XGwvoQ7FCSjUDJa3n6uElvSEQ=";
   };
 
   build-system = [ setuptools ];

From 29f5dd49915eef07f6a6a814359ba8f473d2c39f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 31 Mar 2026 17:13:21 +0200
Subject: [PATCH 191/238] sequoia-git: Add myself to maintainers

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/se/sequoia-git/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/sequoia-git/package.nix b/pkgs/by-name/se/sequoia-git/package.nix
index 252e82f07553..47ef3dcee3a9 100644
--- a/pkgs/by-name/se/sequoia-git/package.nix
+++ b/pkgs/by-name/se/sequoia-git/package.nix
@@ -55,6 +55,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     homepage = "https://sequoia-pgp.gitlab.io/sequoia-git";
     license = lib.licenses.lgpl2Plus;
+    maintainers = [ lib.maintainers.matthiasbeyer ];
     mainProgram = "sq-git";
   };
 }

From 988dc3e32423222c7327c81b32a02ed55f99038b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 31 Mar 2026 08:27:59 -0700
Subject: [PATCH 192/238] python3Packages.aiontfy: 0.8.3 -> 0.8.4

Diff: https://github.com/tr4nt0r/aiontfy/compare/v0.8.3...v0.8.4

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

diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix
index 2cf64b7a64a6..1de685beed70 100644
--- a/pkgs/development/python-modules/aiontfy/default.nix
+++ b/pkgs/development/python-modules/aiontfy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aiontfy";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "aiontfy";
     tag = "v${version}";
-    hash = "sha256-whofQUPT4UcOOBxvdMz3mMzMR/svVaLQrC6c7EfzwZY=";
+    hash = "sha256-mj2wYsmA+CI0y4WykP7CLPUFfSCISCdinajkIHDdAZs=";
   };
 
   build-system = [

From 911218a83d9c0252958ff7aef2ff27656815b974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 31 Mar 2026 08:30:05 -0700
Subject: [PATCH 193/238] python3Packages.fing-agent-api: 1.0.3 -> 1.1.0

Diff: https://github.com/fingltd/fing-agent-pyapi/compare/1.0.3...1.1.0

Changelog: https://github.com/fingltd/fing-agent-pyapi/releases/tag/1.1.0
---
 pkgs/development/python-modules/fing-agent-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fing-agent-api/default.nix b/pkgs/development/python-modules/fing-agent-api/default.nix
index 87f76998a570..6d9bb00e5f89 100644
--- a/pkgs/development/python-modules/fing-agent-api/default.nix
+++ b/pkgs/development/python-modules/fing-agent-api/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fing-agent-api";
-  version = "1.0.3";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fingltd";
     repo = "fing-agent-pyapi";
     tag = finalAttrs.version;
-    hash = "sha256-tkFTkWYvWw/x2k+jT6lu/Takacm6aDX4hn8thnGZf5g=";
+    hash = "sha256-RUV6/iSA82/aQoWfsp/3iPnqwJ4xjMbO/NR/ut4qORU=";
   };
 
   build-system = [ setuptools ];

From c7d7fbb8e99c21492819f1bcd4460a09c80530eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 15:32:39 +0000
Subject: [PATCH 194/238] lichess-bot: 2026.3.18.1 -> 2026.3.29.1

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

diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix
index 493797660769..953c6a2ebd08 100644
--- a/pkgs/by-name/li/lichess-bot/package.nix
+++ b/pkgs/by-name/li/lichess-bot/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "lichess-bot";
-  version = "2026.3.18.1";
+  version = "2026.3.29.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "lichess-bot-devs";
     repo = "lichess-bot";
-    rev = "a36742d99d27a6e942ded48d58716623d3ae71f5";
-    hash = "sha256-FtmBzfpMOUPioGXe0JqzpJi2/hL/EAI2tNU6X3xGSvk=";
+    rev = "bfd5e5e1005be7c5c4a7c880b6981c7e265fc066";
+    hash = "sha256-ZsrepZLbIJEqbxyads+nFeO+FPFQ7H56wE6eaT79Fys=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From e9b8f5cf5e1af9b08876006148ee35352479976c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 15:35:12 +0000
Subject: [PATCH 195/238] python3Packages.cohere: 5.20.7 -> 5.21.1

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

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index dacb16c3f1d5..f08907499408 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.20.7";
+  version = "5.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-oHYCQBJhBc4fWnXW1OyXdm+Ni46kIo9UoO84cKZHKgo=";
+    hash = "sha256-RT4Sxk9fKunuyEXl2pvKgS6U82fPKjMPmSl9jwm+GBk=";
   };
 
   build-system = [ poetry-core ];

From c7b21a3ffd9288ff477cf73f865b0d420d7af6e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 15:50:12 +0000
Subject: [PATCH 196/238] terraform-providers.sumologic_sumologic: 3.2.4 ->
 3.2.5

---
 .../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 44916dd4f2fe..3fc3c0686569 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1265,11 +1265,11 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-lW2XWDc95Sfnb3VNtsw5mZ8uGgInCkaWRCaUS9c7d2s=",
+    "hash": "sha256-cxMx9SCsRbBVG1ixuzB4DqoI6mG2UdyuNYWATbHuRiQ=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.2.4",
+    "rev": "v3.2.5",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },

From 8aa691bf3d12a4f02ab55fe5b4556c5222c1ab42 Mon Sep 17 00:00:00 2001
From: Yujonpradhananga <yujonpradhan123@gmail.com>
Date: Thu, 12 Mar 2026 18:38:35 +0545
Subject: [PATCH 197/238] pdf-cli: rename from lnreader

---
 .../{ln/lnreader => pd/pdf-cli}/package.nix        | 14 +++++++-------
 pkgs/top-level/aliases.nix                         |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/by-name/{ln/lnreader => pd/pdf-cli}/package.nix (64%)

diff --git a/pkgs/by-name/ln/lnreader/package.nix b/pkgs/by-name/pd/pdf-cli/package.nix
similarity index 64%
rename from pkgs/by-name/ln/lnreader/package.nix
rename to pkgs/by-name/pd/pdf-cli/package.nix
index 06cf04be4fb1..85fc0e7dc6ce 100644
--- a/pkgs/by-name/ln/lnreader/package.nix
+++ b/pkgs/by-name/pd/pdf-cli/package.nix
@@ -7,17 +7,17 @@
 }:
 
 buildGoModule (finalAttrs: {
-  pname = "lnreader";
-  version = "1.0";
+  pname = "pdf-cli";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "Yujonpradhananga";
-    repo = "CLI-PDF-EPUB-reader";
+    repo = "pdf-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JeVS0wnShlD4+UfnMsuHMYi6R7pse4Gvh0PdREwmG6k=";
+    hash = "sha256-TvfSauT9UWjQjkzQtepEVyxm/LaiCANmxMtVmjiw8kI=";
   };
 
-  vendorHash = "sha256-66rqTJeV6u4aVciifp41n2onx81w9KE0PGYHlVwsl54=";
+  vendorHash = "sha256-LCIv135ywuq494hZbrKdbqkGPSsSlSkVQ9hCE8i7www=";
 
   nativeBuildInputs = [
     pkg-config
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Lightweight, fast and responsive terminal PDF/EPUB viewer with image support";
-    homepage = "https://github.com/Yujonpradhananga/CLI-PDF-EPUB-reader";
+    homepage = "https://github.com/Yujonpradhananga/pdf-cli";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yujonpradhananga ];
-    mainProgram = "lnreader";
+    mainProgram = "pdf-cli";
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e6a6c584af00..90078b9c4d30 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1228,6 +1228,7 @@ mapAliases {
   llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  lnreader = warnAlias "'lnreader' has been renamed to 'pdf-cli'" pdf-cli; # Added 2026-03-18
   lockfileProgs = warnAlias "'lockfileProgs' has been renamed to 'lockfile-progs'" lockfile-progs; # Added 2026-02-08
   loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27
   log4j-detect = throw "'log4j-detect' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15

From 80282d4d96de0fe553192ba87c0926060cf5e8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 31 Mar 2026 17:55:44 +0200
Subject: [PATCH 198/238] linuxPackages.xpadneo: 0.10 -> 0.10.1

Diff: https://github.com/atar-axis/xpadneo/compare/v0.10...v0.10.1

Changelog: https://github.com/atar-axis/xpadneo/releases/tag/v0.10.1
---
 pkgs/os-specific/linux/xpadneo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 62bf02ca80f8..713708d4a0ae 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.10";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jIY7NzjVZMlJ+2EY4hrka1MBUalQiNWzQgW2aiNi7WU=";
+    hash = "sha256-rMNgKhve76OXr2ha/Sqpw8sy/FWqxDm/bKF4YPlpVlc=";
   };
 
   setSourceRoot = ''

From 2905adf0111c574eeafc8dda64aa9d08ba094b98 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 17:56:33 +0200
Subject: [PATCH 199/238] python3Packages.google-cloud-iam-logging: migrate to
 finalAttrs

---
 .../python-modules/google-cloud-iam-logging/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 41d379d73cd7..3f74f8e0efce 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -12,14 +12,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "google-cloud-iam-logging";
   version = "1.7.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_iam_logging";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-p0PEXDzdq+DX88rW7mN9FBK7Nkhi01xubH+qeECr1d4=";
   };
 
@@ -51,8 +51,8 @@ buildPythonPackage rec {
   meta = {
     description = "IAM Service Logging client library";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam-logging";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-logging-v${version}/packages/google-cloud-iam-logging/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-logging-v${finalAttrs.version}/packages/google-cloud-iam-logging/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 9e68b65375401e7a0d9b02b3ca6c9756c2af5d91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Mar 2026 17:58:40 +0200
Subject: [PATCH 200/238] python3Packages.busylight-core: migrate to finalAttrs

---
 .../development/python-modules/busylight-core/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/busylight-core/default.nix b/pkgs/development/python-modules/busylight-core/default.nix
index 0620ff75e92b..be098b691e4f 100644
--- a/pkgs/development/python-modules/busylight-core/default.nix
+++ b/pkgs/development/python-modules/busylight-core/default.nix
@@ -10,7 +10,7 @@
   uv-build,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "busylight-core";
   version = "2.2.0";
   pyproject = true;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "busylight-core";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-as2IvaxyMjGKPGlBmz1cntAhbpuW+f3INtnNIcwpWh8=";
   };
 
@@ -45,8 +45,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting programmatically with USB-connected LED lights";
     homepage = "https://github.com/JnyJny/busylight-core";
-    changelog = "https://github.com/JnyJny/busylight-core/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/JnyJny/busylight-core/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 23fcdca31f03a2527a0bb40e84f7109c2f4e41fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 16:01:20 +0000
Subject: [PATCH 201/238] terraform-providers.f5networks_bigip: 1.25.1 ->
 1.26.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 44916dd4f2fe..564111f1a847 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -391,11 +391,11 @@
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-L/qV8Ff5UhRs6r+jadBUkofLcxggBq96gCpkk0Tv3k8=",
+    "hash": "sha256-+/YCeCJKeETCewktWc749/GILooNsxyGz3bXOeIDga8=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.25.1",
+    "rev": "v1.26.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From a00ea92e340bf07d12b7771b51e65dea2e0d415a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 31 Mar 2026 18:08:52 +0200
Subject: [PATCH 202/238] python3Packages.mitogen: 0.3.44 -> 0.3.45

Diff: https://github.com/mitogen-hq/mitogen/compare/v0.3.44...v0.3.45

Changelog: https://github.com/mitogen-hq/mitogen/blob/v0.3.45/docs/changelog.rst
---
 pkgs/development/python-modules/mitogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 72fd40098dac..f4cbda227303 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mitogen";
-  version = "0.3.44";
+  version = "0.3.45";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tOyOKBRnYgl2CIND7Mp6QNu+RkUIK84FJu9a/plUgOk=";
+    hash = "sha256-PwvtniLqy8gSHqN0NxMQqh9Jf8zj7PaVTFot61w4LPM=";
   };
 
   build-system = [ setuptools ];

From 53967c81aff21f029f3796743a282fe58fe9bc39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 16:22:28 +0000
Subject: [PATCH 203/238] terraform-providers.hashicorp_tfe: 0.74.1 -> 0.76.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 44916dd4f2fe..441bb859566a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -652,13 +652,13 @@
     "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw="
   },
   "hashicorp_tfe": {
-    "hash": "sha256-dak9/lYjL+2gbXyjxRqS61wr4YJRHFzHNJdCPJqiaW4=",
+    "hash": "sha256-6Qzchshn6T9gHdk6nd2wzDesFTUsGUViwTrBmMue3yI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.74.1",
+    "rev": "v0.76.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc="
+    "vendorHash": "sha256-JNTe1RI2aDw86jNzYJqmiBr5BBnr824/DhkJeaMpbKI="
   },
   "hashicorp_time": {
     "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=",

From 33aa67ad92558292587475983af4e4bab1756d2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 17:01:53 +0000
Subject: [PATCH 204/238] webdav: 5.11.3 -> 5.11.4

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

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 2ef0b226fc90..4fe02d4500b4 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "webdav";
-  version = "5.11.3";
+  version = "5.11.4";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RqhE+yyjlgNvTGLhSUHstnr/1jZ/NLu5/sa/9cFMeM8=";
+    hash = "sha256-EEphTKjfCVgSyyGeZ9BjrNmpK4LMm9mFKJ7zqaYQu7E=";
   };
 
-  vendorHash = "sha256-rV9gQCnPsTP5uJ9+pC9J5ol9aQmGMo0SRQUI9xkkqBk=";
+  vendorHash = "sha256-1rSIJIcJxw1YKy2bI+2RY71bSdfDBp3w7U3SQtJgCgI=";
 
   __darwinAllowLocalNetworking = true;
 

From 81403813f16a813024c03de1050021dfcc328893 Mon Sep 17 00:00:00 2001
From: David Isaksson <davidisaksson93@gmail.com>
Date: Tue, 31 Mar 2026 19:06:01 +0200
Subject: [PATCH 205/238] nordpass: Add pname and version

Checks off `nordpass` for #485742.
---
 pkgs/by-name/no/nordpass/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/no/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix
index c9f4fe7db621..6a7b8edc7786 100644
--- a/pkgs/by-name/no/nordpass/package.nix
+++ b/pkgs/by-name/no/nordpass/package.nix
@@ -149,7 +149,7 @@ let
 in
 
 buildFHSEnv {
-  name = "nordpass";
+  inherit (thisPackage) pname version;
   targetPkgs = _: deps ++ [ thisPackage ];
   runScript = "nordpass";
 

From c85df05b2245458bd91548c376e5e3b3019d95ec Mon Sep 17 00:00:00 2001
From: example <test@example.org>
Date: Tue, 31 Mar 2026 18:45:54 +0200
Subject: [PATCH 206/238] river-classic: 0.3.14 -> 0.3.15

Changelog: https://codeberg.org/river/river-classic/releases/tag/v0.3.15
Diff: https://codeberg.org/river/river-classic/compare/v0.3.14...v0.3.15
---
 .../ri/river-classic/build.zig.zon.nix        |  6 +--
 pkgs/by-name/ri/river-classic/package.nix     | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ri/river-classic/build.zig.zon.nix b/pkgs/by-name/ri/river-classic/build.zig.zon.nix
index f4a5ffb891f9..ea192810be72 100644
--- a/pkgs/by-name/ri/river-classic/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river-classic/build.zig.zon.nix
@@ -22,10 +22,10 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wlroots-0.19.3-jmOlcuL_AwBHhLCwpFsXbTizE3q9BugFmGX-XIxqcPMc";
+    name = "wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.3.tar.gz";
-      hash = "sha256-rw2bafYcXTxMUtWF9ae++h0RjSfuvpCnIHGLrbLfQTQ=";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz";
+      hash = "sha256-QblQBVsDV2kSj31jqmVVi4hQUXuv8bsRgRMaCqlNxNM=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index 802fa35f1da5..c6fd94300ef4 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -1,38 +1,42 @@
 {
-  lib,
-  stdenv,
   callPackage,
   fetchFromCodeberg,
+  lib,
   libGL,
-  libx11,
   libevdev,
   libinput,
+  libx11,
   libxkbcommon,
   pixman,
   pkg-config,
   scdoc,
+  stdenv,
   udev,
   versionCheckHook,
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots_0_19,
-  xwayland,
-  zig_0_15,
   withManpages ? true,
+  wlroots_0_20,
+  xwayland,
   xwaylandSupport ? true,
+  zig_0_15,
 }:
 
+let
+  wlroots = wlroots_0_20;
+  zig = zig_0_15;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "river-classic";
-  version = "0.3.14";
+  version = "0.3.15";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
   src = fetchFromCodeberg {
     owner = "river";
     repo = "river-classic";
-    hash = "sha256-UhWA7jmBDhktHqHds06C0GY+xzlQZZezYopsLmIAGgI=";
+    hash = "sha256-zVUbLojSyCOOz3+DR9J9nQpNNuboG5/moCGjQx2ZI8w=";
     tag = "v${finalAttrs.version}";
   };
 
@@ -42,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wayland-scanner
     xwayland
-    zig_0_15
+    zig
   ]
   ++ lib.optional withManpages scdoc;
 
@@ -55,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     wayland
     wayland-protocols
-    wlroots_0_19
+    wlroots
   ]
   ++ lib.optional xwaylandSupport libx11;
 
@@ -67,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional xwaylandSupport "-Dxwayland";
 
   postInstall = ''
-    install contrib/river.desktop -Dt $out/share/wayland-sessions
-    install -Dm755 example/init -t $out/example/
+    install -Dm644 contrib/river.desktop --target-directory=$out/share/wayland-sessions
+    install -Dm755 example/init --target-directory=$out/example
   '';
 
   doInstallCheck = true;
@@ -81,24 +85,25 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    homepage = "https://codeberg.org/river/river-classic";
     description = "Dynamic tiling wayland compositor";
     longDescription = ''
-      river-classic is a dynamic tiling Wayland compositor with flexible runtime
-      configuration.
+      river-classic is a dynamic tiling Wayland compositor with
+      flexible runtime configuration.
 
-      It is a fork of river 0.3 intended for users that are happy with how river 0.3
-      works and do not wish to deal with the majorly breaking changes planned for
-      the river 0.4.0 release.
+      It is a fork of [river](https://codeberg.org/river/river) 0.3
+      intended for users that are happy with how river 0.3 works and
+      do not wish to deal with the majorly breaking changes from the
+      river 0.4.0 release.
     '';
     changelog = "https://codeberg.org/river/river-classic/releases/tag/v${finalAttrs.version}";
+    homepage = "https://codeberg.org/river/river-classic";
     license = lib.licenses.gpl3Only;
+    mainProgram = "river";
     maintainers = with lib.maintainers; [
       adamcstephens
       moni
       rodrgz
     ];
-    mainProgram = "river";
     platforms = lib.platforms.linux;
   };
 })

From dc90fde27be5b07facff492bc2c7dd9d31f9c744 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Tue, 31 Mar 2026 19:30:01 +0200
Subject: [PATCH 207/238] jetbrains.datagrip: 2025.3.5 -> 2026.1

---
 .../editors/jetbrains/ides/datagrip.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
index f250a2214cb6..bcb7c530099f 100644
--- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix
+++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.5.tar.gz";
-      hash = "sha256-s9Zw7SUhmAzjhTf52nEerXNaP0l7kO/6J35xFtKf6TQ=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.tar.gz";
+      hash = "sha256-iO08H4cMYVKx2p1iJsKqooC5YNGIjTbdqwnM98JC2W8=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.5-aarch64.tar.gz";
-      hash = "sha256-75OME+CICrLNkUT0tFqzUe/qAGtCGNKC6kAGeTuSK6w=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1-aarch64.tar.gz";
+      hash = "sha256-8omllZC5WbYOsXsZ6JTVaDNh/QIyUVgmw3zBwY2nfkY=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.5.dmg";
-      hash = "sha256-FkTK5hu3GloxzzlAuXJUI3G5w84YvzIYtfa0h6hDZ5w=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.dmg";
+      hash = "sha256-UBKNSUVhzJ932Ja7rrugKzqlzxiE5Ynv91yDT6onCNM=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.5-aarch64.dmg";
-      hash = "sha256-lE0b8s37mBHJ7e0iHfKSW/9vpE95d/+wpjIgkcGDcr8=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1-aarch64.dmg";
+      hash = "sha256-V7ip2Er8bQL0feLvovF/rpJpCTYM/MhEywNax91F8Gk=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "DataGrip";
 
   # update-script-start: version
-  version = "2025.3.5";
-  buildNumber = "253.31033.21";
+  version = "2026.1";
+  buildNumber = "261.22158.299";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 80062fdb50c7fb9876d5efa14ac993f61fe2a3af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 17:59:56 +0000
Subject: [PATCH 208/238] checkov: 3.2.511 -> 3.2.513

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

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 262310b28be3..d38e7c7c9d9c 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -35,14 +35,14 @@ let
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "checkov";
-  version = "3.2.511";
+  version = "3.2.513";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = finalAttrs.version;
-    hash = "sha256-biTISn9XhwL1RhlztmydBXwyYruNhc0GoZ1PyIg0IUg=";
+    hash = "sha256-diPsVe8fhWKHMn02qKK91MwPqXNVFpmE8n5e9JJsDCM=";
   };
 
   pythonRelaxDeps = [

From f6324438e10c8258d4540e5f910dce38c6ea7940 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 18:08:36 +0000
Subject: [PATCH 209/238] usql: 0.21.1 -> 0.21.4

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

diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix
index 1edab1462858..417565ebb3e2 100644
--- a/pkgs/by-name/us/usql/package.nix
+++ b/pkgs/by-name/us/usql/package.nix
@@ -11,13 +11,13 @@
 
 buildGo126Module (finalAttrs: {
   pname = "usql";
-  version = "0.21.1";
+  version = "0.21.4";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WaIHm7ozH/R8ByWNTtk8tbv5qOxPB4huexew9VRcLEc=";
+    hash = "sha256-8T3/IuTf7ui/yj9yy/HIOD5/8IQx1Zoodd7nmmGhla8=";
   };
 
   buildInputs = [
@@ -25,7 +25,7 @@ buildGo126Module (finalAttrs: {
     icu
   ];
 
-  vendorHash = "sha256-JhVqXBC9eRfe5fehw+9zhj93wxCelCTbbsH4/hOPhgw=";
+  vendorHash = "sha256-GxU3NLLUJgMTrdtnlyDGivKdf8xjRekpz5gHm7CrWqY=";
   proxyVendor = true;
 
   # Exclude drivers from the bad group

From 146fb01d7d7791f9448f8375f8941da715a1ebd6 Mon Sep 17 00:00:00 2001
From: Nazar Vinnichuk <nazar@vinnich.uk>
Date: Fri, 27 Mar 2026 20:23:55 +0200
Subject: [PATCH 210/238] python3Packages.synchronicity: init at 0.11.1

---
 .../python-modules/synchronicity/default.nix  | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/synchronicity/default.nix

diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix
new file mode 100644
index 000000000000..1509b56d96db
--- /dev/null
+++ b/pkgs/development/python-modules/synchronicity/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  gevent,
+  hatchling,
+  mypy,
+  pytest-asyncio,
+  pytest-markdown-docs,
+  pytestCheckHook,
+  pythonOlder,
+  sigtools,
+  typing-extensions,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "synchronicity";
+  version = "0.11.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "modal-labs";
+    repo = "synchronicity";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-Uyn4apHILBwjHoMkr52IkcFlaX7jx3WzuzZfvdxcDFo=";
+  };
+
+  build-system = [ hatchling ];
+  dependencies = [ typing-extensions ];
+  optional-dependencies.compile = [ sigtools ];
+
+  nativeCheckInputs = [
+    mypy
+    pytestCheckHook
+    pytest-asyncio
+    pytest-markdown-docs
+    sigtools
+  ]
+  ++ lib.optionals (pythonOlder "3.13") [
+    gevent
+  ];
+
+  disabledTests = [
+    # Assert execution time, non-deterministic
+    "test_blocking"
+    "test_multithreaded"
+    "test_nowrap"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Assertion error
+    "test_async"
+  ];
+
+  pythonImportsCheck = [ "synchronicity" ];
+
+  meta = {
+    description = "Export blocking and async library versions from a single async implementation";
+    homepage = "https://github.com/modal-labs/synchronicity";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Kharacternyk ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c100206eae07..ed9eb35aa310 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18825,6 +18825,8 @@ self: super: with self; {
 
   syncer = callPackage ../development/python-modules/syncer { };
 
+  synchronicity = callPackage ../development/python-modules/synchronicity { };
+
   syndication-domination = toPythonModule (
     pkgs.syndication-domination.override {
       enablePython = true;

From 884591ea2fd8e0dc495e5ccee5b0a3cab3c05159 Mon Sep 17 00:00:00 2001
From: Nazar Vinnichuk <nazar@vinnich.uk>
Date: Wed, 25 Mar 2026 20:48:17 +0200
Subject: [PATCH 211/238] python3Packages.types-certifi: init at 2021.10.8.3

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

diff --git a/pkgs/development/python-modules/types-certifi/default.nix b/pkgs/development/python-modules/types-certifi/default.nix
new file mode 100644
index 000000000000..aa3d10198b60
--- /dev/null
+++ b/pkgs/development/python-modules/types-certifi/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "types-certifi";
+  version = "2021.10.8.3";
+  pyproject = true;
+
+  # Building typeshed subpackages from the GitHub repository requires packaging
+  # https://github.com/typeshed-internal/stub_uploader
+  # The switch to fetchFromGitHub can be made at once for all applicable types-*
+  # packages once stub_uploader is packaged
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-cs93mNFlvAt24cEN0eowl8cGPELCHWZFI7ko6ItVSk8=";
+  };
+
+  build-system = [ setuptools ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Typing stubs for certifi";
+    homepage = "https://github.com/python/typeshed";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Kharacternyk ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed9eb35aa310..069d9f08db60 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20221,6 +20221,8 @@ self: super: with self; {
 
   types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { };
 
+  types-certifi = callPackage ../development/python-modules/types-certifi { };
+
   types-click = callPackage ../development/python-modules/types-click { };
 
   types-colorama = callPackage ../development/python-modules/types-colorama { };

From 81de696839d78fab844151e67bf4357e45c675b7 Mon Sep 17 00:00:00 2001
From: Nazar Vinnichuk <nazar@vinnich.uk>
Date: Fri, 27 Mar 2026 20:25:23 +0200
Subject: [PATCH 212/238] python3Packages.modal: init at 1.3.5

---
 .../python-modules/modal/default.nix          | 144 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 146 insertions(+)
 create mode 100644 pkgs/development/python-modules/modal/default.nix

diff --git a/pkgs/development/python-modules/modal/default.nix b/pkgs/development/python-modules/modal/default.nix
new file mode 100644
index 000000000000..41e6c4ad3b5e
--- /dev/null
+++ b/pkgs/development/python-modules/modal/default.nix
@@ -0,0 +1,144 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  cbor2,
+  certifi,
+  click,
+  fastapi,
+  fetchFromGitHub,
+  flaky,
+  grpcio-tools,
+  grpclib,
+  httpx,
+  invoke,
+  ipython,
+  mypy,
+  mypy-protobuf,
+  protobuf,
+  pyjwt,
+  pytest-asyncio,
+  pytest-env,
+  pytest-markdown-docs,
+  pytest-timeout,
+  pytestCheckHook,
+  python-dotenv,
+  rich,
+  ruff,
+  setuptools,
+  six,
+  synchronicity,
+  toml,
+  typer,
+  types-certifi,
+  types-toml,
+  typing-extensions,
+  watchfiles,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "modal";
+  version = "1.3.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "modal-labs";
+    repo = "modal-client";
+    tag = "py/v${finalAttrs.version}";
+    hash = "sha256-DjCEnQ+H03Ga0My2qHGEEF4Ae5HnmlWNvwL+jLdo0pg=";
+  };
+  sourceRoot = "${finalAttrs.src.name}/py";
+
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail 'setuptools~=77.0.3' setuptools
+    patchShebangs protoc_plugin/plugin.py
+    inv protoc
+    inv type-stubs
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeBuildInputs = [
+    invoke
+    ipython
+    grpcio-tools
+    grpclib
+    synchronicity
+    mypy-protobuf
+    ruff
+  ]
+  ++ synchronicity.optional-dependencies.compile;
+
+  pythonRelaxDeps = [
+    "protobuf"
+  ];
+
+  dependencies = [
+    aiohttp
+    cbor2
+    certifi
+    click
+    grpclib
+    protobuf
+    rich
+    synchronicity
+    toml
+    typer
+    types-certifi
+    types-toml
+    typing-extensions
+    watchfiles
+  ];
+
+  nativeCheckInputs = [
+    fastapi
+    flaky
+    httpx
+    mypy
+    pyjwt
+    pytest-asyncio
+    pytest-env
+    pytest-markdown-docs
+    pytest-timeout
+    pytestCheckHook
+    python-dotenv
+    six
+  ];
+
+  disabledTestPaths = [
+    # Fail due to not finding /bin/bash
+    "test/app_composition_test.py"
+    "test/cli_shell_test.py"
+    "test/cli_test.py"
+    "test/container_test.py"
+    "test/mounted_files_test.py"
+
+    # Needs unpackaged pythonjsonlogger
+    "test/logging_test.py"
+
+    # Matches against error messages of a specific mypy version
+    "test/static_types_test.py"
+
+    # Fails due to "Jupyter is migrating its paths to use standard platformdirs"
+    "test/notebook_test.py"
+  ];
+  disabledTests = [
+    # Non-deterministic
+    "test_queue_blocking_put"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "modal" ];
+
+  meta = {
+    description = "Python client library for Modal (serverless compute provider)";
+    homepage = "https://github.com/modal-labs/modal-client";
+    changelog = "https://github.com/modal-labs/modal-client/blob/${finalAttrs.src.tag}/py/CHANGELOG.md";
+    mainProgram = "modal";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Kharacternyk ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 069d9f08db60..56cf8f9db5bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10086,6 +10086,8 @@ self: super: with self; {
 
   mockupdb = callPackage ../development/python-modules/mockupdb { };
 
+  modal = callPackage ../development/python-modules/modal { };
+
   modbus-tk = callPackage ../development/python-modules/modbus-tk { };
 
   moddb = callPackage ../development/python-modules/moddb { };

From 92f6dbb0ac61387fd49835d58c7b55fa0bb5d900 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 18:22:36 +0000
Subject: [PATCH 213/238] python3Packages.google-cloud-vision: 3.12.1 -> 3.13.0

---
 .../python-modules/google-cloud-vision/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index d122306c49ef..61a976635b11 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-vision";
-  version = "3.12.1";
+  version = "3.13.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit (finalAttrs) version;
-    hash = "sha256-+ZuDr3WI0w5wi4fgn/c+Q+OASX/oLHmbnwXgPzEAJ8g=";
+    hash = "sha256-aA9mjTMYWKM0DqxBtzKQPTDcae0IAg/9HVyjJYC99UY=";
   };
 
   build-system = [ setuptools ];

From 5b1caf1b2f440f7fa3b9a4801b8f475a00f2bc1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 18:53:16 +0000
Subject: [PATCH 214/238] vscode-extensions.dart-code.dart-code: 3.130.1 ->
 3.132.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 7dda36009f55..b418258c0ab0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1188,8 +1188,8 @@ let
         mktplcRef = {
           name = "dart-code";
           publisher = "dart-code";
-          version = "3.130.1";
-          hash = "sha256-qBCE1ior+xNKSAVWGbPGKK6pul22DUZ/movaHx0s/8c=";
+          version = "3.132.0";
+          hash = "sha256-AWzHCg6N//+RmQ1I3Qq4c8Kk+e3gZpeqK9yWB8kfl6w=";
         };
 
         meta.license = lib.licenses.mit;

From d30a2c0bec225a917c3f1a7af487d4543eff50bd Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Date: Tue, 31 Mar 2026 14:58:03 -0400
Subject: [PATCH 215/238] nix-scheduler-hook: 0.7.2 -> 0.7.3, use nix 2.34

Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
---
 pkgs/by-name/ni/nix-scheduler-hook/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ni/nix-scheduler-hook/package.nix b/pkgs/by-name/ni/nix-scheduler-hook/package.nix
index 7d90bf0d73ed..8b4f065cbb98 100644
--- a/pkgs/by-name/ni/nix-scheduler-hook/package.nix
+++ b/pkgs/by-name/ni/nix-scheduler-hook/package.nix
@@ -1,8 +1,9 @@
 {
   fetchFromGitHub,
+  fetchFromCodeberg,
   stdenv,
   lib,
-  nix,
+  nixVersions,
   meson,
   cmake,
   ninja,
@@ -29,16 +30,17 @@ let
       slurm.dev
     ];
   };
+  nix = nixVersions.nix_2_34;
 in
 stdenv.mkDerivation rec {
   pname = "nix-scheduler-hook";
-  version = "0.7.2";
+  version = "0.7.3";
 
-  src = fetchFromGitHub {
-    owner = "lisanna-dettwyler";
+  src = fetchFromCodeberg {
+    owner = "lisanna";
     repo = "nix-scheduler-hook";
     tag = "v${version}";
-    hash = "sha256-tgZ2BZuKmaoPh4h4r/nej98tvl4PvwZfA6xbTLgNZMA=";
+    hash = "sha256-r8ybbPxQK+ohsaz4+brrsivj77fCqrrHPskfyrp6R2A=";
   };
 
   sourceRoot = "source/src";

From 5bd407c9dfd2845eeb3c88d6863623c5779a5ce4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 18:59:03 +0000
Subject: [PATCH 216/238] iosevka-bin: 34.1.0 -> 34.3.0

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index aff8a4f8dd85..4b90641763d9 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "${name}-bin";
-  version = "34.1.0";
+  version = "34.3.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${finalAttrs.version}/PkgTTC-${name}-${finalAttrs.version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 1bb2a41d4eda..6687df0f02aa 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1ks27r2aq6039qm6ds846ff0naazpn2f73qr2acy0d58g92mh1yn";
-  IosevkaAile = "04y1c94ndhl7ffav80fk2pllxi4w8lp9gh78a2g8fkfsp032b834";
-  IosevkaCurly = "0f70jjfagcv2xv7ni6p9ja7sfzfm7vjmkbmb7mrw1pabbxv1qv70";
-  IosevkaCurlySlab = "1bhns6wfhpklir350xyvbqli11gv6ngv1hnqindfskvbjdgvksya";
-  IosevkaEtoile = "1rj08pv191p5zh6x4lzb5wri39759jwif3vk6lbpdavjmh7n6ifb";
-  IosevkaSlab = "1nwpgvmhfsrz9sarmjm4bv3fjw8v9xdnhgsk1qmail1ikd0r558b";
-  IosevkaSS01 = "0rr9dpyjdf0zl6dnsd3ywx5bgsmxrmmdcvklr02xypbh0r48yk41";
-  IosevkaSS02 = "0fms0w7k41g511haqc7g6a4y2mv053rrvlyymrldxpczavfmb452";
-  IosevkaSS03 = "1mrk1shgz4b8gh71bz44mq7fc2rqj2dlqwzil3zhfmipp35khr8p";
-  IosevkaSS04 = "0bfqg20pgyxxw9yxn1fn633w5rx87rij0scz37rrwx2ax21b9714";
-  IosevkaSS05 = "1i4s47gwbhpipbcybwh7dj8zqhj3dibcxkm68zz7cqj7d0a3pgz1";
-  IosevkaSS06 = "0b100pni0hfp9cwijasvhwv387zd0ss9ii4hrll6wwxdvl85kygp";
-  IosevkaSS07 = "1138pcqknbs9qd08930q5ymgspvqfqmbvkmzza148q55pypakmhj";
-  IosevkaSS08 = "170sfv87mi6n7mp60dfpkkqg2dckc4537vg1pa7kjqsdlz68w8cj";
-  IosevkaSS09 = "0ggw8pw6rp3bzai453k0cxldjm5aah04h770k76izh8qcmdfn9cx";
-  IosevkaSS10 = "07gpishi3kdvrj4rhiyzbh8689lq4idfwn9qwz8v2177k5hrc3xj";
-  IosevkaSS11 = "0vgnmr4qqhxxqxfcn1i6fb81129gbcyyfx6s2hhsd0412m82za1m";
-  IosevkaSS12 = "1am7l8kbjgzcdrh3rs4lll8rsdbl6nkfigj05ijxj99vy709b3ay";
-  IosevkaSS13 = "0c4mljjijw5jdlcazz88fwaax1mlmslpvqjx04j4fa6y01b5lbwi";
-  IosevkaSS14 = "00hc45hk39fnr1q1nfycyybipv8p7svnpd0v5a8gs2yziwp4lgmy";
-  IosevkaSS15 = "0xklpd7hzbwr0hin7j2rmql5brsp9pnczkwmkv02dkz8wpaplsnh";
-  IosevkaSS16 = "149vn4df6hqhhg4azvbg6ydrddfa2s9w6jl53y4jzh16k1qg299j";
-  IosevkaSS17 = "0rhfkl90balv9q4kvlj7kqnpsq65v695y2420lgm0795jpzjjjqj";
-  IosevkaSS18 = "0jlri23v1skwczqh5jlfgn48h9ax2l3c43ylr5j85ilnj141v83l";
-  SGr-Iosevka = "13wh9xpd9snskargz50g6r12p7c605c9d021cidmrd17gv7xc9gy";
-  SGr-IosevkaCurly = "02v5n4llvsfn5bz5f5bzwjg9sjddyy9g2by5x6vys28lrj1kjdpx";
-  SGr-IosevkaCurlySlab = "1kcahdm2qh65979kjwma64kpqy07rx0vsbbm4nfq97dp89sf1r1v";
-  SGr-IosevkaFixed = "1aqmz56378nsmk714y9zz5zpzn1y7qxir25fswb1q9i1d2a6jrjp";
-  SGr-IosevkaFixedCurly = "08hz11jrg9d3kymfsdvv0pg3l15pfm58ywwwrz7x2s293v7dinij";
-  SGr-IosevkaFixedCurlySlab = "1z7qzlam1611yfaa1x63qii40kv6ammiiq45z8h9ip1y1g89psfk";
-  SGr-IosevkaFixedSlab = "1dh26p28jpcsvfw4rp9r59dzizg2b85a7sx49lzx420nq329nps1";
-  SGr-IosevkaFixedSS01 = "0vba40a2yfxf30q8zskjw4xbyjynm4ddydgydclkbw4xk3lpv81c";
-  SGr-IosevkaFixedSS02 = "06flqwi0xj6fcrf1kba4wmrixx8jp0ki5bl40jlk4b73y77pjdzl";
-  SGr-IosevkaFixedSS03 = "1na81p6944raqfncwlamb6qq8iq3asy6pf3djbqb27q620vs1h2g";
-  SGr-IosevkaFixedSS04 = "14mrnnxadlmkj289n89c0wjhpq9vsqp69jf4iknr0aw0zbxdzygg";
-  SGr-IosevkaFixedSS05 = "096dxrl43955x1jxxmqrgblwcp09rm0bibwvlfzrhd858836ykgb";
-  SGr-IosevkaFixedSS06 = "0g7iws86053z6cz9ccawfakbf5kc5hnv4pvkgw82nvczhswzj9w4";
-  SGr-IosevkaFixedSS07 = "0zrsndf0kgzyar2ciskgnnq69761fz577w5x05cn8fi1j3bk8jw0";
-  SGr-IosevkaFixedSS08 = "0i0b168zs4ivmphb6iv2pk738paqn9kqpxyy8p1hbnpxmhh6567k";
-  SGr-IosevkaFixedSS09 = "1lqj8hac38g4apfy6mdhhvvghvfsicyw0mnihb1dhxfjrfglbgwv";
-  SGr-IosevkaFixedSS10 = "1csr7pl77qcx89669215s52lk1xjk886xdhrxla8a14770vyqhc6";
-  SGr-IosevkaFixedSS11 = "1r6hizv0bfk97sm98yr7frkrni6j3rdfrzkx8dg4k4kdawzgwl52";
-  SGr-IosevkaFixedSS12 = "1g9azwdq9bymj77fvf4qkf19f0bc65z94xj1a47cc2m90q6lh64m";
-  SGr-IosevkaFixedSS13 = "1f550yn0f8yi0wpmakvqxn841b40y3d2g2mkb0y6msh6lbknsyzv";
-  SGr-IosevkaFixedSS14 = "059blzwwhc0vq2k4icxxv446srp3yx001r2pwb4yx9wvxz3s41iv";
-  SGr-IosevkaFixedSS15 = "1f7cbs0zl3bz0bhm41c7155kdiqhz6csmkj9m56imdb9i43bc8dy";
-  SGr-IosevkaFixedSS16 = "14f3ddmdhb3b97dv6hlp1h69xmxbyhya10nm97nhxx978wfb03wi";
-  SGr-IosevkaFixedSS17 = "04ksk0479a6argapgw7cz948g18ji2lz6bgs9y6wgs2j23bdd202";
-  SGr-IosevkaFixedSS18 = "0rrrb9qmr8mcs2w9j8ydgbi9mzh5qixc9wvvq243wf21f2ryyiv7";
-  SGr-IosevkaSlab = "0104yjl6a90cfs1c0c7sv3w2bzxidrl3zwifi1cl7a9knmzf6q8c";
-  SGr-IosevkaSS01 = "0w00c66pxah6cnh8i6da2k6rlj5wl5bjj1w78pc874y7l04bi5sh";
-  SGr-IosevkaSS02 = "02gr60dcvlz961f99xcs3p76g8bdwbavm4qmgyadr9hla97bag5h";
-  SGr-IosevkaSS03 = "01gsp69k7i3188z0gcrfbyl5ik5nhrpqm8qc5iafgdflw1cq3nbj";
-  SGr-IosevkaSS04 = "11yj0r0fpxxbqz9wka4sl2b2yjy6ckk1srg0xf0zjj92ch5snp0c";
-  SGr-IosevkaSS05 = "071y7zs923ngmiaiwfh87pirg5c65029wmbpk7ld3flqfclhcq52";
-  SGr-IosevkaSS06 = "1p3fcwpf67v2br0c6q7ippx5blvj9qybx0kk3q823832i1ncrpxl";
-  SGr-IosevkaSS07 = "15f2i563ii226gi9ysprw2gk9w5p71i8a7yqnx80m4ifhvvgchlc";
-  SGr-IosevkaSS08 = "0jx9igvs79qskcdrjcj7cbkkdyj63m19smhv8dc34p189yf1ik3i";
-  SGr-IosevkaSS09 = "108b1qnpm838sp82car9gg2y407r0nwdh4abaqlrgyr8dzk5f58n";
-  SGr-IosevkaSS10 = "10g4bzfdk199qaplr4w3np6nkgh4mf1v7d9qsbvc3nrj8ll2aq5n";
-  SGr-IosevkaSS11 = "0gxz2w0p0f0363c58nqfhks43r8wqq6pjy0v09yfdmnhqj6z7j9x";
-  SGr-IosevkaSS12 = "1z9qzsmdgw34vcpzi3nbh5yj8hmxw6sxjgw4ixyhz43c4swf4cbn";
-  SGr-IosevkaSS13 = "06lbzy7m3kdqk0f0hssbxidyqhzzgl2n2mpsg4yyxbyvbgdbhj8f";
-  SGr-IosevkaSS14 = "0s8afcg7bcsc8s7rakg8bb561q4mfnf0wz1f5jxs19k1050zs0yd";
-  SGr-IosevkaSS15 = "1q257hagk63bazl0prml0a1d47qyaq1v11f3j5aksdqw8pyd11g2";
-  SGr-IosevkaSS16 = "1kwyrf0q077rn7x2qs454xbyr569a133c0k9a0al8jwjbpg7hsxw";
-  SGr-IosevkaSS17 = "1l1mm2yz6dxzw73myd6spcbzdp2sy7zkg6j7mg06vlbnydk5xnz8";
-  SGr-IosevkaSS18 = "04ppzgbb00anc4x6x6s82aih82pqz8n0isqnm65y4k1hddrm4h3i";
-  SGr-IosevkaTerm = "0v21aqnfrnpkfkfzh6il344nfb3icmd9r5kiamigscc4vwqz6pn3";
-  SGr-IosevkaTermCurly = "1955wg65w556blq2hi6ghgbayb53xq9lq5ajmk13x5hkp5fwbwpw";
-  SGr-IosevkaTermCurlySlab = "0zh61dgfv4plwha45cz5ly3xgb1zk2c9wr0zlfjj30b1nqfffv4l";
-  SGr-IosevkaTermSlab = "0wgq8d8cim0c2kw2qcp7pp65kpbkxkn7z9qsg5qmyv420p5fbckf";
-  SGr-IosevkaTermSS01 = "1mfvqqa98wgsxfb17z3bcrgzblj9kqsah0jpmnblhvn6hrfcssyh";
-  SGr-IosevkaTermSS02 = "1dklck1121y0i32c1vp5qnw8qy7fynn1858wmjq2rj0lzxbxv16s";
-  SGr-IosevkaTermSS03 = "10nrg9bfzn6b7m0fnmy05dj6ma738bmxfcsd4cc2dnwcwj7ijckh";
-  SGr-IosevkaTermSS04 = "0laxpzz7aayv8k8awdqaamaic7cvhnvbcpdgs6qm184vbxgkh25m";
-  SGr-IosevkaTermSS05 = "0cppv8pywxi64mfd6r55l3pqwkdnkgiv3jxws8bx1sddy62vgwgm";
-  SGr-IosevkaTermSS06 = "02mklk15iims5pqamlnmahwmsm1svsdc8066xrf3hncgavd493xg";
-  SGr-IosevkaTermSS07 = "0xph1nanliln6vbd4n1yiz7rm0z5xniszlp9mhahqdpz0fd2rbfr";
-  SGr-IosevkaTermSS08 = "15arp1z8yzhfmmf2z4xm7lwdyblr6xv1gqqrzw524xk24654hnq8";
-  SGr-IosevkaTermSS09 = "01psmw8vbw1vbxmm70dq5cqgyh6fhpz26v9aics3dw1fdlpzk723";
-  SGr-IosevkaTermSS10 = "01d7qnx3247cbcfq35q9dj937jwjlmb6k0c68bayc8ipnh6g6nmz";
-  SGr-IosevkaTermSS11 = "019hg1vkj1smy20gkv277a59nr6bahprc38cql2pf3543cijwgzq";
-  SGr-IosevkaTermSS12 = "14dnnxar7iig9iw8q45hsrilmjx7ygi4b8hm1x3hh1jcri3bywnb";
-  SGr-IosevkaTermSS13 = "03ijmmhhah6994bllnfhjw2kf6llhawbslwrk0p2z92l8xia4cwn";
-  SGr-IosevkaTermSS14 = "0znfgrcyrif6kdhywzzrv7dsq7k473kkm84rmk43crp3459jh7h1";
-  SGr-IosevkaTermSS15 = "0d417ccl9q4zffq3c178g99wqranzqgaf07sna98x645anhyqqyg";
-  SGr-IosevkaTermSS16 = "0fz2zn4gz6vyi4jw7jb8h2k99ll61sxzpfnw1x2gcbxap9qa7bgh";
-  SGr-IosevkaTermSS17 = "0v92f25nqqd6hy84hy1522qspcbcrw5whz8r0vzvhf6k9bz2wma9";
-  SGr-IosevkaTermSS18 = "0pijgwmf6ri92fjz0yv7z72bc4fqs1xwva0r55iibbmmk4n0lwch";
+  Iosevka = "1hi3lj7lhxi9mc9qx5wx6pf2gp4n92nr3w077g8125d0qj1lynmz";
+  IosevkaAile = "0jm03g4z0x2vf27dabcpdhj7y6kmm8c81z3avxa4s5rhw86di3wl";
+  IosevkaCurly = "0sr322g251lsw1bvfcfg5pim8r5lrjh56xyrn0ghd4961cccymvq";
+  IosevkaCurlySlab = "1pjnk9pzn2xknikg7md94cf3m62jjzbkbsp631fkda84vxpla72y";
+  IosevkaEtoile = "1k1ds0bb02rqz9p3bc85512xiihkkljal5p82bappkhha1xqr19v";
+  IosevkaSlab = "132xdhggnq06w062vsm8gq1a9phid7ajwyki7kk76d0xpvh4g91d";
+  IosevkaSS01 = "1r2g1wq2yvzkiywd22x8cji4lg242fvqh2wa80fyj8cb0kza9675";
+  IosevkaSS02 = "0bcjln3aif8vx1l8yfl39yaf2y29rbab21v771y0nh4zq19b3j2h";
+  IosevkaSS03 = "12pps3qhrfg5i7zw2f64ajw3bkgwsa9br857981iv5p9d8fsqaa4";
+  IosevkaSS04 = "0a4x2zhab01abn12r2vq7skjsycij2xkg2hk2zpaa5nzc81vwx7r";
+  IosevkaSS05 = "1g0bvg7ms1smxz1x4p3vbvdmv0ywk9xn88p1lda6glcjjdjvvrj0";
+  IosevkaSS06 = "01kb9mqmkgrrwza5vhdcc4rrwdpq18bmsmk2sdglykxxb4wxdypv";
+  IosevkaSS07 = "0lgx2lshr1z568999c0gj1ym4pjb6y9z9h0sb8wjhjbg2myfzmmv";
+  IosevkaSS08 = "0wxzraih01xxi8sj9y7l5xbplszq4mzimw6zn9asq5lzq0rzyrjy";
+  IosevkaSS09 = "1065na837i39jgy7iml6y2aylsbiipj1kpzrqv370xg70nv4jpvb";
+  IosevkaSS10 = "01n8kxlj6k5674j6yavyl5vcslis6zpmfc26d3yhr13b2lmk8jnx";
+  IosevkaSS11 = "1ds9q64s3vh8s5jzf8hsh37i2dzp98g11by31gip5f3ki0ygiq0s";
+  IosevkaSS12 = "17dw6zsk1y6nh9gdf1wbry792c43rr5qxy2h6jn761g7p5k2yqr4";
+  IosevkaSS13 = "0jyhc22ylhsx5krm7m5fqkpvl6d5qvmwrvizrz1aj6cj9qg7gmk9";
+  IosevkaSS14 = "0n9cibyf9dbhpjv65r0vcz540g878p66nf233y5a9783ilqnaf6g";
+  IosevkaSS15 = "082dj9l6np0jv9l6py0n94dp12z4j21nh4c5rnnd70gwm62a8bs4";
+  IosevkaSS16 = "1d799ggds6yrv7iwif8m9bw5b7wbzzish9yj77k8w2f0m3kkd2bm";
+  IosevkaSS17 = "0fx25bnb3yr9krj3px8zs6s3nbzk75d5dx3g4wy2p103l2dw6kbr";
+  IosevkaSS18 = "1a1f6k45pslin4f07phd4lqcdmqsdwmdn2cyd53zw8hbwc123hy3";
+  SGr-Iosevka = "1p1wrxnlwlwv84ml3y6pd76ipkivk7vg4d4lriv1jf9bc5cf92jq";
+  SGr-IosevkaCurly = "0rzmixda0chbhzmacpqaln5rw83wk5i3aa2ahjh2pyw1mg5aj7ki";
+  SGr-IosevkaCurlySlab = "1byvpqnjb9ima7aw1758x29nrgmsq1hwpxryh0hlyww6yr6iwdc2";
+  SGr-IosevkaFixed = "1a5c67ssj83mzzs7aghmfffchlqajjk4rg5vqlrs2mzm2j03xdkf";
+  SGr-IosevkaFixedCurly = "05b8msl7hxh96djrai6g1s107h3lqzrc2x9qz6qrwni90w5cyv60";
+  SGr-IosevkaFixedCurlySlab = "1nbn1qp977mqg4jlzz6ba4v07f9v7xal7acpfqfw66xjjbbyys36";
+  SGr-IosevkaFixedSlab = "1rs3w2qb9bq8pjvz4lsx3gbiz40jdhjqd7m12mzfwbhmnhxk2pam";
+  SGr-IosevkaFixedSS01 = "1bn3y6k6bg6kibqd9ai6imz8fanz2b8ryj74dva2vcjjhbzw8gfv";
+  SGr-IosevkaFixedSS02 = "01qdpf0zj529s9yp87z54cz9gg4fmpfgrlln1iw19nzj37h2y8kw";
+  SGr-IosevkaFixedSS03 = "0dyj1n82l8zmjrl9061029pjy35vmr4i46bic98m0n23xz10glb7";
+  SGr-IosevkaFixedSS04 = "1kgy80bv21z57lxcc7v22961i2qfczqbvw236f5dsqnjgcx9bf5i";
+  SGr-IosevkaFixedSS05 = "0ac7qnmmnw69gnzm6c0y90mclp0sbqmnyhcaqril2h5nba2s582k";
+  SGr-IosevkaFixedSS06 = "1d5wvzyd7h5n6wg6c8qflmw8a4hc3h4mccf8vam7fglhwbbfswlv";
+  SGr-IosevkaFixedSS07 = "0wjbsdkqr1y10vnmwra16a13yxnvd9gqd030265w6gwnhs0p7r4j";
+  SGr-IosevkaFixedSS08 = "0pypcjicqnm6h133j8m4q5gc1vdk2j2vkl70m81zxlhs9xxf5nlh";
+  SGr-IosevkaFixedSS09 = "0cba4zvq7rgb17bx4z91mbynadgns9szd4wpj5skmg80abkj2wh3";
+  SGr-IosevkaFixedSS10 = "19q3ixasmz0py5h52jx4ic819lv0p2hkipj3gwszhv35cafwi2mc";
+  SGr-IosevkaFixedSS11 = "1zkmhr756k1l5mr51phrc3wkkyc6xpimhz7szxa6r2rq2l0dw5yb";
+  SGr-IosevkaFixedSS12 = "02xxzbnq15dibn3s4b117qafz72a89y1hbznbkds7w1lgrcd3n42";
+  SGr-IosevkaFixedSS13 = "17flb0hw6mddgy39qgi9k18sa4f2mb62qng023zbw2labn1cfk5p";
+  SGr-IosevkaFixedSS14 = "13wqkn6jxajwg0w3rs0m93wzm95i7dsbs4ilni2ab8n4jvx5crhb";
+  SGr-IosevkaFixedSS15 = "04mqjii28fzs6380aqsswcqi8kxd5qykqqw6225z12hb01gz17zz";
+  SGr-IosevkaFixedSS16 = "1i0ngdm70m2fzi7ns5j61rbv9nn3czb0spc7zwj6hg3ric2zddx7";
+  SGr-IosevkaFixedSS17 = "0lsgkvfpj5j4yv5a38afllbhj4py8p2ggx3lfdhd6r8bhqkbn0xi";
+  SGr-IosevkaFixedSS18 = "0yqkjckn5bycp0ckgpf8v9f6w26rpwc27zckbjab29q0l8mv6mz8";
+  SGr-IosevkaSlab = "0ph358rgb0frc4gvar432gsxh7byai9gsrv8awgp089ydjsmwzhj";
+  SGr-IosevkaSS01 = "0kfbh35ibfcj4k38dl3mcs2caplc7s0fagqfjflhz2vwdjwdg1pj";
+  SGr-IosevkaSS02 = "1y3w272bhdyk8vgahr7gayd8q1587wfgfllcr3hj0clgr2k4i64w";
+  SGr-IosevkaSS03 = "1jari56mqa6r7vqqcdcpyidbsv0xl6vps3kpn4p3l02whq1d9wkl";
+  SGr-IosevkaSS04 = "1icn0hj8vwmzk6axfmyqmp6vsm756gwn4l7fhsh0izrrqa5fisz1";
+  SGr-IosevkaSS05 = "12gd65kz1f0i2mrxvmd7vc02r4qrmns7wkzij6klz4fnhfxr7fkz";
+  SGr-IosevkaSS06 = "0vgjdgfm3a396lgz719ykhccx22a35861ckqna1z4k02kqzxps5b";
+  SGr-IosevkaSS07 = "1w8z9ps08yxa8hgqyp31r8yph2n3x3wdhn8dra35xpqrhbf9r6xz";
+  SGr-IosevkaSS08 = "087nyj5pcadz8gg005m4hk6y9hsmvywxnv8bpbz1kw0xlhas23bn";
+  SGr-IosevkaSS09 = "1489nmb0b26any5arppcaxj55an5dsbcr5dz5gpz1mkskl33nqdd";
+  SGr-IosevkaSS10 = "03z56s9zqs7zpdxnq5xpfqz2iddbnj6n3ii5djdg08pms78p5a0z";
+  SGr-IosevkaSS11 = "10byk5zk8x8gkg584cdmjnwx4k7j797blw5mj9rr89v3qz6xd30d";
+  SGr-IosevkaSS12 = "1q40rwqfsk1k51mmkjc89l17cz4r2q69mg9n95nfdgklw96s2pw1";
+  SGr-IosevkaSS13 = "04zmlsz1n40j2yda368dn1918m7zazd4zbmqwjsxiifhqpnl2y2v";
+  SGr-IosevkaSS14 = "05ip3xflipjgp9qbna44fa1gzd5nfc6xs3v4z6xli7c4aiqv96vi";
+  SGr-IosevkaSS15 = "1hhkwk6g041i0zywbh4yn88x9frrghsk77h06k3vayxavg2ygqm3";
+  SGr-IosevkaSS16 = "1mz9811kbgc27sn0njin82v2bphk6gn02gmz3mvl2hgxic97hmaz";
+  SGr-IosevkaSS17 = "112hqzmfcfjj3h0yg9595k9ml0v6cwmkab9yxfjccqyzwmk12s3w";
+  SGr-IosevkaSS18 = "0w0q4znxh2pv4nrdbvgwvfyk8vrm871kps2z7m20pwjl67w6rwj7";
+  SGr-IosevkaTerm = "041arqjjd6nir7swbnl88fshif4aj5fmn77vqi9qswmc5lz4r18z";
+  SGr-IosevkaTermCurly = "1y8s9rarqcdw13lk19dz9k8dvnqcl8nbpbcah8jm313xgxs4cypx";
+  SGr-IosevkaTermCurlySlab = "1dkpv5612zgxijdq5k1v5xdy9l0b2j3pj2phaxdk4px5ayk92i7k";
+  SGr-IosevkaTermSlab = "0f6i383pclkf8n89ra00qs88468vikrwbqmhan5cx5ll5s3j0p7v";
+  SGr-IosevkaTermSS01 = "06snskzqlyjji01n146yp5r49xx6j7kal1rm8qplbibznrb6l7lh";
+  SGr-IosevkaTermSS02 = "04s0y369xsrbsq0kl51jf6mzizc7v1y68wqpvnpxr0qnzsfrfksm";
+  SGr-IosevkaTermSS03 = "1a1dsbbjsmc8bq4hxnwd1ngdd50y936c1ab9j8lj60q7xbifimka";
+  SGr-IosevkaTermSS04 = "0zc39zsysxhcbvndb9j6z46kxsjcj6afcvw7wl5kyrf5l515n3la";
+  SGr-IosevkaTermSS05 = "1nsd9g1rfyxxa2l6b4sf59k2339js5yy3hcrx3k8albyq1v3pm9g";
+  SGr-IosevkaTermSS06 = "1cxnqmxs44savsx04bphh1pnqdcsbbcz7q7fzbgkfzw6pxv0cd29";
+  SGr-IosevkaTermSS07 = "0a2fa875i8597n0q0f0lhxhg05f76nf8cdpvnn3ihhqc98wk4xds";
+  SGr-IosevkaTermSS08 = "13024qddvy4yys9jr4nfqq6y33vqdpaswc5hbjbywzda6ljb7sxq";
+  SGr-IosevkaTermSS09 = "06bz9i4m4rsw3whbgqj8c14y016j316zzi7cc753xnk8ss4ynfq2";
+  SGr-IosevkaTermSS10 = "1lhssdc0dvnqbmy6qmfcpn2psxqvyflqhvvjkrzjwy6gwiqn4bnh";
+  SGr-IosevkaTermSS11 = "11nbhfjzai80i7gw0ig1md5xcabskahqx0qfawhapfrpfil6wwdl";
+  SGr-IosevkaTermSS12 = "07362a24f67qhxmf6lm07zbi2w5rmissnbyig2fc3mpz1f853478";
+  SGr-IosevkaTermSS13 = "1cw5ayfl33hyi26j4vnhm3ymidkhrvcmn7v2f3zcg38ki1d27m84";
+  SGr-IosevkaTermSS14 = "1ksb378jpx1ja5n9nnd27qhnbnlbq7r99yn06lchpdbfxwrk4gqd";
+  SGr-IosevkaTermSS15 = "0jj2cj634ml1cgzqwgr9ivyi7222hmvnl7wm3xhc2ckir1p4jpfa";
+  SGr-IosevkaTermSS16 = "0mf3slw6xrwblv3b4afznv3aizqagj60rdcya7n1bjfdci1jzmjq";
+  SGr-IosevkaTermSS17 = "0xzd8sr07a1cxknb9w8j0yskm3x9zyj5dggdsjdx4dnn5g2rxwnn";
+  SGr-IosevkaTermSS18 = "0rdvxf1kbp44zh7bgp6cpm8kzwp7fr3dch5zn61rzpwrpn1brrdf";
 }

From 4cf3224cfa2c12053951a13bbc75a849f937502a Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 31 Mar 2026 21:33:46 +0200
Subject: [PATCH 217/238] vimPlugins.sg-nvim: skip 'sg.health' module in
 require check hook

---
 .../editors/vim/plugins/non-generated/sg-nvim/default.nix      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
index 1a2653bb134e..4c156d3c2222 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
@@ -58,6 +58,9 @@ vimUtils.buildVimPlugin {
   nvimSkipModules = [
     # Dependent on active fuzzy search state
     "sg.cody.fuzzy"
+    # Invokes a request that fails in the check hook
+    # https://github.com/sourcegraph/sg.nvim/blob/775f22b75a9826eabf69b0094dd1d51d619fe552/lua/sg/health.lua#L2
+    "sg.health"
   ];
 
   passthru = {

From 9ee176bee238e793e9ebe756b790104947316d98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 19:49:20 +0000
Subject: [PATCH 218/238] libretro.swanstation: 0-unstable-2025-08-02 ->
 0-unstable-2026-03-28

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

diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix
index 7bd2bdb8bd17..ecc5716a3868 100644
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2025-08-02";
+  version = "0-unstable-2026-03-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "4d309c05fd7bdc503d91d267bd542edb8d192b09";
-    hash = "sha256-v51xgsyVtyipss0VWqMTI69MLTJ4Eb37hJfbQfid/0Q=";
+    rev = "9498be27f8cdde1244045ee7bd6f11922a8f7916";
+    hash = "sha256-+8CcxNl6s7/St4aRf3a1LTsl8wRTIhAYIaAGCt/HbtU=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From d65016f5a492efbefb00d8f7dd834d6bbfbe1370 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Mar 2026 20:41:40 +0100
Subject: [PATCH 219/238] rtorrent: make updateScript update both this package
 and libtorrent-rakshasa

It is common for newer versions of rtorrent to depend in newer versions
of libtorrent-rakshasa to be built. So updating them separately
sometimes works, sometimes it doesn't and need some intervention until
someone goes and updates both.

Using _experimental-update-script-combinators to update both packages at
the same time should avoid this issue in future.
---
 pkgs/by-name/li/libtorrent-rakshasa/package.nix | 3 ---
 pkgs/by-name/rt/rtorrent/package.nix            | 8 ++++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
index 188057403354..12e647f35c8a 100644
--- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix
+++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
@@ -6,7 +6,6 @@
   curl,
   fetchFromGitHub,
   lib,
-  nix-update-script,
   openssl,
   pkg-config,
   stdenv,
@@ -38,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--enable-aligned=yes" ];
 
-  passthru.updateScript = nix-update-script { };
-
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index 64d4ad957caf..142797ada3da 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -1,4 +1,5 @@
 {
+  _experimental-update-script-combinators,
   autoreconfHook,
   cppunit,
   curl,
@@ -9,8 +10,8 @@
   libtorrent-rakshasa,
   lua5_4_compat,
   ncurses,
-  nixosTests,
   nix-update-script,
+  nixosTests,
   openssl,
   pkg-config,
   stdenv,
@@ -72,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit libtorrent-rakshasa;
     tests = { inherit (nixosTests) rtorrent; };
-    updateScript = nix-update-script { };
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { attrPath = "libtorrent-rakshasa"; })
+      (nix-update-script { })
+    ];
   };
 
   meta = {

From 711b106514eb2bcb27fd389f5c8967bcc2e8e22e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 19:50:59 +0000
Subject: [PATCH 220/238] gokey: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/go/gokey/package.nix b/pkgs/by-name/go/gokey/package.nix
index 42df00407322..c01a42ac580d 100644
--- a/pkgs/by-name/go/gokey/package.nix
+++ b/pkgs/by-name/go/gokey/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gokey";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "gokey";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tJ9nCHhKPrw7SRGsqAlo/tf3tBLF63+CevEXggZADlE=";
+    hash = "sha256-G8cZ5x2XiXdwR0qNCR3KZVGQvu/tOw4vQV26XOZXmKs=";
   };
 
-  vendorHash = "sha256-Btac9Oi8efqRy+OH49Na3Y6RGehHEmGfvDo2/7EWPL4=";
+  vendorHash = "sha256-ntDQi2+7TGVdfgyOhKgaNCfCBK1o5sRC9gVVxonNU6c=";
 
   meta = {
     homepage = "https://github.com/cloudflare/gokey";

From 3b78082f9ce8647c4439f5f1c300eb4a007dcd61 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Tue, 31 Mar 2026 21:55:33 +0200
Subject: [PATCH 221/238] vimPlugins.conjure: unbreak require check hook

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 50e79527dd73..c8885bfbfba7 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -871,6 +871,7 @@ assertNoAdditions {
       "conjure-spec.client.fennel.nfnl_spec"
       "conjure-spec.client.guile.socket_spec"
       "conjure-spec.client.scheme.stdio_spec"
+      "conjure-spec.process_spec"
       # No parser for fennel
       "conjure.client.fennel.def-str-util"
     ];

From 50cbebb0bcf88724d846a19bfc3aaa5ae13a6f4d Mon Sep 17 00:00:00 2001
From: Walavouchey <36758269+Walavouchey@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:30:15 +0200
Subject: [PATCH 222/238] osu-lazer-bin: 2026-305.0 -> 2026.401.0

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 515754f15907..be6c5a211485 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2026.305.0";
+  version = "2026.401.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-UmlqeuO5VeboR0zrxBOS5AiZl/rYw+Xb5L4tbofn6T0=";
+        hash = "sha256-nsQdU3qrsRw94hnwJum3zdKcBJl0Z7hjtC+ZAm2LkvY=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-h1Z+XD0bHECmPCJrxzfwJfdLiuieq/RBg2DytKOOg+c=";
+        hash = "sha256-d6SPgVzM+be+C5kWqZdc9yT7duZPF9+UsQo8iQ57pcA=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-azI3PS5LIVq1H02P1Z4Bny2VFqVLUC6pwCj1UD5HA6g=";
+        hash = "sha256-FEnsFtNAI6nlaw901UVbs2H+bayefcMtu7/n4Vz7bOc=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From fb1554b6e5f91e62d62f6c69101aa300c468a0a6 Mon Sep 17 00:00:00 2001
From: Walavouchey <36758269+Walavouchey@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:31:00 +0200
Subject: [PATCH 223/238] osu-lazer: 2026.305.0 -> 2026.401.0

---
 pkgs/by-name/os/osu-lazer/deps.json   | 237 +++++++++++++-------------
 pkgs/by-name/os/osu-lazer/package.nix |   4 +-
 2 files changed, 118 insertions(+), 123 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index f2e6f82f393d..39cc19190108 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -11,13 +11,13 @@
   },
   {
     "pname": "DiffPlex",
-    "version": "1.7.2",
-    "hash": "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="
+    "version": "1.9.0",
+    "hash": "sha256-ozj2ME8fTj3AXMUguIqI45ecLS41WnOETCxCG6bDeo4="
   },
   {
     "pname": "DiscordRichPresence",
-    "version": "1.2.1.24",
-    "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="
+    "version": "1.6.1.70",
+    "hash": "sha256-uXTNIWfZU7Gf/JpXQ5ufKA3SQdXYSkg3yLm5yCrBDd8="
   },
   {
     "pname": "FFmpeg.AutoGen",
@@ -36,8 +36,8 @@
   },
   {
     "pname": "HtmlAgilityPack",
-    "version": "1.11.72",
-    "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k="
+    "version": "1.12.4",
+    "hash": "sha256-58ohjvtRXFwfY46Hny9GWL2r6KwZzkJWHFXwIWjkaHU="
   },
   {
     "pname": "Humanizer",
@@ -296,8 +296,8 @@
   },
   {
     "pname": "JetBrains.ReSharper.GlobalTools",
-    "version": "2023.3.3",
-    "hash": "sha256-Nn3imJvnqLe02gR1GyUHYH4+XkrNnhLy9dyCjJCkB7M="
+    "version": "2025.2.3",
+    "hash": "sha256-O0391kuA/ds8C7WmtbeMYi4eNiO3DKFPDYsUDHfVFUA="
   },
   {
     "pname": "Markdig",
@@ -306,73 +306,73 @@
   },
   {
     "pname": "MessagePack",
-    "version": "3.1.3",
-    "hash": "sha256-OBn7iltr/rdE7ZKmv0MCUQSS+6OJKUYtlHdTbhEwzzE="
+    "version": "3.1.4",
+    "hash": "sha256-oju/hX+vwZFqSa9ORSa58ToM3cE7fF8x34i2oNLGNVo="
   },
   {
     "pname": "MessagePack.Annotations",
-    "version": "3.1.3",
-    "hash": "sha256-o+T3u+xaHtW1c7AeWysCmIDUfN8lRhes2LoW5iQBafs="
+    "version": "3.1.4",
+    "hash": "sha256-YZGKa20siabb4VIQri5dMuFwnDxX19Htf51nGrIPx28="
   },
   {
     "pname": "MessagePackAnalyzer",
-    "version": "3.1.3",
-    "hash": "sha256-5t4Av4CQ8HI7y9aAw+2qcOp+fsY0/3PdaFPJeCEAXQ0="
+    "version": "3.1.4",
+    "hash": "sha256-qc+mzydfbZ/0O4j7pPDjp+x8aQ4KYqMeCDRIPhb1oe8="
   },
   {
     "pname": "Microsoft.AspNetCore.Connections.Abstractions",
-    "version": "9.0.2",
-    "hash": "sha256-xmPIOJ1MgI7LRLfQBexgBRLSNUEPNjksjpUxqDrOylM="
+    "version": "10.0.5",
+    "hash": "sha256-ciMnBkc2qy6/I3qhYspbf/OHQGUBPaxHvA0+y1xCJYE="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Client",
-    "version": "9.0.2",
-    "hash": "sha256-2TOp4D4zc5qX8XeY0MyYq6s2diaKeTO0PlWvGuIUeo8="
+    "version": "10.0.5",
+    "hash": "sha256-gX/cRqxkee+v4RD0w17OdshRH0iVxx1zCyl7/G79WQs="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Common",
-    "version": "9.0.2",
-    "hash": "sha256-IGjbK3tcvlUkdoI+/6VygAwpBd0Yqn+40FbgOv0UGDU="
+    "version": "10.0.5",
+    "hash": "sha256-pM90k96qeIWJHCn9LBTHQ6ODvrRdn0GShbiH/I/RYk8="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client",
-    "version": "9.0.2",
-    "hash": "sha256-hnvCWtgjKqnOO1q4xvJpZaUjS+I6wu1RkUxqS2ez96w="
+    "version": "10.0.5",
+    "hash": "sha256-avbFNCuSi4xFK8QHhQ2Bz3UfRqaEpbbl1x+LhqQvKv4="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client.Core",
-    "version": "9.0.2",
-    "hash": "sha256-5EuEV8zXfbYoERlCtx7yqzEMT+SVlHfLQj4QFabEye8="
+    "version": "10.0.5",
+    "hash": "sha256-0kLjqwX7lvdDU2gjTAbHtS5KVA5uA9qeE8kh8zxDq1k="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Common",
-    "version": "9.0.2",
-    "hash": "sha256-lEW6uQ87Ml+XqjNHVQfzPQaEL4wERi2bOB6S763DN3w="
+    "version": "10.0.5",
+    "hash": "sha256-oVs3VUtFd8zRls5nHpX/y6SJiVcI7x+rD6xw3kJrl5M="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
-    "version": "9.0.2",
-    "hash": "sha256-AVBp8mGbVdRjyIpo5LNMpnmV8G5uROw4Ko+gTbtnhc4="
+    "version": "10.0.5",
+    "hash": "sha256-m3zjs4Pc9NERMkXnPaegB2ZMuLHcRRqtjmD83CXQ13g="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.MessagePack",
-    "version": "9.0.2",
-    "hash": "sha256-wfYf4wIJ6hwBD4tacI5dWfAMDBYM6aBohEfQUV4ary0="
+    "version": "10.0.5",
+    "hash": "sha256-9fiZVKUrsx+X9YU3l+RmUbtHucVSy32/vPwH3HDc0PU="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson",
-    "version": "9.0.2",
-    "hash": "sha256-g2UwkpwGu+birT76nUcJ+GlN31QN8yL02bFOP1zYWkk="
+    "version": "10.0.5",
+    "hash": "sha256-pWyollxtDu+Cz/82c6THEJWTuti+fWcvygMbiPKvP8Q="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "9.0.2",
-    "hash": "sha256-D+MR5Rzxn+aFPVJWF83pc0dTWnQes658xBM4bPZ6HPc="
+    "version": "10.0.5",
+    "hash": "sha256-HLhS6ysB8lh2TRtFn1EiE2MOjd3og1uniEFFVaz96UU="
   },
   {
     "pname": "Microsoft.Bcl.TimeProvider",
-    "version": "9.0.2",
-    "hash": "sha256-qce+art6dBZTx78LwKfGULXXkwL73nCnn0x4kSGDtC4="
+    "version": "10.0.5",
+    "hash": "sha256-kkfOuLkIDFosDpC/ro4Pfh7fEHUyNwkx7GLZEftUn0Y="
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -386,8 +386,8 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "9.0.2",
-    "hash": "sha256-ZUVDe+oy7fAWcnQDRdhkVeN7YZkJewwqBNaxdZcykiM="
+    "version": "10.0.5",
+    "hash": "sha256-A69tzaD9RjkxdHPj3Jm1WizdBM9QfLQyHuhs9TGrwqA="
   },
   {
     "pname": "Microsoft.Diagnostics.NETCore.Client",
@@ -401,8 +401,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.2",
-    "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
+    "version": "10.0.5",
+    "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "10.0.5",
+    "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -410,9 +415,9 @@
     "hash": "sha256-zJQsAVTfA46hUV5q67BslsVn9yehYBclD06wg2UhyWQ="
   },
   {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.2",
-    "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo="
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "10.0.5",
+    "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -424,51 +429,46 @@
     "version": "6.0.0-rc.1.21451.13",
     "hash": "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.2",
-    "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
-  },
   {
     "pname": "Microsoft.Extensions.Features",
-    "version": "9.0.2",
-    "hash": "sha256-LHvTuI3JilE9g+ODoyjDJkj4AhF0OUHRyN7mMT7bokc="
+    "version": "10.0.5",
+    "hash": "sha256-OazAQa1XfjiLGxEbmovB8UeXYHXpdxlA/58qFQmBFl8="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.2",
-    "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
+    "version": "10.0.5",
+    "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.2",
-    "hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU="
+    "version": "10.0.5",
+    "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
     "version": "5.0.11",
     "hash": "sha256-xNqhEqOm7tI3nxdlbAJ9NSm5/WbkRSUCrdDM+syJ9EQ="
   },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "10.0.5",
+    "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+  },
   {
     "pname": "Microsoft.Extensions.Options",
     "version": "6.0.0",
     "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="
   },
   {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.2",
-    "hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM="
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "10.0.5",
+    "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
     "version": "6.0.0",
     "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="
   },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.2",
-    "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
-  },
   {
     "pname": "Microsoft.NET.StringTools",
     "version": "17.11.4",
@@ -534,11 +534,6 @@
     "version": "1.6.1",
     "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
   },
-  {
-    "pname": "NETStandard.Library",
-    "version": "2.0.0",
-    "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="
-  },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.1",
@@ -546,8 +541,8 @@
   },
   {
     "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
   },
   {
     "pname": "NuGet.Versioning",
@@ -556,13 +551,8 @@
   },
   {
     "pname": "NUnit",
-    "version": "3.14.0",
-    "hash": "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY="
-  },
-  {
-    "pname": "NVika",
-    "version": "4.0.0",
-    "hash": "sha256-daeovN+AsZX0r59SKYDSbofVAsXxT2DOTV892QrgMLY="
+    "version": "4.5.1",
+    "hash": "sha256-+BO4kpkiPEvC4R2wyqV/QMjpKc6jcGwARyc3Bk9skPU="
   },
   {
     "pname": "OpenTabletDriver",
@@ -626,8 +616,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2026.303.0",
-    "hash": "sha256-wkbRfNuatxkweNe+62I3gkq9KYBbT/mVOPXOK7LRhPw="
+    "version": "2026.318.0",
+    "hash": "sha256-LKRgb7Qiuap13zPB14+StllK52Oz/VN35bGnymqek4s="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -641,8 +631,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2026.305.0",
-    "hash": "sha256-f79dXDjW5AH+T77mP1s36kuMZ+ukjjCnn/3Wfd7d6ys="
+    "version": "2026.331.0",
+    "hash": "sha256-RsqGRsarnaTbVciOKZwhoWoeTpppXoNyJTIHOKmcvVg="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -961,13 +951,13 @@
   },
   {
     "pname": "Sentry",
-    "version": "5.1.1",
-    "hash": "sha256-Ud0rRSJZDxxs1gQSXeiuoAdxmHqPH6mfnJ0TPTKyryg="
+    "version": "6.2.0",
+    "hash": "sha256-mGCqvgqXvCxXZcreXHDzyZqSnIkHFSwNWGaPzX5AQFY="
   },
   {
     "pname": "SharpCompress",
-    "version": "0.39.0",
-    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
+    "version": "0.47.0",
+    "hash": "sha256-eeTuwUXeH9gw54bczkwrYCze2bHX22Rclx8QZm4zoxY="
   },
   {
     "pname": "SharpFNT",
@@ -989,25 +979,35 @@
     "version": "3.1.11",
     "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
   },
+  {
+    "pname": "SourceGear.sqlite3",
+    "version": "3.50.4.2",
+    "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
+  },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "2.1.10",
-    "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="
+    "version": "3.0.2",
+    "hash": "sha256-l3LqZUP4iVNyMJuBxr1VYDJr28VqoCPUPmXX6JC2ldU="
+  },
+  {
+    "pname": "SQLitePCLRaw.config.e_sqlite3",
+    "version": "3.0.2",
+    "hash": "sha256-Q8wi2rEqnE1n53DZ1wnaM8Dr5h/Bic1/EiytK3XQzrU="
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.10",
-    "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
+    "version": "2.1.11",
+    "hash": "sha256-s/fxEoYlNf9c2C4HZueMzPCBvpiViDVlSpg7epB0GXY="
   },
   {
-    "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.10",
-    "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="
+    "pname": "SQLitePCLRaw.core",
+    "version": "3.0.2",
+    "hash": "sha256-AK1Yc78ykY3H0Jq1INq3O1x278CtcWH7dF9heKhWvno="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.10",
-    "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="
+    "version": "3.0.2",
+    "hash": "sha256-LOD39Pqx58tMjP4uc4j8BvzhnsIRFocX9e5a8I1ZgPg="
   },
   {
     "pname": "StbiSharp",
@@ -1029,11 +1029,6 @@
     "version": "4.5.1",
     "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
-  {
-    "pname": "System.Buffers",
-    "version": "4.6.0",
-    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
-  },
   {
     "pname": "System.Collections",
     "version": "4.0.11",
@@ -1076,13 +1071,13 @@
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "4.3.0",
-    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
+    "version": "10.0.5",
+    "hash": "sha256-yVXEbpbQRF+B4oYUJEWUgMUmOvZTFZzK3CWrr9pynVY="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "9.0.2",
-    "hash": "sha256-vhlhNgWeEosMB3DyneAUgH2nlpHORo7vAIo5Bx5Dgrc="
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
   {
     "pname": "System.Diagnostics.Tools",
@@ -1151,13 +1146,13 @@
   },
   {
     "pname": "System.IO.Packaging",
-    "version": "9.0.2",
-    "hash": "sha256-633GG/fTf5MHhi5RrCiuD5q2JzWUUeuDashmYWIBrXo="
+    "version": "10.0.5",
+    "hash": "sha256-nR3shhnchCqZq//ypgn+/l2QDiiSbNKpSswqZ43rxoM="
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "9.0.2",
-    "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE="
+    "version": "10.0.5",
+    "hash": "sha256-zV+G9x2d3ugEaq7ClmZbMhQe0901hxj0WtleEEglpcE="
   },
   {
     "pname": "System.Linq",
@@ -1199,6 +1194,11 @@
     "version": "4.5.5",
     "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
   },
+  {
+    "pname": "System.Memory",
+    "version": "4.6.3",
+    "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU="
+  },
   {
     "pname": "System.Net.Http",
     "version": "4.3.0",
@@ -1221,8 +1221,8 @@
   },
   {
     "pname": "System.Net.ServerSentEvents",
-    "version": "9.0.2",
-    "hash": "sha256-XZi2duryjNRtvyFrLlX2u8WlSlBbE8ccTS6X72P/kY4="
+    "version": "10.0.5",
+    "hash": "sha256-kIFzD6o58dtrWohy2lZFAkPPJvTwAcKVDBGryke5mtM="
   },
   {
     "pname": "System.Net.Sockets",
@@ -1491,13 +1491,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "9.0.2",
-    "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8="
+    "version": "10.0.5",
+    "hash": "sha256-8dXorb9rjnaqD8EpGlyHkvKrwgcxZblQdzeLYDdk6lw="
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.2",
-    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
+    "version": "10.0.5",
+    "hash": "sha256-Phy+3UAOvqk8U0yeCSpr4n6H7JjKMTHdrHlV2bZfiUU="
   },
   {
     "pname": "System.Text.RegularExpressions",
@@ -1516,13 +1516,13 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "6.0.0",
-    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
+    "version": "10.0.5",
+    "hash": "sha256-mk27zxVvlbgOSOsKl0NqV6aHbdyJkMMM8CGh5MZdTqI="
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "9.0.2",
-    "hash": "sha256-Ubs57l7OtgMyC/N1qiAFcfqAxqghRVXs9tB7Jws30t8="
+    "version": "6.0.0",
+    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
   },
   {
     "pname": "System.Threading.Tasks",
@@ -1593,10 +1593,5 @@
     "pname": "Vortice.Mathematics",
     "version": "1.4.25",
     "hash": "sha256-Mr/HVvwIeeDJtMNToP6kh2hyqud2zT31913HdhB4hm4="
-  },
-  {
-    "pname": "ZstdSharp.Port",
-    "version": "0.8.4",
-    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
   }
 ]
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 1bdf0b4affc1..13e1fad48a12 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2026.305.0";
+  version = "2026.401.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-vUFaazcaaVRp5r/S0iAMnUa6hLHgoTauhK9KGD5/txg=";
+    hash = "sha256-cdFHPM3mhiSGhyhSrZdFlgdzgaaCsM/t0IsiJvmZGOM=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From df04619776ac27f9388d6209d31e23ffbd856c81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 20:50:25 +0000
Subject: [PATCH 224/238] cog: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index a09614df34a8..8e07f8db7bd5 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cog";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cx9ztZufX199jiVT4ZB5qNUR5W2bfN3jzYhUmdAi+80=";
+    hash = "sha256-QMYqrPmJjDmB7Kc9HZN9ypqtiwF9Cah3fnj4iMM8W4Y=";
   };
 
-  vendorHash = "sha256-rz/qL5kEryIV2SMQKoVav4C6scIKaxIFuwtTjqBaF4g=";
+  vendorHash = "sha256-KOk8SvajH98jjvoPZPC4UAsF5tXKjn1xcVq5juQXQVA=";
 
   subPackages = [ "cmd/cli" ];
 

From 08782d935c44568eeb2121307cf9af196ffa09a3 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Tue, 31 Mar 2026 23:03:16 +0200
Subject: [PATCH 225/238] krita: remove ilmbase dependency to unbreak build

---
 pkgs/by-name/kr/krita-unwrapped/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/kr/krita-unwrapped/package.nix b/pkgs/by-name/kr/krita-unwrapped/package.nix
index 94685a4c48dd..8b5efa331ecd 100644
--- a/pkgs/by-name/kr/krita-unwrapped/package.nix
+++ b/pkgs/by-name/kr/krita-unwrapped/package.nix
@@ -11,7 +11,6 @@
   fribidi,
   giflib,
   gsl,
-  ilmbase,
   immer,
   kseexpr,
   lager,
@@ -72,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     opencolorio
     xsimd
     curl
-    ilmbase
     immer
     kseexpr
     libmypaint

From 282f8587a2a15a6b28e1e61c57ab344a074c1fab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 21:13:34 +0000
Subject: [PATCH 226/238] burn-central-cli: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix
index f4a9270dbc68..6dd2826b874a 100644
--- a/pkgs/by-name/bu/burn-central-cli/package.nix
+++ b/pkgs/by-name/bu/burn-central-cli/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "burn-central-cli";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "tracel-ai";
     repo = "burn-central-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gZ92DFZPox6s4+EKPQ/uxWNV5+F7kYhSnv/Mtpur3Vo=";
+    hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA=";
   };
 
   buildAndTestSubdir = "crates/burn-central-cli";
 
-  cargoHash = "sha256-kUCjkkIog+xXFMTw8LAoHE/D6aBPR6S7Mtqg/Hjuw+o=";
+  cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk=";
 
   nativeBuildInputs = [
     pkg-config

From 11bda3b3bd1b5287d46134bd1de9164da964c18e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 31 Mar 2026 14:18:58 -0700
Subject: [PATCH 227/238] system-manager: fix test sandbox failure, add
 latest-nix test

Add writableTmpDirAsHomeHook to nativeCheckInputs to fix the
test_try_nix_eval test failure caused by Nix trying to create
/homeless-shelter/.cache/nix in the sandbox.

Add passthru.tests.latest-nix to verify system-manager builds
and passes tests with nixVersions.latest.

Related: NixOS/nixpkgs#505121
---
 pkgs/by-name/sy/system-manager/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/system-manager/package.nix b/pkgs/by-name/sy/system-manager/package.nix
index be7a6640f84f..059c1abbdb7a 100644
--- a/pkgs/by-name/sy/system-manager/package.nix
+++ b/pkgs/by-name/sy/system-manager/package.nix
@@ -6,8 +6,11 @@
   pkg-config,
   clippy,
   nix,
+  nixVersions,
   cargo,
   nix-update-script,
+  writableTmpDirAsHomeHook,
+  system-manager,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -32,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     clippy
     nix
     cargo
+    writableTmpDirAsHomeHook
   ];
 
   preCheck = ''
@@ -43,7 +47,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export NIX_STATE_DIR=$TMPDIR
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.latest-nix = system-manager.override { nix = nixVersions.latest; };
+  };
 
   meta = {
     description = "Manage system config using nix on any distro";

From dcd7b1411ba5bd79ae79b1d51584d6e9cd9f55b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2026 21:21:21 +0000
Subject: [PATCH 228/238] libretro.gambatte: 0-unstable-2026-03-13 ->
 0-unstable-2026-03-31

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

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 5fd51dc435ba..85d58a1129be 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-03-13";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "d3c39fa18476ddce05027db3d29abba813fa74e2";
-    hash = "sha256-FkvO03x6oRqdeaot8vq5C15VjQXJ7tUoJtal7/z09rU=";
+    rev = "9669d1f9266684e60ac1c5ed9b438bd2a02a3b4d";
+    hash = "sha256-/mxkjVG7fkjUZ1LHNtFYA0/7ZTyvAYtcF5xO8cxWkzc=";
   };
 
   meta = {

From aacfecb4ec84530aa5661fe14fc04c0e6a9cc998 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:25:02 +0300
Subject: [PATCH 229/238] art: drop unused ilmbase dependency

Uses OpenEXR 3, which doesn't need it.
---
 pkgs/by-name/ar/art/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 93dd853dcb43..4e5ca00c16e3 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -33,7 +33,6 @@
   exiftool,
   mimalloc,
   openexr,
-  ilmbase,
   opencolorio,
   color-transformation-language,
 }:
@@ -92,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
     libcanberra-gtk3
     mimalloc
     openexr
-    ilmbase
     opencolorio
     color-transformation-language
   ];

From f3a756f86b5d2d2a1c1e64ad3d9d185712274606 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:25:50 +0300
Subject: [PATCH 230/238] color-transformation-language: drop unused ilmbase
 dependency

Uses OpenEXR 3, which doesn't need it.
---
 pkgs/by-name/co/color-transformation-language/package.nix | 2 --
 1 file changed, 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 1fd5403142c9..24e1651244b9 100644
--- a/pkgs/by-name/co/color-transformation-language/package.nix
+++ b/pkgs/by-name/co/color-transformation-language/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  ilmbase,
   openexr,
   libtiff,
   aces-container,
@@ -22,7 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    ilmbase
     openexr
     libtiff
     aces-container

From a44614f0664dad545dec748707af106c05fd22aa Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:26:13 +0300
Subject: [PATCH 231/238] darktable: drop unused ilmbase dependency

Uses OpenEXR 3, which doesn't need it.
---
 pkgs/by-name/da/darktable/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index e554dbef3f06..822b15d3f2ca 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -27,7 +27,6 @@
   graphicsmagick,
   gtk3,
   icu,
-  ilmbase,
   isocodes,
   jasper,
   json-glib,
@@ -114,7 +113,6 @@ stdenv.mkDerivation rec {
     graphicsmagick
     gtk3
     icu
-    ilmbase
     isocodes
     jasper
     json-glib
@@ -122,7 +120,7 @@ stdenv.mkDerivation rec {
     lensfun
     lerc
     libaom
-    #libavif # TODO re-enable once cmake files are fixed (#425306)
+    libavif
     libdatrie
     libepoxy
     libexif

From 6234dd8699d88ec14fdffa2bcf614d08924c5faa Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 31 Mar 2026 23:30:26 +0200
Subject: [PATCH 232/238] chromium,chromedriver: 146.0.7680.164 ->
 146.0.7680.177

https://chromereleases.googleblog.com/2026/03/stable-channel-update-for-desktop_31.html
---
 .../networking/browsers/chromium/info.json    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 623458fcccb1..a69e70625dd4 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "146.0.7680.164",
+    "version": "146.0.7680.177",
     "chromedriver": {
-      "version": "146.0.7680.165",
-      "hash_darwin": "sha256-qqzgaahlWqaIN2bYxzCQREUrBEpyE4HSG5QT29xJ26E=",
-      "hash_darwin_aarch64": "sha256-XAEirnBWR5/v/uk5pDTKMcnfPZVBrsfSqckGSmbpTMs="
+      "version": "146.0.7680.178",
+      "hash_darwin": "sha256-5AAo1FK6pXDSehPxhlmtt4XssfZLeE/cKhTkUlkUDhg=",
+      "hash_darwin_aarch64": "sha256-6u3EDl9LHsymh2TDmi4CdhsS0T9yJtUQl/Zuor8LOh4="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "bbd8c5dd25fb2f569d98e626a9517cf2171abdff",
-        "hash": "sha256-hwZehtGUyuMdHisIaztsYlu0MEftbmmAqN/X+ias4nI=",
+        "rev": "ae03f7fb2cf1215853896d6a4c15fdceee2badb7",
+        "hash": "sha256-WVJ6dtDpXnp+Q8N/KEFJZWU9/4xEmpEYcu53MA94PZ8=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "e05753c6d05b17b23d514038957469c70b75475c",
-        "hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk="
+        "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
+        "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "a655251a59c4af3fbf8058bb2572d6a457f896d2",
-        "hash": "sha256-UKoDytne6QD2d6ojy4mYPjLbo9GB4xy1fUf9C1pLKaE="
+        "rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5",
+        "hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -652,8 +652,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "6a75afe9792764f6faa76ad50125781899ca05e8",
-        "hash": "sha256-S4AAmNw50ToTZIuHl41Pc+Z1MZfUVf0/ZGGIiEr5cXo="
+        "rev": "30d129c8800b5626c46fb83fa62db10b9b22b319",
+        "hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -787,8 +787,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58",
-        "hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8="
+        "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
+        "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -817,8 +817,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "0e999a528db40a3ef6fa917adf96370a18b87d70",
-        "hash": "sha256-rkSuZBdFUHJyYmqp2oN3mLjNtKjk569MocyvnICo+uw="
+        "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
+        "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI="
       }
     }
   },

From f67c55ef607e557c3d31d73632e842750b74ef37 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:25:34 +0300
Subject: [PATCH 233/238] bambu-studio: drop unused ilmbase dependency

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

diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 8ddc0ba3081f..de869f8f2f52 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -25,12 +25,12 @@
   gtest,
   gtk3,
   hicolor-icon-theme,
-  ilmbase,
   libpng,
   mpfr,
   nlopt,
   opencascade-occt_7_6,
   openvdb,
+  openexr,
   opencv,
   pcre,
   systemd,
@@ -94,11 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-good
     gtk3
     hicolor-icon-theme
-    ilmbase
     libpng
     mpfr
     nlopt
     opencascade-occt_7_6
+    openexr
     openvdb
     pcre
     onetbb

From 5d22f4353623d601f9da279dff20a9777c17553e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:26:53 +0300
Subject: [PATCH 234/238] orca-slicer: pick patch to remove unused ilmbase
 dependency

---
 pkgs/by-name/or/orca-slicer/package.nix       |  5 ++-
 .../or/orca-slicer/patches/no-ilmbase.patch   | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/or/orca-slicer/patches/no-ilmbase.patch

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 36e1193bc0fa..bff4abbdf27e 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -26,7 +26,6 @@
   gtest,
   gtk3,
   hicolor-icon-theme,
-  ilmbase,
   libsecret,
   libpng,
   mpfr,
@@ -111,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-good
     gtk3
     hicolor-icon-theme
-    ilmbase
     libsecret
     libpng
     mpfr
@@ -141,6 +139,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/SoftFever/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch";
       hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk=";
     })
+
+    # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
+    ./patches/no-ilmbase.patch
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/or/orca-slicer/patches/no-ilmbase.patch b/pkgs/by-name/or/orca-slicer/patches/no-ilmbase.patch
new file mode 100644
index 000000000000..2d9cdec4e053
--- /dev/null
+++ b/pkgs/by-name/or/orca-slicer/patches/no-ilmbase.patch
@@ -0,0 +1,38 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 4fde5fa4a75..b62813fa663 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -347,25 +347,6 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
+@@ -471,7 +452,6 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)

From 4b93e4aacf980a2d999b01d03a5bd5e0d29751de Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:27:18 +0300
Subject: [PATCH 235/238] prusa-slicer: pick patch to drop unused ilmbase
 dependency

---
 pkgs/by-name/pr/prusa-slicer/no-ilmbase.patch | 38 +++++++++++++++++++
 pkgs/by-name/pr/prusa-slicer/package.nix      |  4 +-
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/pr/prusa-slicer/no-ilmbase.patch

diff --git a/pkgs/by-name/pr/prusa-slicer/no-ilmbase.patch b/pkgs/by-name/pr/prusa-slicer/no-ilmbase.patch
new file mode 100644
index 000000000000..2d9cdec4e053
--- /dev/null
+++ b/pkgs/by-name/pr/prusa-slicer/no-ilmbase.patch
@@ -0,0 +1,38 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 4fde5fa4a75..b62813fa663 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -347,25 +347,6 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
+@@ -471,7 +452,6 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix
index 39e2840dcf07..d79c2a7b63e3 100644
--- a/pkgs/by-name/pr/prusa-slicer/package.nix
+++ b/pkgs/by-name/pr/prusa-slicer/package.nix
@@ -19,7 +19,6 @@
   gmp,
   gtk3,
   hicolor-icon-theme,
-  ilmbase,
   libpng,
   mpfr,
   nanosvg,
@@ -78,6 +77,8 @@ clangStdenv.mkDerivation (finalAttrs: {
     # https://github.com/NixOS/nixpkgs/issues/415703
     # https://gitlab.archlinux.org/archlinux/packaging/packages/prusa-slicer/-/merge_requests/5
     ./allow_wayland.patch
+    # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
+    ./no-ilmbase.patch
   ];
 
   # (not applicable to super-slicer fork)
@@ -119,7 +120,6 @@ clangStdenv.mkDerivation (finalAttrs: {
     gmp
     gtk3
     hicolor-icon-theme
-    ilmbase
     libpng
     mpfr
     nanosvg-fltk

From d15d04c78ec0bb23e8e0d7698415555668f6d4dc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Apr 2026 00:27:39 +0300
Subject: [PATCH 236/238] super-slicer: pick patch to drop unused ilmbase
 dependency

---
 pkgs/by-name/su/super-slicer/no-ilmbase.patch | 38 +++++++++++++++++++
 pkgs/by-name/su/super-slicer/package.nix      |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/su/super-slicer/no-ilmbase.patch

diff --git a/pkgs/by-name/su/super-slicer/no-ilmbase.patch b/pkgs/by-name/su/super-slicer/no-ilmbase.patch
new file mode 100644
index 000000000000..2d9cdec4e053
--- /dev/null
+++ b/pkgs/by-name/su/super-slicer/no-ilmbase.patch
@@ -0,0 +1,38 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 4fde5fa4a75..b62813fa663 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -347,25 +347,6 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
+@@ -471,7 +452,6 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
diff --git a/pkgs/by-name/su/super-slicer/package.nix b/pkgs/by-name/su/super-slicer/package.nix
index 5f14f172aa4b..5130dabe53fa 100644
--- a/pkgs/by-name/su/super-slicer/package.nix
+++ b/pkgs/by-name/su/super-slicer/package.nix
@@ -21,6 +21,8 @@ let
     })
     ./super-slicer-use-boost186.patch
     ./super-slicer-fix-cereal-1.3.1.patch
+    # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
+    ./no-ilmbase.patch
   ];
 
   wxwidgets_3_1-prusa = wxwidgets_3_1.overrideAttrs (old: {

From 1b5d3d01f06ec043ec99553b1e9828dfbbdbab10 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 31 Mar 2026 12:30:58 -0700
Subject: [PATCH 237/238] python3Packages.scalene: 2.1.4 -> 2.2.1

---
 .../python-modules/scalene/default.nix           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index 17f46719c69e..c1d583cd9bba 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -12,6 +12,7 @@
   psutil,
   pydantic,
   pytestCheckHook,
+  python,
   pyyaml,
   rich,
   setuptools-scm,
@@ -34,18 +35,20 @@ let
     tag = "v4.0.0";
     hash = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI=";
   };
+
+  pythonPath = lib.getExe python;
 in
 
 buildPythonPackage (finalAttrs: {
   pname = "scalene";
-  version = "2.1.4";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plasma-umass";
     repo = "scalene";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ISXD7QegTL0OvAGS7KYZAk9MAKTr0hMFe/9ws02Ykgk=";
+    hash = "sha256-a8laU7w6DLNIxmfhis/PvYd0iQMSqiQ2j6WURbsWPxk=";
   };
 
   patches = [
@@ -62,6 +65,15 @@ buildPythonPackage (finalAttrs: {
     sed -i 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h
   '';
 
+  postPatch = ''
+    # Fix hash mismatch
+    rm vendor/printf/printf.c
+
+    # Set correct sys.executable
+    substituteInPlace tests/test_{multiprocessing_pool_spawn,on_off_windows}.py \
+      --replace-fail "sys.executable" "\"${pythonPath}\""
+  '';
+
   build-system = [
     cython
     setuptools

From 26d1718cf7f9ad6fb2f7e95578be8f0f610efa6c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 31 Mar 2026 19:29:08 -0400
Subject: [PATCH 238/238] google-chrome: 146.0.7680.164 -> 146.0.7680.177

Changelog: https://chromereleases.googleblog.com/2026/03/stable-channel-update-for-desktop_31.html
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index fc4c55d7d282..43fcf5305a81 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -184,11 +184,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "146.0.7680.164";
+    version = "146.0.7680.177";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-9t2HFaPxDwzTey57iDGpY1nqhWx0faIi07JiOuZRs3Q=";
+      hash = "sha256-Tb142IoeaaYDa6jorbmfyoCHkOI7LqkthhBJStf1cyg=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -302,11 +302,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "146.0.7680.165";
+    version = "146.0.7680.178";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acieaz5gurxr6um2wu2e5hogjueq_146.0.7680.165/GoogleChrome-146.0.7680.165.dmg";
-      hash = "sha256-g9smFwpu8F3WrYX+eUkYuEdhzR2rSAzt8/nVPG8xaEg=";
+      url = "http://dl.google.com/release2/chrome/aco4gwkxcefkxklazdyhgwkrndkq_146.0.7680.178/GoogleChrome-146.0.7680.178.dmg";
+      hash = "sha256-aGqEFAzQZLy85hbsjhgYr5eFYgCaMhOiUG00wSlANHk=";
     };
 
     dontPatch = true;