From ba52c96059a084b9aa6622016c010f3f52ac4004 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Feb 2026 12:31:24 +0000
Subject: [PATCH 01/38] asunder: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix
index 40c6d1009dd7..0dade5ac7bcf 100644
--- a/pkgs/by-name/as/asunder/package.nix
+++ b/pkgs/by-name/as/asunder/package.nix
@@ -36,11 +36,11 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.0.1";
+  version = "3.0.2";
   pname = "asunder";
   src = fetchurl {
     url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
+    hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks=";
   };
 
   nativeBuildInputs = [

From 6b2ce71060df376d599347d49605d53b5768bed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Feb 2026 20:44:29 +0000
Subject: [PATCH 02/38] shot-scraper: 1.9 -> 1.9.1

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

diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix
index d8be38b4bca6..61ab9494d0a5 100644
--- a/pkgs/by-name/sh/shot-scraper/package.nix
+++ b/pkgs/by-name/sh/shot-scraper/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "shot-scraper";
-  version = "1.9";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "shot-scraper";
     tag = finalAttrs.version;
-    hash = "sha256-HIiUZZz2/EqTdaCtiaqVaJfbRwkoYL8H6XHaIYP0R6M=";
+    hash = "sha256-l1SPhdcQ2lH2Glw4BJSlJxUSBE28b5/ny+66hUJtOQU=";
   };
 
   postPatch = ''

From 90cf19a85c010ad61e398f919c750177b2a09b42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Feb 2026 18:45:20 +0000
Subject: [PATCH 03/38] elinks: 0.19.0 -> 0.19.1

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

diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix
index 0cdbb6934211..6ab33a4e7e7c 100644
--- a/pkgs/by-name/el/elinks/package.nix
+++ b/pkgs/by-name/el/elinks/package.nix
@@ -33,13 +33,13 @@ assert enablePython -> python != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elinks";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "rkd77";
     repo = "elinks";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eFH42PCMF3HPvNqcaXOyIM6AAr3RusgxiRlUa2X8B9U=";
+    hash = "sha256-aQ+q2I6uTVv5kpKBaGJ1xiE/9vv9T7JI05VX/ROkAqA=";
   };
 
   buildInputs = [

From e88e2da91ffae4d76fbdee81f8a4d79787834cc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 02:57:45 +0000
Subject: [PATCH 04/38] yapesdl: 0.80.1 -> 0.81.1

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

diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix
index d58230544caf..753258bfdda3 100644
--- a/pkgs/by-name/ya/yapesdl/package.nix
+++ b/pkgs/by-name/ya/yapesdl/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yapesdl";
-  version = "0.80.1";
+  version = "0.81.1";
 
   src = fetchFromGitHub {
     owner = "calmopyrin";
     repo = "yapesdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VCjxdVatu1h6VNMkLYL8Nknwn7ax0J2OhO1bc7dnQRA=";
+    hash = "sha256-vCScQmkODKZKbvrauuR9WNTjjKEvlomfzB0QifHxSVs=";
   };
 
   nativeBuildInputs = [

From 98f26b485a6a33c674040113c839bdb5ba8a7ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 05:59:41 +0000
Subject: [PATCH 05/38] nfdump: 1.7.6 -> 1.7.7

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

diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix
index ffa6e506a0d6..1c3ffa6a1036 100644
--- a/pkgs/by-name/nf/nfdump/package.nix
+++ b/pkgs/by-name/nf/nfdump/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nfdump";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchFromGitHub {
     owner = "phaag";
     repo = "nfdump";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4iyoQAjOQW4KNJbRmdisdecuOz+DFvQGEKgq8cq7GDI=";
+    hash = "sha256-2CQ57OEKCOaRvuBX4GN2Gz/S7B6CUTpvArD84QqLZEw=";
   };
 
   nativeBuildInputs = [

From 2b1c8c0f90715e8dfa2dfb0be293485d2a3836f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 21:56:32 +0000
Subject: [PATCH 06/38] xbps: 0.60.6 -> 0.60.7

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

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 5b66db055e56..6f3e1ef231ea 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xbps";
-  version = "0.60.6";
+  version = "0.60.7";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
     tag = finalAttrs.version;
-    hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70=";
+    hash = "sha256-noi+OAyBmLCBnmLDWEuNXEOPyqt9Qr1v4CNm7GjKXHA=";
   };
 
   nativeBuildInputs = [

From f9e7737427873e854e12ee3ee55963b41912dd46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Feb 2026 00:40:30 +0000
Subject: [PATCH 07/38] zexy: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/by-name/ze/zexy/package.nix b/pkgs/by-name/ze/zexy/package.nix
index b4b01e246383..fb881ad92e63 100644
--- a/pkgs/by-name/ze/zexy/package.nix
+++ b/pkgs/by-name/ze/zexy/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zexy";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitLab {
     domain = "git.iem.at";
     owner = "pd";
     repo = "zexy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9f0uYBDBq5lcN/N0uJwC/HBEFcj9b8ZtBHnPAce2s/A=";
+    hash = "sha256-9+kWnfYLSOI2PaFQVzlaq1EjzUeOZvVRomGfWSLNXCw=";
   };
 
   buildInputs = [ puredata ];

From eef71f1b209700467392149ff0c97fca4fbe7d84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Feb 2026 04:34:00 +0000
Subject: [PATCH 08/38] x42-gmsynth: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/by-name/x4/x42-gmsynth/package.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix
index c7e77890c370..ffc7def4d9c7 100644
--- a/pkgs/by-name/x4/x42-gmsynth/package.nix
+++ b/pkgs/by-name/x4/x42-gmsynth/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "x42-gmsynth";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "x42";
     repo = "gmsynth.lv2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-js7c8d+yOjrRBs/xtHNfhXAcbiPX1PKFjHsThtEgzPQ=";
+    hash = "sha256-PDuvVNw9hxJVJwEYGeBJDKAt9ogHHJWELw/8LT+ZnVQ=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 0b801dd71cbd7ae17942e8c6ad588def724919a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Feb 2026 04:39:08 +0000
Subject: [PATCH 09/38] xlockmore: 5.87 -> 5.88

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

diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 7355d6253f33..7dc1c970fb05 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xlockmore";
-  version = "5.87";
+  version = "5.88";
 
   src = fetchurl {
     url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
-    sha256 = "sha256-Pzu/xN3jCMqA05MHj1FTiSHaKzx11cKmBkIOEpVga3s=";
+    sha256 = "sha256-oioJDS8MlSXgsVw11wk7g9TRdYfz7crdHatcn39eB+E=";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From cc8738df4d38c8baea83da91dc33658365f340b1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 19 Mar 2026 16:49:45 +0100
Subject: [PATCH 10/38] python3Packages.latex2mathml: 3.78.1 -> 3.79.0, use
 finalAttrs

---
 .../python-modules/latex2mathml/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index 145637b554f2..b3d77daf2b5a 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -2,26 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
   pytestCheckHook,
   pytest-cov-stub,
   multidict,
   xmljson,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "latex2mathml";
-  version = "3.78.1";
+  version = "3.79.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = "latex2mathml";
-    tag = version;
-    hash = "sha256-VhBq6KSiomFPue9yzYhU68gH+MkHovVi8VEEFi3yUZ8=";
+    tag = finalAttrs.version;
+    hash = "sha256-/ixS6TlovxOZgBqDq1t6KzcG6EKBSYwf3c+drHjQec4=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -35,9 +35,9 @@ buildPythonPackage rec {
   meta = {
     description = "Pure Python library for LaTeX to MathML conversion";
     homepage = "https://github.com/roniemartinez/latex2mathml";
-    changelog = "https://github.com/roniemartinez/latex2mathml/releases/tag/${src.tag}";
+    changelog = "https://github.com/roniemartinez/latex2mathml/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "latex2mathml";
     maintainers = with lib.maintainers; [ sfrijters ];
   };
-}
+})

From 4ccbe12a716e84b17c8df22eb7019e5aa6254c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 27 Feb 2026 20:45:26 +0100
Subject: [PATCH 11/38] fwupd: 2.0.19 -> 2.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Diff: https://github.com/fwupd/fwupd/compare/2.0.19...2.1.1

Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.1

Co-developed-by: Daniel Schaefer <git@danielschaefer.me>
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
---
 nixos/tests/installed-tests/fwupd.nix         |  6 +++
 .../0001-Install-fwupdplugin-to-out.patch     |  2 +-
 .../0002-Add-output-for-installed-tests.patch | 10 ++---
 ...d-option-for-installation-sysconfdir.patch | 39 ++++++-------------
 .../0004-Get-the-efi-app-from-fwupd-efi.patch |  4 +-
 pkgs/by-name/fw/fwupd/package.nix             | 34 +++++++---------
 6 files changed, 40 insertions(+), 55 deletions(-)

diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix
index fe4f443d7004..a40ca0df084c 100644
--- a/nixos/tests/installed-tests/fwupd.nix
+++ b/nixos/tests/installed-tests/fwupd.nix
@@ -3,7 +3,13 @@
 makeInstalledTest {
   tested = pkgs.fwupd;
 
+  # same as fwupd upstream CI
+  testRunnerFlags = [ "--timeout=1200" ];
+
   testConfig = {
+    # for easier debugging
+    systemd.globalEnvironment.FWUPD_VERBOSE = "1";
+
     services.fwupd = {
       enable = true;
       daemonSettings.TestDevices = true;
diff --git a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
index 4924c0066916..5e3608e27319 100644
--- a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
+++ b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Install fwupdplugin to out
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index b711ab04b..7b065f278 100644
+index 1a56d3308..c7bf2c9aa 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -734,7 +734,7 @@ if build_standalone
diff --git a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
index 2f7600c1d87c..1f3bfcf79f3e 100644
--- a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
+++ b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
@@ -24,11 +24,11 @@ index e15cab2fa..bad033dbf 100644
  
  if umockdev_integration_tests.allowed()
 diff --git a/meson.build b/meson.build
-index 7b065f278..1a4b0ea1f 100644
+index c7bf2c9aa..bf77bf6d6 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -239,8 +239,8 @@ else
-   datadir = join_paths(prefix, get_option('datadir'))
+@@ -241,8 +241,8 @@ else
+   includedir = join_paths(prefix, get_option('includedir'))
    sysconfdir = join_paths(prefix, get_option('sysconfdir'))
    localstatedir = join_paths(prefix, get_option('localstatedir'))
 -  installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
@@ -47,10 +47,10 @@ index 7b065f278..1a4b0ea1f 100644
  conf.set_quoted('FWUPD_LIBDIR', libdir)
  conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
 diff --git a/meson_options.txt b/meson_options.txt
-index 18991b983..937578f19 100644
+index eb57391eb..420997355 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -197,6 +197,11 @@ option(
+@@ -198,6 +198,11 @@ option(
    value: 'fwupd-refresh',
    description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
  )
diff --git a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
index f3769e570ce1..1efe00bed4ed 100644
--- a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
+++ b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Add option for installation sysconfdir
 ---
  data/bios-settings.d/meson.build |  2 +-
  data/meson.build                 |  2 +-
- data/pki/meson.build             |  8 ++++----
+ data/pki/meson.build             |  4 ++--
  data/remotes.d/meson.build       |  8 ++++----
  docs/meson.build                 | 16 ++++++++--------
  meson.build                      |  6 ++++++
  meson_options.txt                |  6 ++++++
  plugins/uefi-capsule/meson.build |  4 ++--
- 8 files changed, 32 insertions(+), 20 deletions(-)
+ 8 files changed, 30 insertions(+), 18 deletions(-)
 
 diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
 index 2a2a07016..99df55afb 100644
@@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644
    )
  endif
 diff --git a/data/meson.build b/data/meson.build
-index 5716669f0..78e754f40 100644
+index 70d08c55e..5a5d8bf46 100644
 --- a/data/meson.build
 +++ b/data/meson.build
 @@ -29,7 +29,7 @@ if build_standalone
@@ -40,25 +40,10 @@ index 5716669f0..78e754f40 100644
    )
    plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk')
 diff --git a/data/pki/meson.build b/data/pki/meson.build
-index 1072051c0..6ef9c9111 100644
+index b87068405..21f59753a 100644
 --- a/data/pki/meson.build
 +++ b/data/pki/meson.build
-@@ -12,12 +12,12 @@ if supported_gpg
-   install_data(
-     ['GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
-     install_tag: 'runtime',
--    install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
-   )
-   install_data(
-     ['GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
-     install_tag: 'runtime',
--    install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
-   )
- endif
- 
-@@ -25,11 +25,11 @@ if supported_pkcs7
+@@ -8,11 +8,11 @@ if supported_pkcs7
    install_data(
      ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
      install_tag: 'runtime',
@@ -111,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
 diff --git a/docs/meson.build b/docs/meson.build
-index 787b4387c..b3144757f 100644
+index b4d48b086..8a1f8fc8c 100644
 --- a/docs/meson.build
 +++ b/docs/meson.build
 @@ -196,7 +196,7 @@ if build_docs
@@ -123,7 +108,7 @@ index 787b4387c..b3144757f 100644
    )
  
    subdir('hsi-tests.d')
-@@ -247,7 +247,7 @@ if build_docs
+@@ -257,7 +257,7 @@ if build_docs
      build_by_default: true,
      install: true,
      install_tag: 'doc',
@@ -132,7 +117,7 @@ index 787b4387c..b3144757f 100644
    )
    man_cmd = []
    foreach man : man_md
-@@ -260,36 +260,36 @@ if build_docs
+@@ -270,36 +270,36 @@ if build_docs
      command: [generate_index, '@INPUT@', '-o', '@OUTPUT@', man_cmd],
      install: true,
      install_tag: 'doc',
@@ -176,10 +161,10 @@ index 787b4387c..b3144757f 100644
    )
  endif
 diff --git a/meson.build b/meson.build
-index 1a4b0ea1f..16c7cad40 100644
+index bf77bf6d6..f1f51e841 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -246,6 +246,12 @@ endif
+@@ -248,6 +248,12 @@ endif
  mandir = join_paths(prefix, get_option('mandir'))
  localedir = join_paths(prefix, get_option('localedir'))
  
@@ -193,7 +178,7 @@ index 1a4b0ea1f..16c7cad40 100644
  gio = dependency(
    'gio-2.0',
 diff --git a/meson_options.txt b/meson_options.txt
-index 937578f19..08b26b3ad 100644
+index 420997355..67b3058d5 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -14,6 +14,12 @@ option(
@@ -210,7 +195,7 @@ index 937578f19..08b26b3ad 100644
    'build',
    type: 'combo',
 diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
-index 647ace53e..4ee0192df 100644
+index f104f36d7..30356ea53 100644
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
 @@ -23,7 +23,7 @@ if host_machine.system() == 'linux'
diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
index 9924c12b66c8..7394273ebfed 100644
--- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
+++ b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 16c7cad40..81804bf3b 100644
+index f1f51e841..aaefe55d9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -657,7 +657,7 @@ endif
+@@ -646,7 +646,7 @@ endif
  
  # EFI
  if build_standalone
diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index cbdf4702a393..bce7dd41db25 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -17,9 +17,6 @@
   pkg-config,
   pkgsBuildBuild,
 
-  # propagatedBuildInputs
-  json-glib,
-
   # nativeBuildInputs
   ensureNewerSourcesForZipFilesHook,
   gettext,
@@ -27,8 +24,6 @@
   gobject-introspection,
   meson,
   ninja,
-  protobuf,
-  protobufc,
   shared-mime-info,
   vala,
   wrapGAppsNoGuiHook,
@@ -42,7 +37,6 @@
   fwupd-efi,
   gnutls,
   gusb,
-  libarchive,
   libcbor,
   libdrm,
   libgudev,
@@ -135,7 +129,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.19";
+  version = "2.1.1";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -153,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-DjO+7CEOef5KMbYEPtDr3GrnXTDUO/jwwZ4P17o4oDg=";
+    hash = "sha256-pb5BBA+3KTeZZ8WyNDaY9EKNTxp4MT/3G/MEgQ+Nysk=";
   };
 
   patches = [
@@ -174,6 +168,18 @@ stdenv.mkDerivation (finalAttrs: {
 
     # EFI capsule is located in fwupd-efi now.
     ./0004-Get-the-efi-app-from-fwupd-efi.patch
+
+    # FIXME: remove patches that fix CI on aarch64 after next release
+    (fetchpatch {
+      url = "https://github.com/fwupd/fwupd/commit/b3d721360faa4de7dd6960d8f9f8f13aa310715f.patch";
+      sha256 = "sha256-x37QCK7XBzUUjUj1m3jaNe1qvaqtszB9DGFyF8gC3Ig=";
+      name = "fix-mtdram-test-for-missing-kernel-module.patch";
+    })
+    (fetchpatch {
+      url = "https://github.com/fwupd/fwupd/commit/9ad8b76dc6c5af005a2c712ae3a6f352b51e9eea.patch";
+      sha256 = "sha256-h9zLTHeJbfDoamdfICKc0ohQ51yJC4I/CK0SQ4H6rRk=";
+      name = "fix-test_get_devices-on-non-x86-architectures.patch";
+    })
   ];
 
   postPatch = ''
@@ -197,10 +203,6 @@ stdenv.mkDerivation (finalAttrs: {
     (pkgsBuildBuild.callPackage ./build-time-python.nix { })
   ];
 
-  propagatedBuildInputs = [
-    json-glib
-  ];
-
   nativeBuildInputs = [
     ensureNewerSourcesForZipFilesHook # required for firmware zipping
     gettext
@@ -210,8 +212,6 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    protobuf # for protoc
-    protobufc # for protoc-gen-c
     shared-mime-info
     vala
     wrapGAppsNoGuiHook
@@ -230,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: {
     fwupd-efi
     gnutls
     gusb
-    libarchive
     libcbor
     libdrm
     libgudev
@@ -243,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
     modemmanager
     pango
     polkit
-    protobufc
     readline
     sqlite
     tpm2-tss
@@ -359,12 +357,8 @@ stdenv.mkDerivation (finalAttrs: {
       "fwupd/remotes.d/lvfs.conf"
       "fwupd/remotes.d/vendor.conf"
       "fwupd/remotes.d/vendor-directory.conf"
-      "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
-      "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
       "pki/fwupd/LVFS-CA-2025PQ.pem"
       "pki/fwupd/LVFS-CA.pem"
-      "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
-      "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
       "pki/fwupd-metadata/LVFS-CA-2025PQ.pem"
       "pki/fwupd-metadata/LVFS-CA.pem"
       "grub.d/35_fwupd"

From 3fea8d0a0309b887f1f432a1cc7911e1140bd779 Mon Sep 17 00:00:00 2001
From: variadico <variadico@users.noreply.github.com>
Date: Fri, 3 Apr 2026 13:33:15 -0700
Subject: [PATCH 12/38] noti: update project home

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

diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index 4cfd4316b9ea..264e5e34fbfe 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildGoModule,
-  fetchFromGitHub,
+  fetchFromCodeberg,
   installShellFiles,
 }:
 
@@ -9,8 +9,8 @@ buildGoModule (finalAttrs: {
   pname = "noti";
   version = "3.8.0";
 
-  src = fetchFromGitHub {
-    owner = "variadico";
+  src = fetchFromCodeberg {
+    owner = "roble";
     repo = "noti";
     tag = finalAttrs.version;
     hash = "sha256-FwOS4ifMiODIzKVQufLhkDYOcmXz9dAfWw+hM3rXT/Y=";
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
       Never sit and wait for some long-running process to finish. Noti can alert
       you when it's done. You can receive messages on your computer or phone.
     '';
-    homepage = "https://github.com/variadico/noti";
+    homepage = "https://codeberg.org/roble/noti";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.stites ];
     mainProgram = "noti";

From 8ec536a05c76fbe81c3f253523a2e5e49b2011e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 6 Apr 2026 07:43:10 -0700
Subject: [PATCH 13/38] metadata-cleaner: 2.5.6 -> 4.0.0

Diff: https://gitlab.com/metadatacleaner/metadatacleaner/-/compare/v2.5.6...v4.0.0

Changelog: https://gitlab.com/metadatacleaner/metadatacleaner/-/releases/v4.0.0
---
 pkgs/by-name/me/metadata-cleaner/package.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index 76528cf8336e..ddb41c76614d 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -12,7 +12,6 @@
   librsvg,
   meson,
   ninja,
-  nix-update-script,
   pkg-config,
   poppler_gi,
   wrapGAppsHook4,
@@ -20,14 +19,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "metadata-cleaner";
-  version = "2.5.6";
+  version = "4.0.0";
   pyproject = false;
 
   src = fetchFromGitLab {
-    owner = "rmnvgr";
-    repo = "metadata-cleaner";
+    owner = "metadatacleaner";
+    repo = "metadatacleaner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
+    hash = "sha256-9e8uH//FtufYUsvule3JirkeHTjDMebruZ3bAYyDVWY=";
   };
 
   nativeBuildInputs = [
@@ -56,15 +55,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     pygobject3
   ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
   meta = {
     description = "Python GTK application to view and clean metadata in files, using mat2";
     mainProgram = "metadata-cleaner";
-    homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
-    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://gitlab.com/metadatacleaner/metadatacleaner";
+    changelog = "https://gitlab.com/metadatacleaner/metadatacleaner/-/releases/${finalAttrs.src.tag}";
     license = with lib.licenses; [
       gpl3Plus
       cc-by-sa-40

From 1b3b41288caf7b6c928c46b7b48d4e3e24e607b6 Mon Sep 17 00:00:00 2001
From: VZstless <i@vzstless.moe>
Date: Mon, 16 Mar 2026 17:58:18 +0800
Subject: [PATCH 14/38] snmalloc: init at 0.7.4

---
 pkgs/by-name/sn/snmalloc/package.nix | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/sn/snmalloc/package.nix

diff --git a/pkgs/by-name/sn/snmalloc/package.nix b/pkgs/by-name/sn/snmalloc/package.nix
new file mode 100644
index 000000000000..aaf7544b655b
--- /dev/null
+++ b/pkgs/by-name/sn/snmalloc/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  clangStdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "snmalloc";
+  version = "0.7.4";
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "snmalloc";
+    tag = finalAttrs.version;
+    hash = "sha256-+UCqUrfvhnB4leiYCnGJ8ORfVkTaGimaErP56XCJ5PM=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Message passing based memory allocator";
+    homepage = "https://github.com/microsoft/snmalloc";
+    downloadPage = "https://github.com/microsoft/snmalloc/releases";
+    changelog = "https://github.com/microsoft/snmalloc/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ VZstless ];
+  };
+})

From 8a8dd3e060fb5104bc3934a27f5d31074a6479ce Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 9 Apr 2026 14:19:36 +0200
Subject: [PATCH 15/38] fwupd: only enable HSI on x86

Upstream auto-disables the `hsi` meson feature on non-x86 hosts, but
nixpkgs' meson setup hook passes `-Dauto_features=enabled` which
overrides that and force-enables it everywhere. With HSI compiled in,
`fwupdtool security` succeeds on aarch64 while the installed test
script expects it to fail on non-x86, so `fwupdtool.test` has been
broken on Hydra/aarch64-linux since fwupd 2.0.17.

Explicitly mirror upstream's auto behaviour so the installed tests
match their expectations again.
---
 pkgs/by-name/fw/fwupd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index bce7dd41db25..5c08854d67ab 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -263,6 +263,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
     (lib.mesonOption "efi_os_dir" "nixos")
     (lib.mesonEnable "plugin_modem_manager" true)
+    # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides
+    # that, breaking the fwupdtool installed test which expects rc=1 on non-x86.
+    (lib.mesonEnable "hsi" isx86)
     (lib.mesonBool "vendor_metadata" true)
     (lib.mesonBool "plugin_uefi_capsule_splash" false)
     # TODO: what should this be?

From d7fc07c54fcc433209a43aaeed2841e5e7b6bfc8 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 9 Apr 2026 14:19:52 +0200
Subject: [PATCH 16/38] nixos/tests/fwupd: drop FWUPD_VERBOSE again

---
 nixos/tests/installed-tests/fwupd.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix
index a40ca0df084c..91853bdd2f05 100644
--- a/nixos/tests/installed-tests/fwupd.nix
+++ b/nixos/tests/installed-tests/fwupd.nix
@@ -7,9 +7,6 @@ makeInstalledTest {
   testRunnerFlags = [ "--timeout=1200" ];
 
   testConfig = {
-    # for easier debugging
-    systemd.globalEnvironment.FWUPD_VERBOSE = "1";
-
     services.fwupd = {
       enable = true;
       daemonSettings.TestDevices = true;

From 1c3a7f12bda766e40e968f39bc1055779a03ff2e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 11 Apr 2026 17:35:14 +0000
Subject: [PATCH 17/38] python313Packages.pymupdf: 1.27.2 -> 1.27.2.2

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index a1e0c482e340..58f4da5afd4a 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -44,14 +44,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "pymupdf";
-  version = "1.27.2";
+  version = "1.27.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymupdf";
     repo = "PyMuPDF";
     tag = finalAttrs.version;
-    hash = "sha256-7Bnu5AG1b5v4hd85xzyFvjsqXl5Lqltbb2NcmkTQwaE=";
+    hash = "sha256-o70IMa64jjX+b83uW4gISOiNrWtefQ8nc8Z99DfqrQI=";
   };
 
   patches = [

From 13b448d737bc9bad27a90daeed7f7b12224511ce Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 12 Apr 2026 12:40:19 +0200
Subject: [PATCH 18/38] shishi: set strictDeps

---
 pkgs/by-name/sh/shishi/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sh/shishi/package.nix b/pkgs/by-name/sh/shishi/package.nix
index 7b826ca7bba0..bf07955faa96 100644
--- a/pkgs/by-name/sh/shishi/package.nix
+++ b/pkgs/by-name/sh/shishi/package.nix
@@ -30,7 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   separateDebugInfo = true;
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    libgcrypt
+    pkg-config
+  ];
+
   buildInputs = [
     libgcrypt
     libgpg-error
@@ -79,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
     -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
   '';
 
+  strictDeps = true;
+
   meta = {
     homepage = "https://www.gnu.org/software/shishi/";
     description = "Implementation of the Kerberos 5 network security system";

From cb1339b8d32e086d1d969182bc9234ba7320e674 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 12 Apr 2026 12:40:47 +0200
Subject: [PATCH 19/38] shishi: resolve TODO

---
 pkgs/by-name/sh/shishi/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sh/shishi/package.nix b/pkgs/by-name/sh/shishi/package.nix
index bf07955faa96..8494d061d0d1 100644
--- a/pkgs/by-name/sh/shishi/package.nix
+++ b/pkgs/by-name/sh/shishi/package.nix
@@ -39,10 +39,15 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     libgpg-error
     libtasn1
-    # TODO use lib.optional instead of setting packages to null
-    (if usePam then pam else null)
-    (if useLibidn then libidn else null)
-    (if useGnutls then gnutls else null)
+  ]
+  ++ lib.optionals usePam [
+    pam
+  ]
+  ++ lib.optionals useLibidn [
+    libidn
+  ]
+  ++ lib.optionals useGnutls [
+    gnutls
   ];
 
   configureFlags = [

From 3f584fd8e922f49bca87ca523e840c216011a82a Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Wed, 8 Apr 2026 18:29:02 +0800
Subject: [PATCH 20/38] resterm: 0.24.1 -> 0.26.2

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

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index 2159ccea52a0..4d736bcf4541 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.24.1";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-7AgxDA1E20H2WYGFuwCIyBcB/1Zt58AbQwkEkcJdnq0=";
+    hash = "sha256-Addc59NlrD4GMEuir2BKoURDjMcqZYtAq4UPRCxNmCE=";
   };
 
   vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";

From a9ae9560b0282a81caaa02556a79b8658c3cf216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Apr 2026 10:30:14 -0700
Subject: [PATCH 21/38] libdeltachat: 2.48.0 -> 2.49.0

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

Changelog: https://github.com/chatmail/core/blob/v2.49.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 46fc20e3b867..56120089890f 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.48.0";
+  version = "2.49.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg=";
+    hash = "sha256-iMgWXlffbGG25iM/SMCQzer1J6clDWwP0hURloL3n2k=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38=";
+    hash = "sha256-0QhMJis1Hbl/Tn3Rwiz+UjCSieodfYhgL060DWjEOIM=";
   };
 
   nativeBuildInputs = [

From 25f48d9add0a3d9e3424fec444673229b8de8a16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 09:43:10 +0000
Subject: [PATCH 22/38] ghostfolio: 2.252.0 -> 2.254.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 1974b4f6f101..89af6e6a53dd 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.252.0";
+  version = "2.254.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-IR6/LTCBUfGweGA+cM/qfgK3i2ZUaV9u7K2XZH0Q0ZI=";
+    hash = "sha256-bcUr0tzq/X2pOmg7ZYj46+TQO9NBKmevm+C6PbyV/yc=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-2EGjP7PQVeWpXonAOM7JD3rRptyEbNgSGe1sTlV/ImM=";
+  npmDepsHash = "sha256-Wa15OSsd2IXTO1OjZoiFsSF0UhrzvS6fsymvxyPm0s8=";
 
   nativeBuildInputs = [
     prisma_6

From 3ce59897c87f7058e27a47bb63322442208cd767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 11:33:40 +0000
Subject: [PATCH 23/38] ipsw: 3.1.668 -> 3.1.671

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

diff --git a/pkgs/by-name/ip/ipsw/package.nix b/pkgs/by-name/ip/ipsw/package.nix
index 35287121835e..d72a1c8097eb 100644
--- a/pkgs/by-name/ip/ipsw/package.nix
+++ b/pkgs/by-name/ip/ipsw/package.nix
@@ -6,17 +6,17 @@
 }:
 
 buildGo126Module (finalAttrs: {
-  version = "3.1.668";
+  version = "3.1.671";
   pname = "ipsw";
 
   src = fetchFromGitHub {
     owner = "blacktop";
     repo = "ipsw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SsFj5/a9Xk7I4H07kdfVnbIF6sTE61ztqYMSFt5tpPY=";
+    hash = "sha256-Grh0WeeslpebG+ryacUPXD3OPIbJtA1zDejothKmdxQ=";
   };
 
-  vendorHash = "sha256-jvZSO3aLRI+7Nl/U4dmyhKrXkRV97tmkkU+uSHR8+Co=";
+  vendorHash = "sha256-J4S5VsGZEeDdiNNl0LlqIPG53Vg0xKuW1wsmrULetgQ=";
 
   ldflags = [
     "-s"

From 68096c126f49c435c18a3c1706e737066d68df56 Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Tue, 14 Apr 2026 15:09:20 +0200
Subject: [PATCH 24/38] rply: init at 1.1.4

---
 pkgs/by-name/rp/rply/package.nix | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/rp/rply/package.nix

diff --git a/pkgs/by-name/rp/rply/package.nix b/pkgs/by-name/rp/rply/package.nix
new file mode 100644
index 000000000000..fee08600a330
--- /dev/null
+++ b/pkgs/by-name/rp/rply/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rply";
+  version = "1.1.4";
+
+  src = fetchFromGitHub {
+    owner = "diegonehab";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-WkUgb6WeYp1OpV3/+EcEJkxEXYP0e7inQZQM87tGOGo=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    gcc -c -fPIC -o rply.o rply.c
+    gcc -shared -o librply.so rply.o
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib $out/include
+    cp -t $out/lib librply.so
+    cp -t $out/include rply.h
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "ANSI C Library for PLY file format input and output";
+    homepage = "https://github.com/diegonehab/rply";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tmarkus ];
+  };
+})

From 9eeb9b523820fac10063ccaeb4948b65f979597e Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Tue, 14 Apr 2026 15:09:40 +0200
Subject: [PATCH 25/38] libmeshb: init at 7.80

---
 pkgs/by-name/li/libmeshb/package.nix | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/li/libmeshb/package.nix

diff --git a/pkgs/by-name/li/libmeshb/package.nix b/pkgs/by-name/li/libmeshb/package.nix
new file mode 100644
index 000000000000..c69f5c285db1
--- /dev/null
+++ b/pkgs/by-name/li/libmeshb/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gfortran,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmeshb";
+  version = "7.80";
+
+  src = fetchFromGitHub {
+    owner = "LoicMarechal";
+    repo = "libMeshb";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-nkQ7Lq0rUCbqaWq6GkHejDqWFa21/pGBLZg93LSVvjc=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    gfortran
+  ];
+
+  meta = {
+    description = "A library to handle the *.meshb file format.";
+    homepage = "https://github.com/LoicMarechal/libMeshb";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tmarkus ];
+  };
+})

From 355bda7c1023ad27bbefdfb91c4838043881f461 Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Tue, 14 Apr 2026 15:10:08 +0200
Subject: [PATCH 26/38] geogram: 1.9.2 -> 1.9.9

---
 .../ge/geogram/cmake-fix-link-libraries.patch | 17 ++++
 pkgs/by-name/ge/geogram/package.nix           | 95 +++++--------------
 .../ge/geogram/replace-bundled-zlib.patch     | 23 +----
 3 files changed, 47 insertions(+), 88 deletions(-)
 create mode 100644 pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch

diff --git a/pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch b/pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch
new file mode 100644
index 000000000000..5463ba4c1562
--- /dev/null
+++ b/pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch
@@ -0,0 +1,17 @@
+--- a/src/lib/geogram/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
++++ b/src/lib/geogram/CMakeLists.txt	2026-03-03 10:21:32.918057952 +0100
+@@ -92,7 +92,13 @@
+   if(GEOGRAM_USE_BUILTIN_DEPS)
+       target_link_libraries(geogram pthread dl)
+   else()
+-      target_link_libraries(geogram pthread dl lua5.4 z triangle Meshb.7 rply)
++      target_link_libraries(geogram pthread dl z Meshb.7 rply)
++      if(GEOGRAM_WITH_LUA)
++         target_link_libraries(geogram lua5.4)
++      endif()
++      if(GEOGRAM_WITH_TRIANGLE)
++         target_link_libraries(geogram triangle)
++      endif()
+   endif()
+ endif()
+ endif()
diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix
index de6a8d83e6fe..87f89e888151 100644
--- a/pkgs/by-name/ge/geogram/package.nix
+++ b/pkgs/by-name/ge/geogram/package.nix
@@ -5,64 +5,58 @@
   cmake,
   doxygen,
   zlib,
-  python3Packages,
   nix-update-script,
-  fetchpatch2,
+  stb,
+  libmeshb,
+  rply,
 }:
-
-let
-  exploragram = fetchFromGitHub {
-    owner = "BrunoLevy";
-    repo = "exploragram";
-    rev = "3190f685653f8aa75b7c4604d008c59a999f1bb6";
-    hash = "sha256-9ePCOyQWSxu12PtHFSxfoDcvTtxvYR3T68sU3cAfZiE=";
-  };
-  testdata = fetchFromGitHub {
-    owner = "BrunoLevy";
-    repo = "geogram.data";
-    rev = "ceab6179189d23713b902b6f26ea2ff36aea1515";
-    hash = "sha256-zUmYI6+0IdDkglLzzWHS8ZKmc5O6aJ2X4IwRBouRIxI=";
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "geogram";
-  version = "1.9.2";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "BrunoLevy";
     repo = "geogram";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v7ChuE9F/z1MD5OUMiGXZWiGqjMauIka4sNXVDe/yYU=";
+    hash = "sha256-wAq6j/HUOv6In49lJVRZ2iS6ugbtYOxHN3PwTE1HZks=";
     fetchSubmodules = true;
   };
 
   outputs = [
-    "bin"
     "lib"
     "dev"
     "doc"
     "out"
   ];
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   cmakeFlags = [
     # Triangle is unfree
-    "-DGEOGRAM_WITH_TRIANGLE=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_TRIANGLE" false)
 
     # Disable some extra features (feel free to create a PR if you need one of those)
 
     # If GEOGRAM_WITH_LEGACY_NUMERICS is enabled GeoGram will build its own version of
     # ARPACK, CBLAS, CLAPACK, LIBF2C and SUPERLU
-    "-DGEOGRAM_WITH_LEGACY_NUMERICS=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_LEGACY_NUMERICS" false)
 
     # Don't build Lua
-    "-DGEOGRAM_WITH_LUA=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_LUA" false)
 
     # Disable certain features requiring GLFW
-    "-DGEOGRAM_WITH_GRAPHICS=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_GRAPHICS" false)
+
+    # Enables a packaging mode in some places
+    (lib.cmakeBool "GEOGRAM_FOR_DEBIAN" true)
+
+    # Only build the library itself
+    (lib.cmakeBool "GEOGRAM_LIB_ONLY" true)
 
     # NOTE: Options introduced by patch (see below)
-    "-DGEOGRAM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake"
-    "-DGEOGRAM_INSTALL_PKGCONFIG_DIR=${placeholder "dev"}/lib/pkgconfig"
+    (lib.cmakeOptionType "path" "GEOGRAM_INSTALL_CMAKE_DIR" "${placeholder "dev"}/lib/cmake")
+    (lib.cmakeOptionType "path" "GEOGRAM_INSTALL_PKGCONFIG_DIR" "${placeholder "dev"}/lib/pkgconfig")
   ];
 
   nativeBuildInputs = [
@@ -72,64 +66,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
+    stb
+    libmeshb
+    rply
   ];
 
-  # exploragram library is not listed as submodule and must be copied manually
-  prePatch = ''
-    cp -r ${exploragram} ./src/lib/exploragram/ && chmod 755 ./src/lib/exploragram/
-  '';
-
   patches = [
     # This patch replaces the bundled (outdated) zlib with our zlib
     # Should be harmless, but if there are issues this patch can also be removed
     # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress
     ./replace-bundled-zlib.patch
 
-    # fixes https://github.com/BrunoLevy/geogram/issues/203, remove when 1.9.3 is released
-    (fetchpatch2 {
-      url = "https://github.com/BrunoLevy/geogram/commit/2e1b6fba499ddc55b2150a1f610cf9f8d4934c39.patch";
-      hash = "sha256-t6Pocf3VT8HpKOSh1UKKa0QHpsZyFqlAng6ltiAfKA8=";
-    })
+    ./cmake-fix-link-libraries.patch
   ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
-    substituteInPlace cmake/platforms/*/config.cmake \
-      --replace "-m64" ""
-  '';
-
   postBuild = ''
     make doc-devkit-full
   '';
 
-  nativeCheckInputs = [
-    python3Packages.robotframework
-  ];
-
-  doCheck = true;
-
-  checkPhase =
-    let
-      skippedTests = [
-        # Skip slow RVD test
-        "RVD"
-
-        # Needs unfree library geogramplus with extended precision
-        # see https://github.com/BrunoLevy/geogram/wiki/GeogramPlus
-        "CSGplus"
-      ];
-    in
-    ''
-      runHook preCheck
-
-      ln -s ${testdata} ../tests/data
-
-      source tests/testenv.sh
-      robot \
-        ${lib.concatMapStringsSep " " (t: lib.escapeShellArg "--skip=${t}") skippedTests} \
-        ../tests
-
-      runHook postCheck
-    '';
+  doCheck = false;
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch b/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
index 3d19d66b0d2b..afb4b2bd1285 100644
--- a/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
+++ b/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
@@ -1,6 +1,6 @@
 --- a/src/lib/geogram/third_party/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
 +++ b/src/lib/geogram/third_party/CMakeLists.txt	2023-03-09 20:46:16.740801862 +0100
-@@ -33,7 +33,6 @@
+@@ -62,7 +62,6 @@
  aux_source_directories(SOURCES "Source Files\\LM6"          LM7)
  aux_source_directories(SOURCES "Source Files\\rply"         rply)
  aux_source_directories(SOURCES "Source Files\\shewchuk"     shewchuk)
@@ -10,7 +10,7 @@
  
 --- a/src/lib/geogram/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
 +++ b/src/lib/geogram/CMakeLists.txt	2023-03-09 20:49:21.080059939 +0100
-@@ -70,6 +70,9 @@
+@@ -109,6 +109,9 @@
      target_link_libraries(geogram psapi)
  endif()
  
@@ -20,24 +20,11 @@
  # Install the library
  install_devkit_targets(geogram)
  
---- a/src/lib/geogram/basic/geofile.h	1970-01-01 01:00:01.000000000 +0100
-+++ b/src/lib/geogram/basic/geofile.h	2023-03-09 20:52:33.713329571 +0100
-@@ -44,7 +44,7 @@
- #include <geogram/basic/numeric.h>
- #include <geogram/basic/memory.h>
- #include <geogram/basic/string.h>
--#include <geogram/third_party/zlib/zlib.h>
-+#include <zlib.h>
- 
- #include <stdexcept>
- #include <fstream>
 --- a/src/lib/geogram/third_party/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
-+++ b/src/lib/geogram/third_party/CMakeLists.txt	2023-03-09 20:54:50.276520762 +0100
-@@ -60,8 +59,10 @@
-     ${ANDROID_NDK}/sources/android/native_app_glue
-   )
++++ b/src/lib/geogram/third_party/CMakeLists.txt	2026-03-03 09:48:09.800627417 +0100
+@@ -92,6 +92,8 @@
    message(STATUS "building for Android")
- endif()  
+ endif()
  
 +find_package(ZLIB REQUIRED)
 +target_link_libraries(geogram_third_party PUBLIC ZLIB::ZLIB)

From 2cd7efc6957879eb2402916b79c2cb85ca7ca25b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 16:11:51 +0000
Subject: [PATCH 27/38] leo-editor: 6.8.7 -> 6.8.8

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

diff --git a/pkgs/by-name/le/leo-editor/package.nix b/pkgs/by-name/le/leo-editor/package.nix
index 9422e4f37580..3366319ee810 100644
--- a/pkgs/by-name/le/leo-editor/package.nix
+++ b/pkgs/by-name/le/leo-editor/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "leo-editor";
-  version = "6.8.7";
+  version = "6.8.8";
 
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GbbSPZQEPufRcF2aLjr9vEVLZlUIgAEP1QkaNILwJV4=";
+    hash = "sha256-A7eFYdmKd4E515xRI4fuLs8wuC9sZu1qd2qMZXs7Ko0=";
   };
 
   dontBuild = true;

From e688c8e81b470d2c6750fe453e0fd3ef09592231 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 16:38:58 +0000
Subject: [PATCH 28/38] mdns-scanner: 0.26.3 -> 0.27.0

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

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index db3775c431ad..e85fed6926aa 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.26.3";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Bgt5dROZVbtRHhRiwGzNdZgXb5KSmRV0S9sXyETF/k=";
+    hash = "sha256-rJhY2U7GMzt8/yoXKyHc0no38nfdYTnGn8ghdeNhM2Q=";
   };
 
-  cargoHash = "sha256-blyzKp25kWFrVo+FCfYp5Kd3LPqmNuSYgBdiibzMX1c=";
+  cargoHash = "sha256-n/KVarvd3gcWLYZD5Ww7XoMRHRuTcldxI/HB4Wta5NA=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";

From 43f6c47d0ce23801f985096969e8f4cb6fd24547 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 14 Apr 2026 22:38:00 +0200
Subject: [PATCH 29/38] victoriametrics: 1.139.0 -> 1.140.0

Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.140.0
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.139.0...v1.140.0
---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 3e0ae695ec3c..ab3a8065824d 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.139.0";
+  version = "1.140.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5+Hlt9cF/V3x+4TGrMd1NPaApQsIWWvDIYmN/BLhLMU=";
+    hash = "sha256-f/qcUSf/JMfe0rTUY5qT9k7MCVqsZCwRzsCv6puz6tw=";
   };
 
   vendorHash = null;

From 964b67633177e0e11c386b3409ee291b01a6c7ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 20:59:08 +0000
Subject: [PATCH 30/38] cargo-outdated: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index ca8402031ac1..7339448c48bc 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-outdated";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = "cargo-outdated";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-r7FtuXx9+OmVAdL6+9s2bYHjsURmX60+2c7+2FjkSRs=";
+    hash = "sha256-V4zNFi/ZU98egCElU/dDLQZm/8f6oyvbeQYn7JFraDs=";
   };
 
-  cargoHash = "sha256-l4UfmntTRlqRq1040FTzAn/QU33+owv569tcWNXSGN0=";
+  cargoHash = "sha256-51UjhAC2boNgW5kc7WxZOxcnXirw1E07CjLRcj/GEOM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From cc5058278b7f962e6bd79e0584cababdb95b0780 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 1 Mar 2026 16:12:17 -0800
Subject: [PATCH 31/38] doc/installFonts: init hook docs in manual

---
 doc/hooks/index.md                |  1 +
 doc/hooks/installFonts.section.md | 24 ++++++++++++++++++++++++
 doc/redirects.json                | 21 +++++++++++++++------
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 doc/hooks/installFonts.section.md

diff --git a/doc/hooks/index.md b/doc/hooks/index.md
index 8338c4629fd0..bac8306ff10e 100644
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -20,6 +20,7 @@ ghc.section.md
 gnome.section.md
 haredo.section.md
 installShellFiles.section.md
+installFonts.section.md
 julec.section.md
 just.section.md
 libglycin.section.md
diff --git a/doc/hooks/installFonts.section.md b/doc/hooks/installFonts.section.md
new file mode 100644
index 000000000000..6c1c2c139313
--- /dev/null
+++ b/doc/hooks/installFonts.section.md
@@ -0,0 +1,24 @@
+# `installFonts` {#installfonts}
+
+This hook installs common font formats to the proper location. In its default state, the hook automatically handles ttf, ttc, otf, bdf, and psf. Given a `webfont` output, woff and woff2 formats will be installed under this output.
+
+The automatic behavior of the hook can be disabled by setting the `dontInstallFonts` variable to true.
+
+Additionally, it exposes the `installFont` function that can be used from your `postInstall`
+hook, to install additional formats:
+
+## `installFont` {#installfonts-installfont}
+
+The `installFont` function takes two arguments, a file extension to move (*without* a preceding dot), and the install location.
+
+### Example Usage {#installfonts-installfont-exampleusage}
+
+```nix
+{
+  nativeBuildInputs = [ installFonts ];
+
+  postInstall = ''
+    installFont svg $out/share/fonts/svg
+  '';
+}
+```
diff --git a/doc/redirects.json b/doc/redirects.json
index f12f7ed29da9..9e22def037df 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -134,18 +134,21 @@
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
+  "installfonts": [
+    "index.html#installfonts"
+  ],
+  "installfonts-installfont": [
+    "index.html#installfonts-installfont"
+  ],
+  "installfonts-installfont-exampleusage": [
+    "index.html#installfonts-installfont-exampleusage"
+  ],
   "javascript-buildNpmPackage-npmFlags": [
     "index.html#javascript-buildNpmPackage-npmFlags"
   ],
   "javascript-buildNpmPackage-npmWorkspace": [
     "index.html#javascript-buildNpmPackage-npmWorkspace"
   ],
-  "libcxxhardeningextensive": [
-    "index.html#libcxxhardeningextensive"
-  ],
-  "libcxxhardeningfast": [
-    "index.html#libcxxhardeningfast"
-  ],
   "julec-hook": [
     "index.html#julec-hook"
   ],
@@ -182,6 +185,12 @@
   "julec-hook-variables": [
     "index.html#julec-hook-variables"
   ],
+  "libcxxhardeningextensive": [
+    "index.html#libcxxhardeningextensive"
+  ],
+  "libcxxhardeningfast": [
+    "index.html#libcxxhardeningfast"
+  ],
   "major-ghc-deprecation": [
     "index.html#major-ghc-deprecation"
   ],

From b5d357d0dd830a27c89048316c131f2e7c0ede32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 22:01:38 +0000
Subject: [PATCH 32/38] act: 0.2.86 -> 0.2.87

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

diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
index bc0723afe5e2..8c1ca70f674b 100644
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "act";
-  version = "0.2.86";
+  version = "0.2.87";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = "act";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nA7QzQYd4oa+OJiPLpfWNjavVJiCd0t62+qC2TpJcSM=";
+    hash = "sha256-i3DaVLspm/lP6HvRD56qToi3Vj9MijK0IfZA4n2Y5IA=";
   };
 
   vendorHash = "sha256-MsrWfrXuIi1m0vhDR05qbD4ynNpKvKwjUgDKbaq5iLs=";

From 9092674a75555da723e7bee12300c3beab76de32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 23:24:31 +0000
Subject: [PATCH 33/38] github-copilot-cli: 1.0.21 -> 1.0.26

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

diff --git a/pkgs/by-name/gi/github-copilot-cli/sources.json b/pkgs/by-name/gi/github-copilot-cli/sources.json
index 2d37414f45c2..82eff4c0068e 100644
--- a/pkgs/by-name/gi/github-copilot-cli/sources.json
+++ b/pkgs/by-name/gi/github-copilot-cli/sources.json
@@ -1,19 +1,19 @@
 {
-  "version": "1.0.21",
+  "version": "1.0.26",
   "x86_64-linux": {
     "name": "copilot-linux-x64",
-    "hash": "sha256-pvxJSj3Vp2JG+zNCS68Iq7W0y2iJ//KM8pUVXCixz3c="
+    "hash": "sha256-i77fn0DOW/VjCzXY4mQbmtADQ2pFsju4zPM9iZNmmG8="
   },
   "aarch64-linux": {
     "name": "copilot-linux-arm64",
-    "hash": "sha256-QUuuOtIo5LtJ734f5pf7wUSdNF+VdmBxp8Haa7IasWg="
+    "hash": "sha256-bc/MoSL8RvCRLE1Qkwi9OdZpSIYc7LW6tjGU+kqb6nI="
   },
   "x86_64-darwin": {
     "name": "copilot-darwin-x64",
-    "hash": "sha256-dS3MmOrDhgatzqZOXumIiinINduWm17dq95rqPmeqXc="
+    "hash": "sha256-l316KVesMJtZflglg1fYgYvmBAM3LvaK2B9YxuInpLg="
   },
   "aarch64-darwin": {
     "name": "copilot-darwin-arm64",
-    "hash": "sha256-mQy7nZTNLa0CRej3xO0riP+qhlMb+Eboby2QWPTUWIo="
+    "hash": "sha256-Y3/7JUU3g5sssXxJ/1+ERpJ9XOkYl0gPM+6vzwQO79U="
   }
 }

From 5f04b491f7d0f322410a9bccc4b28abc14b66784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 00:08:53 +0000
Subject: [PATCH 34/38] terraform-providers.oracle_oci: 8.8.0 -> 8.9.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 be318d742194..c361da17a91f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1049,11 +1049,11 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-lyIrdjvsII9LjoqTByXTlOZAO+fJU+AB0jOBG8nlN+c=",
+    "hash": "sha256-U4Laml29samuCVGCaLSH/nR/o9jbn8lK/c73OsDeE7c=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v8.8.0",
+    "rev": "v8.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 8fdb91386e5a47ca0ca9c275e412bc5488d41e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 01:10:16 +0000
Subject: [PATCH 35/38] neovide: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 9d2a0d80d4cd..876d3652a770 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -30,16 +30,16 @@
 
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   pname = "neovide";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "neovide";
     repo = "neovide";
     tag = finalAttrs.version;
-    hash = "sha256-yiIJEVEjXvFkTm4PIPOVX8gDAI6aA5PzBMlu51POCZU=";
+    hash = "sha256-mzlyw9NIBb35QJ5L7+ZxgJ5IUoHznAUQOLA0SglJ3bw=";
   };
 
-  cargoHash = "sha256-bWkK8tmKJrBKmdzJzHDht7BYVBMgpapzG79o8RM+Wuc=";
+  cargoHash = "sha256-WVNmG+KJK93yLrL2/KPc2czAxwt5brKxRkrPB7Bv46M=";
 
   env = {
     SKIA_SOURCE_DIR =

From fe87a4e4f057859af7e7e3b2017d1fd7426b9677 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 01:15:28 +0000
Subject: [PATCH 36/38] python3Packages.victron-mqtt: 2026.4.1 -> 2026.4.9

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

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index b6aaae1f7513..2474e31e11ae 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.4.1";
+  version = "2026.4.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EJVzbOgf0BT9qIDite3JhNmK1uU3zrXgJWW8KhZh0bk=";
+    hash = "sha256-Lq3I5xZCu3UrllW0cHLo7wlKnDOl73TDRN97gThvP1M=";
   };
 
   build-system = [

From ebadbaf5d713db2241fdd938811bff378dc0e26c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 02:00:57 +0000
Subject: [PATCH 37/38] warp-terminal: 0.2026.03.25.08.24.stable_09 ->
 0.2026.04.08.08.36.stable_05

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 77eb058c4197..4b7a689c42ad 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-+vr4OINeprn3dqarB6ZotK4oA1h09WT6wIuKyxPtAeQ=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-gkXz9pkv/0T9TR+wGj8PU7JOC4qEbCHoKSei6xdL8Qs=",
+    "version": "0.2026.04.08.08.36.stable_05"
   },
   "linux_x86_64": {
-    "hash": "sha256-FceMF9fAz4XMBwL/iAaQdz/elSnS5DNV1uaBy5BEwSc=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-Vt6NPu5u7LMnP8sxpl8p3JZSk3ymFf4PZmNdmiVMCO0=",
+    "version": "0.2026.04.08.08.36.stable_05"
   },
   "linux_aarch64": {
-    "hash": "sha256-9x3mNKT8PaFaZouMN7iXPfCv2U1SsbkI4BcpzfhCODw=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-ZaZoRRUAxuemXS+vkIlP5skr1BpT5nWOI2jjVjCK+gw=",
+    "version": "0.2026.04.08.08.36.stable_05"
   }
 }

From 8bf7d6589d1ab66d8282c5d2b2bfd267d756b034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 02:23:09 +0000
Subject: [PATCH 38/38] spicedb: 1.51.0 -> 1.51.1

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

diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix
index 170099b33892..520d9874fc52 100644
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "spicedb";
-  version = "1.51.0";
+  version = "1.51.1";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kKdBS9Rl0nHRE3Nv/B5KF8SRlG4dnGmpVt8qaE3idMI=";
+    hash = "sha256-I5srDvkGDe0QQirDtMzTGdz8TS625E8wHYJDdRADhhc=";
   };
 
-  vendorHash = "sha256-9VWTJyAOJD7YivzNcVOYYF3eWnR7Fhb/neSVx9pNM7g=";
+  vendorHash = "sha256-vVkqu2YR/puTAdsPZFWrPDo57Npke4+vngJBcQeQr8Q=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"