From 2ca0360e0fa1f1c15135eb266941b8bdc9ffc11b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:52:49 +0100
Subject: [PATCH 01/50] iortcw: set pname and version

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

diff --git a/pkgs/by-name/io/iortcw/package.nix b/pkgs/by-name/io/iortcw/package.nix
index 49ceab43c5aa..4fdcec1e5e93 100644
--- a/pkgs/by-name/io/iortcw/package.nix
+++ b/pkgs/by-name/io/iortcw/package.nix
@@ -11,7 +11,8 @@ let
   });
 in
 buildEnv {
-  name = "iortcw";
+  inherit (sp) version;
+  pname = "iortcw";
 
   paths = [
     sp

From e84fb323a9cae0e2ddd7fb1f393bb1ca748397b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 23:56:14 +0000
Subject: [PATCH 02/50] tree-sitter-grammars.tree-sitter-matlab:
 1.3.0-unstable-2025-11-22 -> 1.3.0-unstable-2026-03-04

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

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 87b94bfa0e78..f824dd112e14 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -1552,10 +1552,10 @@
   };
 
   matlab = {
-    version = "1.3.0-unstable-2025-11-22";
+    version = "1.3.0-unstable-2026-03-04";
     url = "github:acristoffers/tree-sitter-matlab";
-    rev = "1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef";
-    hash = "sha256-V7GOXiR//JgxjTOxRi+PpfRGvunX4r3C0Bu1CrN+/K4=";
+    rev = "c2390a59016f74e7d5f75ef09510768b4f30217e";
+    hash = "sha256-WgyWvItbysSqeD/LdBr233NYlKF1HaxIDtHIr6BQOjw=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 3df7af7263ee28ff5b1d4c1bba5631c0c1f812b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Mart=C3=ADnez?= <zen@itram.es>
Date: Mon, 9 Mar 2026 23:43:11 +0100
Subject: [PATCH 03/50] bitwarden-desktop: disable coredumps on Linux

---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 48822d2e1e24..926bfdde293d 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -196,6 +196,7 @@ buildNpmPackage' rec {
     cp -r apps/desktop/dist/linux-*unpacked/{locales,resources{,.pak}} $out/opt/Bitwarden
 
     makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
+      --run "ulimit -c 0" \
       --add-flags $out/opt/Bitwarden/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --set-default ELECTRON_IS_DEV 0 \

From 26c59d4b2a85b12041341f1ca258e8174eb5d905 Mon Sep 17 00:00:00 2001
From: Lach <iam@lach.pw>
Date: Wed, 25 Jun 2025 21:20:39 +0200
Subject: [PATCH 04/50] octoprint: use headless ffmpeg by default

---
 nixos/modules/services/misc/octoprint.nix | 2 +-
 pkgs/by-name/oc/octoprint/package.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 0343b2376d21..bf5cf47c9d0a 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -11,7 +11,7 @@ let
   baseConfig = lib.recursiveUpdate {
     plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
     server.port = cfg.port;
-    webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
+    webcam.ffmpeg = "${pkgs.ffmpeg-headless.bin}/bin/ffmpeg";
   } (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; });
 
   fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 862f77ab649a..cc85ad38a780 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -172,7 +172,7 @@ let
 
             # hardcore path to ffmpeg and hide related settings
             (replaceVars ./ffmpeg-path.patch {
-              ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
+              ffmpeg = "${pkgs.ffmpeg-headless}/bin/ffmpeg";
             })
           ];
 

From 284c8d6b2ce6656e6490e9218f2f64bfe34b7442 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2026 14:02:34 +0000
Subject: [PATCH 05/50] emilua: 0.11.7 -> 0.12.1

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

diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
index 344713d4e341..f31f3e1d8f49 100644
--- a/pkgs/development/interpreters/emilua/default.nix
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "emilua";
-  version = "0.11.7";
+  version = "0.12.1";
 
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "emilua";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c+X8HD/G75XD54Fs89DSkebLDd7h12Bk45+w7VBUXPY=";
+    hash = "sha256-h/uC5yAj64A5cVQN6XPVlFg+mDFdugwWblp6qNoU824=";
   };
 
   propagatedBuildInputs = [

From a5f2323fdbaa9e1061fb989b2134321313318af5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2026 01:11:27 +0000
Subject: [PATCH 06/50] java-service-wrapper: 3.6.4 -> 3.6.5

---
 pkgs/by-name/ja/java-service-wrapper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/java-service-wrapper/package.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix
index b86338695317..be96d1e48baf 100644
--- a/pkgs/by-name/ja/java-service-wrapper/package.nix
+++ b/pkgs/by-name/ja/java-service-wrapper/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "java-service-wrapper";
-  version = "3.6.4";
+  version = "3.6.5";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${finalAttrs.version}/wrapper_${finalAttrs.version}_src.tar.gz";
-    hash = "sha256-+yLgXYnwpqErzV/Y1HQqtCy/ulMk42eoeBCmpn9ZWhI=";
+    hash = "sha256-4TaO/3Gffh41jVo8tHSXWcvb3EVVFe6/Ra3mRr4fgsA=";
   };
 
   strictDeps = true;

From 6dd27a616e52d31e8ad9e4af60790a8fdbd56224 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 19 Mar 2026 13:35:30 +0100
Subject: [PATCH 07/50] x2t: move under onlyoffice-documentserver

No longer makes sense to have this as its own entry
---
 .../modules/services/web-apps/onlyoffice.nix  |  2 +-
 .../common-cpp20.patch                        |  0
 .../common-pole-c20.patch                     |  0
 .../common-v8-no-compress-pointers.patch      |  0
 .../common-v8-no-snapshots.patch              |  0
 .../core-fontengine-custom-fonts-paths.patch  |  0
 .../cximage-types.patch                       |  0
 .../doctrenderer-format-security.patch        |  0
 .../doctrenderer-v8-iterator.patch            |  0
 .../doctrenderer-v8-test.patch                |  0
 .../fontengine-format-security.patch          |  0
 .../ofdfile-test.patch                        |  0
 .../on/onlyoffice-documentserver/package.nix  |  9 +++-
 .../pdffile-limits-include.patch              |  0
 .../v8_updates.patch                          |  0
 .../onlyoffice-documentserver/versions.json   |  6 +++
 .../web-apps-avoid-phantomjs.patch            |  0
 .../web-apps-mobile-no-spinner.patch          |  0
 .../web-apps-no-mobile.patch                  |  0
 .../onlyoffice-documentserver/x2t.nix}        |  6 ++-
 .../xlsx-missing-import.patch                 |  0
 .../zlib-cstd.patch                           |  0
 .../x2/x2t/MsBinaryFile-pragma-regions.patch  | 47 -------------------
 23 files changed, 18 insertions(+), 52 deletions(-)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/common-cpp20.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/common-pole-c20.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/common-v8-no-compress-pointers.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/common-v8-no-snapshots.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/core-fontengine-custom-fonts-paths.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/cximage-types.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/doctrenderer-format-security.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/doctrenderer-v8-iterator.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/doctrenderer-v8-test.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/fontengine-format-security.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/ofdfile-test.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/pdffile-limits-include.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/v8_updates.patch (100%)
 create mode 100644 pkgs/by-name/on/onlyoffice-documentserver/versions.json
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/web-apps-avoid-phantomjs.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/web-apps-mobile-no-spinner.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/web-apps-no-mobile.patch (100%)
 rename pkgs/by-name/{x2/x2t/package.nix => on/onlyoffice-documentserver/x2t.nix} (99%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/xlsx-missing-import.patch (100%)
 rename pkgs/by-name/{x2/x2t => on/onlyoffice-documentserver}/zlib-cstd.patch (100%)
 delete mode 100644 pkgs/by-name/x2/x2t/MsBinaryFile-pragma-regions.patch

diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix
index 526ef9269645..d56e7855775d 100644
--- a/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/nixos/modules/services/web-apps/onlyoffice.nix
@@ -50,7 +50,7 @@ in
 
     package = lib.mkPackageOption pkgs "onlyoffice-documentserver" { };
 
-    x2t = lib.mkPackageOption pkgs "x2t" { };
+    x2t = lib.mkPackageOption pkgs "onlyoffice-documentserver.passthru.x2t" { };
 
     port = lib.mkOption {
       type = lib.types.port;
diff --git a/pkgs/by-name/x2/x2t/common-cpp20.patch b/pkgs/by-name/on/onlyoffice-documentserver/common-cpp20.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/common-cpp20.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/common-cpp20.patch
diff --git a/pkgs/by-name/x2/x2t/common-pole-c20.patch b/pkgs/by-name/on/onlyoffice-documentserver/common-pole-c20.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/common-pole-c20.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/common-pole-c20.patch
diff --git a/pkgs/by-name/x2/x2t/common-v8-no-compress-pointers.patch b/pkgs/by-name/on/onlyoffice-documentserver/common-v8-no-compress-pointers.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/common-v8-no-compress-pointers.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/common-v8-no-compress-pointers.patch
diff --git a/pkgs/by-name/x2/x2t/common-v8-no-snapshots.patch b/pkgs/by-name/on/onlyoffice-documentserver/common-v8-no-snapshots.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/common-v8-no-snapshots.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/common-v8-no-snapshots.patch
diff --git a/pkgs/by-name/x2/x2t/core-fontengine-custom-fonts-paths.patch b/pkgs/by-name/on/onlyoffice-documentserver/core-fontengine-custom-fonts-paths.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/core-fontengine-custom-fonts-paths.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/core-fontengine-custom-fonts-paths.patch
diff --git a/pkgs/by-name/x2/x2t/cximage-types.patch b/pkgs/by-name/on/onlyoffice-documentserver/cximage-types.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/cximage-types.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/cximage-types.patch
diff --git a/pkgs/by-name/x2/x2t/doctrenderer-format-security.patch b/pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-format-security.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/doctrenderer-format-security.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-format-security.patch
diff --git a/pkgs/by-name/x2/x2t/doctrenderer-v8-iterator.patch b/pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-v8-iterator.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/doctrenderer-v8-iterator.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-v8-iterator.patch
diff --git a/pkgs/by-name/x2/x2t/doctrenderer-v8-test.patch b/pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-v8-test.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/doctrenderer-v8-test.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/doctrenderer-v8-test.patch
diff --git a/pkgs/by-name/x2/x2t/fontengine-format-security.patch b/pkgs/by-name/on/onlyoffice-documentserver/fontengine-format-security.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/fontengine-format-security.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/fontengine-format-security.patch
diff --git a/pkgs/by-name/x2/x2t/ofdfile-test.patch b/pkgs/by-name/on/onlyoffice-documentserver/ofdfile-test.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/ofdfile-test.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/ofdfile-test.patch
diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
index 61f9d7e50ae8..03915fb061ee 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
@@ -1,6 +1,7 @@
 {
   buildFHSEnv,
   buildNpmPackage,
+  callPackage,
   dpkg,
   fetchFromGitHub,
   fetchurl,
@@ -13,13 +14,13 @@
   stdenv,
   vips,
   writeScript,
-  x2t,
 
   extra-fonts ? [ ],
 }:
 
 let
   version = "9.2.1";
+  x2t = callPackage ./x2t.nix { };
   server-src = fetchFromGitHub {
     owner = "ONLYOFFICE";
     repo = "server";
@@ -190,12 +191,16 @@ let
 
     passthru = {
       inherit
+        x2t
         x2t-with-fonts-and-themes
         common
         docservice
         fileconverter
         ;
-      tests = nixosTests.onlyoffice;
+      tests = {
+        nixosTest = nixosTests.onlyoffice;
+      }
+      // x2t.tests;
       fhs = buildFHSEnv {
         name = "onlyoffice-wrapper";
 
diff --git a/pkgs/by-name/x2/x2t/pdffile-limits-include.patch b/pkgs/by-name/on/onlyoffice-documentserver/pdffile-limits-include.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/pdffile-limits-include.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/pdffile-limits-include.patch
diff --git a/pkgs/by-name/x2/x2t/v8_updates.patch b/pkgs/by-name/on/onlyoffice-documentserver/v8_updates.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/v8_updates.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/v8_updates.patch
diff --git a/pkgs/by-name/on/onlyoffice-documentserver/versions.json b/pkgs/by-name/on/onlyoffice-documentserver/versions.json
new file mode 100644
index 000000000000..84ec2a43e4c0
--- /dev/null
+++ b/pkgs/by-name/on/onlyoffice-documentserver/versions.json
@@ -0,0 +1,6 @@
+{
+  "DocumentServer": {
+    "version": "9.2.0",
+    "hash": "xxx"
+  }
+}
diff --git a/pkgs/by-name/x2/x2t/web-apps-avoid-phantomjs.patch b/pkgs/by-name/on/onlyoffice-documentserver/web-apps-avoid-phantomjs.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/web-apps-avoid-phantomjs.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/web-apps-avoid-phantomjs.patch
diff --git a/pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch b/pkgs/by-name/on/onlyoffice-documentserver/web-apps-mobile-no-spinner.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/web-apps-mobile-no-spinner.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/web-apps-mobile-no-spinner.patch
diff --git a/pkgs/by-name/x2/x2t/web-apps-no-mobile.patch b/pkgs/by-name/on/onlyoffice-documentserver/web-apps-no-mobile.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/web-apps-no-mobile.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/web-apps-no-mobile.patch
diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
similarity index 99%
rename from pkgs/by-name/x2/x2t/package.nix
rename to pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
index 2d6595ac45c8..bc9c76ea9bf2 100644
--- a/pkgs/by-name/x2/x2t/package.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
@@ -25,7 +25,7 @@
   stdenv,
   writers,
   writeScript,
-  x2t,
+  onlyoffice-documentserver,
   grunt-cli,
 }:
 
@@ -946,8 +946,10 @@ buildCoreComponent "X2tConverter/build/Qt" {
     docxrenderer = docxrenderer.tests;
     doctrenderer = doctrenderer.tests;
     ofdfile = ofdfile.tests;
+    starmath = starmath.tests;
+    ooxmlsignature = ooxmlsignature.tests;
     x2t = runCommand "x2t-test" { } ''
-      (${x2t}/bin/x2t || true) | grep "OOX/binary file converter." && mkdir -p $out
+      (${onlyoffice-documentserver.x2t}/bin/x2t || true) | grep "OOX/binary file converter." && mkdir -p $out
     '';
     nixos-module = nixosTests.onlyoffice;
   };
diff --git a/pkgs/by-name/x2/x2t/xlsx-missing-import.patch b/pkgs/by-name/on/onlyoffice-documentserver/xlsx-missing-import.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/xlsx-missing-import.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/xlsx-missing-import.patch
diff --git a/pkgs/by-name/x2/x2t/zlib-cstd.patch b/pkgs/by-name/on/onlyoffice-documentserver/zlib-cstd.patch
similarity index 100%
rename from pkgs/by-name/x2/x2t/zlib-cstd.patch
rename to pkgs/by-name/on/onlyoffice-documentserver/zlib-cstd.patch
diff --git a/pkgs/by-name/x2/x2t/MsBinaryFile-pragma-regions.patch b/pkgs/by-name/x2/x2t/MsBinaryFile-pragma-regions.patch
deleted file mode 100644
index d167c51e3a3d..000000000000
--- a/pkgs/by-name/x2/x2t/MsBinaryFile-pragma-regions.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp b/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp
-index 08f56fb64e..dfbc4e4e15 100644
---- a/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp
-+++ b/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp
-@@ -73,7 +73,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
- 
-     for(std::wstring::const_iterator it = assembled_formula.begin(), itEnd = assembled_formula.end(); it != itEnd;)
-     {
--        #pragma region Operators
-         if(SyntaxPtg::is_operators(it, itEnd) || SyntaxPtg::is_PtgIsect(it, itEnd))
-         {
-             OperatorPtgPtr found_operator;
-@@ -182,8 +181,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
-             ptg_stack.push(found_operator);
-             last_ptg = found_operator;
-         }
--        #pragma endregion
--        #pragma region Parenthesis
-         else if(SyntaxPtg::extract_LeftParenthesis(it, itEnd))
-         {
-             PtgFuncPtr func;
-@@ -246,8 +243,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
-             rgce.addPtg(last_ptg);
-             operand_expected = false;
-         }
--        #pragma endregion
--        #pragma region Comma and PtgUnion
-         else if(SyntaxPtg::extract_comma(it, itEnd))
-         {
-             PtgParenPtr left_p;
-@@ -271,8 +266,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
-             last_ptg = left_p; // PtgParen. Mostly to differ unary and binary minuses and pluses
-             operand_expected = true;
-         }
--        #pragma endregion
--        #pragma region Operands
-         else
-         {
-             OperandPtgPtr found_operand;
-@@ -401,7 +394,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
-             last_ptg = found_operand;
-             operand_expected = false;
-         }
--        #pragma endregion
-     }
- 
-     while(ptg_stack.size())

From 6b4efecad47dbe18ce564481a575dd78c4689f1c Mon Sep 17 00:00:00 2001
From: Joel Pepper <pepper@bronze-deer.de>
Date: Thu, 19 Mar 2026 22:18:05 +0100
Subject: [PATCH 08/50] delve: add shell completion files

---
 pkgs/by-name/de/delve/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix
index 5d81b4d509a6..b7f00122b70a 100644
--- a/pkgs/by-name/de/delve/package.nix
+++ b/pkgs/by-name/de/delve/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   stdenv,
   nix-update-script,
+  installShellFiles,
 }:
 
 buildGoModule (finalAttrs: {
@@ -23,6 +24,8 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
+  nativeBuildInputs = [ installShellFiles ];
+
   subPackages = [ "cmd/dlv" ];
 
   ldflags = [
@@ -48,6 +51,11 @@ buildGoModule (finalAttrs: {
     # add symlink for vscode golang extension
     # https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap
     ln $out/bin/dlv $out/bin/dlv-dap
+
+    installShellCompletion --cmd dlv \
+      --bash <($out/bin/dlv completion bash) \
+      --fish <($out/bin/dlv completion fish) \
+      --zsh <($out/bin/dlv completion zsh)
   '';
 
   # delve doesn't support --version

From 2220963fcd01df2b24d088cbed22ce20b2ae3d03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2026 02:48:14 +0000
Subject: [PATCH 09/50] grafanaPlugins.marcusolsson-json-datasource: 1.3.27 ->
 1.3.28

---
 .../grafana/plugins/marcusolsson-json-datasource/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
index fde268f9b07a..e3c57d8d3ae7 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-json-datasource";
-  version = "1.3.27";
-  zipHash = "sha256-/v7t54qofPxUytNvrH9S2vCswjgB+5raBCoqycxzPJM=";
+  version = "1.3.28";
+  zipHash = "sha256-YosFDERsbi4etIuBfAVo8/x4LyTJjRGiAGfxVZZtpcA=";
   meta = {
     description = "Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana";
     license = lib.licenses.asl20;

From ba1b5ebad68971658b8e98d7869c418c244db7d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 05:06:51 +0000
Subject: [PATCH 10/50] tree-sitter-grammars.tree-sitter-sshclientconfig:
 2026.2.18 -> 2026.3.19

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

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 8d1e6f580439..b170ab31c3d7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -2438,9 +2438,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.2.18";
+    version = "2026.3.19";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-zEQ9jof8CMx6YtzU+y/GnBeI7htv9EbUHtAKSmX6c3M=";
+    hash = "sha256-lR9YMp62YjB4OF/eSQlbEDOqGu5Ag/YMrZBIHldXN6s=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [

From be49d3a94515ea1b64b773897b957ed875b1bb1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 16:54:17 +0000
Subject: [PATCH 11/50] python3Packages.langchain-aws: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 8234d482ebdf..04a2a4f49fb2 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-aws";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${finalAttrs.version}";
-    hash = "sha256-1zeZsLff0dcn9rJZu6zR6l/oXvXPXNTqKo0Ma+cXafo=";
+    hash = "sha256-q+79xKpUN9whg0E37m6Mu4oECdJfPxUTh94bXHLg6sM=";
   };
 
   postPatch = ''

From 7821a105024f04f32ff2d7b7ddba627d717dcacd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2026 21:56:53 +0000
Subject: [PATCH 12/50] python3Packages.beets-audible: 1.3.1 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix
index 30bc3e2bfe8b..071cd0b64ea9 100644
--- a/pkgs/development/python-modules/beets-audible/default.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "beets-audible";
-  version = "1.3.1";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
     tag = "v${version}";
-    hash = "sha256-JijKKbceQejpOFIjrpoWRt6qlwBA6Yr8dwVTHyM7Io8=";
+    hash = "sha256-eyyj1zwdf7pINeULhhPvUnnkE2skE69fpWArZls0nLU=";
   };
 
   build-system = [

From 583b8e446c0abd82983c268a4ab4e0de6a41775f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 25 Mar 2026 17:49:52 +0100
Subject: [PATCH 13/50] yaup: unstable-2019-10-16 -> 0-unstable-2026-03-25

---
 pkgs/by-name/ya/yaup/package.nix | 41 ++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ya/yaup/package.nix b/pkgs/by-name/ya/yaup/package.nix
index 4657ce380840..cdf2ccd66a44 100644
--- a/pkgs/by-name/ya/yaup/package.nix
+++ b/pkgs/by-name/ya/yaup/package.nix
@@ -2,34 +2,26 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   intltool,
   pkg-config,
   wrapGAppsHook3,
   gtk3,
   miniupnpc,
+  makeDesktopItem,
+  copyDesktopItems,
 }:
 
 stdenv.mkDerivation {
   pname = "yaup";
-  version = "unstable-2019-10-16";
+  version = "0-unstable-2026-03-25";
 
   src = fetchFromGitHub {
     owner = "Holarse-Linuxgaming";
     repo = "yaup";
-    rev = "7ee3fdbd8c1ecf0a0e6469c47560e26082808250";
-    hash = "sha256-RWnNjpgXRYncz9ID8zirENffy1UsfHD1H6Mmd8DKN4k=";
+    rev = "7135987a17208dab1b980ba5de55114abe217b63";
+    hash = "sha256-1P95cbGy8H+iXs/i7B4eTDzOPXJUJVBTOECsUZX9wG4=";
   };
 
-  patches = [
-    # Fix build with miniupnpc 2.2.8
-    # https://github.com/Holarse-Linuxgaming/yaup/pull/6
-    (fetchpatch2 {
-      url = "https://github.com/Holarse-Linuxgaming/yaup/commit/c92134e305932785a60bd72131388f507b4d1853.patch?full_index=1";
-      hash = "sha256-Exqkfp9VYIf9JpAc10cO8NuEAWvI5Houi7CLXV5zBDY=";
-    })
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Replace GNU ld's --export-dynamic with macOS linker equivalent
     substituteInPlace src/Makefile.in \
@@ -37,6 +29,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [
+    copyDesktopItems
     intltool
     pkg-config
     wrapGAppsHook3
@@ -47,6 +40,28 @@ stdenv.mkDerivation {
     miniupnpc
   ];
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "yaup";
+      desktopName = "Yaup";
+      genericName = "UPnP Portmapper";
+      comment = "Yet Another UPnP Portmapper";
+      icon = "yaup";
+      exec = "yaup";
+      categories = [
+        "Network"
+        "Utility"
+      ];
+      keywords = [
+        "Port forwarding"
+      ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 src/yaup-dark.png $out/share/icons/hicolor/512x512/apps/yaup.png
+  '';
+
   meta = {
     homepage = "https://github.com/Holarse-Linuxgaming/yaup";
     description = "Yet Another UPnP Portmapper";

From 4ddfd80f1a91eca48f8b8ae40bb10393cabcf26d Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Fri, 27 Mar 2026 00:05:08 +0100
Subject: [PATCH 14/50] pyhanko: 0.33.0 -> 0.34.1

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

diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix
index 32e1e8c3b1f4..b68b80b851a2 100644
--- a/pkgs/development/python-modules/pyhanko/default.nix
+++ b/pkgs/development/python-modules/pyhanko/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyhanko";
-  version = "0.33.0";
+  version = "0.34.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyHanko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+576MAbtWFGaPu/HqhdeeRNHi84pLnDaMDa0e/J/CUs=";
+    hash = "sha256-ZBlkp6nhTKEAWxCPDq9NIoOullwWartpU3eL0QIGFpw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko";
@@ -145,7 +145,7 @@ buildPythonPackage (finalAttrs: {
       sourceRoot = "${finalAttrs.src.name}/internal/common-test-utils";
       # Include the test pdf/xml files etc. in the build output
       postPatch = ''
-        echo "graft src/test_data" > MANIFEST.in
+        echo "graft src/pyhanko_testing_commons/test_data" > MANIFEST.in
       '';
 
       build-system = [ setuptools ];

From 26a153f86f1595eb0937193d2eac8883075ef47b Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Fri, 27 Mar 2026 00:05:35 +0100
Subject: [PATCH 15/50] pyhanko-cli: 0.2.1 -> 0.3.1

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

diff --git a/pkgs/by-name/py/pyhanko-cli/package.nix b/pkgs/by-name/py/pyhanko-cli/package.nix
index b39dd5350d33..f8c4f0c37c45 100644
--- a/pkgs/by-name/py/pyhanko-cli/package.nix
+++ b/pkgs/by-name/py/pyhanko-cli/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyhanko-cli";
-  version = "0.2.1";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyhanko";
     tag = "pyhanko-cli/v${finalAttrs.version}";
-    hash = "sha256-UyJ9odchy63CcCkJVtBgraRQuD2fxqCciwLuhN4+8aw=";
+    hash = "sha256-ZBlkp6nhTKEAWxCPDq9NIoOullwWartpU3eL0QIGFpw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko-cli";

From 1bcb441b7b5bf7f645292c63e32e9b6d711d71d5 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 28 Mar 2026 14:52:13 +0100
Subject: [PATCH 16/50] iortcw: fix build

---
 pkgs/by-name/io/iortcw/sp.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/iortcw/sp.nix b/pkgs/by-name/io/iortcw/sp.nix
index 863f61dafdc2..2749778dea5e 100644
--- a/pkgs/by-name/io/iortcw/sp.nix
+++ b/pkgs/by-name/io/iortcw/sp.nix
@@ -19,10 +19,17 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "iortcw";
     repo = "iortcw";
-    rev = finalAttrs.version;
-    sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw";
+    tag = finalAttrs.version;
+    hash = "sha256-3F8JAEuPydufXqeOGwYCX0M8pEVRyFZAu2TUFxZ+vDw=";
   };
 
+  # Constexpr is a reserved keyword since C++11 that can't be overwritten. Replacing constexpr with
+  # const_expr is necessary in this case for the build to function.
+  postPatch = ''
+    substituteInPlace code/tools/lcc/src/{c.h,init.c,simp.c,stmt.c} \
+      --replace-fail 'constexpr' 'const_expr'
+  '';
+
   enableParallelBuilding = true;
 
   sourceRoot = "${finalAttrs.src.name}/SP";

From 99906e3539c9356dee2e4b1e3281baa40b8e1de5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 11:34:02 +0000
Subject: [PATCH 17/50] python3Packages.phonopy: 3.2.1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index f1e53c10f103..b178b881c0c1 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "phonopy";
-  version = "3.2.1";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "phonopy";
     repo = "phonopy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JSLwABXVYhGm9nb4W9M0AKCU98grBpfyHp5JB8KcIJc=";
+    hash = "sha256-pCBCZzVSthExY6NhmQKyGj7aFgvHLyztUToYGL4Y3Jo=";
   };
 
   postPatch = ''

From b283f04b18418a10398928f903b08e9c0f90201c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2026 00:50:38 +0000
Subject: [PATCH 18/50] python3Packages.copier: 9.14.0 -> 9.14.1

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index 832154aa05d6..d847937a3af8 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.14.0";
+  version = "9.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-ntPd0uJabePbgf4wvyG1WCmIYCjNyPaQIllNAkxExxo=";
+    hash = "sha256-9+GV+y6vgzsEkqIX3lJXJdwFrBxcKbTO1H6LtykIRac=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From f41372db10f7108c5e098b06be6a5b574fef12fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Fri, 3 Apr 2026 16:09:38 +0200
Subject: [PATCH 19/50] inventree: Init at 1.2.6

This is the package from https://github.com/NixOS/nixpkgs/pull/478011,
but with the following improvements:

- 1.2.6 instead of 1.1.0
- Django 5
- Python 3.13
- Build static assets in the package instead of the module
- Build translations
- Correct changelog
- Way more tests working now, the skipped ones now have comments
- Parallel tests
- Wrap in fake revision and date to prevent calls to git

Co-Authored-By: kurogeek <kurogeek@lmvhaus.com>
---
 pkgs/by-name/in/inventree/package.nix | 308 ++++++++++++++++++++++++++
 1 file changed, 308 insertions(+)
 create mode 100644 pkgs/by-name/in/inventree/package.nix

diff --git a/pkgs/by-name/in/inventree/package.nix b/pkgs/by-name/in/inventree/package.nix
new file mode 100644
index 000000000000..d43f84756647
--- /dev/null
+++ b/pkgs/by-name/in/inventree/package.nix
@@ -0,0 +1,308 @@
+{
+  fetchFromGitHub,
+  fetchYarnDeps,
+  lib,
+  nodejs,
+  python3,
+  python3Packages,
+  gettext,
+  stdenv,
+  yarnBuildHook,
+  yarnConfigHook,
+  yarnInstallHook,
+}:
+let
+
+  version = "1.2.6";
+  src = fetchFromGitHub {
+    owner = "inventree";
+    repo = "inventree";
+    tag = "${version}";
+    hash = "sha256-JJtjW0PAsGiDnM8vwqrSdDtO6QuzdVoyY4MeEyaSH4w=";
+  };
+
+  frontend =
+    let
+      frontendSource = src + "/src/frontend";
+    in
+    stdenv.mkDerivation (finalAttrs: {
+
+      pname = "inventree-frontend";
+      inherit version;
+
+      src = frontendSource;
+
+      yarnOfflineCache = fetchYarnDeps {
+        yarnLock = finalAttrs.src + "/yarn.lock";
+        hash = "sha256-tZHrl6NC4MGpmH7+Ge2V/y9FRNd9NdbQ/NreHE10b10=";
+      };
+
+      nativeBuildInputs = [
+        nodejs
+        yarnConfigHook
+        yarnBuildHook
+        yarnInstallHook
+      ];
+
+      buildPhase = ''
+        runHook preBuild
+
+        export PATH=$PATH:$TMP/frontend/node_modules/.bin
+        substituteInPlace $TMP/frontend/vite.config.ts --replace-fail "../../src/backend/InvenTree/web/static/web" out/static/web
+
+        npm run extract
+        npm run compile
+        npm run build
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out
+        mv out/static $out
+
+        runHook postInstall
+      '';
+    });
+in
+python3Packages.buildPythonApplication rec {
+  pname = "inventree";
+  pyproject = true;
+  inherit version src;
+
+  dependencies =
+    with python3Packages;
+    [
+      django
+      dj-rest-auth
+      django-allauth
+      django-cleanup
+      django-cors-headers
+      django-crispy-forms
+      django-dbbackup
+      django-error-report-2
+      django-filter
+      django-flags
+      django-formtools
+      django-ical
+      django-import-export
+      django-maintenance-mode
+      django-markdownify
+      django-money
+      django-mptt
+      django-mailbox
+      django-anymail
+      django-q2
+      django-redis
+      django-sesame
+      django-sql-utils
+      django-sslserver
+      django-stdimage
+      django-storages
+      django-structlog
+      django-taggit
+      django-oauth-toolkit
+      django-otp
+      django-user-sessions
+      django-weasyprint
+      standard-imghdr
+      django-xforwardedfor-middleware
+      djangorestframework-simplejwt
+      djangorestframework
+      drf-spectacular
+
+      bleach
+      cryptography
+      distutils
+      dulwich
+      feedparser
+      gunicorn
+      jinja2
+      pdf2image
+      pillow
+      pint
+      python-barcode
+      python-dotenv
+      qrcode
+      pytz
+      pyyaml
+      rapidfuzz
+      sentry-sdk
+      structlog
+      tablib
+      tinycss2
+      weasyprint
+      whitenoise
+      pypdf
+      ppf-datamatrix
+      psycopg2
+      mysqlclient
+      requests-mock
+
+      opentelemetry-api
+      opentelemetry-sdk
+      opentelemetry-exporter-otlp
+      opentelemetry-instrumentation-django
+      opentelemetry-instrumentation-requests
+      opentelemetry-instrumentation-redis
+      opentelemetry-instrumentation-sqlite3
+      opentelemetry-instrumentation-system-metrics
+      opentelemetry-instrumentation-wsgi
+    ]
+    ++ tablib.optional-dependencies.all
+    ++ tablib.optional-dependencies.xls
+    ++ tablib.optional-dependencies.xlsx
+    ++ djangorestframework-simplejwt.optional-dependencies.crypto
+    ++ django-anymail.optional-dependencies.amazon-ses
+    ++ django-allauth.optional-dependencies.socialaccount
+    ++ django-allauth.optional-dependencies.saml
+    ++ django-allauth.optional-dependencies.openid
+    ++ django-allauth.optional-dependencies.mfa;
+
+  build-system = [ python3Packages.setuptools ];
+  nativeBuildInputs = [ gettext ];
+
+  prePatch =
+    let
+      skippedCheckFunctions = [
+        # Tries to access github.com
+        "test_download_build_orders"
+        "test_download_csv"
+        "test_download_image"
+        "test_download_line_items"
+        "test_download_xlsx"
+        "test_task_check_for_updates"
+        "test_valid_url"
+        # Tries to access api.frankfurter.app
+        "test_rates"
+        "test_refresh_endpoint"
+        # Tries to use pip
+        "test_full_process"
+        "test_package_loading"
+        "test_plugin_install"
+        # Appears not to work under sqlite3
+        "test_users_exist"
+        # Wants to access git
+        "test_commit_info"
+        # TODO figure out why this fails
+        "test_setting_object"
+      ];
+      skippedFuncScripts = builtins.map (funcName: ''
+        grep -rlZ ${funcName} . | while IFS= read -r -d "" file; do
+          substituteInPlace "$file" --replace-fail "${funcName}" "skip_${funcName}"
+        done
+      '') skippedCheckFunctions;
+    in
+    ''
+      ${lib.concatStringsSep "\n" skippedFuncScripts}
+    '';
+
+  installPhase =
+    let
+      pythonPath = python3Packages.makePythonPath dependencies;
+    in
+    ''
+      runHook preInstall
+
+      # Don't need to bother with a non-maintained library from ages ago
+      substituteInPlace src/backend/InvenTree/InvenTree/settings.py --replace-fail "django_slowtests.testrunner.DiscoverSlowestTestsRunner" "django.test.runner.DiscoverRunner"
+
+      mkdir -p $out/lib/${pname}/src/backend/InvenTree/web/
+      cp -r src $out/lib/${pname}
+      ln -s ${frontend}/static $out/lib/${pname}/src/backend/InvenTree/web
+
+      chmod +x $out/lib/${pname}/src/backend/InvenTree/manage.py
+
+      makeWrapper $out/lib/${pname}/src/backend/InvenTree/manage.py $out/bin/${pname} \
+        --prefix PYTHONPATH : "${pythonPath}:$out/lib/${pname}/src/backend/InvenTree" \
+        --set INVENTREE_COMMIT_HASH abcdef \
+        --set INVENTREE_COMMIT_DATE 1970-01-01
+
+      makeWrapper ${lib.getExe python3Packages.gunicorn} $out/bin/gunicorn \
+        --prefix PYTHONPATH : "${pythonPath}:$out/${python3.sitePackages}":"${pythonPath}:$out/lib/${pname}/src/backend/InvenTree" \
+        --set INVENTREE_COMMIT_HASH abcdef \
+        --set INVENTREE_COMMIT_DATE 1970-01-01
+
+      # Generate static assets
+      pushd $out/lib/${pname}/src/backend/InvenTree &>/dev/null
+      export INVENTREE_STATIC_ROOT=$out/lib/inventree/static
+      export INVENTREE_MEDIA_ROOT=$(mktemp -d)
+      export INVENTREE_BACKUP_DIR=$(mktemp -d)
+      export INVENTREE_DB_ENGINE=django.db.backends.sqlite3
+      export INVENTREE_DB_NAME=inventree.db
+      export INVENTREE_SITE_URL="http://localhost:8000"
+      ${python3.interpreter} ./manage.py collectstatic --no-input
+
+      # Build translations
+      ${python3.interpreter} ./manage.py compilemessages
+      popd &>/dev/null
+
+      runHook postInstall
+    '';
+  doCheck = true;
+  env = {
+    DJANGO_SETTINGS_MODULE = "InvenTree.settings";
+  };
+
+  checkPhase = ''
+    runHook preCheck
+
+    tmpDir=$(mktemp -d)
+    mkdir -p $tmpDir/media
+    mkdir -p $tmpDir/.cache/fontconfig
+    export HOME=$tmpDir
+    export INVENTREE_DEBUG=True
+    export INVENTREE_STATIC_ROOT=$out/lib/inventree/static
+    export INVENTREE_MEDIA_ROOT=$tmpDir/media
+    export INVENTREE_BACKUP_DIR=$tmpDir
+    export INVENTREE_DB_ENGINE=django.db.backends.sqlite3
+    export INVENTREE_DB_NAME=inventree.db
+    export INVENTREE_SITE_URL="http://localhost:8000"
+    # test_date
+    export INVENTREE_COMMIT_HASH=abcdef
+    export INVENTREE_COMMIT_DATE=1970-01-01
+
+    export INVENTREE_PLUGINS_ENABLED=true
+    export INVENTREE_PLUGIN_TESTING=true
+    export INVENTREE_PLUGIN_TESTING_SETUP=true
+
+    pushd src/backend/InvenTree &>/dev/null
+    ${python3.interpreter} ./manage.py check
+    ${python3.interpreter} ./manage.py migrate
+    ${python3.interpreter} ./manage.py compilemessages
+
+    ${python3.interpreter} ./manage.py test --parallel --failfast
+    popd &>/dev/null
+
+    runHook postCheck
+  '';
+
+  nativeCheckInputs = with python3Packages; [
+    django-test-migrations
+    pytest-django
+    pytest-env
+    invoke
+    coverage
+    pdfminer-six
+    tblib
+    pytest
+  ];
+  passthru =
+    let
+      pythonPath = python3Packages.makePythonPath dependencies;
+    in
+    {
+      inherit frontend pythonPath;
+    };
+
+  meta = {
+    description = "Open Source Inventory Management System";
+    homepage = "https://inventree.org/";
+    changelog = "https://github.com/inventree/inventree/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "inventree";
+    maintainers = with lib.maintainers; [ kurogeek ];
+  };
+}

From 4b224eefdd48c31812d78cada05936471b891f02 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 24 Mar 2026 13:11:33 +0100
Subject: [PATCH 20/50] nixos/autossh-ng: more accurate systemd unit readiness

This is convenient e.g. if you have another process that wants
to use the connection; that can wait for the unit to become ready
instead of 'blindly' (re)trying the connection.
---
 nixos/modules/services/networking/autossh-ng.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/networking/autossh-ng.nix b/nixos/modules/services/networking/autossh-ng.nix
index 3eca98b2e25d..c7f4f52ebaab 100644
--- a/nixos/modules/services/networking/autossh-ng.nix
+++ b/nixos/modules/services/networking/autossh-ng.nix
@@ -105,6 +105,8 @@ in
           wantedBy = [ "multi-user.target" ];
 
           serviceConfig = {
+            Type = "notify";
+            NotifyAccess = "all";
             User = "${s.user}";
             # backoff would be nice, but doesn't automatically
             # get reset on successful start yet, so static 10s restart for now:
@@ -117,11 +119,16 @@ in
                     "-o \"UserKnownHostsFile=${s.knownHostsFile}\""
                   else
                     "-o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\"";
+                ready = pkgs.writers.writeBash "systemd-signal-ready" ''
+                  ${pkgs.systemd}/bin/systemd-notify --ready
+                '';
               in
               ''
                 ${pkgs.openssh}/bin/ssh \
                   -o "ServerAliveInterval 30" \
                   -o "ServerAliveCountMax 3" \
+                  -o "PermitLocalCommand=yes" \
+                  -o "LocalCommand ${ready}" \
                   -o ExitOnForwardFailure=yes \
                   ${hostKeyCheckOption} \
                   -N \

From 1759a2ccbdb06bfc479a8bcdd48e47e30efdca79 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 19 Mar 2026 15:48:26 +0100
Subject: [PATCH 21/50] onlyoffice-documentserver: 9.2.1 -> 9.3.1

---
 .../on/onlyoffice-documentserver/package.nix  | 16 ++--
 .../on/onlyoffice-documentserver/x2t.nix      | 86 ++++++++++++++-----
 2 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
index 03915fb061ee..7a300dd81102 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
@@ -19,13 +19,13 @@
 }:
 
 let
-  version = "9.2.1";
+  version = "9.3.1";
   x2t = callPackage ./x2t.nix { };
   server-src = fetchFromGitHub {
     owner = "ONLYOFFICE";
     repo = "server";
-    tag = "v9.2.1.1";
-    hash = "sha256-McG+PGL+ZmmnInuBhqVqMeX0o36/LbC0C5vQA1TDjO8=";
+    tag = "v9.3.1.1";
+    hash = "sha256-uN1L/4I7wrg0BqAAu3zdn8LqtdfJDAHnAMbCvzQnOvI=";
   };
   common = buildNpmPackage (finalAttrs: {
     name = "onlyoffice-server-Common";
@@ -51,7 +51,7 @@ let
     buildInputs = [
       vips.dev
     ];
-    npmDepsHash = "sha256-4t3wrO+Tt3bTRzmvB+tbVr5D3fXpn7CCU7+dNRc7xEo=";
+    npmDepsHash = "sha256-eD7hyeIcSL0nLcmBE5+gDJcjT+LdUaqIZ+g5sPcn8HQ=";
     npmFlags = [ "--loglevel=verbose" ];
     dontNpmBuild = true;
     postInstall = ''
@@ -68,7 +68,7 @@ let
 
     sourceRoot = "${finalAttrs.src.name}/FileConverter";
 
-    npmDepsHash = "sha256-JKZqbpVBNe6dwxsTg8WqlJAlAqOYmqm+LyWgIxpRb8k=";
+    npmDepsHash = "sha256-zGLZBbQYV2z0HgQKISKVhclRKbMB8RYEX13H0mB6qJw=";
 
     dontNpmBuild = true;
 
@@ -133,13 +133,13 @@ let
   # var/www/onlyoffice/documentserver/server/DocService/docservice
   onlyoffice-documentserver = stdenv.mkDerivation {
     pname = "onlyoffice-documentserver";
-    version = "9.2.1";
+    version = "9.3.1";
 
     src = fetchFromGitHub {
       owner = "ONLYOFFICE";
       repo = "document-server-package";
-      tag = "v9.2.1.13";
-      hash = "sha256-jyXSYkWu63vdeWsRm1Pl/3p3jRjasj0whzN0CytdHks=";
+      tag = "v9.3.1.11";
+      hash = "sha256-AUXOiI6yRjbkSyCFbqMchGba5wiwQOVl1ciFXuWUOd4=";
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
index bc9c76ea9bf2..26d1d20ea9db 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
@@ -50,21 +50,21 @@ let
     "QMAKE_LFLAGS+=-licudata"
     "QMAKE_LFLAGS+=-L${icu}/lib"
   ];
-  # see core/Common/3dParty/html/fetch.py
+  # see DocumentServer/core/Common/3dParty/html/fetch.py
   gumbo-parser-src = fetchFromGitHub {
     owner = "google";
     repo = "gumbo-parser";
     rev = "aa91b27b02c0c80c482e24348a457ed7c3c088e0";
     hash = "sha256-+607iXJxeWKoCwb490pp3mqRZ1fWzxec0tJOEFeHoCs=";
   };
-  # see core/Common/3dParty/html/fetch.sh
+  # see DocumentServer/core/Common/3dParty/html/fetch.py
   katana-parser-src = fetchFromGitHub {
     owner = "jasenhuang";
     repo = "katana-parser";
     rev = "be6df458d4540eee375c513958dcb862a391cdd1";
     hash = "sha256-SYJFLtrg8raGyr3zQIEzZDjHDmMmt+K0po3viipZW5c=";
   };
-  # see build_tools scripts/core_common/modules/googletest.py
+  # see build_tools/scripts/core_common/modules/googletest.py
   googletest-src = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
@@ -72,49 +72,49 @@ let
     hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ=";
   };
   # 'latest' version
-  # (see build_tools scripts/core_common/modules/hyphen.py)
+  # (see build_tools/scripts/core_common/modules/hyphen.py)
   hyphen-src = fetchFromGitHub {
     owner = "hunspell";
     repo = "hyphen";
     rev = "73dd2967c8e1e4f6d7334ee9e539a323d6e66cbd";
     hash = "sha256-WIHpSkOwHkhMvEKxOlgf6gsPs9T3xkzguD8ONXARf1U=";
   };
-  # core/Common/3dParty/md/fetch.py
+  # see DocumentServer/core/Common/3dParty/md/fetch.py
   md4c-src = fetchFromGitHub {
     owner = "mity";
     repo = "md4c";
     rev = "481fbfbdf72daab2912380d62bb5f2187d438408";
     hash = "sha256-zhInM3R0CJUqnzh6wRxMwlUdErovplbZQ5IwXe9XzZ4=";
   };
-  # core/Common/3dParty/apple/fetch.py
+  # see DocumentServer/core/Common/3dParty/apple/fetch.py
   glm-src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
     rev = "33b4a621a697a305bc3a7610d290677b96beb181";
     hash = "sha256-wwGI17vlQzL/x1O0ANr5+KgU1ETnATpLw3njpKfjnKQ=";
   };
-  # core/Common/3dParty/apple/fetch.py
+  # see DocumentServer/core/Common/3dParty/apple/fetch.py
   mdds-src = fetchFromGitHub {
     owner = "kohei-us";
     repo = "mdds";
     rev = "0783158939c6ce4b0b1b89e345ab983ccb0f0ad0";
     hash = "sha256-HMGMxMRO6SadisUjZ0ZNBGQqksNDFkEh3yaQGet9rc0=";
   };
-  # core/Common/3dParty/apple/fetch.py
+  # see DocumentServer/core/Common/3dParty/apple/fetch.py
   librevenge-src = fetchFromGitHub {
     owner = "DistroTech";
     repo = "librevenge";
     rev = "becd044b519ab83893ad6398e3cbb499a7f0aaf4";
     hash = "sha256-2YRxuMYzKvvQHiwXH08VX6GRkdXnY7q05SL05Vbn0Vs=";
   };
-  # core/Common/3dParty/apple/fetch.py
+  # see DocumentServer/core/Common/3dParty/apple/fetch.py
   libodfgen-src = fetchFromGitHub {
     owner = "DistroTech";
     repo = "libodfgen";
     rev = "8ef8c171ebe3c5daebdce80ee422cf7bb96aa3bc";
     hash = "sha256-Bv/smZFmZn4PEAcOlXD2Z4k96CK7A7YGDHFDsqZpuiE=";
   };
-  # core/Common/3dParty/apple/fetch.py
+  # see DocumentServer/core/Common/3dParty/apple/fetch.py
   libetonyek-src = fetchFromGitHub {
     owner = "LibreOffice";
     repo = "libetonyek";
@@ -127,14 +127,14 @@ let
 
   # x2t is not 'directly' versioned, so we version it after the version
   # of documentserver it's pulled into as a submodule
-  version = "9.2.1";
-  core-rev = "a22f0bfb6032e91f218951ef1c0fc29f6d1ceb36";
+  version = "9.3.1";
+  core-rev = "7043b3609328e917a4791aec8f3e8fca3225120f";
   core = fetchFromGitHub {
     owner = "ONLYOFFICE";
     repo = "core";
     # rev that the 'core' submodule in documentserver points at
     rev = core-rev;
-    hash = "sha256-RSoCRcUGnavcNdZEfmBdtxJbEXhiOvbA8IwSeGBkWcs=";
+    hash = "sha256-tCYc5R0dlEBoEaUo3DY6GCDJjoBZIaz8Syik0Z30s/s=";
   };
   # mini implementation of https://github.com/kentcdodds/cross-env
   # because that was not trivial to package and we don't need most
@@ -156,8 +156,8 @@ let
     subprocess.run(cmd, env=env)
   '';
   # rev that the 'web-apps' submodule in documentserver points at
-  web-apps-rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
-  web-apps-hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
+  web-apps-rev = "1c8ca9987876bada73c0bde21367da09c0e1ed83";
+  web-apps-hash = "sha256-1OniYHaf5kMVYJbEThkeuWfJPxaJoaYqiHaBTi/euAc=";
   web-apps-mobile = buildNpmPackage (finalAttrs: {
     name = "web-apps-mobile";
 
@@ -257,6 +257,12 @@ let
       # for device_scale.js
       chmod u+rwx ../..
       ln -s ${sdkjs.src} ../../sdkjs
+
+      echo "Merging and checking translation files"
+      cd ../translation
+      chmod u+rwx ../apps/*/main/locale/*
+      ${python3}/bin/python3 merge_and_check.py
+      cd -
     '';
 
     postBuild = ''
@@ -275,6 +281,9 @@ let
 
       mv ../deploy/web-apps $out
 
+      # e.g. formats@2.5x.svg
+      cp -r ../apps/common/main/resources/img/doc-formats/* $out/apps/common/main/resources/img/doc-formats
+
       for component in documenteditor spreadsheeteditor presentationeditor visioeditor; do
         ln -s ${web-apps-mobile}/$component/mobile/css $out/apps/$component/mobile/css
         rm -r $out/apps/$component/mobile/dist
@@ -291,8 +300,8 @@ let
       owner = "ONLYOFFICE";
       repo = "sdkjs";
       # rev that the 'sdkjs' submodule in documentserver points at
-      rev = "1e81e7e844fcc602c639067cce7d7726749dc11b";
-      hash = "sha256-9vDGU8paLUAk3GtLbawhog2EDtCVHzNPBjkryxyg6Gs=";
+      rev = "aa78926242b3da023255d9c7e9180e5a3294167b";
+      hash = "sha256-wZh4TH7+f1dr8sx2C3k3U8zRWLBxmKx8MocLBbPdhJA=";
     };
     sourceRoot = "${finalAttrs.src.name}/build";
 
@@ -465,6 +474,7 @@ let
       libheif.lib
       x265
       libde265
+      boost
     ];
     preConfigure = ''
       ln -s ${katana-parser-src} $BUILDRT/Common/3dParty/html/katana-parser
@@ -519,9 +529,6 @@ let
     buildInputs = [ boost ];
   };
   xlsformatlib = buildCoreComponent "MsBinaryFile/Projects/XlsFormatLib/Linux" {
-    patches = [
-      ./MsBinaryFile-pragma-regions.patch
-    ];
     buildInputs = [ boost ];
   };
   docformatlib = buildCoreComponent "MsBinaryFile/Projects/DocFormatLib/Linux" {
@@ -585,8 +592,25 @@ let
   odfformatlib = buildCoreComponent "OdfFile/Projects/Linux" {
     buildInputs = [ boost ];
   };
+  starmath = buildCoreComponent "OdfFile/Reader/Converter/StarMath2OOXML" {
+    buildInputs = [
+      kernel
+      boost
+    ];
+    preConfigure = ''
+      source ${fixIcu}
+    '';
+    passthru.tests = buildCoreTests "OdfFile/Reader/Converter/StarMath2OOXML/TestSMConverter" {
+      buildInputs = [ starmath ];
+      preConfigure = ''
+        source ${fixIcu}
+        ln -s ${googletest-src} $BUILDRT/Common/3dParty/googletest/googletest
+      '';
+    };
+  };
   hwpfile = buildCoreComponent "HwpFile" {
     buildInputs = [
+      starmath
       cryptopp
       kernel
       unicodeConverter
@@ -805,6 +829,26 @@ let
       '';
     };
   };
+  ooxmlsignature = buildCoreComponent "DesktopEditor/xmlsec/src" {
+    buildInputs = [
+      kernel
+    ];
+    preConfigure = ''
+      mkdir -p $BUILDRT/Common/3dParty/openssl/build/linux_64/lib
+      for i in ${openssl'.out}/lib/*; do
+        ln -s $i $BUILDRT/Common/3dParty/openssl/build/linux_64/lib/$(basename $i)
+      done
+    '';
+    passthru.tests = buildCoreTests "DesktopEditor/xmlsec/src/test" {
+      buildInputs = [
+        kernel
+        ooxmlsignature
+      ];
+      preConfigure = ''
+        source ${fixIcu}
+      '';
+    };
+  };
   allfontsgen = buildCoreComponent "DesktopEditor/AllFontsGen" {
     buildInputs = [
       unicodeConverter
@@ -906,6 +950,8 @@ buildCoreComponent "X2tConverter/build/Qt" {
     ofdfile
     vbaformatlib
     odfformatlib
+    starmath
+    ooxmlsignature
   ];
   qmakeFlags = qmakeFlags ++ icuQmakeFlags ++ [ "X2tConverter.pro" ];
   preConfigure = ''

From 321ba7833a3c07a36d62dd22e16588bf26455db5 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 5 Apr 2026 23:50:57 +0200
Subject: [PATCH 22/50] monero-gui: 0.18.4.5 -> 0.18.4.7

Diff: https://github.com/monero-project/monero-gui/compare/v0.18.4.5...v0.18.4.7
Changelog: https://github.com/monero-project/monero-gui/releases/tag/v0.18.4.7
---
 pkgs/by-name/mo/monero-gui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index efc61cd2ab54..824c0505a49e 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.5";
+  version = "0.18.4.7";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-K275qry6PWeEh3g0EofkD8E4pO5uWGFoAGzdkj9kuvA=";
+    hash = "sha256-22v4KwtmjIkeQXfMdxCQr6TUdAEih6xwtNPbuzpQDZk=";
   };
 
   nativeBuildInputs = [

From 5e164a2db6674d637aef369d9e0a4435787206df Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 5 Apr 2026 23:44:13 +0200
Subject: [PATCH 23/50] monero-cli: 0.18.4.5 -> 0.18.4.6

Changelog: https://github.com/monero-project/monero/releases/tag/v0.18.4.6
Diff: https://github.com/monero-project/monero/compare/v0.18.4.5...v0.18.4.6
---
 pkgs/by-name/mo/monero-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index b97182b23ccb..a1a1d5645f2c 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.5";
+  version = "0.18.4.6";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-8ObxMPBpH5uonpb7E/PEfuq++7R4MU0k1khsott5J88=";
+    hash = "sha256-A7EqamADbTyK6l26foSXfZLH94OUUMsgi7jdsKRubXU=";
   };
 
   patches = [

From bc3e028a7325a7ee8a2c503914330ce5bea38e0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Apr 2026 20:40:54 +0200
Subject: [PATCH 24/50] python3Packages.llama-index-llms-openai: 0.7.2 -> 0.7.5

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

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 3a41a6d30825..7fb50ab9bd57 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-llms-openai";
-  version = "0.7.2";
+  version = "0.7.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit (finalAttrs) version;
-    hash = "sha256-NnpHdp9jqfZi5uP6kCT/27Q0nXbWZ+zeTAaDYNzJ3oM=";
+    hash = "sha256-VBI+Z5p83cHy6WnyeKRlQFBzDa+EaRcxoMU64U/qw8c=";
   };
 
   build-system = [ hatchling ];

From 615c8be5346c66b3945429103e6cfd80b71ce245 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Mon, 6 Apr 2026 17:22:43 -0700
Subject: [PATCH 25/50] fsv: fix build with gcc15

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

diff --git a/pkgs/by-name/fs/fsv/package.nix b/pkgs/by-name/fs/fsv/package.nix
index 007d63be275d..5d3867bf044c 100644
--- a/pkgs/by-name/fs/fsv/package.nix
+++ b/pkgs/by-name/fs/fsv/package.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     libGLU
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   installPhase = ''
     runHook preInstall
 

From 6851838fa5c7a2b356aa9b072250dd60627f511b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 06:23:31 +0000
Subject: [PATCH 26/50] baresip: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index fcfa695e7097..e862f912a40f 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "4.6.0";
+  version = "4.7.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ikfSr9chbkv+5XPlDZKH/80N98tBzHvyNf29kENXOFI=";
+    hash = "sha256-IfzLwK6mDfMPug6vRfsOJwByP6LwGkefh8lBC75eVbU=";
   };
 
   patches = [

From b1c6c6e4630a49121c812a597662da1dc51c8d0f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Apr 2026 12:28:10 +0200
Subject: [PATCH 27/50] python3Packages.volkszaehler: 0.5.2 -> 0.6.0

Diff: https://github.com/home-assistant-ecosystem/python-volkszaehler/compare/0.5.2...0.6.0

Changelog: https://github.com/home-assistant-ecosystem/python-volkszaehler/releases/tag/0.6.0
---
 .../python-modules/volkszaehler/default.nix   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix
index 77795c554380..44bb651f2638 100644
--- a/pkgs/development/python-modules/volkszaehler/default.nix
+++ b/pkgs/development/python-modules/volkszaehler/default.nix
@@ -1,34 +1,34 @@
 {
   lib,
   aiohttp,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  hatchling,
+  pytest-asyncio,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "volkszaehler";
-  version = "0.5.2";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-volkszaehler";
     tag = version;
-    hash = "sha256-2XOV+Cft7xLIDNDpwNc+F8VasCYD8XEkxnwW0iS/p9U=";
+    hash = "sha256-DgsP3ol6VcOnoUJF1eQjNWR45SokElNosyfgvPZVihU=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
-  dependencies = [
-    aiohttp
-    async-timeout
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
   ];
 
-  # no tests are present
-  doCheck = false;
-
   pythonImportsCheck = [ "volkszaehler" ];
 
   meta = {

From 3d5c124e6844b24fd4a9ce2035990b4be076b0c5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Apr 2026 12:29:33 +0200
Subject: [PATCH 28/50] python3Packages.volkszaehler: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix
index 44bb651f2638..3ca540079395 100644
--- a/pkgs/development/python-modules/volkszaehler/default.nix
+++ b/pkgs/development/python-modules/volkszaehler/default.nix
@@ -8,7 +8,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "volkszaehler";
   version = "0.6.0";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-volkszaehler";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-DgsP3ol6VcOnoUJF1eQjNWR45SokElNosyfgvPZVihU=";
   };
 
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python module for interacting with the Volkszahler API";
     homepage = "https://github.com/home-assistant-ecosystem/python-volkszaehler";
-    changelog = "https://github.com/home-assistant-ecosystem/python-volkszaehler/releases/tag/${version}";
+    changelog = "https://github.com/home-assistant-ecosystem/python-volkszaehler/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From e50e0f953beef5ec450018422fa568f6df68052e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 12:29:17 +0000
Subject: [PATCH 29/50] sub-store-frontend: 2.16.30 -> 2.16.46

---
 pkgs/by-name/su/sub-store-frontend/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix
index 4b8dadac8dc7..0732de11ed1c 100644
--- a/pkgs/by-name/su/sub-store-frontend/package.nix
+++ b/pkgs/by-name/su/sub-store-frontend/package.nix
@@ -13,13 +13,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sub-store-frontend";
-  version = "2.16.30";
+  version = "2.16.46";
 
   src = fetchFromGitHub {
     owner = "sub-store-org";
     repo = "Sub-Store-Front-End";
     tag = finalAttrs.version;
-    hash = "sha256-D4oAW0H/yKPHSWAWNivlaONXC1e8zxj8Rluhk68c8q8=";
+    hash = "sha256-2E1g4QlakBKT8B81BYGjJMttutg02e2Azo2XVpbzkgM=";
   };
 
   nativeBuildInputs = [

From e6102d53fd0f64cee140782ef7ac176eef761afe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Apr 2026 13:08:32 +0000
Subject: [PATCH 30/50] sub-store: 2.21.64 -> 2.21.81

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

diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix
index 22593f5d06e7..74800cd0fe55 100644
--- a/pkgs/by-name/su/sub-store/package.nix
+++ b/pkgs/by-name/su/sub-store/package.nix
@@ -15,13 +15,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sub-store";
-  version = "2.21.64";
+  version = "2.21.81";
 
   src = fetchFromGitHub {
     owner = "sub-store-org";
     repo = "Sub-Store";
     tag = finalAttrs.version;
-    hash = "sha256-aCDGOCtIojNnPK33GWGhYKZMmByrC5ywjxr6QVlemrM=";
+    hash = "sha256-ERmNMStNVLXyNWQRQnAtvH2Y2kLU6jAi4tflCcHr4/w=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";

From 669ad0887eeb8882865fa304acb928c787518888 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:40:11 +0200
Subject: [PATCH 31/50] freefilesync: 14.8 -> 14.9

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

diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix
index 2465edb9a541..59b024995149 100644
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@@ -22,13 +22,13 @@
 let
   wxwidgets_3_3_1 = wxwidgets_3_3.overrideAttrs (
     finalAttrs: previousAttrs: {
-      version = "3.3.1";
+      version = "3.3.2";
       src = fetchFromGitHub {
         owner = "wxWidgets";
         repo = "wxWidgets";
         tag = "v${finalAttrs.version}";
         fetchSubmodules = true;
-        hash = "sha256-eYmZrh9lvDnJ3VAS+TllT21emtKBPAOhqIULw1dTPhk=";
+        hash = "sha256-UL1NuByKFGMQ/dhjuWRdnWTgdy4+1cD9pSls3e1mur8=";
       };
       patches = [
         ./wxcolorhook.patch
@@ -38,7 +38,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freefilesync";
-  version = "14.8";
+  version = "14.9";
 
   src = fetchurl {
     url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f "$out"
       tryDownload "$url" "$out"
     '';
-    hash = "sha256-vIvM6j4gDQcsRjgczQqxbV4XvDQECCLvuTflkebMFU8=";
+    hash = "sha256-TY41DJIvp7CNR8U12q2YUhiyHZuL9FcfLTVDQWTIfQA=";
   };
 
   sourceRoot = ".";

From 4ee1cb72377bcb5ca892d5f2483b4a10cf0814ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Apr 2026 20:13:05 +0200
Subject: [PATCH 32/50] python3Packages.hole: 0.9.0 -> 0.9.1

Diff: https://github.com/home-assistant-ecosystem/python-hole/compare/0.9.0...0.9.1

Changelog: https://github.com/home-assistant-ecosystem/python-hole/releases/tag/0.9.1
---
 .../python-modules/hole/default.nix           | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix
index aaf2ac24370c..f29a4ee3358f 100644
--- a/pkgs/development/python-modules/hole/default.nix
+++ b/pkgs/development/python-modules/hole/default.nix
@@ -3,30 +3,31 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
+  hatchling,
+  pytest-asyncio,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "hole";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-hole";
     tag = version;
-    hash = "sha256-yyqLbnW49R7f8C0IBL8z9Sq69TtaS5Ng2VQLJofNqcI=";
+    hash = "sha256-rIKb6GeULi2ooNtWD2a23JQxO9HkXiUYy0AroYeVeKU=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [ aiohttp ];
 
-  # Module has no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "hole" ];
 

From 84133f7f69f9621d102a83fdb933ac9d76bf10cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Apr 2026 20:19:26 +0200
Subject: [PATCH 33/50] python3Packages.hole: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix
index f29a4ee3358f..da6316841658 100644
--- a/pkgs/development/python-modules/hole/default.nix
+++ b/pkgs/development/python-modules/hole/default.nix
@@ -8,7 +8,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "hole";
   version = "0.9.1";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-hole";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-rIKb6GeULi2ooNtWD2a23JQxO9HkXiUYy0AroYeVeKU=";
   };
 
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python API for interacting with a Pihole instance";
     homepage = "https://github.com/home-assistant-ecosystem/python-hole";
-    changelog = "https://github.com/home-assistant-ecosystem/python-hole/releases/tag/${src.tag}";
+    changelog = "https://github.com/home-assistant-ecosystem/python-hole/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 3f8feba9c37b4aa9a8234bf9e07cc3aba57678e5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Apr 2026 23:12:29 +0200
Subject: [PATCH 34/50] python3Packages.iamdata: 0.1.202604061 -> 0.1.202604071

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202604061...v0.1.202604071

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202604071
---
 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 520c9740fe8b..f3bff8841552 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.202604061";
+  version = "0.1.202604071";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7lE6XsODQ3SbwMZdaHAu2kmJBWKRPgft+3jTxMRpEzo=";
+    hash = "sha256-jlzyncEWMY/XqoYkIAGwy+zv5gmHj+mBpMuRCApvakA=";
   };
 
   __darwinAllowLocalNetworking = true;

From 3c03adedfb19bbe1e911dd20086c54f41f24ad69 Mon Sep 17 00:00:00 2001
From: stefan <stefan.r.boca@gmail.com>
Date: Tue, 7 Apr 2026 15:57:14 -0700
Subject: [PATCH 35/50] python3Packages.cupy: drop dependency on cudnn

From cupy 14.0.0 release notes:
> All cuDNN-related functionality has been completely removed from CuPy.
  We recommend users who need to access cuDNN functionality from Python to
  consider using cuDNN Frontend instead.
---
 pkgs/development/python-modules/cupy/default.nix |  3 ---
 pkgs/top-level/python-packages.nix               | 16 +---------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 024c99843ba0..a1ebd8f5a3f9 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -22,8 +22,6 @@
 }:
 
 let
-  inherit (cudaPackages) cudnn;
-
   shouldUsePkg = lib.mapNullable (pkg: if pkg.meta.available or true then pkg else null);
 
   # some packages are not available on all platforms
@@ -106,7 +104,6 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs
 
   buildInputs = [
     cudatoolkit-joined
-    cudnn
     libcutensor
     nccl
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71574797509c..9d4062cdd287 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3396,21 +3396,7 @@ self: super: with self; {
 
   cuda-pathfinder = callPackage ../development/python-modules/cuda-pathfinder { };
 
-  cupy = callPackage ../development/python-modules/cupy {
-    cudaPackages =
-      # CuDNN 9 is not supported:
-      # https://github.com/cupy/cupy/issues/8215
-      # NOTE: cupy 14 will drop support for cuDNN entirely.
-      # https://github.com/cupy/cupy/pull/9326
-      let
-        version = if pkgs.cudaPackages.backendStdenv.hasJetsonCudaCapability then "8.9.5" else "8.9.7";
-      in
-      pkgs.cudaPackages.override (prevArgs: {
-        manifests = prevArgs.manifests // {
-          cudnn = pkgs._cuda.manifests.cudnn.${version};
-        };
-      });
-  };
+  cupy = callPackage ../development/python-modules/cupy { };
 
   curated-tokenizers = callPackage ../development/python-modules/curated-tokenizers { };
 

From 517e574a6e606a2731f8d2a7a5ed2eaff0c1c682 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 01:21:47 +0000
Subject: [PATCH 36/50] brltty: 6.9 -> 6.9.1

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

diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix
index 2eea370f19b7..5555b279bc15 100644
--- a/pkgs/by-name/br/brltty/package.nix
+++ b/pkgs/by-name/br/brltty/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brltty";
-  version = "6.9";
+  version = "6.9.1";
 
   src = fetchurl {
     url = "https://brltty.app/archive/brltty-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-KiWymWeI5RqRq++m23SJKnZYowqIbdBSrmffZ59FDaQ=";
+    sha256 = "sha256-gi3iyHtECf3wLWFU0bRoVsNTnT6onGWu80MPJ3Nnf3Y=";
   };
 
   depsBuildBuild = [ pkg-config ];

From 0fcfe80b0baf26911192f9c00bcd349da2b4a171 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Tue, 7 Apr 2026 19:58:26 -0700
Subject: [PATCH 37/50] python3Packages.webrtc-noise-gain: fix build

task_queue_base.h was missing a cstdint.h include.
---
 .../0001-fix-missing-cstdint-include.patch    | 24 +++++++++++++++++++
 .../webrtc-noise-gain/default.nix             |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/webrtc-noise-gain/0001-fix-missing-cstdint-include.patch

diff --git a/pkgs/development/python-modules/webrtc-noise-gain/0001-fix-missing-cstdint-include.patch b/pkgs/development/python-modules/webrtc-noise-gain/0001-fix-missing-cstdint-include.patch
new file mode 100644
index 000000000000..7417ae253e6f
--- /dev/null
+++ b/pkgs/development/python-modules/webrtc-noise-gain/0001-fix-missing-cstdint-include.patch
@@ -0,0 +1,24 @@
+From 54b34a4a58d305ad9f40aceaf333486bc4e59706 Mon Sep 17 00:00:00 2001
+From: Alex Martens <alex@thinglab.org>
+Date: Tue, 7 Apr 2026 19:56:25 -0700
+Subject: [PATCH] Fix missing cstdint include in task_queue_base.h
+
+---
+ .../webrtc-audio-processing-1/api/task_queue/task_queue_base.h   | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/webrtc-audio-processing/webrtc-audio-processing-1/api/task_queue/task_queue_base.h b/webrtc-audio-processing/webrtc-audio-processing-1/api/task_queue/task_queue_base.h
+index 90b1efd..7403ee9 100644
+--- a/webrtc-audio-processing/webrtc-audio-processing-1/api/task_queue/task_queue_base.h
++++ b/webrtc-audio-processing/webrtc-audio-processing-1/api/task_queue/task_queue_base.h
+@@ -11,6 +11,7 @@
+ #define API_TASK_QUEUE_TASK_QUEUE_BASE_H_
+ 
+ #include <memory>
++#include <cstdint>
+ 
+ #include "api/task_queue/queued_task.h"
+ #include "rtc_base/system/rtc_export.h"
+-- 
+2.53.0
+
diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
index 2e6cb401617d..1e670751958b 100644
--- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix
+++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
@@ -27,6 +27,10 @@ buildPythonPackage rec {
     hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY=";
   };
 
+  patches = [
+    ./0001-fix-missing-cstdint-include.patch
+  ];
+
   postPatch = with stdenv.hostPlatform.uname; ''
     # Configure the correct host platform for cross builds
     substituteInPlace setup.py --replace-fail \

From a0addf6a27787d3761b31dcb624a8f8d7b605c9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 03:56:05 +0000
Subject: [PATCH 38/50] home-assistant-custom-components.battery_notes: 3.4.0
 -> 3.4.1

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

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

From beaa7bc1f579a2d1676279328ae527f075a392e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 04:12:50 +0000
Subject: [PATCH 39/50] sentry-native: 0.13.4 -> 0.13.5

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index d959436a6ba5..377248dbbdaa 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sentry-native";
-  version = "0.13.4";
+  version = "0.13.5";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = finalAttrs.version;
-    hash = "sha256-8eRiLvwLDqAN8oZayJQ5jDXouXTi4PFb2HtHp0UHAg4=";
+    hash = "sha256-EXuSc1xpRwECrOHWLs2hT4VoRmF6x+lDCeu4J0ma5uQ=";
   };
 
   nativeBuildInputs = [

From 563249454d0a45ece81fb78a2f6f73ea4f7b206b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 8 Apr 2026 07:54:45 +0200
Subject: [PATCH 40/50] =?UTF-8?q?ocamlPackages.lwt=5Feio:=200.5.1=20?=
 =?UTF-8?q?=E2=86=92=200.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/lwt_eio/default.nix         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix
index c84d716c507f..d7bc05f2b648 100644
--- a/pkgs/development/ocaml-modules/lwt_eio/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix
@@ -2,35 +2,35 @@
   lib,
   buildDunePackage,
   fetchurl,
-  fetchpatch,
   eio,
   lwt,
 }:
-buildDunePackage rec {
+
+buildDunePackage (finalAttrs: {
   pname = "lwt_eio";
-  version = "0.5.1";
+  version = if lib.versionAtLeast lwt.version "6.0.0" then "0.6" else "0.5.1";
 
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
-    hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE=";
+    url = "https://github.com/ocaml-multicore/lwt_eio/releases/download/v${finalAttrs.version}/lwt_eio-${finalAttrs.version}.tbz";
+    hash =
+      {
+        "0.5.1" = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE=";
+        "0.6" = "sha256-6xyIQyMRUE5Q+FQCzAkvaXZqqo8LSFzG6U1A7GZwSLw=";
+      }
+      ."${finalAttrs.version}";
   };
 
-  patches = lib.optional (lib.versionAtLeast lwt.version "6.0.0") (fetchpatch {
-    url = "https://github.com/ocaml-multicore/lwt_eio/commit/5f8bf1e7af33590683ee45151894d7b9a20607f0.patch";
-    hash = "sha256-5A3Bh+xOXo79Rw145hYqYv42li30M0TKLW+qu/dC0KQ=";
-  });
-
   propagatedBuildInputs = [
     eio
     lwt
   ];
 
   meta = {
-    homepage = "https://github.com/ocaml-multicore/${pname}";
-    changelog = "https://github.com/ocaml-multicore/${pname}/raw/v${version}/CHANGES.md";
+    homepage = "https://github.com/ocaml-multicore/lwt_eio";
+    changelog = "https://github.com/ocaml-multicore/lwt_eio/raw/v${finalAttrs.version}/CHANGES.md";
     description = "Use Lwt libraries from within Eio";
     license = with lib.licenses; [ isc ];
   };
-}
+})

From bb8b3fa5f27b88662b2535348864c9edd45bdefc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 8 Apr 2026 05:57:43 +0000
Subject: [PATCH 41/50] python3Packages.mmengine: add missing test dependency,
 skip failing tests

---
 .../python-modules/mmengine/default.nix       | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index aa4907f3482d..dcede7e2c76c 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -27,11 +27,12 @@
   mlflow,
   parameterized,
   pytestCheckHook,
+  torchvision,
   transformers,
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mmengine";
   version = "0.10.7";
   pyproject = true;
@@ -39,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmengine";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hQnwenuxHQwl+DwQXbIfsKlJkmcRvcHV1roK7q2X1KA=";
   };
 
@@ -63,7 +64,7 @@ buildPythonPackage rec {
       substituteInPlace setup.py \
         --replace-fail \
           "return locals()['__version__']" \
-          "return '${version}'"
+          "return '${finalAttrs.version}'"
     ''
     + ''
       substituteInPlace tests/test_config/test_lazy.py \
@@ -94,6 +95,7 @@ buildPythonPackage rec {
     mlflow
     parameterized
     pytestCheckHook
+    torchvision
     transformers
     writableTmpDirAsHomeHook
   ];
@@ -172,6 +174,23 @@ buildPythonPackage rec {
     # AssertionError: os is not <module 'os' (frozen)>
     "test_lazy_module"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # RuntimeError: Failed to initialize cpuinfo!
+    "test_to_device_and_dtype_00_cpu"
+    "test_to_device_and_dtype_01_cpu"
+    "test_to_device_and_dtype_02_cpu"
+    "test_to_device_and_dtype_09_cpu"
+    "test_to_device_and_dtype_10_cpu"
+    "test_to_device_and_dtype_11_cpu"
+    "test_to_device_and_dtype_12"
+    "test_to_device_and_dtype_13"
+    "test_to_device_and_dtype_14"
+    "test_to_device_and_dtype_21"
+    "test_to_device_and_dtype_22"
+    "test_to_device_and_dtype_23"
+    "test_to_dtype_0"
+    "test_to_dtype_3"
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Fails when max-jobs is set to use fewer processes than cores
     # for example `AssertionError: assert 14 == 4`
@@ -184,8 +203,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library for training deep learning models based on PyTorch";
     homepage = "https://github.com/open-mmlab/mmengine";
-    changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}";
+    changelog = "https://github.com/open-mmlab/mmengine/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ rxiao ];
   };
-}
+})

From c9f4e568fceecda214bb5fcce67ae656d918ee6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 06:51:25 +0000
Subject: [PATCH 42/50] pocket-casts: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index b547df3e40f2..4c598c7e666e 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -12,16 +12,16 @@ let
 in
 buildNpmPackage rec {
   pname = "pocket-casts";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
     rev = "v${version}";
-    hash = "sha256-SsPTNNxC5gXXDpwU7BWjY4+K1Ve3DnzxAYk1H2+VmK0=";
+    hash = "sha256-niVS3rfQetc2GPQCFxpQo+mCxSHAQaWAi2pU0kApxyM=";
   };
 
-  npmDepsHash = "sha256-w4Y/RDmoWygowaQvnKiI37lwCBE5zdOtgkv6TM2qR9A=";
+  npmDepsHash = "sha256-iLSnXGXbeHA5JuR6WFHlP9cgmmX6/S+1mIEzDjb45w0=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From bf785734fb7ee6b515c03422a35ab4551ce1d825 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 7 Apr 2026 14:55:47 +0200
Subject: [PATCH 43/50] dnsdist: 2.0.2 -> 2.0.3

---
 pkgs/by-name/dn/dnsdist/package.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix
index 8af9f1347384..78cad5c3b163 100644
--- a/pkgs/by-name/dn/dnsdist/package.nix
+++ b/pkgs/by-name/dn/dnsdist/package.nix
@@ -1,10 +1,8 @@
 {
   boost,
   cargo,
-  fetchpatch,
   fetchurl,
   fstrm,
-  h2o,
   lib,
   libbpf,
   libcap,
@@ -28,22 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnsdist";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
-    hash = "sha256-M3Trplpco8+5/Fl5HEflA1FJ/lIcy7ztX4NKF/RWQb8=";
+    hash = "sha256-oiklC4GcQNVRc6+nIC7x7yprco+Fx1Bol6Hxymq1cUk=";
   };
 
-  patches = [
-    # Fix build error when only protobuf is enabled
-    (fetchpatch {
-      url = "https://github.com/PowerDNS/pdns/commit/daece82818d7f83b26dcf724ec1864644bc3f854.patch";
-      hash = "sha256-Ag65Gjmm2m4yvRfqMjSo1EEJg/2EHWDBg15vSL5DKCU=";
-      stripLen = 2;
-    })
-  ];
-
   nativeBuildInputs = [
     cargo
     pkg-config
@@ -52,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pyyaml
     rustPlatform.cargoSetupHook
   ];
+
   buildInputs = [
     boost
     fstrm # Required for DNSTAP
-    h2o
     libbpf
     libcap
     libedit
@@ -91,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) cargoRoot src;
-    hash = "sha256-nDAvgM3xb+95dcGIHiSKlFo4/0Rs5Evf1vvR5vF4MXs=";
+    hash = "sha256-OU24ahqFc4DivCpO451rsHV8rofyHv+LnLgkVsFPMG4=";
   };
 
   cargoRoot = "dnsdist-rust-lib/rust";

From b61d633d070fae26bd3aebb7e4ffe388f47384d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 08:36:14 +0000
Subject: [PATCH 44/50] ft2-clone: 2.13 -> 2.14

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

diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix
index 977bd9b44dff..b5ea594b1c1f 100644
--- a/pkgs/by-name/ft/ft2-clone/package.nix
+++ b/pkgs/by-name/ft/ft2-clone/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ft2-clone";
-  version = "2.13";
+  version = "2.14";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ieu7dxNEPz2DVKTfo2sitvtvAeKMCu3EiF6/PKrgETs=";
+    hash = "sha256-JfATinxTuc8SCdLPxTwY/NL05UP34k5gFpcurI2TG1U=";
   };
 
   nativeBuildInputs = [ cmake ];

From 8a989d94ee5133114cc117361d5130bbe660f3cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 08:48:08 +0000
Subject: [PATCH 45/50] snipe-it: 8.4.0 -> 8.4.1

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

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 43d02273715d..3040580084b4 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -12,16 +12,16 @@ let
 in
 php.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.4.0";
+  version = "8.4.1";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W4tqJOuC1Wrg/QA9MKVw+CLbmbTq03fBWRvUo8QT4+0=";
+    hash = "sha256-SSz0bFhspS3c5z0+mpub6gIqiMwzJ/5YfzPs9NdClCo=";
   };
 
-  vendorHash = "sha256-hz9FhWwqk32XJsyPCDewQPM744btLiqZN9u9Fg6r6Ow=";
+  vendorHash = "sha256-crHl0CU5nf1SuXWf2O4tDLiNW1T7ku5cfNXjeNE6bDw=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 8d012e30b6a570a6be36867f0f8a0377414435af Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Wed, 8 Apr 2026 10:56:51 +0200
Subject: [PATCH 46/50] ocamlPackages.linol: 0.10 -> 0.11

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

diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
index 60668a60d1d3..b478f85bcebd 100644
--- a/pkgs/development/ocaml-modules/linol/default.nix
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -10,7 +10,7 @@
 
 buildDunePackage (finalAttrs: {
   pname = "linol";
-  version = "0.10";
+  version = "0.11";
 
   minimalOCamlVersion = "4.14";
 
@@ -18,7 +18,7 @@ buildDunePackage (finalAttrs: {
     owner = "c-cube";
     repo = "linol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G/5nTJd+MxPgNObKW2Hmmwn4HejQ81c3f4oVXjpNSZg=";
+    hash = "sha256-9n610J62IPUXYQ/u+WjGTtowYFKQ45wE8M7UkLdEKVM=";
   };
 
   propagatedBuildInputs = [

From 821d2d033dbec111fa32921ca6a24f58e510f330 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 09:05:39 +0000
Subject: [PATCH 47/50] snip: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/by-name/sn/snip/package.nix b/pkgs/by-name/sn/snip/package.nix
index 26aa8bf0636f..1ec50d9473e8 100644
--- a/pkgs/by-name/sn/snip/package.nix
+++ b/pkgs/by-name/sn/snip/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "snip";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "edouard-claude";
     repo = "snip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-95CHMKE894IkQONvVKO44/9bEfXzJrNRV+iVIVRx8TA=";
+    hash = "sha256-af27LOFlUxMrLFjubeTTcdGYZtU86MJlVpoDgJnjTtg=";
   };
 
   vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY=";

From 24c6ca86187114ffbb9ccc1327b0592fb48ccdf7 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Wed, 8 Apr 2026 10:59:55 +0200
Subject: [PATCH 48/50] odoo18: switch to pypdf

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

diff --git a/pkgs/by-name/od/odoo18/package.nix b/pkgs/by-name/od/odoo18/package.nix
index af443693db23..239e06fd092c 100644
--- a/pkgs/by-name/od/odoo18/package.nix
+++ b/pkgs/by-name/od/odoo18/package.nix
@@ -35,6 +35,8 @@ python.pkgs.buildPythonApplication rec {
     }"
   ];
 
+  pythonRemoveDeps = [ "PyPDF2" ];
+
   build-system = with python.pkgs; [
     setuptools
     distutils
@@ -57,6 +59,7 @@ python.pkgs.buildPythonApplication rec {
     jinja2
     libsass
     lxml
+    lxml-html-clean
     markupsafe
     num2words
     ofxparse
@@ -68,7 +71,7 @@ python.pkgs.buildPythonApplication rec {
     psycopg2
     pydot
     pyopenssl
-    pypdf2
+    pypdf
     pyserial
     python-dateutil
     python-ldap

From efbaa29639d7fbce89863b075ad5d3e6c7b29bcb Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Wed, 8 Apr 2026 11:22:33 +0200
Subject: [PATCH 49/50] calibre-web: orphan

I'm no longer using calibre-web and don't have capacity to maintain it.
---
 nixos/modules/services/web-apps/calibre-web.nix | 2 +-
 pkgs/by-name/ca/calibre-web/package.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix
index 5eb2d452f79f..3813c8027cb0 100644
--- a/nixos/modules/services/web-apps/calibre-web.nix
+++ b/nixos/modules/services/web-apps/calibre-web.nix
@@ -250,5 +250,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pborzenkov ];
+  meta.maintainers = [ ];
 }
diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 6dd202176fd7..0c2cd0fa6729 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -154,7 +154,7 @@ python3Packages.buildPythonApplication rec {
     # changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
     changelog = "https://github.com/janeczku/calibre-web/compare/0.6.26...${src.rev}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ pborzenkov ];
+    maintainers = [ ];
     mainProgram = "calibre-web";
     platforms = lib.platforms.all;
   };

From c20859229dea656bdfb4ea0882d2e38568b4f39d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 11:23:58 +0000
Subject: [PATCH 50/50] sandbox-runtime: 0.0.44 -> 0.0.49

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

diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix
index db0480f2b5aa..c5455d952375 100644
--- a/pkgs/by-name/sa/sandbox-runtime/package.nix
+++ b/pkgs/by-name/sa/sandbox-runtime/package.nix
@@ -17,13 +17,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sandbox-runtime";
-  version = "0.0.44";
+  version = "0.0.49";
 
   src = fetchFromGitHub {
     owner = "anthropic-experimental";
     repo = "sandbox-runtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2yso4x2bsjMD4ij8Lp23dm61zQp+cdDMvsrMjiGKxo8=";
+    hash = "sha256-1QwUOtgOYcVm61nLCeQL46O/+G/LyXSv+ZnC3la2Ajc=";
   };
 
   postPatch =
@@ -35,7 +35,7 @@ buildNpmPackage (finalAttrs: {
 
   strictDeps = true;
 
-  npmDepsHash = "sha256-7vZYKkIknGaVSDiFikDLzpd9aNdRLnaiq8GT0chOhUk=";
+  npmDepsHash = "sha256-YAzekNE9lOEMRaaGqLdpXMXgqh4kfGp4CF54ShS3xwA=";
 
   postFixup =
     let