From fb957e8b7c0086c232efc03548d2342d134bec2c Mon Sep 17 00:00:00 2001
From: "toporiame." <popply.soma@gmail.com>
Date: Sun, 24 May 2026 20:19:02 +0200
Subject: [PATCH 01/76] doc: on overriding and excluding packages from TeX Live
 collections

Document a method to override package or collection dependencies with texlive.withPackages

Co-authored-by: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
---
 doc/languages-frameworks/texlive.section.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index f380cc4c5a92..391cb48633c3 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -32,6 +32,21 @@ There is a TeX Live packaging that lives entirely under attribute `texlive`.
   )
   ```
 
+- Packages can be overriden by passing a new package with the same `pname` to `.withPackages`. For instance, the following replaces Asymptote with the version from Nixpkgs, which is usually more up to date:
+  ```nix
+  texliveMedium.withPackages (ps: [ asymptote ])
+  ```
+
+- To exclude a package from a collection, use an empty override as below:
+  ```nix
+  texliveBasic.withPackages (
+    ps: with ps; [
+      collection-bibtexextra
+      { pname = "bib2gls"; }
+    ]
+  )
+  ```
+
 - To add the documentation for all packages in the environment, use
   ```nix
   texliveSmall.overrideAttrs { withDocs = true; }

From 2186fb955e88654f4f3b866405d06a588381719a Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 14 Jun 2026 22:53:58 +0200
Subject: [PATCH 02/76] python3Packages.gibberish-detector: use finalAttrs

---
 .../python-modules/gibberish-detector/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index 9b432d32c042..fbc36e15e528 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -5,7 +5,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gibberish-detector";
   version = "0.1.1";
   format = "setuptools";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "domanchi";
     repo = "gibberish-detector";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
   };
 
@@ -28,4 +28,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 592bc72109e2877d0bb96752ff58c9b22a6afc10 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 14 Jun 2026 22:54:56 +0200
Subject: [PATCH 03/76] python3Packages.gibberish-detector: enable
 __structuredAttrs

---
 pkgs/development/python-modules/gibberish-detector/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index fbc36e15e528..9f9f04f2bf53 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage (finalAttrs: {
   version = "0.1.1";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "domanchi";
     repo = "gibberish-detector";

From 053b78277da4a9af0c2e801dc77a015f35006b36 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 14 Jun 2026 22:56:12 +0200
Subject: [PATCH 04/76] python3Packages.gibberish-detector: migrate to
 pyproject

---
 .../python-modules/gibberish-detector/default.nix            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index 9f9f04f2bf53..6a0bf85180c2 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -3,12 +3,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "gibberish-detector";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -19,6 +20,8 @@ buildPythonPackage (finalAttrs: {
     sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "gibberish_detector" ];

From 4c89d8ceedf2c6c854ee67e332b55f60c5822d4e Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Tue, 23 Jun 2026 01:38:22 +0900
Subject: [PATCH 05/76] perlPackages.FinanceQuote: 1.68 -> 1.70

Changelog: https://github.com/finance-quote/finance-quote/releases/tag/v1.70
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5b7a40a4a6dc..de7181d871ec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14308,10 +14308,10 @@ with self;
 
   FinanceQuote = buildPerlPackage rec {
     pname = "Finance-Quote";
-    version = "1.68";
+    version = "1.70";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
-      hash = "sha256-MuyDh8qZZr/iTob1TiR/mgt9d5mrwADM+k8oI6+iREE=";
+      hash = "sha256-XxrIe3j3b8nDAT2PRi1BpMuKDKCLqvnhvu3Fw7j0eRU=";
     };
     buildInputs = [
       DateManip

From 3a768809c6b274da633246a4735ff9e63c200cd4 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Sun, 28 Jun 2026 18:29:21 +0100
Subject: [PATCH 06/76] texlive: make overlaying texlive.pkgs possible

---
 .../typesetting/tex/texlive/build-tex-env.nix | 18 ++++++------
 .../tex/texlive/combine-wrapper.nix           |  4 +--
 .../tools/typesetting/tex/texlive/default.nix | 16 ++++++-----
 .../tex/texlive/tlpdb-overrides.nix           | 28 +++++++++----------
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index dc98b0a64297..7cb7b5668850 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -1,6 +1,6 @@
 {
   # texlive package set
-  tl,
+  pkgs,
 
   tlpdbVersion,
 
@@ -55,7 +55,7 @@ lib.fix (
         # resolve dependencies of the packages that affect the runtime
         all =
           let
-            packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages tl);
+            packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages pkgs);
             runtime = builtins.partition (
               p:
               p.outputSpecified or false
@@ -72,7 +72,7 @@ lib.fix (
               inherit p;
               tlDeps =
                 if p ? tlDeps then
-                  (if builtins.isFunction p.tlDeps then p.tlDeps tl else ensurePkgSets p.tlDeps)
+                  (if builtins.isFunction p.tlDeps then p.tlDeps pkgs else ensurePkgSets p.tlDeps)
                 else
                   [ ];
             };
@@ -214,13 +214,13 @@ lib.fix (
 
         # mktexlsr
         nativeBuildInputs = [
-          tl.texlive-scripts # for mktexlsr.pl with --sort support
+          pkgs.texlive-scripts # for mktexlsr.pl with --sort support
           perl
         ];
 
         postBuild = # generate ls-R database
           ''
-            perl ${tl.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out"
+            perl ${pkgs.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out"
           '';
       };
 
@@ -269,7 +269,7 @@ lib.fix (
           + lib.concatMapStringsSep "\n - " (
             p:
             p.pname + (lib.optionalString (p.outputSpecified or false) " (${p.tlOutputName or p.outputName})")
-          ) (finalAttrs.passthru.requiredTeXPackages tl);
+          ) (finalAttrs.passthru.requiredTeXPackages pkgs);
       };
 
       # other outputs
@@ -479,9 +479,9 @@ lib.fix (
         nativeBuildInputs = [
           makeWrapper
           libfaketime
-          tl."texlive.infra" # mktexlsr
-          tl.texlive-scripts # fmtutil, updmap
-          tl.texlive-scripts-extra # texlinks
+          pkgs."texlive.infra" # mktexlsr
+          pkgs.texlive-scripts # fmtutil, updmap
+          pkgs.texlive-scripts-extra # texlinks
           perl
         ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
index e0ed2bc8f1fa..2117f2a5d41f 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
@@ -2,7 +2,7 @@
 {
   lib,
   toTLPkgList,
-  tl,
+  pkgs,
   buildTeXEnv,
 }:
 args@{
@@ -49,7 +49,7 @@ let
         operator =
           { pkg, ... }:
           pkgListToSets (
-            if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps tl else pkg.tlDeps else [ ]
+            if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps pkgs else pkg.tlDeps else [ ]
           );
       }
     );
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 092d41f98e5e..397ac2a9e8bf 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -46,6 +46,7 @@
   nixfmt,
   luajit,
   texinfo,
+  texlive,
   # for bin.nix
   gnum4,
   jdk_headless,
@@ -73,7 +74,6 @@
   unzip,
   fetchFromGitHub,
   buildPackages,
-  texlive,
   zlib,
   libiconv,
   libpng,
@@ -99,6 +99,7 @@ let
   overriddenTlpdb =
     let
       overrides = import ./tlpdb-overrides.nix {
+        inherit (texlive) pkgs;
         inherit
           stdenv
           lib
@@ -106,7 +107,6 @@ let
           bin
           tlpdb
           tlpdbxz
-          tl
           installShellFiles
           coreutils
           findutils
@@ -226,13 +226,15 @@ let
         inherit mirrors pname;
         fixedHashes = fixedHashes."${pname}-${toString revision}${extraRevision}" or { };
       }
-      // lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n} or bin.${n}) (args.deps or [ ]); }
+      // lib.optionalAttrs (args ? deps) {
+        deps = map (n: texlive.pkgs.${n} or bin.${n}) (args.deps or [ ]);
+      }
     )
   ) overriddenTlpdb;
 
   # function for creating a working environment
   buildTeXEnv = import ./build-tex-env.nix {
-    inherit tl;
+    inherit (texlive) pkgs;
     inherit tlpdbVersion;
     ghostscript = ghostscript_headless;
     inherit
@@ -260,7 +262,7 @@ let
       drvWithoutDeps = removeAttrs drv [ "tlDeps" ];
       drvWithDeps =
         if (drv ? tlDeps) then
-          drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps tl else drv.tlDeps; }
+          drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps texlive.pkgs else drv.tlDeps; }
         else
           drv;
     in
@@ -320,10 +322,10 @@ let
   # function for creating a working environment from a set of TL packages
   # now a legacy wrapper around buildTeXEnv
   combine = import ./combine-wrapper.nix {
+    inherit (texlive) pkgs;
     inherit
       buildTeXEnv
       lib
-      tl
       toTLPkgList
       ;
   };
@@ -667,7 +669,7 @@ allPkgLists
     bin
     // {
       # for backward compatibility
-      latexindent = tl.latexindent;
+      latexindent = texlive.pkgs.latexindent;
     };
 
   combine =
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index 2eb1eec2366f..58131679d0a8 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -5,7 +5,7 @@
   tlpdb,
   bin,
   tlpdbxz,
-  tl,
+  pkgs,
   installShellFiles,
   coreutils,
   findutils,
@@ -253,9 +253,9 @@ lib.recursiveUpdate orig rec {
 
   context.binlinks = {
     context = "luametatex";
-    "context.lua" = tl.context.tex + "/scripts/context/lua/context.lua";
+    "context.lua" = pkgs.context.tex + "/scripts/context/lua/context.lua";
     mtxrun = "luametatex";
-    "mtxrun.lua" = tl.context.tex + "/scripts/context/lua/mtxrun.lua";
+    "mtxrun.lua" = pkgs.context.tex + "/scripts/context/lua/mtxrun.lua";
   };
 
   dvipdfmx.binlinks = {
@@ -269,10 +269,10 @@ lib.recursiveUpdate orig rec {
 
   # TODO: handle symlinks in bin.core
   ptex.binlinks = {
-    pbibtex = tl.uptex.out + "/bin/upbibtex";
-    pdvitype = tl.uptex.out + "/bin/updvitype";
-    ppltotf = tl.uptex.out + "/bin/uppltotf";
-    ptftopl = tl.uptex.out + "/bin/uptftopl";
+    pbibtex = pkgs.uptex.out + "/bin/upbibtex";
+    pdvitype = pkgs.uptex.out + "/bin/updvitype";
+    ppltotf = pkgs.uptex.out + "/bin/uppltotf";
+    ptftopl = pkgs.uptex.out + "/bin/uptftopl";
   };
 
   texdef.binlinks = {
@@ -281,7 +281,7 @@ lib.recursiveUpdate orig rec {
 
   texlive-scripts.binlinks = {
     mktexfmt = "fmtutil";
-    texhash = tl."texlive.infra".out + "/bin/mktexlsr";
+    texhash = pkgs."texlive.infra".out + "/bin/mktexlsr";
   };
 
   texlive-scripts-extra.binlinks = {
@@ -309,7 +309,7 @@ lib.recursiveUpdate orig rec {
   '';
 
   context-legacy.postFixup = ''
-    sed -i 's!File.dirname(\$0)!'"'"'${tl.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
+    sed -i 's!File.dirname(\$0)!'"'"'${pkgs.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
   '';
 
   cyrillic-bin.postFixup = ''
@@ -476,7 +476,7 @@ lib.recursiveUpdate orig rec {
 
   # find files in source container, fix incompatibilities with snobol4
   texaccents.postFixup = ''
-    sed -i '1s!$! -I${tl.texaccents.texsource}/source/support/texaccents!' "$out"/bin/*
+    sed -i '1s!$! -I${pkgs.texaccents.texsource}/source/support/texaccents!' "$out"/bin/*
   '';
   texaccents.postUnpack = ''
     if [[ -f "$out"/source/support/texaccents/grepl.inc ]] ; then
@@ -586,7 +586,7 @@ lib.recursiveUpdate orig rec {
         mkdir -p support/texdoc
         touch support/texdoc/NEWS
 
-        TEXMFCNF="${tl.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \
+        TEXMFCNF="${pkgs.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \
           "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \
           -c texlive_tlpdb=texlive.tlpdb -lM texdoc
 
@@ -596,7 +596,7 @@ lib.recursiveUpdate orig rec {
 
     # install zsh completion
     postFixup = ''
-      TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \
+      TEXMFCNF="${pkgs.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \
         texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc
       installShellCompletion --zsh "$TMPDIR"/_texdoc
     '';
@@ -618,7 +618,7 @@ lib.recursiveUpdate orig rec {
       coreutils
       gnused
       gnupg
-      tl.kpathsea
+      pkgs.kpathsea
       (perl.withPackages (ps: with ps; [ Tk ]))
     ];
 
@@ -631,7 +631,7 @@ lib.recursiveUpdate orig rec {
         lib.makeBinPath [
           coreutils
           gnused
-          tl.kpathsea
+          pkgs.kpathsea
         ]
       }''${PATH:+:$PATH}"' "$out"/bin/mktexlsr
     '';

From d95b729be2c8b3da9f7e28f90843c76e9cb45ed4 Mon Sep 17 00:00:00 2001
From: utopiatopia <98685984+utopiatopia@users.noreply.github.com>
Date: Tue, 23 Jun 2026 04:14:12 -0700
Subject: [PATCH 07/76] auto-editor: 30.4.0 -> 31.0.0

---
 pkgs/by-name/au/auto-editor/package.nix | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index e260967f09ce..e4f4af57f247 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -1,7 +1,5 @@
 {
   lib,
-  stdenv,
-  config,
   buildNimPackage,
   fetchFromGitHub,
 
@@ -9,9 +7,9 @@
   yt-dlp,
   lame,
   libopus,
-  libvpx,
   x264,
   dav1d,
+  zlib,
 
   python3,
   python3Packages,
@@ -19,13 +17,13 @@
 
 buildNimPackage rec {
   pname = "auto-editor";
-  version = "30.4.0";
+  version = "31.0.0";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-AzUTDOWzyhZLrwqO9HfZ/Ke72LElJAMzVoDydBfYKwg=";
+    hash = "sha256-25xzVaG9seu4hE5rc776lvNucf8lsEDvjkQPbFzjgII=";
   };
 
   lockFile = ./lock.json;
@@ -36,6 +34,7 @@ buildNimPackage rec {
     libopus
     x264
     dav1d
+    zlib
   ];
 
   env = {
@@ -54,8 +53,6 @@ buildNimPackage rec {
     # buildNimPackage hack
     substituteInPlace ae.nimble \
       --replace-fail '"main=auto-editor"' '"main"'
-
-    mv tests/unit.nim tests/tunit.nim # buildNimPackage expects tests to start with t
   '';
 
   nativeCheckInputs = [
@@ -63,19 +60,6 @@ buildNimPackage rec {
     python3Packages.av
   ];
 
-  checkPhase = ''
-    runHook preCheck
-
-    nim_builder --phase:check
-
-    substituteInPlace tests/test.py \
-      --replace-fail '"./auto-editor"' "\"$out/bin/main\""
-
-    python3 tests/test.py
-
-    runHook postCheck
-  '';
-
   postInstall = ''
     mv $out/bin/main $out/bin/auto-editor
   '';

From fc8e4620a79fa129b2829d317efde36b17f6280b Mon Sep 17 00:00:00 2001
From: kemal <kemal@descript.com>
Date: Fri, 3 Jul 2026 18:34:02 -0500
Subject: [PATCH 08/76] framework-control: add updateScript

---
 pkgs/by-name/fr/framework-control/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fr/framework-control/package.nix b/pkgs/by-name/fr/framework-control/package.nix
index 37fcf8b1df53..d324064136ff 100644
--- a/pkgs/by-name/fr/framework-control/package.nix
+++ b/pkgs/by-name/fr/framework-control/package.nix
@@ -7,6 +7,7 @@
   fetchNpmDeps,
   makeDesktopItem,
   copyDesktopItems,
+  nix-update-script,
   controlPort ? 30912,
 }:
 
@@ -75,6 +76,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       $out/share/icons/hicolor/256x256/apps/framework-control.png
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Lightweight control surface for Framework laptops";
     homepage = "https://github.com/ozturkkl/framework-control";

From eb516b012fa17933856a325bc9b0c0b987fd397d Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 9 Jul 2026 02:56:14 -0700
Subject: [PATCH 09/76] wsjtx: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix
index 38c063c47313..d26092866957 100644
--- a/pkgs/by-name/ws/wsjtx/package.nix
+++ b/pkgs/by-name/ws/wsjtx/package.nix
@@ -6,8 +6,8 @@
   asciidoctor,
   cmake,
   nix-update-script,
-  gitUpdater,
   pkg-config,
+  portaudio,
   fftw,
   fftwFloat,
   gfortran,
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wsjtx";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "WSJTX";
     repo = "wsjtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0Agm6lvzH3sgBatOBpYV3/CoyNJsO7Sw9mD/wewJ1DM=";
+    hash = "sha256-PompKWVxPpF3ie811tqy8bplnULyXdenBrR/pHvtM08=";
   };
 
   nativeBuildInputs = [
@@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftwFloat
     hamlib_4
     libusb1
+    portaudio
     qt5.qtbase
     qt5.qtmultimedia
     qt5.qtserialport

From be1416f43c62fd565c543069733f76dc6ac6e1a4 Mon Sep 17 00:00:00 2001
From: mlyxshi <mlyxdev@gmail.com>
Date: Thu, 9 Jul 2026 21:49:06 +0800
Subject: [PATCH 10/76] komari-agent: updateScript use-github-releases

---
 pkgs/by-name/ko/komari-agent/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix
index b2bf904c6e73..280f8e295a4c 100644
--- a/pkgs/by-name/ko/komari-agent/package.nix
+++ b/pkgs/by-name/ko/komari-agent/package.nix
@@ -27,7 +27,9 @@ buildGoModule (finalAttrs: {
   # tests require network access
   doCheck = false;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--use-github-releases" ];
+  };
 
   meta = {
     homepage = "https://github.com/komari-monitor/komari-agent";

From 865320f255a4dbba40f5afe135a8b9ab19ec2463 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 09:46:47 +0000
Subject: [PATCH 11/76] croc: 10.4.6 -> 10.4.12

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

diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 6c54f91f9708..24bcc1e1fcaa 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "croc";
-  version = "10.4.6";
+  version = "10.4.12";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = "croc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+KG1PHUymeoAj92UAn/sitQF6xC1xwl+cdisxy2ZtPs=";
+    hash = "sha256-ThMwPbQcxRBVvL/jxTluBc4gKbEIl1Wm69c/3r976s0=";
   };
 
   vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI=";

From 4dd23d9a4a94271f861628a1cf7ae1779fa3d197 Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Thu, 9 Jul 2026 13:46:14 +0200
Subject: [PATCH 12/76] croc: fix passthrough tests

Both tests target a specific relay on purpose, so the local-relay path is
not what we want to exercise. Passing ``--no-local` on the sender disables
the ephemeral local relay and LAN discovery, forcing the transfer through
the relay under test and making the tests deterministic again.

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 nixos/tests/croc.nix                      | 4 ++--
 pkgs/by-name/cr/croc/test-local-relay.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix
index f5eec96d6cc3..571a64f736ba 100644
--- a/nixos/tests/croc.nix
+++ b/nixos/tests/croc.nix
@@ -12,8 +12,8 @@ in
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       equirosa
-      SuperSandro2000
       ryan4yin
+      kaynetik
     ];
   };
 
@@ -45,7 +45,7 @@ in
     sender.execute("echo Hello World > testfile01.txt")
     sender.execute("echo Hello Earth > testfile02.txt")
     sender.execute(
-        "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &"
+        "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send --no-local testfile01.txt testfile02.txt >&2 &"
     )
 
     # receive the testfiles and check them
diff --git a/pkgs/by-name/cr/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix
index f0a66fcaba82..a9d0b36455db 100644
--- a/pkgs/by-name/cr/croc/test-local-relay.nix
+++ b/pkgs/by-name/cr/croc/test-local-relay.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
     # start sender in background
     MSG="See you later, alligator!"
-    croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
+    croc --relay localhost:11111 send --no-local --code correct-horse-battery-staple --text "$MSG" &
 
     # wait for things to settle
     sleep 1

From db275fd72a637f314107b0f871e9a8241ec14f73 Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Fri, 10 Jul 2026 07:28:33 +0200
Subject: [PATCH 13/76] croc: bump to v10.4.13

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 nixos/tests/croc.nix                      | 2 +-
 pkgs/by-name/cr/croc/package.nix          | 4 ++--
 pkgs/by-name/cr/croc/test-local-relay.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix
index 571a64f736ba..bb5d5d6635e4 100644
--- a/nixos/tests/croc.nix
+++ b/nixos/tests/croc.nix
@@ -45,7 +45,7 @@ in
     sender.execute("echo Hello World > testfile01.txt")
     sender.execute("echo Hello Earth > testfile02.txt")
     sender.execute(
-        "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send --no-local testfile01.txt testfile02.txt >&2 &"
+        "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &"
     )
 
     # receive the testfiles and check them
diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 24bcc1e1fcaa..d10752e52d65 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "croc";
-  version = "10.4.12";
+  version = "10.4.13";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = "croc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ThMwPbQcxRBVvL/jxTluBc4gKbEIl1Wm69c/3r976s0=";
+    hash = "sha256-XhudK0wFk2VFYmd1ihW4SjJ4nzwNxOp9pTNUWJUg+AU=";
   };
 
   vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI=";
diff --git a/pkgs/by-name/cr/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix
index a9d0b36455db..f0a66fcaba82 100644
--- a/pkgs/by-name/cr/croc/test-local-relay.nix
+++ b/pkgs/by-name/cr/croc/test-local-relay.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
     # start sender in background
     MSG="See you later, alligator!"
-    croc --relay localhost:11111 send --no-local --code correct-horse-battery-staple --text "$MSG" &
+    croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
 
     # wait for things to settle
     sleep 1

From 10658b83fb947e50f513365c2384275da7dc4ee4 Mon Sep 17 00:00:00 2001
From: aln730 <arnavgawas707@gmail.com>
Date: Sat, 11 Jul 2026 01:42:42 -0400
Subject: [PATCH 14/76] surrealdb: 2.6.1 -> 3.0.0

---
 maintainers/maintainer-list.nix       |  6 ++++++
 pkgs/by-name/su/surrealdb/package.nix | 12 +++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 09a2d77eebc9..16a0bd701891 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1463,6 +1463,12 @@
     githubId = 60479013;
     name = "Alma Cemerlic";
   };
+  aln730 = {
+    email = "arnsg730@proton.me";
+    github = "aln730";
+    githubId = 94751172;
+    name = "AGawas";
+  };
   Alper-Celik = {
     email = "alper@alper-celik.dev";
     name = "Alper Çelik";
diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix
index 2b72bd39f5d6..9d0662d48103 100644
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@@ -18,7 +18,7 @@ assert lib.assertMsg (builtins.elem backend [
 ]) "surrealdb: backend must be one of [ \"rocksdb\" \"surrealkv\" ]";
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = if hasRocksDB then "surrealdb" else "surrealdb-surrealkv";
-  version = "2.6.1";
+  version = "3.0.0";
 
   __structuredAttrs = true;
 
@@ -26,15 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "surrealdb";
     repo = "surrealdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Dd6tabpSTh7IN9PLE4Zt/s1G7mNUwYfy+nEZpPTy8a8=";
+    hash = "sha256-KDVc5BTkJ5OwxANeXOBnerJihnKU6y72Dw8h1ARcj3U=";
   };
 
-  cargoHash = "sha256-lebSQPGnxW+3a7vWw3R7QYtHx04/DsRK/n8c/UT3FZo=";
+  cargoHash = "sha256-yemnwhcC5CsQgO29Qiau39QAVbGnrNsOG1dNen987HM=";
 
   # Upstream hard-codes `aarch64-linux-gnu-gcc` in `.cargo/config.toml`.
   # Remove it so Cargo uses nixpkgs' wrapped C toolchain instead.
   postPatch = ''
     rm .cargo/config.toml
+    sed -i '1i #![recursion_limit = "256"]' surrealdb/server/src/lib.rs
   '';
 
   buildNoDefaultFeatures = true;
@@ -44,10 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "http"
     "scripting"
     "storage-mem"
-    "storage-surrealcs"
-    # Keep this enabled for the default RocksDB build to preserve upstream's
-    # default storage feature set. It can be dropped if `pkgs.surrealdb` is
-    # intentionally slimmed to RocksDB-only in a later change.
     "storage-surrealkv"
   ]
   ++ lib.optional hasRocksDB "storage-rocksdb";
@@ -94,6 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "surreal";
     license = lib.licenses.bsl11;
     maintainers = with lib.maintainers; [
+      aln730
       sikmir
       happysalada
       siriobalmelli

From a1f1ce91f4d41bebf6b594ea0e836545376724ba Mon Sep 17 00:00:00 2001
From: misumisumi <s.kobayashi@misumi-sumi.com>
Date: Wed, 15 Jul 2026 01:55:53 +0900
Subject: [PATCH 15/76] deskreen: 2.0.4 -> 3.2.16

---
 pkgs/by-name/de/deskreen/package.nix | 65 +++++++++++++++-------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix
index b8f091919bee..7747ac41388f 100644
--- a/pkgs/by-name/de/deskreen/package.nix
+++ b/pkgs/by-name/de/deskreen/package.nix
@@ -4,35 +4,39 @@
   fetchurl,
   appimageTools,
 }:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
+appimageTools.wrapType2 rec {
   pname = "deskreen";
-  version = "2.0.4";
+  version = "3.2.16";
 
-  src = fetchurl {
-    url = "https://github.com/pavlobu/deskreen/releases/download/v${finalAttrs.version}/Deskreen-${finalAttrs.version}.AppImage";
-    hash = "sha256-0jI/mbXaXanY6ay2zn+dPWGvsqWRcF8aYHRvfGVsObE=";
-  };
-  deskreenUnwrapped = appimageTools.wrapType2 {
-    inherit (finalAttrs) pname version;
-    src = finalAttrs.src;
-  };
-
-  buildInputs = [
-    finalAttrs.deskreenUnwrapped
-  ];
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    ln -s ${finalAttrs.deskreenUnwrapped}/bin/deskreen $out/bin/deskreen
-
-    runHook postInstall
-  '';
+  src =
+    let
+      sources = {
+        x86_64-linux = {
+          arch = "x86_64";
+          hash = "sha256-JcVKRINEWHJXzpdyiMSzx+cp/BzHBhrXRxYizQmkerI=";
+        };
+        aarch64-linux = {
+          arch = "arm64";
+          hash = "sha256-FDZz3Aarz9j8ppaLO6C1IhVKr7Dns77fLdQQCaCoKg0=";
+        };
+      };
+      inherit (stdenvNoCC.hostPlatform) system;
+    in
+    fetchurl {
+      url = "https://github.com/pavlobu/deskreen/releases/download/v${version}/deskreen-ce-${version}-${sources.${system}.arch}.AppImage";
+      inherit (sources.${system}) hash;
+    };
+  extraInstallCommands =
+    let
+      contents = appimageTools.extractType2 { inherit pname version src; };
+    in
+    ''
+      install -m 444 -D ${contents}/deskreen-ce.desktop $out/share/applications/deskreen-ce.desktop
+      install -m 444 -D ${contents}/usr/share/icons/hicolor/256x256/apps/deskreen-ce.png \
+        $out/share/icons/hicolor/512x512/apps/deskreen-ce.png
+      substituteInPlace $out/share/applications/deskreen-ce.desktop \
+        --replace-fail 'Exec=AppRun' 'Exec=deskreen'
+    '';
 
   meta = {
     description = "Turn any device into a secondary screen for your computer";
@@ -42,6 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       leo248
     ];
-    platforms = lib.platforms.linux;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
-})
+}

From b4f4906389a5a5159baa7123be0eb4c97c43a10f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 14 Jul 2026 11:11:14 -0700
Subject: [PATCH 16/76] python3Packages.mlflow: allow pandas 3

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

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 45725a423f68..8f204d225b39 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -50,8 +50,11 @@ buildPythonPackage (finalAttrs: {
     patch -p1 -d "$out/lib/python"*/site-packages < ${./subprocess-pythonpath.patch}
   '';
 
+  # 3.14.0 dependency check fails with pandas >= 3.0. But the code changes required are minimal
+  # (strings are now `str` instead of `numpy.object`.)
   pythonRelaxDeps = [
     "cryptography"
+    "pandas"
   ];
 
   dependencies = [

From cfdbc6e79c98b7695372aac89693b337dfdabacd Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 17 Jul 2026 02:02:50 +0200
Subject: [PATCH 17/76] gerrit: 3.13.6 -> 3.14.2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index adf149804c93..4d7c87408399 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gerrit";
-  version = "3.13.6";
+  version = "3.14.2";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
-    hash = "sha256-nGKl5KNundR+FkiQ5CO/qBezOSNAHDHcPsssm1lZAhk=";
+    hash = "sha256-OuM96W9++2QKD2O2IwkzDjmBaC9Ej/6ReHY/Rwujuno=";
   };
 
   buildCommand = ''

From e77fc0ac7d25739c75fdeabf1ea33d9c39179c14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 05:04:43 +0000
Subject: [PATCH 18/76] lefthook: 2.1.5 -> 2.1.10

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index 99363cb56b44..10db700c22ce 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lefthook";
-  version = "2.1.5";
+  version = "2.1.10";
 
   src = fetchFromGitHub {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HLC6X9JjiiR3Ecg5MQ33vELs6ooLLjQ9x++4xB1qyHU=";
+    hash = "sha256-GR97Z9wnM6z6gNIcf35leBGkhdj1d6OHQ9oFnaz3f1s=";
   };
 
-  vendorHash = "sha256-75jrXoBXoPCE/Ue7OlGAA4nUDXHM5ccIaK4rsKgfG84=";
+  vendorHash = "sha256-G+v6ZqnkcFdPDzXlN89oqD7mOnHfq1tvIkFxdoVnBNo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0c265dd595304f406d78d27d3697b7ca5d1f7b18 Mon Sep 17 00:00:00 2001
From: Hussain <hmiyaziwala@anduril.com>
Date: Fri, 17 Jul 2026 08:35:03 -0400
Subject: [PATCH 19/76] nixosTests.optee: adjust ram and kernel offsets,
 explicitly load optee kernel module

---
 nixos/tests/optee.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/optee.nix b/nixos/tests/optee.nix
index 2d7c80bda78c..08377a84a188 100644
--- a/nixos/tests/optee.nix
+++ b/nixos/tests/optee.nix
@@ -4,7 +4,6 @@
 
   meta = {
     maintainers = with lib.maintainers; [ jmbaur ];
-    broken = pkgs.stdenv.hostPlatform.isAarch64;
   };
 
   nodes.machine =
@@ -17,7 +16,8 @@
       uboot = ubootQemuAarch64.overrideAttrs (old: {
         postPatch = (old.postPatch or "") + ''
           substituteInPlace board/emulation/qemu-arm/qemu-arm.env \
-            --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000"
+            --replace-fail "kernel_addr_r=0x40400000" "kernel_addr_r=0x50000000" \
+            --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x58000000"
         '';
       });
 
@@ -53,6 +53,7 @@
 
       # VM boots up via qfw
       boot.loader.grub.enable = false;
+      boot.kernelModules = [ "optee" ];
 
       services.tee-supplicant = {
         enable = true;

From de758f39f9f21dbf389a4b0418816afa862188b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jul 2026 21:59:45 +0000
Subject: [PATCH 20/76] libchewing: 0.13.0 -> 0.13.1

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

diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix
index 1c8ddd95b7b6..7258de3b987a 100644
--- a/pkgs/by-name/li/libchewing/package.nix
+++ b/pkgs/by-name/li/libchewing/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libchewing";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromCodeberg {
     owner = "chewing";
     repo = "libchewing";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-1/aamkc66pjAf/jl4pD2rJ9ipFW0bAWjvKg6KtINWuQ=";
+    hash = "sha256-BiAQSaSOjzeRt+vw+b7JoTR1+mF+UYMIyx+5nuqk9Ko=";
   };
 
   # ld: unknown option: -version-script
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-1b8GbZ75jBVmvXquOjG2CEcLXg4AthAwQzdO68CjjPs=";
+    hash = "sha256-WPB1IIwKTF9lnkdcgNXcOP6kWIwQcUguUf8Nh5vDA5E=";
   };
 
   nativeBuildInputs = [

From 21abc93a48187556f7be7cea07d8aae1503dde81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Jul 2026 08:18:11 +0000
Subject: [PATCH 21/76] libfrida-core: 17.15.4 -> 17.16.0

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

diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix
index 7a0515460c24..044e98bb2a1c 100644
--- a/pkgs/by-name/li/libfrida-core/package.nix
+++ b/pkgs/by-name/li/libfrida-core/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "libfrida-core";
-  version = "17.15.4";
+  version = "17.16.0";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -29,15 +29,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       x86_64-linux = fetchurl {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-x86_64.tar.xz";
-        hash = "sha256-VzPu6AYN8LVQULJBb4Ug7GrenyklksORpcZoj9Sg354=";
+        hash = "sha256-4OkangepbSAtn6DPGOrDVVlcXjVnj2XXlT0xE/+WBsg=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz";
-        hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0=";
+        hash = "sha256-HrFTlYbpS01i6mVJlrieFpdZ0a27/u45sLJwarCQ150=";
       };
       aarch64-darwin = fetchurl {
         url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz";
-        hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88=";
+        hash = "sha256-QeT3LLGNBQOgziu/HWqMHI6q3dNmyxJfqcm5xqpxY2Q=";
       };
     };
     updateScript = writeShellScript "update-libfrida-core" ''

From 52dac2eaee65bd400ce1690b9832cf3a11f1df7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Jul 2026 11:35:47 +0000
Subject: [PATCH 22/76] firebase-tools: 15.22.4 -> 15.24.0

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 008f989f61c7..3e4e196679f3 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -11,17 +11,17 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "15.22.4";
+  version = "15.24.0";
   nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-0O6/tOd9PNtsTzXvgFMl7bneejMJ4uAGvinWZFjlkUo=";
+    hash = "sha256-Ly2iWu29lmexSQL/MMjo10CStItxrHKZD1RgEHUzOVM=";
   };
 
-  npmDepsHash = "sha256-TlAcsOKmHnXPNdOpgXhr16tMWFjtahT/CG5INBR59fM=";
+  npmDepsHash = "sha256-Qe/azXfVryMs+XFZdLq270dPrh1AqzWWqpn8PqvRnds=";
 
   # No more package-lock.json in upstream src
   postPatch = ''

From 7685c6f823949dd9dd5c63a98c4888855945614c Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 15 Jul 2026 10:13:08 +0200
Subject: [PATCH 23/76] slurp-fediverse: init at 1.1.1

---
 pkgs/by-name/sl/slurp-fediverse/package.nix | 32 +++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/sl/slurp-fediverse/package.nix

diff --git a/pkgs/by-name/sl/slurp-fediverse/package.nix b/pkgs/by-name/sl/slurp-fediverse/package.nix
new file mode 100644
index 000000000000..ad6a26981c32
--- /dev/null
+++ b/pkgs/by-name/sl/slurp-fediverse/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromCodeberg,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "slurp";
+  version = "1.1.1";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromCodeberg {
+    owner = "vyr";
+    repo = "slurp";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-bqIX+kG/VXLvw/ORqS+Gq8fezd0QW6dlKdLr2vW0YY0=";
+  };
+
+  vendorHash = "sha256-i/xoMJORuJbAQW+g9H95xQ5O3811NncCgJIL9OY+B5k=";
+
+  # Tests require networking
+  doCheck = false;
+
+  meta = {
+    description = "Tool for exporting data from and importing data to Fediverse instances";
+    homepage = "https://codeberg.org/vyr/slurp";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ onny ];
+    mainProgram = "slurp";
+  };
+})

From ca6501bddb205bc7083fd909e32cf42785c24066 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sat, 18 Jul 2026 17:20:09 +0000
Subject: [PATCH 24/76] s3cmd: migrate to pyproject

---
 pkgs/by-name/s3/s3cmd/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/s3/s3cmd/package.nix b/pkgs/by-name/s3/s3cmd/package.nix
index 7e76de2f114d..42a0a9d2b3aa 100644
--- a/pkgs/by-name/s3/s3cmd/package.nix
+++ b/pkgs/by-name/s3/s3cmd/package.nix
@@ -4,23 +4,27 @@
   fetchFromGitHub,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "s3cmd";
   version = "2.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "s3tools";
     repo = "s3cmd";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-cxwf6+9WFt3U7+JdKRgZxFElD+Dgf2P2VyejHVoiDJk=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     python-magic
     python-dateutil
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonImportsCheck = [ "S3" ];
+
   meta = {
     homepage = "https://s3tools.org/s3cmd";
     description = "Command line tool for managing Amazon S3 and CloudFront services";
@@ -28,4 +32,4 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
-}
+})

From 342a9f8798ed0a252fd22862b6df37500f84c44c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 19 Jul 2026 00:23:14 +0700
Subject: [PATCH 25/76] python3Packages.graphqlclient: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/graphqlclient/default.nix b/pkgs/development/python-modules/graphqlclient/default.nix
index e0c85fbd3751..3aee4e90e6cf 100644
--- a/pkgs/development/python-modules/graphqlclient/default.nix
+++ b/pkgs/development/python-modules/graphqlclient/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "graphqlclient";
   version = "0.2.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
+
+  dependencies = [ six ];
 
   # Project has no tests
   doCheck = false;

From c7055191453d3090408e9c855d7447b0ca027e0b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 19 Jul 2026 00:27:16 +0700
Subject: [PATCH 26/76] python3Packages.graphqlclient: modernize

---
 .../python-modules/graphqlclient/default.nix          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/graphqlclient/default.nix b/pkgs/development/python-modules/graphqlclient/default.nix
index 3aee4e90e6cf..2a8263a79ffc 100644
--- a/pkgs/development/python-modules/graphqlclient/default.nix
+++ b/pkgs/development/python-modules/graphqlclient/default.nix
@@ -6,14 +6,17 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "graphqlclient";
   version = "0.2.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k";
+    pname = "graphqlclient";
+    inherit (finalAttrs) version;
+    hash = "sha256-szBfPfiMBIORlXVNQJpJotw628uk6/kTO1ZjdJ4d2Sw=";
   };
 
   build-system = [ setuptools ];
@@ -31,4 +34,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lde ];
   };
-}
+})

From cbe1c494fddc489d7b64bcd455104dee41b7a507 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sat, 18 Jul 2026 17:42:11 +0000
Subject: [PATCH 27/76] s3cmd: Enable __structuredAttrs

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

diff --git a/pkgs/by-name/s3/s3cmd/package.nix b/pkgs/by-name/s3/s3cmd/package.nix
index 42a0a9d2b3aa..8e9b4f8cfcce 100644
--- a/pkgs/by-name/s3/s3cmd/package.nix
+++ b/pkgs/by-name/s3/s3cmd/package.nix
@@ -9,6 +9,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "2.4.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "s3tools";
     repo = "s3cmd";

From 4c06da3cb826720116e4cd82cf9e8b4e02441246 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 18 Jul 2026 20:47:32 +0200
Subject: [PATCH 28/76] pnpm: 11.13.1 -> 11.15.0

https://github.com/pnpm/pnpm/releases/tag/v11.14.0
https://github.com/pnpm/pnpm/releases/tag/v11.15.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 1da0155ebc96..13ce810188b2 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -61,8 +61,8 @@ let
       hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI=";
     };
     "11" = {
-      version = "11.13.1";
-      hash = "sha256-EAErV9I7lnO8U0Fo/1axrGVbpKJzf/N/bZ0ZpVFEr6o=";
+      version = "11.15.0";
+      hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do=";
     };
   };
 

From 927370f46c8e9e9306863e77382a25403321f7d2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 18 Jul 2026 23:53:14 +0200
Subject: [PATCH 29/76] wifite2: migrate to pyproject

---
 pkgs/by-name/wi/wifite2/package.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix
index 41426beb1c9a..584a614e3dbb 100644
--- a/pkgs/by-name/wi/wifite2/package.nix
+++ b/pkgs/by-name/wi/wifite2/package.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   fetchpatch,
-  python3,
   python3Packages,
   wirelesstools,
   aircrack-ng,
@@ -20,16 +19,10 @@
   macchanger,
 }:
 
-let
-  pythonDependencies = with python3Packages; [
-    chardet
-    scapy
-  ];
-in
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "wifite2";
   version = "2.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kimocoder";
@@ -38,6 +31,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-G2AKKZUDS2UQm95TEhGJIucyMRcm7oL0d3J8uduEQhw=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   patches = [
     (fetchpatch {
       url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.7.0-1/debian/patches/Disable-aircrack-failing-test.patch";
@@ -53,6 +48,13 @@ python3.pkgs.buildPythonApplication rec {
     })
   ];
 
+  dependencies = with python3Packages; [
+    chardet
+    scapy
+  ];
+
+  pythonRemoveDeps = [ "argparse" ];
+
   propagatedBuildInputs = [
     aircrack-ng
     wireshark-cli
@@ -68,10 +70,9 @@ python3.pkgs.buildPythonApplication rec {
     john
     iw
     macchanger
-  ]
-  ++ pythonDependencies;
+  ];
 
-  nativeCheckInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ];
+  nativeCheckInputs = propagatedBuildInputs ++ [ python3Packages.pytestCheckHook ];
 
   meta = {
     homepage = "https://github.com/kimocoder/wifite2";

From 3160431a467c11234eb5f924365f7750fd6d6cae Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 30 Jun 2026 16:53:01 +0200
Subject: [PATCH 30/76] onlyoffice-documentserver: update nodejs

Fixes #477803
---
 .../on/onlyoffice-documentserver/x2t.nix      | 66 +++++++++++++++----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
index 17d891a27037..8f30d4b87cae 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
@@ -15,8 +15,7 @@
   icu,
   jdk,
   lib,
-  nodejs_22,
-  nodejs-slim_22,
+  nodejs-slim,
   openssl,
   pkg-config,
   python3,
@@ -224,9 +223,6 @@ let
   web-apps = buildNpmPackage (finalAttrs: {
     name = "onlyoffice-core-web-apps";
 
-    # workaround for https://github.com/NixOS/nixpkgs/issues/477803
-    nodejs = nodejs_22;
-
     src = fetchFromGitHub {
       owner = "ONLYOFFICE";
       repo = "web-apps";
@@ -732,8 +728,6 @@ let
       qmakeFlags
       ++ icuQmakeFlags
       ++ [
-        # c++1z for nodejs-slim_22.libv8 (20 seems to produce errors around 'is_void_v' there)
-        # c++ 20 for nodejs_23.libv8
         "CONFIG+=c++2a"
         # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000
         # which is not page-aligned, so disable memory limitation for now
@@ -744,6 +738,13 @@ let
     preConfigure = ''
       cd $BUILDRT
 
+      # We need to build statically to be able to piggy-back
+      # on nodejs's v8
+      substituteInPlace \
+        DesktopEditor/doctrenderer/doctrenderer.pri \
+        --replace-fail "CONFIG += shared" "CONFIG += staticlib" \
+        --replace-fail "CONFIG += plugin" ""
+
       substituteInPlace \
         DesktopEditor/doctrenderer/nativecontrol.h \
         --replace-fail "fprintf(f, strVal.c_str());" "fprintf(f, \"%s\", strVal.c_str());" \
@@ -761,16 +762,26 @@ let
       done
 
       echo "== v8 =="
+      substituteInPlace \
+        DesktopEditor/doctrenderer/js_internal/v8/v8_base.h \
+        --replace-fail "args.Holder" "args.This"
+      substituteInPlace \
+        DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp \
+        --replace-fail "args.Holder" "args.This"
+
       mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64
-      # using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805
-      ln -s ${nodejs-slim_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
-      tar xf ${nodejs-slim_22.libv8.src} --one-top-level=/tmp/xxxxx
+      ln -s ${nodejs-slim.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
+      tar xf ${nodejs-slim.libv8.src} --one-top-level=/tmp/xxxxx
       for i in /tmp/xxxxx/*/deps/v8/*; do
         cp -r $i Common/3dParty/v8_89/v8/
       done
 
       cd $BUILDRT/DesktopEditor/doctrenderer
     '';
+    installPhase = ''
+      mkdir -p $out/lib
+      cp ../../build/lib/*/*.a $out/lib
+    '';
     passthru.tests = lib.attrsets.genAttrs [ "embed/external" "embed/internal" "js_internal" "json" ] (
       test:
       buildCoreTests "DesktopEditor/doctrenderer/test/${test}" {
@@ -885,9 +896,24 @@ let
       xpsfile
       djvufile
     ];
-    qmakeFlags = qmakeFlags ++ icuQmakeFlags;
+    qmakeFlags =
+      qmakeFlags
+      ++ icuQmakeFlags
+      ++ [
+        "QMAKE_LFLAGS+=-licui18n"
+      ];
     preConfigure = ''
       source ${fixIcu}
+
+      # We need to build statically to be able to piggy-back
+      # on nodejs's v8
+      substituteInPlace \
+        $BUILDRT/DesktopEditor/doctrenderer/doctrenderer.pri \
+        --replace-fail "CONFIG += shared" "CONFIG += staticlib" \
+        --replace-fail "CONFIG += plugin" ""
+
+      echo "LIBS += -L${openssl'.out}/lib -lcrypto" >> $BUILDRT/DesktopEditor/allthemesgen/allthemesgen.pro
+      echo "LIBS += -L${nodejs-slim.libv8}/lib -lv8 -pthread" >> $BUILDRT/DesktopEditor/allthemesgen/allthemesgen.pro
     '';
     dontStrip = true;
     installPhase = ''
@@ -956,10 +982,26 @@ buildCoreComponent "X2tConverter/build/Qt" {
     starmath
     ooxmlsignature
   ];
-  qmakeFlags = qmakeFlags ++ icuQmakeFlags ++ [ "X2tConverter.pro" ];
+  qmakeFlags =
+    qmakeFlags
+    ++ icuQmakeFlags
+    ++ [
+      "QMAKE_LFLAGS+=-licui18n"
+      "X2tConverter.pro"
+    ];
   preConfigure = ''
     source ${fixIcu}
 
+    # We need to build statically to be able to piggy-back
+    # on nodejs's v8
+    substituteInPlace \
+      $BUILDRT/DesktopEditor/doctrenderer/doctrenderer.pri \
+      --replace-fail "CONFIG += shared" "CONFIG += staticlib" \
+      --replace-fail "CONFIG += plugin" ""
+
+    echo "LIBS += -L${nodejs-slim.libv8}/lib -lv8 -pthread" >> $BUILDRT/X2tConverter/build/Qt/X2tConverter.pro
+    echo "LIBS += -L${openssl'.out}/lib -lcrypto" >> $BUILDRT/X2tConverter/build/Qt/X2tConverter.pro
+
     # (not as patch because of line endings)
     sed -i '47 a #include <limits>' $BUILDRT/Common/OfficeFileFormatChecker2.cpp
 

From 2dcb86fc30fd7a7239d0aeae32b863138d26d6df Mon Sep 17 00:00:00 2001
From: RoGreat <roguegreat@gmail.com>
Date: Sat, 18 Jul 2026 18:32:49 -0500
Subject: [PATCH 31/76] _7zz-rar: move to pkgs/by-name

---
 pkgs/by-name/_7/_7zz-rar/package.nix | 6 ++++++
 pkgs/top-level/all-packages.nix      | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/_7/_7zz-rar/package.nix

diff --git a/pkgs/by-name/_7/_7zz-rar/package.nix b/pkgs/by-name/_7/_7zz-rar/package.nix
new file mode 100644
index 000000000000..5a1cf62bda75
--- /dev/null
+++ b/pkgs/by-name/_7/_7zz-rar/package.nix
@@ -0,0 +1,6 @@
+{
+  _7zz,
+}:
+_7zz.override {
+  enableUnfree = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80118b0bb715..d26752b6b5fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -937,8 +937,6 @@ with pkgs;
 
   ### TOOLS
 
-  _7zz-rar = _7zz.override { enableUnfree = true; };
-
   acquire = with python3Packages; toPythonApplication acquire;
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;

From 345d2059b5b4018de84c6f11b2d1f1049632ef95 Mon Sep 17 00:00:00 2001
From: RoGreat <roguegreat@gmail.com>
Date: Sat, 18 Jul 2026 18:33:02 -0500
Subject: [PATCH 32/76] _7zz: 26.0.1 -> 26.0.2

---
 pkgs/by-name/_7/_7zz/package.nix | 33 +++++++++++++++++++++-----------
 pkgs/by-name/_7/_7zz/update.sh   | 15 ---------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100755 pkgs/by-name/_7/_7zz/update.sh

diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index fe3878f417aa..6923d10979d1 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -1,7 +1,9 @@
 {
   stdenv,
   lib,
-  fetchzip,
+  fetchFromGitHub,
+  _experimental-update-script-combinators,
+  nix-update-script,
 
   # Free MASM-compatible assembler
   asmc-linux,
@@ -43,17 +45,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "7zz";
-  version = "26.01";
+  version = "26.02";
 
-  src = fetchzip {
-    url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
+  src = fetchFromGitHub {
+    owner = "ip7z";
+    repo = "7zip";
+    tag = finalAttrs.version;
     hash =
-      {
-        free = "sha256-52+Gg66MOFmwYUVB0OO4PAtZJtQOkoVpxV7F9xBGy58=";
-        unfree = "sha256-w0fk8EDusUYiOfrmIiUq+xevlwfQxMhjdPzfkHkOkR8=";
-      }
-      .${if enableUnfree then "unfree" else "free"};
-    stripRoot = false;
+      if enableUnfree then
+        "sha256-MmnsCM4guQ5DuWDE5MslI8QIIbkUtZnddVPgAuCRWQU="
+      else
+        "sha256-prKxsT7y7iHbzduM+xqz1yQMEbJ8IjnsmafzC2mOwr4=";
     # remove the unRAR related code from the src drv
     # > the license requires that you agree to these use restrictions,
     # > or you must remove the software (source and binary) from your hard disks
@@ -138,7 +140,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = ./update.sh;
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        attrPath = "_7zz";
+        extraArgs = [ "--use-github-releases" ];
+      })
+      (nix-update-script {
+        attrPath = "_7zz-rar";
+        extraArgs = [ "--version=skip" ];
+      })
+    ];
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
       command = "7zz --help";
diff --git a/pkgs/by-name/_7/_7zz/update.sh b/pkgs/by-name/_7/_7zz/update.sh
deleted file mode 100755
index 1128cedd5491..000000000000
--- a/pkgs/by-name/_7/_7zz/update.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p curl xq-xml common-updater-scripts
-set -euo pipefail
-
-OLD_VERSION="$(nix-instantiate --eval --json --expr 'let pkgs = import ./. {}; in pkgs._7zz.version' | sed 's/"//g')"
-NEW_VERSION="$(curl -H 'Accept: application/rss+xml' 'https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip' | xq -x "substring((/rss/channel/item[link[contains(., 'src.tar.xz')]])[1]/title, 8, 5)")"
-
-echo "comparing versions $OLD_VERSION => $NEW_VERSION"
-if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
-    echo "Already up to date! Doing nothing"
-    exit 0
-fi
-
-update-source-version _7zz "$NEW_VERSION"
-update-source-version _7zz-rar "$NEW_VERSION" --ignore-same-version

From 19e9caf20780e9e4f0fabb71c4bbc935c5eba412 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 18 Jul 2026 19:30:02 -0700
Subject: [PATCH 33/76] nixos/tests/immichframe: increase resources

immich is quite demanding which leaves it out of reach if you have one
core (e.g. on a laptop, when my EPYC P core was fine).

Make the test look more like the test for immich.
---
 nixos/tests/web-apps/immichframe.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/web-apps/immichframe.nix b/nixos/tests/web-apps/immichframe.nix
index dff57b5c27c2..810fe24b796d 100644
--- a/nixos/tests/web-apps/immichframe.nix
+++ b/nixos/tests/web-apps/immichframe.nix
@@ -31,9 +31,14 @@ in
         ../common/x11.nix
       ];
 
-      # When setting this to 2500 I got "Kernel panic - not syncing: Out of
+      # When setting memory to 2500 I got "Kernel panic - not syncing: Out of
       # memory: compulsory panic_on_oom is enabled".
-      virtualisation.memorySize = 3000;
+      # Setting cores to 1 (the default) also makes immich take a long time to start up.
+      # If this breaks, keep synced with the immich test.
+      virtualisation = {
+        memorySize = 4096;
+        cores = 2;
+      };
       hardware.graphics.enable = true;
       environment.variables.XAUTHORITY = "/home/${user}/.Xauthority";
       test-support.displayManager.auto.user = user;

From f2d74e7e87f766052a0786ec34c4bad9da015a72 Mon Sep 17 00:00:00 2001
From: Ian Kilgore <iank@iank.org>
Date: Sun, 19 Jul 2026 00:11:08 -0400
Subject: [PATCH 34/76] liquid-dsp: move to by-name/

---
 .../li}/liquid-dsp/fix-cmake-pc-paths.patch                   | 0
 .../libraries => by-name/li}/liquid-dsp/include-stdarg.patch  | 0
 .../default.nix => by-name/li/liquid-dsp/package.nix}         | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{development/libraries => by-name/li}/liquid-dsp/fix-cmake-pc-paths.patch (100%)
 rename pkgs/{development/libraries => by-name/li}/liquid-dsp/include-stdarg.patch (100%)
 rename pkgs/{development/libraries/liquid-dsp/default.nix => by-name/li/liquid-dsp/package.nix} (94%)

diff --git a/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch
similarity index 100%
rename from pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch
rename to pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch
diff --git a/pkgs/development/libraries/liquid-dsp/include-stdarg.patch b/pkgs/by-name/li/liquid-dsp/include-stdarg.patch
similarity index 100%
rename from pkgs/development/libraries/liquid-dsp/include-stdarg.patch
rename to pkgs/by-name/li/liquid-dsp/include-stdarg.patch
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/by-name/li/liquid-dsp/package.nix
similarity index 94%
rename from pkgs/development/libraries/liquid-dsp/default.nix
rename to pkgs/by-name/li/liquid-dsp/package.nix
index 6b4ce1c17233..55e1192680bc 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/by-name/li/liquid-dsp/package.nix
@@ -4,7 +4,7 @@
   cmake,
   fetchFromGitHub,
   autoreconfHook,
-  autoSignDarwinBinariesHook,
+  darwin,
   fixDarwinDylibNames,
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cmake
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    autoSignDarwinBinariesHook
+    darwin.autoSignDarwinBinariesHook
     fixDarwinDylibNames
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80118b0bb715..83fb4894fbab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6217,10 +6217,6 @@ with pkgs;
 
   libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
 
-  liquid-dsp = callPackage ../development/libraries/liquid-dsp {
-    inherit (darwin) autoSignDarwinBinariesHook;
-  };
-
   luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
 
   luabind_luajit = luabind.override { lua = luajit; };

From 7b89c66142462324b535b0204b068ee5f74eee1b Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 18 Jul 2026 19:34:37 -0700
Subject: [PATCH 35/76] maintainers: add @numinit new laptop ecdsa-sk signing
 key

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 63ef1e025c0d..b4c0fbce895c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20782,8 +20782,9 @@
     github = "numinit";
     githubId = 369111;
     keys = [
-      # SSH
+      # SSH, per-machine yubikey ecdsa-sk keys
       { fingerprint = "XX/0lMz82MpucPqf0KG+5EJoozzNRi8i/t59byD2kNo"; }
+      { fingerprint = "dye2C1N4RQaf+8ht5Ipd52BbnnuwBtdXxocPzk8b2mw"; }
       # GPG, >=2025, stays in one place
       { fingerprint = "FD28 F9C9 81C5 D78E 56E8  8311 5C3E B94D 198F 1491"; }
       # GPG, >=2025, travels with me

From 44045f695f796857463c01c41d458085b531be1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 06:01:21 +0000
Subject: [PATCH 36/76] ggml: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix
index 2e1ae161f39d..aa55a4bdd3ed 100644
--- a/pkgs/by-name/gg/ggml/package.nix
+++ b/pkgs/by-name/gg/ggml/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ggml";
-  version = "0.16.0";
+  version = "0.17.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "ggml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0DdBEsnUAEdC+qN5s310Ih+ELyXOjvwrykMFNHLkoO4=";
+    hash = "sha256-kUCXeIgRRv9UgVlTDwSJaZuTw4piaP23pzTUi1PCi5Q=";
   };
 
   # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR

From 1d676a19a176802653210e98fb9de654a4b038f0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Jul 2026 09:37:17 +0000
Subject: [PATCH 37/76] python3Packages.plotnine: skip newly failing tests

---
 .../python-modules/plotnine/default.nix       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index 0ff799eade41..78787065e881 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -64,6 +64,11 @@ buildPythonPackage (finalAttrs: {
     # After manually checking, this is caused by extremely subtle differences in label placement.
     # See https://github.com/has2k1/plotnine/issues/627
     "test_aesthetics"
+    "test_after_scale_mapping"
+    "test_annotate_faceting"
+    "test_inserting_layers"
+    "test_multiple_annotation_geoms"
+    "test_to_pandas"
   ];
 
   disabledTestPaths = [
@@ -72,40 +77,56 @@ buildPythonPackage (finalAttrs: {
     # After manually checking, this is caused by extremely subtle differences in label placement.
     "tests/test_aes.py"
     "tests/test_annotation_logticks.py"
+    "tests/test_annotation_stripes.py"
     "tests/test_coords.py"
     "tests/test_facet_labelling.py"
     "tests/test_facets.py"
+    "tests/test_geom_abline.py"
     "tests/test_geom_bar_col_histogram.py"
     "tests/test_geom_bin_2d.py"
+    "tests/test_geom_blank.py"
     "tests/test_geom_boxplot.py"
     "tests/test_geom_count.py"
-    "tests/test_geom_density_2d.py"
     "tests/test_geom_density.py"
+    "tests/test_geom_density_2d.py"
     "tests/test_geom_dotplot.py"
+    "tests/test_geom_errorbar_errorbarh.py"
     "tests/test_geom_freqpoly.py"
+    "tests/test_geom_linerange_pointrange.py"
     "tests/test_geom_map.py"
     "tests/test_geom_path_line_step.py"
     "tests/test_geom_point.py"
     "tests/test_geom_pointdensity.py"
     "tests/test_geom_polygon.py"
+    "tests/test_geom_qq_qq_line.py"
+    "tests/test_geom_quantile.py"
     "tests/test_geom_raster.py"
     "tests/test_geom_rect_tile.py"
     "tests/test_geom_ribbon_area.py"
+    "tests/test_geom_rug.py"
+    "tests/test_geom_segment.py"
     "tests/test_geom_sina.py"
     "tests/test_geom_smooth.py"
+    "tests/test_geom_spoke.py"
     "tests/test_geom_text_label.py"
     "tests/test_geom_violin.py"
+    "tests/test_guide_internals.py"
     "tests/test_layout.py"
     "tests/test_plot_composition.py"
     "tests/test_position.py"
     "tests/test_qplot.py"
     "tests/test_scale_internals.py"
     "tests/test_scale_labelling.py"
+    "tests/test_scale_linetype.py"
+    "tests/test_scale_symlog.py"
     "tests/test_stat_ecdf.py"
     "tests/test_stat_ellipse.py"
     "tests/test_stat_function.py"
+    "tests/test_stat_hull.py"
     "tests/test_stat_summary.py"
+    "tests/test_stat_summary_bin.py"
     "tests/test_theme.py"
+    "tests/test_watermark.py"
 
     # Linting / formatting: useless as it has nothing to do with the package functioning
     # Disabling this prevents adding a dependency on 'ruff' and 'black'.

From 1e20e9d829349b1fc36b0e88a7612d6297f10c50 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Jul 2026 10:04:18 +0000
Subject: [PATCH 38/76] pyspread: cleanup, fix

---
 pkgs/by-name/py/pyspread/package.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 6bb3b984431e..ea2b080a080b 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitLab,
   qt6,
   R,
   copyDesktopItems,
@@ -10,14 +10,19 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyspread";
   version = "2.4.5";
+  pyproject = true;
+  __structuredAttrs = true;
 
-  src = fetchPypi {
-    pname = "pyspread";
-    inherit (finalAttrs) version;
-    hash = "sha256-7Nurn9OmK6LEz5TT543JUYKc/LjpkwfN/7r0ebS1PfY=";
+  src = fetchFromGitLab {
+    owner = "pyspread";
+    repo = "pyspread";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3DAoRIzwFxOEIXSCO+MyCAZ92Y57AD9Z9oq6ps1Ck0k=";
   };
 
-  pyproject = true;
+  build-system = with python3Packages; [
+    setuptools
+  ];
 
   nativeBuildInputs = [
     R
@@ -67,7 +72,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
     })
   ];
 
-  makeWrapperArgs = [ "--set R_HOME ${lib.getLib R}/lib/R" ];
+  makeWrapperArgs = [
+    "--set"
+    "R_HOME"
+    "${lib.getLib R}/lib/R"
+  ];
 
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")

From 656a07eafd00a3081cfb112daefc5a932e19ea0a Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 16 Jul 2026 20:00:15 +0800
Subject: [PATCH 39/76] vtk: fix build with gdal-3.13

---
 pkgs/development/libraries/vtk/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 4c701d85148a..90f65eb6b358 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,6 +1,6 @@
 {
   callPackage,
-  fetchpatch2,
+  fetchpatch,
 }:
 let
   mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { };
@@ -9,10 +9,24 @@ in
   vtk_9_5 = mkVtk {
     version = "9.5.2";
     sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk=";
+    patches = [
+      (fetchpatch {
+        name = "fix-gdal-3.13-const-conversion.patch";
+        url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch";
+        hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I=";
+      })
+    ];
   };
 
   vtk_9_6 = mkVtk {
     version = "9.6.0";
     sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI=";
+    patches = [
+      (fetchpatch {
+        name = "fix-gdal-3.13-const-conversion.patch";
+        url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch";
+        hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I=";
+      })
+    ];
   };
 }

From c1987d2d9132443be6e18d27e288306e0295e638 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 2 Jul 2026 16:06:11 +0800
Subject: [PATCH 40/76] vtk_9_6: 9.6.0 -> 9.6.2

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

diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 90f65eb6b358..6f846c8eedca 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -19,8 +19,8 @@ in
   };
 
   vtk_9_6 = mkVtk {
-    version = "9.6.0";
-    sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI=";
+    version = "9.6.2";
+    sourceSha256 = "sha256-rtEs7BKpYJF5v2YykHAmZifKZCRKEIVqRSsqF/+wSh0=";
     patches = [
       (fetchpatch {
         name = "fix-gdal-3.13-const-conversion.patch";

From c7e1afd8ef452cdb7e4c237ad9cdb228272384ad Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 16 Jul 2026 19:43:57 +0800
Subject: [PATCH 41/76] python3Packages.vtk: drop wslink dependency

wslink is an optional dependency of vtk.
See also https://github.com/Kitware/wslink/pull/165#issuecomment-3769609059.
---
 pkgs/development/libraries/vtk/generic.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 2c55cb56a380..536499f718aa 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -227,7 +227,6 @@ stdenv.mkDerivation (finalAttrs: {
         with python3Packages;
         [
           numpy
-          wslink
           matplotlib
         ]
         ++ lib.optional mpiSupport (mpi4py.override { inherit mpi; });

From 795a776aac5c6b33ac910693880f6b5287594817 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 2 Jul 2026 16:13:07 +0800
Subject: [PATCH 42/76] vtk: propagate qttools

---
 pkgs/by-name/pa/parmmg/package.nix         | 9 ++++++---
 pkgs/development/libraries/vtk/generic.nix | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix
index 0d1681c04f2c..9623b341eb53 100644
--- a/pkgs/by-name/pa/parmmg/package.nix
+++ b/pkgs/by-name/pa/parmmg/package.nix
@@ -10,10 +10,13 @@
   metis,
   mmg,
   scotch,
-  vtk-full,
+  vtk,
   withVtk ? true,
   testers,
 }:
+let
+  vtk-mpi = vtk.override { mpiSupport = true; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "parmmg";
   version = "1.5.0";
@@ -53,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
     scotch
     (mmg.override {
       inherit withVtk;
-      vtk = vtk-full;
+      vtk = vtk-mpi;
     })
   ]
-  ++ lib.optional withVtk vtk-full;
+  ++ lib.optional withVtk vtk-mpi;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 536499f718aa..b09439d68196 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -169,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxrender
     libxcursor
   ]
-  ++ lib.optional withQt6 qt6.qttools
   ++ lib.optional mpiSupport mpi
   ++ lib.optional pythonSupport tk;
 
@@ -219,6 +218,7 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     gl2ps
   ]
+  ++ lib.optionals withQt6 [ qt6.qttools ]
   # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do
   ++ lib.optionals pythonSupport [
     (python3Packages.mkPythonMetaPackage {
@@ -319,7 +319,6 @@ stdenv.mkDerivation (finalAttrs: {
         package = finalAttrs.finalPackage;
 
         nativeBuildInputs = lib.optionals withQt6 [
-          qt6.qttools
           qt6.wrapQtAppsHook
         ];
       };

From 94cccf0fcd834b3c38a5eb6dca40201ef1a85c40 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 16 Jul 2026 20:07:32 +0800
Subject: [PATCH 43/76] vtk_9_6: propagate libxcursor

libxcursor is publicly referenced in vtkX11Functions.h.
See also https://github.com/NixOS/nixpkgs/pull/501661#issuecomment-4102231881.
---
 pkgs/development/libraries/vtk/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index b09439d68196..0028af291ca3 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -218,6 +218,9 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     gl2ps
   ]
+  ++ lib.optionals ((lib.versionAtLeast finalAttrs.version "9.6.0") && stdenv.hostPlatform.isLinux) [
+    libxcursor
+  ]
   ++ lib.optionals withQt6 [ qt6.qttools ]
   # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do
   ++ lib.optionals pythonSupport [

From 0943d5cbff6148c9ec942f2bf0b1edba5d7367e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 11:11:22 +0000
Subject: [PATCH 44/76] edhm-ui: 3.0.69 -> 3.0.70

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

diff --git a/pkgs/by-name/ed/edhm-ui/package.nix b/pkgs/by-name/ed/edhm-ui/package.nix
index c3e9f4aebc30..cfd0561164b6 100644
--- a/pkgs/by-name/ed/edhm-ui/package.nix
+++ b/pkgs/by-name/ed/edhm-ui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edhm-ui";
-  version = "3.0.69";
+  version = "3.0.70";
 
   strictDeps = true;
 
   src = fetchzip {
     url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip";
-    hash = "sha256-t/K8VohJjjP/VgreHZWYtlsMXp1gp9Gme/joHywfeH4=";
+    hash = "sha256-jAvUWrjQl8dmXxd99ONYqgdnPkzDQwdSEf8ar2nLEds=";
   };
 
   nativeBuildInputs = [

From a752f646403de27de41e60d2c0d5a540b5c8dfb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 12:26:59 +0000
Subject: [PATCH 45/76] gdb-dashboard: 0.17.4 -> 0.17.5

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

diff --git a/pkgs/by-name/gd/gdb-dashboard/package.nix b/pkgs/by-name/gd/gdb-dashboard/package.nix
index badac418d66a..84a3b8f2b467 100644
--- a/pkgs/by-name/gd/gdb-dashboard/package.nix
+++ b/pkgs/by-name/gd/gdb-dashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdb-dashboard";
-  version = "0.17.4";
+  version = "0.17.5";
 
   src = fetchFromGitHub {
     owner = "cyrus-and";
     repo = "gdb-dashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xoBkAFwkbaAsvgPwGwe1JxE1C8gPR6GP1iXeNKK5Z70=";
+    hash = "sha256-q1oh/i7BWhycTK+2dZDDOTGHzMZuBKb9qrawmuyW2CU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4c54c8b8794c7a32970827d34d61974464a03bcf Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Sun, 19 Jul 2026 14:51:17 +0200
Subject: [PATCH 46/76] invidious: patch CVE-2026-58447

https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45

https://tracker.security.nixos.org/suggestions/by-id/10419/

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/in/invidious/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 589f0e55d209..57d6250fee35 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -3,6 +3,7 @@
   callPackage,
   crystal,
   fetchFromGitHub,
+  fetchpatch2,
   librsvg,
   pkg-config,
   libxml2,
@@ -41,6 +42,15 @@ crystal.buildCrystalPackage rec {
     inherit (versions.invidious) hash;
   };
 
+  patches = [
+    # Remove with the first release containing this commit.
+    (fetchpatch2 {
+      name = "CVE-2026-58447.patch";
+      url = "https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45.patch?full_index=1";
+      hash = "sha256-0pf6eu0ckQ2gYHLr2tEDy+1dvAhVjepG26kuxuHbZl8=";
+    })
+  ];
+
   postPatch =
     let
       # Replacing by the value (templates) of the variables ensures that building

From bcd6e4df6d70dbeffbe68398de1132400790ca76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 13:23:20 +0000
Subject: [PATCH 47/76] just: 1.56.0 -> 1.57.0

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

diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index b418ef405a55..0a2aa7e81fc1 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -17,7 +17,7 @@
   withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
 }:
 let
-  version = "1.56.0";
+  version = "1.57.0";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -36,10 +36,10 @@ rustPlatform.buildRustPackage {
     owner = "casey";
     repo = "just";
     tag = version;
-    hash = "sha256-ZDaSZnn/2oncsl5JTBctUXXSqw2WQnIUIWfYRh2N70A=";
+    hash = "sha256-fFeWGX72YcTKzPqfRYloTtnW4r7uXHUipyYP9VV8LZE=";
   };
 
-  cargoHash = "sha256-I0aWzBSpU2gu1wjsUJ0jPO5oifXFcMcRdqs9P4j2vnA=";
+  cargoHash = "sha256-hdfOs9UDjdrk8XclCxTdQgSOpt+yYQoPD5lWZrdNs2Q=";
 
   nativeBuildInputs =
     lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]

From e40f42ad346babea1925b5bcca8e0d9db3b9d711 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 14:02:07 +0000
Subject: [PATCH 48/76] terraform-providers.oracle_oci: 8.22.0 -> 8.23.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6b6b69fc7333..3717352cd6d2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1058,11 +1058,11 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-ENFE5nK1qxZcOxIMzXiilCLxRGBg0dc3lTPODk9e99g=",
+    "hash": "sha256-ZDpyBnralPWEMorou9A8+llGqavGlPMe1YJlUMrfYRY=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v8.22.0",
+    "rev": "v8.23.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 564a971a9de47e9ed3e6f67446da39afd02afaba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 15:41:07 +0000
Subject: [PATCH 49/76] zashboard: 3.14.0 -> 3.15.0

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

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index 30bbb2c8a6ff..8dd9000fce7a 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "zashboard";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GSzJpBGDCh7OPPr5OWfAAbraRjIhKkVo5/EMRmrLm/o=";
+    hash = "sha256-esGLewI9zF25yXZeztFGiKjYYbMn9cwYnOjLzLIijWI=";
   };
 
   npmDeps = null;

From 8ed5a1e5cb4f8c0b3adab02aaf4bb58bfabb4e76 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Sun, 19 Jul 2026 23:41:40 +0800
Subject: [PATCH 50/76] pocketbase: 0.39.6 -> 0.39.8

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index e31c998bf487..5a19aca35b40 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.39.6";
+  version = "0.39.8";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo=";
+    hash = "sha256-ZStu568NCfNo46NNsuAi0i8Oph0bL5L2v+Zny3WqdIY=";
   };
 
-  vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8=";
+  vendorHash = "sha256-88GNxiHZzDJp8Xj0Il3D3gT8NaVAyyd+gcGmFAzfKp8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From f08b7d8a73c614396e246d4d20ada1352918ea15 Mon Sep 17 00:00:00 2001
From: Ian Kilgore <iank@iank.org>
Date: Sun, 19 Jul 2026 10:38:12 -0400
Subject: [PATCH 51/76] liquid-dsp: tidy

attribute ordering, remove unused arg, patch comments
---
 pkgs/by-name/li/liquid-dsp/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/liquid-dsp/package.nix b/pkgs/by-name/li/liquid-dsp/package.nix
index 55e1192680bc..55e7f60d85df 100644
--- a/pkgs/by-name/li/liquid-dsp/package.nix
+++ b/pkgs/by-name/li/liquid-dsp/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   cmake,
   fetchFromGitHub,
-  autoreconfHook,
   darwin,
   fixDarwinDylibNames,
 }:
@@ -19,10 +18,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI=";
   };
 
-  cmakeFlags = [
-    # Prevent native cpu arch from leaking into binaries.
-    (lib.cmakeBool "ENABLE_SIMD" false)
-    (lib.cmakeBool "FIND_SIMD" false)
+  patches = [
+    # Fix CMake absolute include/lib paths issue, see also
+    # - https://github.com/NixOS/nixpkgs/issues/144170
+    # - https://github.com/jgaeddert/liquid-dsp/pull/450
+    ./fix-cmake-pc-paths.patch
+    # liquid.h uses va_list; needs stdarg.h
+    ./include-stdarg.patch
   ];
 
   nativeBuildInputs = [
@@ -33,9 +35,10 @@ stdenv.mkDerivation rec {
     fixDarwinDylibNames
   ];
 
-  patches = [
-    ./fix-cmake-pc-paths.patch
-    ./include-stdarg.patch
+  cmakeFlags = [
+    # Prevent native cpu arch from leaking into binaries.
+    (lib.cmakeBool "ENABLE_SIMD" false)
+    (lib.cmakeBool "FIND_SIMD" false)
   ];
 
   doCheck = true;

From 3fa169169d0d368af8956005df4ed8fdd967ecc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 15:47:45 +0000
Subject: [PATCH 52/76] python3Packages.victron-mqtt: 2026.7.3 -> 2026.7.5

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

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index 12f1952ab591..9ea5b7794f96 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.7.3";
+  version = "2026.7.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J5k3JkAP1E39KL3JMIfg00jDuiFfIss+N3+/Jxscx3s=";
+    hash = "sha256-nFsv8fij2kqzpGwflWPfN29Tt8lbHS2EvLqljWHHOwE=";
   };
 
   build-system = [

From 6fe8039026234040655ee3e49d225d74ff4d0377 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 17:19:38 +0000
Subject: [PATCH 53/76] betteralign: 0.14.0 -> 0.14.2

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

diff --git a/pkgs/by-name/be/betteralign/package.nix b/pkgs/by-name/be/betteralign/package.nix
index b1e5a9605035..c7efd14543a8 100644
--- a/pkgs/by-name/be/betteralign/package.nix
+++ b/pkgs/by-name/be/betteralign/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "betteralign";
-  version = "0.14.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "dkorunic";
     repo = "betteralign";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8aIFHFZ9O+4Tq9dfbl2Ou8LYekRgBcx6O/G+xP+7BPA=";
+    hash = "sha256-H6KjYk90GhBzLcv2gN5gfv8Y4MY2VH3EFCq8Zf7xHI0=";
 
     # Trick for getting accurate commit, source date and timestamp for ldflags
     # Required by upstream https://github.com/dkorunic/betteralign/blob/346baa9c9dd024bfe55302c9d7d0ca46b2734c1c/.goreleaser.yml
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-DaAa3Rj6Tl+KtLjjQlHR/peZPaEeUo7wwlfBeVQVx/s=";
+  vendorHash = "sha256-K2n418V0LBM3Q9UcWS59v915RgiCnhQ5pNRy9P9OBTg=";
 
   env.CGO_ENABLED = 0;
 

From dfdf079ccd8114467b7d0894757e57edc945fcad Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sun, 19 Jul 2026 20:48:50 +0300
Subject: [PATCH 54/76] python3Packages.exllamav3: 0.0.43 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix
index ab7e43ef490f..64f380cd44fe 100644
--- a/pkgs/development/python-modules/exllamav3/default.nix
+++ b/pkgs/development/python-modules/exllamav3/default.nix
@@ -7,7 +7,6 @@
 
   setuptools,
 
-  flash-attn,
   flash-linear-attention,
   formatron,
   kbnf,
@@ -22,21 +21,20 @@
   tokenizers,
   torch,
   typing-extensions,
-  xformers,
 }:
 let
   newerThanTuring = lib.filter (version: lib.versionOlder "7.9" version) torch.cudaCapabilities;
 in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "exllamav3";
-  version = "0.0.43";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "turboderp-org";
     repo = "exllamav3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-68v8ptvtOzRTnnRXrgU0emqmbCO0pECidgJ36bwm8/s=";
+    hash = "sha256-JlZt1UuTMmjaQWhiQZxzbHK3WgYYoBjP9PMEizEfsLY=";
   };
 
   pythonRelaxDeps = [
@@ -60,7 +58,6 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   ];
 
   dependencies = [
-    flash-attn
     flash-linear-attention
     formatron
     kbnf
@@ -74,7 +71,6 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     tokenizers
     torch
     typing-extensions
-    xformers
   ];
 
   env = lib.optionalAttrs torch.cudaSupport {

From ae9dcf6e3c334a54cb89ed56e4bc9fee2695fdb7 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sun, 19 Jul 2026 20:49:19 +0300
Subject: [PATCH 55/76] tabbyapi: 0-unstable-2026-06-27 ->
 0-unstable-2026-07-18

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

diff --git a/pkgs/by-name/ta/tabbyapi/package.nix b/pkgs/by-name/ta/tabbyapi/package.nix
index cac9ebfe2c59..2ecf9cb6b700 100644
--- a/pkgs/by-name/ta/tabbyapi/package.nix
+++ b/pkgs/by-name/ta/tabbyapi/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication {
   pname = "tabbyapi";
-  version = "0-unstable-2026-06-27";
+  version = "0-unstable-2026-07-18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theroyallab";
     repo = "tabbyAPI";
-    rev = "3cf468c28362c28be1c8fc731ce1ccaf7b2206d0";
-    hash = "sha256-s97YFyij2/oYlClmV2laDrCkkoK4uVZgRsn5WwftLag=";
+    rev = "0158fb48d76546a6475d1d63f6cd5b90932d1d11";
+    hash = "sha256-Bkpx3MyZg7Np5zXAsq8mgxdAFsHUZhy2NZ93XSLbJgk=";
   };
 
   build-system = with python3Packages; [
@@ -57,7 +57,6 @@ python3Packages.buildPythonApplication {
       numpy
       setuptools
 
-      exllamav2
       exllamav3
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [

From f54df095479861765490319b51041fdb11ea8ae5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 17:53:24 +0000
Subject: [PATCH 56/76] archon-lite: 9.3.172 -> 9.4.36

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

diff --git a/pkgs/by-name/ar/archon-lite/package.nix b/pkgs/by-name/ar/archon-lite/package.nix
index d5177c4a810d..adc73facd7ad 100644
--- a/pkgs/by-name/ar/archon-lite/package.nix
+++ b/pkgs/by-name/ar/archon-lite/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "archon-lite";
-  version = "9.3.172";
+  version = "9.4.36";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage";
-    hash = "sha256-Jl1/40jtdG9acb2SSef4G91hs/b1UdOp6gPnoGPnQ60=";
+    hash = "sha256-th48nSDIi2iugtiqjgkI7/QZtBq+BRQjRs1pKweDArI=";
   };
 
   extracted = appimageTools.extractType2 { inherit pname version src; };

From 5507f97c7fa0b4d93e75d4831a3eab6666424163 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sun, 19 Jul 2026 20:55:11 +0300
Subject: [PATCH 57/76] python3Packages.exllamav2: drop

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

diff --git a/pkgs/development/python-modules/exllamav2/default.nix b/pkgs/development/python-modules/exllamav2/default.nix
deleted file mode 100644
index fd8304708569..000000000000
--- a/pkgs/development/python-modules/exllamav2/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  torch,
-
-  cudaPackages,
-
-  # nativeBuildInputs
-  pybind11,
-
-  # dependencies
-  fastparquet,
-  flash-attn,
-  ninja,
-  numpy,
-  pandas,
-  pillow,
-  pygments,
-  regex,
-  rich,
-  safetensors,
-  tokenizers,
-  websockets,
-}:
-buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
-  pname = "exllamav2";
-  version = "0.3.2";
-  pyproject = true;
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "turboderp-org";
-    repo = "exllamav2";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-WbpbANenOuy6F0qAKVKAmolHjgRKfPxSVud8FZG1TXw=";
-  };
-
-  build-system = [
-    setuptools
-    torch
-  ];
-
-  nativeBuildInputs = [
-    ninja
-  ];
-
-  preConfigure = ''
-    export MAX_JOBS="$NIX_BUILD_CORES"
-    export NVCC_THREADS=2
-  '';
-
-  buildInputs = [
-    pybind11
-  ]
-  ++ lib.optionals torch.cudaSupport [
-    cudaPackages.cuda_cudart # cuda_runtime.h
-    cudaPackages.libcublas # cublas_v2.h
-    cudaPackages.libcurand # curand_kernel.h
-    cudaPackages.libcusolver # cusolverDn.h
-    cudaPackages.libcusparse # cusparse.h
-  ];
-
-  env = lib.optionalAttrs torch.cudaSupport {
-    CUDA_HOME = lib.getDev cudaPackages.cuda_nvcc;
-    TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" torch.cudaCapabilities;
-  };
-
-  dependencies = [
-    fastparquet
-    flash-attn
-    ninja
-    numpy
-    pandas
-    pillow
-    pygments
-    regex
-    rich
-    safetensors
-    tokenizers
-    torch
-    websockets
-  ];
-
-  pythonImportsCheck = [ "exllamav2" ];
-
-  # Tests require GPU hardware and external model files
-  doCheck = false;
-
-  meta = {
-    homepage = "https://github.com/turboderp-org/exllamav2";
-    description = "Inference library for running LLMs locally on modern consumer-class GPUs";
-    changelog = "https://github.com/turboderp-org/exllamav2/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.mit;
-    platforms = [
-      "x86_64-windows"
-      "x86_64-linux"
-    ];
-
-    # Package requires CUDA or ROCm for functionality
-    # ROCm support is partially implemented but untested
-    broken = !torch.cudaSupport;
-    maintainers = with lib.maintainers; [ BatteredBunny ];
-  };
-})
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 062af50d1470..fd1601785079 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -219,6 +219,7 @@ mapAliases {
   esig = throw "'esig' has been removed as it was broken and unmaintained upstream"; # Added 2026-05-27
   et_xmlfile = throw "'et_xmlfile' has been renamed to/replaced by 'et-xmlfile'"; # Converted to throw 2025-10-29
   ev3dev2 = throw "'ev3dev2' has been renamed to/replaced by 'python-ev3dev2'"; # Converted to throw 2025-10-29
+  exllamav2 = throw "'exllamav2' was removed because it is archived upstream and support was dropped in tabbyapi"; # Added 2026-07-19
   eyeD3 = throw "'eyeD3' has been renamed to/replaced by 'eyed3'"; # Converted to throw 2025-10-29
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   Fabric = throw "'Fabric' has been renamed to/replaced by 'fabric'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ccdc7774bb4..f5f981ffcbe7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5662,8 +5662,6 @@ self: super: with self; {
 
   exiv2 = callPackage ../development/python-modules/exiv2 { inherit (pkgs) exiv2; };
 
-  exllamav2 = callPackage ../development/python-modules/exllamav2 { };
-
   exllamav3 = callPackage ../development/python-modules/exllamav3 { };
 
   expandvars = callPackage ../development/python-modules/expandvars { };

From b88fa50389ce93fe12f22a455367a3918b7bf5d0 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Sun, 19 Jul 2026 21:01:23 +0300
Subject: [PATCH 58/76] nixos/tabbyapi: sync options with upstream

Assisted-by: Claude Code (Claude Opus 4.8)
---
 nixos/modules/services/web-apps/tabbyapi.nix | 97 ++++++++++++++++++--
 1 file changed, 88 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-apps/tabbyapi.nix b/nixos/modules/services/web-apps/tabbyapi.nix
index bd937b0d5685..a955afe463b5 100644
--- a/nixos/modules/services/web-apps/tabbyapi.nix
+++ b/nixos/modules/services/web-apps/tabbyapi.nix
@@ -34,7 +34,7 @@ in
             host = lib.mkOption {
               type = lib.types.str;
               default = "127.0.0.1";
-              description = "The IP to host on. Use 0.0.0.0 to expose on all adapters.";
+              description = "The IP to host on. Use 0.0.0.0 to expose on all network adapters.";
             };
 
             port = lib.mkOption {
@@ -46,13 +46,22 @@ in
             disable_auth = lib.mkOption {
               type = lib.types.bool;
               default = false;
-              description = "Disable HTTP token authentication. WARNING: Vulnerable if exposed.";
+              description = ''
+                Disable HTTP token authentication with requests.
+                WARNING: This will make your instance vulnerable! Only turn this on if you are ONLY connecting from localhost.
+              '';
+            };
+
+            disable_fetch_requests = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Disable fetching external content in response to requests, such as images from URLs.";
             };
 
             api_servers = lib.mkOption {
               type = lib.types.listOf lib.types.str;
               default = [ "OAI" ];
-              description = "Select API servers to enable. Options: OAI, Kobold.";
+              description = "Select API servers to enable. Possible values: OAI, Kobold.";
             };
           };
 
@@ -66,7 +75,18 @@ in
             log_requests = lib.mkOption {
               type = lib.types.bool;
               default = false;
-              description = "Enable request logging. Only use for debug.";
+              description = "Enable request logging. NOTE: Only use this for debugging!";
+            };
+
+            log_chat_completion_requests = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = ''
+                Write every /v1/chat/completions request to logs/debug/ as JSON.
+                PRIVACY WARNING: Enabling this creates a comprehensive request log, including the
+                full message history and generation parameters. API keys are redacted, but prompts
+                and user-provided content are preserved for bug-report reproduction.
+              '';
             };
           };
 
@@ -111,35 +131,94 @@ in
               '';
             };
 
+            inline_model_loading = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = ''
+                Allow direct loading of models from a completion or chat completion request.
+                This method of loading is strict by default; enable dummy models to add
+                exceptions for invalid model names.
+              '';
+            };
+
             model_name = lib.mkOption {
               type = lib.types.nullOr lib.types.str;
               default = null;
-              description = "The initial model to load on startup. Must exist in model_dir.";
+              description = ''
+                An initial model to load. Make sure the model is located in the model directory!
+                REQUIRED: This must be filled out to load a model on startup.
+              '';
               example = "Qwen3_5-9B";
             };
 
             max_seq_len = lib.mkOption {
               type = lib.types.nullOr lib.types.int;
               default = null;
-              description = "Max sequence length. Set null to use model defaults.";
+              description = ''
+                Max sequence length (default: min(max_position_embeddings, cache_size)).
+                Set to -1 to fetch from the model's config.json.
+              '';
             };
 
             cache_mode = lib.mkOption {
               type = lib.types.str;
               default = "FP16";
-              description = "Cache mode for VRAM savings. ExLlamaV2: FP16, Q8, Q6, Q4. ExLlamaV3: specific pair string (e.g., '8,8').";
+              description = ''
+                Enable different cache modes for VRAM savings.
+                Specify the pair k_bits,v_bits where k_bits and v_bits are integers from 2-8 (e.g. '8,8').
+                The legacy values 'FP16', 'Q8', 'Q6', 'Q4' are also accepted.
+              '';
+            };
+
+            tensor_parallel = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = ''
+                Load model with tensor parallelism.
+                Falls back to autosplit if GPU split isn't provided. This ignores the gpu_split_auto value.
+              '';
             };
 
             gpu_split_auto = lib.mkOption {
               type = lib.types.bool;
               default = true;
-              description = "Automatically allocate resources to GPUs.";
+              description = "Automatically allocate resources to GPUs. Not parsed for single GPU users.";
             };
 
             dummy_model_names = lib.mkOption {
               type = lib.types.listOf lib.types.str;
               default = [ "gpt-3.5-turbo" ];
-              description = "List of fake model names sent via the /v1/models endpoint.";
+              description = ''
+                A list of fake model names that are sent via the /v1/models endpoint.
+                Also used as bypasses for strict mode if inline_model_loading is true.
+              '';
+            };
+
+            vision = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Enables vision support if the model supports it.";
+            };
+
+            reasoning = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = ''
+                Enable reasoning parser.
+                Do NOT enable this if the model is not a reasoning model (e.g. deepseek-r1 series).
+              '';
+            };
+
+            reasoning_start_token = lib.mkOption {
+              type = lib.types.str;
+              default = "<think>";
+              description = "The start token for reasoning content.";
+            };
+
+            reasoning_end_token = lib.mkOption {
+              type = lib.types.str;
+              default = "</think>";
+              description = "The end token for reasoning content.";
             };
           };
         };

From 83d207ac9fceb26f2a3e2aea050537a10cfada4f Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:14:48 +0200
Subject: [PATCH 59/76] tml: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
---
 pkgs/by-name/tm/tml/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index 41700c789543..72aa80545ccc 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -28,6 +28,8 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
   };
 })

From e0ad052d15ee915a6a5e1d25b8f383293048feb9 Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:20:15 +0200
Subject: [PATCH 60/76] unimap: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
---
 pkgs/by-name/un/unimap/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index a97d7f501f2d..d02ed9f5f80f 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -51,7 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/Edu4rdSHL/unimap";
     changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
     mainProgram = "unimap";
   };
 })

From 3435825c66ec487a9a2f727dce41627766dea07a Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
Date: Sun, 19 Jul 2026 20:28:38 +0200
Subject: [PATCH 61/76] timelimit: adopt

See https://github.com/NixOS/nixpkgs/issues/458096.

Signed-off-by: Leonard Sheng Sheng Lee <leonard.sheng.sheng.lee@gmail.com>
---
 pkgs/by-name/ti/timelimit/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix
index b80ff791acc0..f68acb32c985 100644
--- a/pkgs/by-name/ti/timelimit/package.nix
+++ b/pkgs/by-name/ti/timelimit/package.nix
@@ -31,7 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://devel.ringlet.net/sysutils/timelimit/";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+    ];
     mainProgram = "timelimit";
   };
 })

From 58fee7f4f7524452cf0a04153c66c0b77b0dab40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C3=B6lfchen?= <w-lfchen@posteo.net>
Date: Sun, 19 Jul 2026 20:44:24 +0200
Subject: [PATCH 62/76] eww: remove rustc bootstrap

eww has not been on nightly for over two years now, this is not needed
anymore
---
 pkgs/by-name/ew/eww/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 53fc9eea0f50..3b60609fb638 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -46,9 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoTestFlags = finalAttrs.cargoBuildFlags;
 
-  # requires unstable rust features
-  env.RUSTC_BOOTSTRAP = 1;
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd eww \
       --bash <($out/bin/eww shell-completions --shell bash) \

From a11b7d5ce8a5b7b8b6cd43e81c82e1eadc3bc03f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 18:59:31 +0000
Subject: [PATCH 63/76] oci-cli: 3.89.1 -> 3.89.2

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 570b7829961b..15e0883007c4 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -31,14 +31,14 @@ in
 
 py.pkgs.buildPythonApplication (finalAttrs: {
   pname = "oci-cli";
-  version = "3.89.1";
+  version = "3.89.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9sr+7zFP7THy39XWWI8bC2Th9e2t6zwfjbBkyajvOHM=";
+    hash = "sha256-iR4Sq0S8dUsygUeuTI3xEKEZFgjfAQwGqUOH+i+Kw/g=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From bdca419f3819f2fdc66dae70c825fbb428555a45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 19:01:30 +0000
Subject: [PATCH 64/76] home-assistant-custom-components.smarthq: 1.2.2 ->
 1.2.3

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

diff --git a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix
index 1abf81c5ca88..c455cf9b9dbe 100644
--- a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent (finalAttrs: {
   owner = "geappliances";
   domain = "smarthq";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "geappliances";
     repo = "geappliances-smarthq-integration";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PwCorYIqRK4gQLaYxoebIVRIeTcIrDo3CRNs/6DUc9o=";
+    hash = "sha256-OiEUrYR4J+AUDDQN7BkGZPuBSG5lry7OB0sh7CsShtI=";
   };
 
   dependencies = [

From 2a7f6f66bdfcc1a0e24273e4e8baf2f9650d0b7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 19:03:06 +0000
Subject: [PATCH 65/76] home-assistant-custom-components.cable_modem_monitor:
 3.14.0-beta.13 -> 3.14.0-beta.14

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

diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
index 33068130ec24..b5e736f0c4f6 100644
--- a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
@@ -17,12 +17,12 @@
   requests,
 }:
 let
-  version = "3.14.0-beta.13";
+  version = "3.14.0-beta.14";
   src = fetchFromGitHub {
     owner = "solentlabs";
     repo = "cable_modem_monitor";
     tag = "v${version}";
-    hash = "sha256-biQVMq2IoOdbpdP+zDfLXdl91++aKmN3EPQfvzEACyU=";
+    hash = "sha256-9spsEWLwRmWgWz6EZAGHaLmLgjQN2bQevrF1+XFvBtY=";
     fetchLFS = true;
   };
 

From 148342b2232aa0eb14c6151d77ae5aac2654cff1 Mon Sep 17 00:00:00 2001
From: phluxjr <noreply@phluxjr.net>
Date: Sun, 19 Jul 2026 10:53:05 -0500
Subject: [PATCH 66/76] maintainers: add phluxjr

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index be893bb67a64..2fc10e3cf623 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22085,6 +22085,12 @@
     githubId = 421510;
     name = "Noé Rubinstein";
   };
+  phluxjr = {
+    email = "phluxjr@phluxjr.net";
+    github = "phluxjr";
+    githubId = 185956030;
+    name = "phluxjr";
+  };
   pho = {
     email = "phofin@gmail.com";
     github = "pho";

From 304f5ed0bedd0e71014f78e158528400405c33aa Mon Sep 17 00:00:00 2001
From: phluxjr <noreply@phluxjr.net>
Date: Sun, 19 Jul 2026 11:18:53 -0500
Subject: [PATCH 67/76] confy-tui: init at 3.0.0

---
 pkgs/by-name/co/confy-tui/package.nix | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/co/confy-tui/package.nix

diff --git a/pkgs/by-name/co/confy-tui/package.nix b/pkgs/by-name/co/confy-tui/package.nix
new file mode 100644
index 000000000000..ea852b704127
--- /dev/null
+++ b/pkgs/by-name/co/confy-tui/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "confy-tui";
+  version = "3.0.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "phluxjr";
+    repo = "confy";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-yhzmkIPrOckDxoB10RBX5ul/rYzVKtU6l6O1Zm69e9c=";
+  };
+
+  build-system = [
+    python3Packages.hatchling
+  ];
+
+  postInstall = ''
+    install -Dm644 confy.1 $out/share/man/man1/confy.1
+  '';
+
+  meta = {
+    description = "config manager tui for linux/unix systems";
+    homepage = "https://github.com/phluxjr/confy";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ phluxjr ];
+    mainProgram = "confy";
+    platforms = lib.platforms.unix;
+  };
+})

From 68cb9af564d67bfbd49887efc59496951b7d8e18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 19:26:06 +0000
Subject: [PATCH 68/76] rbspy: 0.49.0 -> 0.50.0

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

diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index dbdbea6f7eda..267420b6c609 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.49.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H4SFivaMmRvAhJy5n/QZ1dHFRfYywrpABMl1A9waYzo=";
+    hash = "sha256-rDPaG6cT+1IJ8Q0iYU3e+XPBr9gufQyOb682LJguhDs=";
   };
 
-  cargoHash = "sha256-NtUJxQTRmXsI76DjJ43UfBf9FskFk/gehw5STcuQEuQ=";
+  cargoHash = "sha256-YiPfjLVYfn38t9wfhWiagUQvWZuOjRdxm7RzG5S9IeU=";
 
   doCheck = true;
 

From 74b37d77b750308a43f5059e1d681810e352aaab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 19:26:11 +0000
Subject: [PATCH 69/76] 
 home-assistant-custom-lovelace-modules.universal-remote-card: 4.11.4 ->
 4.11.5

---
 .../universal-remote-card/package.nix                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index d1f38dcba27b..788b1c54da91 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "universal-remote-card";
-  version = "4.11.4";
+  version = "4.11.5";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-R2fs9J0ibV9RUUbFBzKl6LCHGr5GATS4ZtABTS4Wjd8=";
+    hash = "sha256-6UdoWzYekoAyLF4D7LP92/LVcczB7nJU6y/C9OT/NVs=";
   };
 
-  npmDepsHash = "sha256-w21PeUt34FIy2BOQNXizEfM93Wd/UwvJjU1fdSzU2OY=";
+  npmDepsHash = "sha256-8A5FPbxqUIS76/6K6oTrgQMRYgl9Q+4JgQJAYGSCI2U=";
 
   installPhase = ''
     runHook preInstall

From 76c59399edad6cdcaef372451e8bfd5ad8e0fd4a Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Mon, 8 Jun 2026 23:28:20 +0200
Subject: [PATCH 70/76] python3Packages.meld3: drop

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

diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
deleted file mode 100644
index cc67de2ee01c..000000000000
--- a/pkgs/development/python-modules/meld3/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "meld3";
-  version = "2.0.1";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775";
-  };
-
-  doCheck = false;
-
-  meta = {
-    description = "HTML/XML templating engine used by supervisor";
-    homepage = "https://github.com/supervisor/meld3";
-    license = lib.licenses.free;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index be7ef4fbf689..89c47393da19 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -368,6 +368,7 @@ mapAliases {
   mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25
   MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
   MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
+  meld3 = throw "'meld3' has been removed because it was unused and unmaintained upstream"; # added 2026-06-08
   memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
   memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 115f30770f75..93348e637f7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10310,8 +10310,6 @@ self: super: with self; {
 
   meinheld = callPackage ../development/python-modules/meinheld { };
 
-  meld3 = callPackage ../development/python-modules/meld3 { };
-
   melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { };
 
   memestra = callPackage ../development/python-modules/memestra { };

From 6ca435f1c65c32eff8fd991142a70fb2424cf4dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 19:32:25 +0000
Subject: [PATCH 71/76] phoenixd: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index 9e6357913b2a..f718ba742e22 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoenixd";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src =
     let
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
     fetchurl {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
-        aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s=";
-        x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI=";
-        aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs=";
+        aarch64-darwin = "sha256-NQyHyQzfkdLPpQnuSP09cSZwITA9Q1ml7q2haU3qm5o=";
+        x86_64-linux = "sha256-2eVLk4E/F3GwcslsWulo/7WwUvLKHEJ2K2biy4A2Kg8=";
+        aarch64-linux = "sha256-yAbw2AWKSHKEFzU2rMupBBF2+CF/jITOWbbpfQSoizE=";
       };
     };
 

From cf53f06606924cd9109e8890b27a257fa442058f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Jul 2026 20:06:10 +0000
Subject: [PATCH 72/76] prometheus-node-exporter: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
index f7c75d99ea84..a450f93da895 100644
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "node_exporter";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pjgxx7Xz0q2SctTEwDiwqmZAOTxrHt1XEl1pSMP7Ids=";
+    hash = "sha256-10sGJ4PkYMmr9mpYu22dw9zDbbDsCsHfG6Z7czaywAc=";
   };
 
   vendorHash = "sha256-WFRxkwMM9D612tLJjij+kwpcwhcl3KhR8xXxx43SC9o=";

From 60b3b829befc8ee348d1bbe7feab3da17de0b02d Mon Sep 17 00:00:00 2001
From: mert-kurttutan <kurttutan.mert@gmail.com>
Date: Fri, 19 Jun 2026 21:56:43 +0000
Subject: [PATCH 73/76] python3Packages.flask-static-digest: init at 0.4.1

---
 .../flask-static-digest/default.nix           | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-static-digest/default.nix

diff --git a/pkgs/development/python-modules/flask-static-digest/default.nix b/pkgs/development/python-modules/flask-static-digest/default.nix
new file mode 100644
index 000000000000..e22833682455
--- /dev/null
+++ b/pkgs/development/python-modules/flask-static-digest/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  flask,
+
+  # optional-dependencies
+  brotli,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "flask-static-digest";
+  version = "0.4.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "nickjj";
+    repo = "flask-static-digest";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-A+NELUCjYTkUYbL0TIPvgGcJ49YRgoBn/eJRxi/yLyc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [ flask ];
+
+  optional-dependencies.brotli = [ brotli ];
+
+  # Upstream does not provide tests.
+  doCheck = false;
+
+  pythonImportsCheck = [ "flask_static_digest" ];
+
+  meta = {
+    description = "Flask extension for md5 tagging and compressing static files";
+    homepage = "https://github.com/nickjj/flask-static-digest";
+    changelog = "https://github.com/nickjj/flask-static-digest/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mert-kurttutan ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe310669b717..5235fe44f8d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5916,6 +5916,8 @@ self: super: with self; {
 
   flask-sslify = callPackage ../development/python-modules/flask-sslify { };
 
+  flask-static-digest = callPackage ../development/python-modules/flask-static-digest { };
+
   flask-swagger = callPackage ../development/python-modules/flask-swagger { };
 
   flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };

From 74f1e0fd88ab1fdbf858d6ba2107cbf3ca82892b Mon Sep 17 00:00:00 2001
From: lumi <lumi@suwi.moe>
Date: Sun, 19 Jul 2026 22:05:55 +0200
Subject: [PATCH 74/76] maintainers: remove lumi

---
 maintainers/maintainer-list.nix     | 6 ------
 pkgs/by-name/sh/shotgun/package.nix | 4 +---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 17fef91ebf6f..275e67c6df39 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16684,12 +16684,6 @@
     githubId = 10746692;
     name = "Leopold Luley";
   };
-  lumi = {
-    email = "lumi@pew.im";
-    github = "lumi-me-not";
-    githubId = 26020062;
-    name = "lumi";
-  };
   luminarleaf = {
     github = "LuminarLeaf";
     githubId = 80571430;
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index c3126dd8b418..5c3c0f535d80 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -21,9 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Minimal X screenshot utility";
     homepage = "https://github.com/neXromancers/shotgun";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [
-      lumi
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "shotgun";
   };

From f7ebebed87250a40e83b612a21626613c1d45829 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 19 Jul 2026 23:35:40 +0200
Subject: [PATCH 75/76] casync: drop fuse support

Upstream does not seem to support fuse3 any time soon:
https://github.com/systemd/casync/issues/269

Drop fuse support for now to get rid of our FUSE dependency.

Closes #534923.
---
 pkgs/by-name/ca/casync/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix
index 9a1c009ab9b3..0bd0fe6abf62 100644
--- a/pkgs/by-name/ca/casync/package.nix
+++ b/pkgs/by-name/ca/casync/package.nix
@@ -9,12 +9,10 @@
   sphinx,
   acl,
   curl,
-  fuse,
   libselinux,
   udev,
   xz,
   zstd,
-  fuseSupport ? true,
   selinuxSupport ? true,
   udevSupport ? true,
   glibcLocales,
@@ -39,7 +37,6 @@ stdenv.mkDerivation {
     xz
     zstd
   ]
-  ++ lib.optionals fuseSupport [ fuse ]
   ++ lib.optionals selinuxSupport [ libselinux ]
   ++ lib.optionals udevSupport [ udev ];
   nativeBuildInputs = [
@@ -66,10 +63,12 @@ stdenv.mkDerivation {
 
   env.PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
 
-  mesonFlags =
-    lib.optionals (!fuseSupport) [ "-Dfuse=false" ]
-    ++ lib.optionals (!udevSupport) [ "-Dudev=false" ]
-    ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
+  mesonFlags = [
+    # fuse2 only, https://github.com/systemd/casync/issues/269
+    "-Dfuse=false"
+  ]
+  ++ lib.optionals (!udevSupport) [ "-Dudev=false" ]
+  ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
 
   doCheck = true;
   preCheck = ''

From 640837cdf5351f55beadd0c894a193ea24fbb971 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 19 Jul 2026 18:52:02 +0800
Subject: [PATCH 76/76] vigra: fix hdf5 discovery

The vigra package currently claims hdf5 not foun
due to szip supporch check HDF5_SZLIB_OK not passing.

Szip support has been added to the hdf5 package
with commit 96e0d84b53f9 ("hdf5: enable szip with libaec"),
and vigra's FindHDF5.cmake is aware of that by testing with H5pubconf.h.
What fails the HDF5_SZLIB_OK check happens to be szip not presented,
which is not quite sensible as vigra itself doesn't use szip.

Before fixing from the upstream, let's present szip and please the check
Here, libaec is a FOSS implementation of the unfree szip.
---
 pkgs/by-name/vi/vigra/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/vi/vigra/package.nix b/pkgs/by-name/vi/vigra/package.nix
index c095fbf53c01..23d0a049a14e 100644
--- a/pkgs/by-name/vi/vigra/package.nix
+++ b/pkgs/by-name/vi/vigra/package.nix
@@ -7,6 +7,7 @@
   fftw,
   fftwSinglePrec,
   hdf5,
+  libaec,
   libjpeg,
   libpng,
   libtiff,
@@ -43,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
     (hdf5.override {
       apiVersion = "v110";
     })
+    # Satisfy the HDF5_SZLIB_OK check in the source's config/FindHDF5.cmake
+    # libaec is a drop-in replacement of szip.
+    libaec
     libjpeg
     libpng
     libtiff