From af0d1d900bf25def45873cbee6c43d48f97a5e7f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 9 Sep 2025 21:45:37 +0200
Subject: [PATCH 01/38] nixos/autoUpgrade: add runGarbageCollection option

---
 nixos/modules/tasks/auto-upgrade.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 4effda9ef4cd..29eb03743b9c 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -184,6 +184,15 @@ in
         '';
       };
 
+      runGarbageCollection = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Whether to automatically run `nix-gc.service` after a successful
+          system upgrade.
+        '';
+      };
+
     };
 
   };
@@ -197,6 +206,12 @@ in
           The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set.
         '';
       }
+      {
+        assertion = (cfg.runGarbageCollection -> config.nix.enable);
+        message = ''
+          The option 'system.autoUpgrade.runGarbageCollection = true' requires 'nix.enable = true'.
+        '';
+      }
     ];
 
     system.autoUpgrade.flags = (
@@ -218,6 +233,9 @@ in
 
       restartIfChanged = false;
       unitConfig.X-StopOnRemoval = false;
+      unitConfig.OnSuccess = lib.optional (
+        cfg.runGarbageCollection && config.nix.enable
+      ) "nix-gc.service";
 
       serviceConfig.Type = "oneshot";
 

From 1f40da62f13ba3f47b5871ffb36da7606d78a58f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 11 Nov 2025 05:07:14 +0000
Subject: [PATCH 02/38] bibata-cursors-translucent: fix build

- The build is broken due to dangling and reflexive symlinks.

- A PR is open upstream to fix
  this (https://github.com/silica-dev/Bibata_Cursor_Translucent/pull/11),
  but it has not been merged yet. Therefore, the patch has been vendored
  in this PR.
---
 .../0001-fix-broken-symlinks.patch            | 80 +++++++++++++++++++
 .../data/icons/bibata-cursors/translucent.nix |  4 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch

diff --git a/pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch b/pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch
new file mode 100644
index 000000000000..ecf451e51987
--- /dev/null
+++ b/pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch
@@ -0,0 +1,80 @@
+diff --git a/Bibata_Ghost/cursors/diamond_cross b/Bibata_Ghost/cursors/diamond_cross
+deleted file mode 120000
+index f406d83..0000000
+--- a/Bibata_Ghost/cursors/diamond_cross
++++ /dev/null
+@@ -1 +0,0 @@
+-diamond_cross
+\ No newline at end of file
+diff --git a/Bibata_Ghost/cursors/draft_large b/Bibata_Ghost/cursors/draft_large
+index 1ab4059..490f177 120000
+--- a/Bibata_Ghost/cursors/draft_large
++++ b/Bibata_Ghost/cursors/draft_large
+@@ -1 +1 @@
+-daft
+\ No newline at end of file
++draft
+\ No newline at end of file
+diff --git a/Bibata_Ghost/cursors/ew-resize b/Bibata_Ghost/cursors/ew-resize
+index c5694de..572e2ca 120000
+--- a/Bibata_Ghost/cursors/ew-resize
++++ b/Bibata_Ghost/cursors/ew-resize
+@@ -1 +1 @@
+-side_hor
+\ No newline at end of file
++size-hor
+\ No newline at end of file
+diff --git a/Bibata_Spirit/cursors/diamond_cross b/Bibata_Spirit/cursors/diamond_cross
+deleted file mode 120000
+index f406d83..0000000
+--- a/Bibata_Spirit/cursors/diamond_cross
++++ /dev/null
+@@ -1 +0,0 @@
+-diamond_cross
+\ No newline at end of file
+diff --git a/Bibata_Spirit/cursors/draft_large b/Bibata_Spirit/cursors/draft_large
+index 1ab4059..490f177 120000
+--- a/Bibata_Spirit/cursors/draft_large
++++ b/Bibata_Spirit/cursors/draft_large
+@@ -1 +1 @@
+-daft
+\ No newline at end of file
++draft
+\ No newline at end of file
+diff --git a/Bibata_Spirit/cursors/ew-resize b/Bibata_Spirit/cursors/ew-resize
+index c5694de..572e2ca 120000
+--- a/Bibata_Spirit/cursors/ew-resize
++++ b/Bibata_Spirit/cursors/ew-resize
+@@ -1 +1 @@
+-side_hor
+\ No newline at end of file
++size-hor
+\ No newline at end of file
+diff --git a/Bibata_Tinted/cursors/diamond_cross b/Bibata_Tinted/cursors/diamond_cross
+deleted file mode 120000
+index f406d83..0000000
+--- a/Bibata_Tinted/cursors/diamond_cross
++++ /dev/null
+@@ -1 +0,0 @@
+-diamond_cross
+\ No newline at end of file
+diff --git a/Bibata_Tinted/cursors/draft_large b/Bibata_Tinted/cursors/draft_large
+index 1ab4059..490f177 120000
+--- a/Bibata_Tinted/cursors/draft_large
++++ b/Bibata_Tinted/cursors/draft_large
+@@ -1 +1 @@
+-daft
+\ No newline at end of file
++draft
+\ No newline at end of file
+diff --git a/Bibata_Tinted/cursors/ew-resize b/Bibata_Tinted/cursors/ew-resize
+index c5694de..572e2ca 120000
+--- a/Bibata_Tinted/cursors/ew-resize
++++ b/Bibata_Tinted/cursors/ew-resize
+@@ -1 +1 @@
+-side_hor
+\ No newline at end of file
++size-hor
+\ No newline at end of file
+-- 
+2.50.1
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index 1de84b0ff499..89687d203247 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -15,6 +15,10 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s=";
   };
 
+  patches = [
+    ./0001-fix-broken-symlinks.patch
+  ];
+
   installPhase = ''
     install -dm 0755 $out/share/icons
     cp -pr Bibata_* $out/share/icons/

From 7da7101972f6de63abfbd19e42fe68af1be6bfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 12 Nov 2025 18:58:17 -0800
Subject: [PATCH 03/38] python3Packages.directv: replace async-timeout with
 asyncio.timeout

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

diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix
index dfc205beb077..3baaef43be4e 100644
--- a/pkgs/development/python-modules/directv/default.nix
+++ b/pkgs/development/python-modules/directv/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   setuptools,
   aiohttp,
   yarl,
@@ -22,11 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-s4bE8ACFCfpNq+HGEO8fv3VCGPI4OOdR5A7RjY2bTKY=";
   };
 
-  postPatch = ''
-    # TypeError: 'Timeout' object does not support the context manager protocol
-    substituteInPlace directv/directv.py \
-      --replace-fail "with async_timeout.timeout" "async with async_timeout.timeout"
-  '';
+  patches = [
+    # https://github.com/ctalkington/python-directv/pull/365
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/ctalkington/python-directv/commit/a161454b09e144de15883d25378fbb13069e241b.patch";
+      hash = "sha256-jI+ALoQ0EDUQCSQp90SE+e3sGMWLwojNtLevAbgoScc=";
+    })
+  ];
 
   build-system = [ setuptools ];
 

From 04627e8249801daf776cf5616dc6fc134842f084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 12 Nov 2025 19:05:16 -0800
Subject: [PATCH 04/38] python3Packages.geocachingapi: replace async-timeout
 with asyncio.timeout

---
 .../python-modules/geocachingapi/default.nix        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix
index 554df72a7009..d0a67315949c 100644
--- a/pkgs/development/python-modules/geocachingapi/default.nix
+++ b/pkgs/development/python-modules/geocachingapi/default.nix
@@ -4,7 +4,7 @@
   backoff,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  fetchpatch,
   reverse-geocode,
   setuptools-scm,
   yarl,
@@ -15,8 +15,6 @@ buildPythonPackage rec {
   version = "0.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Sholofly";
     repo = "geocachingapi-python";
@@ -24,6 +22,15 @@ buildPythonPackage rec {
     hash = "sha256-zme1jqn3qtoo39zyj4dKxt9M7gypMqJu0bfgY1iYhjs=";
   };
 
+  patches = [
+    # https://github.com/Sholofly/geocachingapi-python/pull/25
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/Sholofly/geocachingapi-python/commit/2ba042bc2a6ebb4a494f71821502df4534eeb1a1.patch";
+      hash = "sha256-AtjZJ9tnBeOv76fVIiqY45MeYTzcWvXCtbc6DevH8aM=";
+    })
+  ];
+
   build-system = [ setuptools-scm ];
 
   dependencies = [

From 3755e7002232c0529de75b1b816b78db99ec0b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 12 Nov 2025 19:13:54 -0800
Subject: [PATCH 05/38] python3Packages.python-izone: replace async-timeout
 with asyncio.timeout

---
 .../python-modules/python-izone/default.nix   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix
index 5a52d2d58a8a..7946f8201559 100644
--- a/pkgs/development/python-modules/python-izone/default.nix
+++ b/pkgs/development/python-modules/python-izone/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
   aiohttp,
   netifaces,
   pytest-aio,
@@ -14,9 +14,7 @@
 buildPythonPackage rec {
   pname = "python-izone";
   version = "1.2.9";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Swamp-Ig";
@@ -25,9 +23,24 @@ buildPythonPackage rec {
     hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  patches = [
+    # https://github.com/Swamp-Ig/pizone/pull/26
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/Swamp-Ig/pizone/commit/776a7c5682ecd1b75a0b36dea71c914c25476a77.patch";
+      hash = "sha256-Cl71BErInSPtFNbPaV7E/LEDZPMuFNGKA8i5e+C3BMA=";
+    })
+  ];
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools_scm[toml] >= 4, <6" "setuptools-scm[toml]" \
+      --replace-fail '"setuptools_scm_git_archive",' ""
+  '';
+
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
     aiohttp
     netifaces
   ];

From da13994306838964c076df4e41557e8a044604d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Nov 2025 11:44:22 +0000
Subject: [PATCH 06/38] kimai: 2.40.0 -> 2.42.0

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

diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 1137d8419b74..b668aed83bb5 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.40.0";
+  version = "2.42.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-/962VDi/50PMfSjMtJtlR9uIbJSzkF7kSQiRzb6o+SI=";
+    hash = "sha256-5CPNUneOHbKxI/7/ARRt2hDKGmpvtmJwBAWdblCNmCQ=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-I4v4WkPGLc8vBPjCiYzPxcLn4rH3HWtQXSqwGVKXeGg=";
+  vendorHash = "sha256-z0bSqSCSPF61x+zCbIVxRJ4SsxWaqL5yrK6+E8cxgiI=";
 
   composerNoPlugins = false;
 

From 0516b1346859a8d546550782d2a17ae822c7c4ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Nov 2025 19:24:24 +0000
Subject: [PATCH 07/38] cryptomator: 1.17.1 -> 1.18.0

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

diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index e0547ce0220f..ce778d581e42 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -17,18 +17,18 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "cryptomator";
     repo = "cryptomator";
     tag = version;
-    hash = "sha256-2iWeF2su55yQjiFe8nyqTgqNDZuj2+JpzAx5tQJE1Z0=";
+    hash = "sha256-UWe9iBgb6eBasHnqfBtOFnZlLF1XCIF0y+ebphYQkQw=";
   };
 
   mvnJdk = jdk;
   mvnParameters = "-Dmaven.test.skip=true -Plinux";
-  mvnHash = "sha256-lbyNCuZOYIoznOV+DHuhNFk9ALNQbMMXBrF7y246ktE=";
+  mvnHash = "sha256-dOpvojr6gVtDFE52eghOVZWGspRLQrTDotOMkVGaG9k=";
 
   preBuild = ''
     VERSION=${version}

From f052ef2bd03188bd5e066c580cb1578798f8a562 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Nov 2025 00:46:04 +0000
Subject: [PATCH 08/38] python3Packages.python-manilaclient: 5.6.0 -> 5.7.0

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

diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index ebdeb63376e0..657e3d4e75b5 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -22,13 +22,13 @@
 
 buildPythonPackage rec {
   pname = "python-manilaclient";
-  version = "5.6.0";
+  version = "5.7.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_manilaclient";
     inherit version;
-    hash = "sha256-Vw8ei22MEmXOygtwOtKLDIMcb3nBjqONgRrhfSGFuJc=";
+    hash = "sha256-ozpvEpIR1DdfG8+7RD0NisDfqa109GtMDEVB+H91uAQ=";
   };
 
   build-system = [

From a0fb838d019a98ed3a71bcd9d334e522d3180375 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Nov 2025 01:17:30 +0000
Subject: [PATCH 09/38] crosvm: 0-unstable-2025-11-05 -> 0-unstable-2025-11-13

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

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index e4efa7ff3062..c45254893556 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,18 +21,18 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-11-05";
+  version = "0-unstable-2025-11-13";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb";
-    hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs=";
+    rev = "3d7db6c9fded7a184e279ca9170abfa94fd59e34";
+    hash = "sha256-sRl0ABggh1u3ctsqA/OSgDKtB1mO6zNHiRKvZ316sOM=";
     fetchSubmodules = true;
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-P6vFWs9lVn4EkXUVOi+3s/tptAV/J7tH5GBCQv/dwUA=";
+  cargoHash = "sha256-NeyJLsE/Uvcg/kNzS1SXEBjExKwbjcHkkhT2jSQjxx4=";
 
   nativeBuildInputs = [
     pkg-config

From 2ae5d00537035fe389cad60b6abad6a2dac0ff41 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 14 Nov 2025 09:11:12 +0100
Subject: [PATCH 10/38] python3Packages.fpdf2: 2.8.4 -> 2.8.5

fixes build error after latest staging-next cycle
---
 pkgs/development/python-modules/fpdf2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix
index 3aedd7332ea3..7bff450f4e34 100644
--- a/pkgs/development/python-modules/fpdf2/default.nix
+++ b/pkgs/development/python-modules/fpdf2/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "fpdf2";
-  version = "2.8.4";
+  version = "2.8.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-pdf";
     repo = "fpdf2";
     tag = version;
-    hash = "sha256-MD1ci80FBX8pVspMPqAX2UaTjymWHReI3lA9J4ZiBio=";
+    hash = "sha256-LQZ7OMfL+PFxEc7q/dSw+YJoKr+eYEaZF8XCzd7AdBI=";
   };
 
   build-system = [ setuptools ];

From f550b7aa685ec389a1284c2d3afcc60222aff99a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Nov 2025 12:30:35 +0000
Subject: [PATCH 11/38] python3Packages.plugwise: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 39a7af210c85..e90306f130aa 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.9.0";
+  version = "1.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-OKbzN4IWrXCrn0qUd7hL6Oh2dvO9udxymo7pZXPmqA4=";
+    hash = "sha256-jLSX9tNJMsjdTzzSkjHpDm4QYWI+Xjw/nlKj33/lTLs=";
   };
 
   postPatch = ''

From 3534fa0cbcf3b1e9b1effb55e1fbc8dc2ce6ffe7 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 14 Nov 2025 23:18:06 +0800
Subject: [PATCH 12/38] tuba: 0.10.1 -> 0.10.3

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

diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index 81a566154812..e17c50ca5491 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuba";
-  version = "0.10.1";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
     rev = "v${version}";
-    hash = "sha256-t1L1TP1G6jr/jjhBYelidobzHSrjupgus19T+cMdj0I=";
+    hash = "sha256-uMfxHQOjL1bnKAz0MUUEv2IR4aRiR4UhIM5aHPspJDU=";
   };
 
   nativeBuildInputs = [

From 12996966e832f8535b444a6006147ec654340621 Mon Sep 17 00:00:00 2001
From: aware70 <7832566+aware70@users.noreply.github.com>
Date: Fri, 14 Nov 2025 14:08:42 -0600
Subject: [PATCH 13/38] cabinpkg: fix build with fmt_11 pin

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

diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
index 472d56fd7615..74167a55ccdf 100644
--- a/pkgs/by-name/ca/cabinpkg/package.nix
+++ b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -5,7 +5,7 @@
   onetbb,
   libgit2,
   curl,
-  fmt,
+  fmt_11,
   nlohmann_json,
   pkg-config,
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libgit2
-    fmt
+    fmt_11
     onetbb
     nlohmann_json
     curl

From d1d3bee38ab9d59fd96b105c5ebc9a7882399653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 14 Nov 2025 21:59:31 +0100
Subject: [PATCH 14/38] sparrow: zulu24 -> zulu25

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

diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix
index 2533b628abe7..c31e9efeed4f 100644
--- a/pkgs/by-name/sp/sparrow/package.nix
+++ b/pkgs/by-name/sp/sparrow/package.nix
@@ -7,7 +7,7 @@
   makeDesktopItem,
   copyDesktopItems,
   autoPatchelfHook,
-  zulu24,
+  zulu25,
   gtk3,
   gsettings-desktop-schemas,
   writeScript,
@@ -27,7 +27,7 @@ let
   pname = "sparrow";
   version = "2.2.3";
 
-  openjdk = zulu24.override { enableJavaFX = true; };
+  openjdk = zulu25.override { enableJavaFX = true; };
 
   sparrowArch =
     {

From cd32dbcac1372437660e5e15aa9964e01ee635ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 14 Nov 2025 22:05:29 +0100
Subject: [PATCH 15/38] zulu23: drop

---
 pkgs/development/compilers/zulu/23.nix | 54 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 pkgs/top-level/all-packages.nix        |  2 -
 3 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/development/compilers/zulu/23.nix

diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix
deleted file mode 100644
index 836d545ab2af..000000000000
--- a/pkgs/development/compilers/zulu/23.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  callPackage,
-  enableJavaFX ? false,
-  ...
-}@args:
-
-callPackage ./common.nix (
-  {
-    # Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk
-    # Note that the latest build may differ by platform
-    dists = {
-      x86_64-linux = {
-        zuluVersion = "23.28.85";
-        jdkVersion = "23.0.0";
-        hash =
-          if enableJavaFX then
-            "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA="
-          else
-            "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA=";
-      };
-
-      aarch64-linux = {
-        zuluVersion = "23.28.85";
-        jdkVersion = "23.0.0";
-        hash =
-          if enableJavaFX then
-            throw "JavaFX is not available for aarch64-linux"
-          else
-            "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M=";
-      };
-
-      x86_64-darwin = {
-        zuluVersion = "23.28.85";
-        jdkVersion = "23.0.0";
-        hash =
-          if enableJavaFX then
-            "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4="
-          else
-            "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw=";
-      };
-
-      aarch64-darwin = {
-        zuluVersion = "23.28.85";
-        jdkVersion = "23.0.0";
-        hash =
-          if enableJavaFX then
-            "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ="
-          else
-            "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc=";
-      };
-    };
-  }
-  // removeAttrs args [ "callPackage" ]
-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 54a75385c096..d452b1acc992 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1686,6 +1686,7 @@ mapAliases {
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
+  zulu23 = throw "Zulu OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-14
   zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
   # keep-sorted end
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d79a0a739829..65c8030437c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5427,7 +5427,6 @@ with pkgs;
       zulu11 = callPackage ../development/compilers/zulu/11.nix { };
       zulu17 = callPackage ../development/compilers/zulu/17.nix { };
       zulu21 = callPackage ../development/compilers/zulu/21.nix { };
-      zulu23 = callPackage ../development/compilers/zulu/23.nix { };
       zulu24 = callPackage ../development/compilers/zulu/24.nix { };
       zulu25 = callPackage ../development/compilers/zulu/25.nix { };
     })
@@ -5435,7 +5434,6 @@ with pkgs;
     zulu11
     zulu17
     zulu21
-    zulu23
     zulu24
     zulu25
     ;

From 550d60aa8372534a95ba2cab967593ef0ca43bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 14 Nov 2025 22:06:19 +0100
Subject: [PATCH 16/38] zulu24: drop

---
 pkgs/development/compilers/zulu/24.nix | 55 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 pkgs/top-level/all-packages.nix        |  2 -
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 pkgs/development/compilers/zulu/24.nix

diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix
deleted file mode 100644
index 36a545742d06..000000000000
--- a/pkgs/development/compilers/zulu/24.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  callPackage,
-  enableJavaFX ? false,
-  ...
-}@args:
-
-let
-  # For 24 JDK FX can be different version than regular JDK
-  zuluVersion = if enableJavaFX then "24.32.13" else "24.32.13";
-  jdkVersion = "24.0.2";
-in
-callPackage ./common.nix (
-  {
-    # Details from https://www.azul.com/downloads/?version=java-24&package=jdk
-    # Note that the latest build may differ by platform
-    dists = {
-      x86_64-linux = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-6ZCa348yFLoZ70iDjNkN17dl1IWe53HxKMGpMhFuEOE="
-          else
-            "sha256-seZl5oZmHJlAFsOR6mFAvX9CEY+WatKIeYbi7W8RO/U=";
-      };
-
-      aarch64-linux = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-pVspe5R5INmEIJNiihDanOwleBklUp7Svj1NwzOe+ws="
-          else
-            "sha256-hV19g22QKWngOvNGh4dCaTOzLke6VjdsPCGQiVlyij0=";
-      };
-
-      x86_64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-JXsx8GvjPEQO9ZN3p+CraSWeqc0KDIRBado+jz7l2ww="
-          else
-            "sha256-UHY+Oy6g98bVk5BTfd/Mx3OT5He9SnWUR0L+LZso3Lo=";
-      };
-
-      aarch64-darwin = {
-        inherit zuluVersion jdkVersion;
-        hash =
-          if enableJavaFX then
-            "sha256-Z825S6qxHMm3kwHQnu15dihguDOrxlM1lca3wU8lCqk="
-          else
-            "sha256-jDHoPG4NpNXVK35yNHe5JBkmaKNAixmmMEE0P9jcfnU=";
-      };
-    };
-  }
-  // removeAttrs args [ "callPackage" ]
-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d452b1acc992..ebea08a806aa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1687,6 +1687,7 @@ mapAliases {
   zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
   zulu23 = throw "Zulu OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-14
+  zulu24 = throw "Zulu OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-11-14
   zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
   # keep-sorted end
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c8030437c9..5ce952f2b3a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5427,14 +5427,12 @@ with pkgs;
       zulu11 = callPackage ../development/compilers/zulu/11.nix { };
       zulu17 = callPackage ../development/compilers/zulu/17.nix { };
       zulu21 = callPackage ../development/compilers/zulu/21.nix { };
-      zulu24 = callPackage ../development/compilers/zulu/24.nix { };
       zulu25 = callPackage ../development/compilers/zulu/25.nix { };
     })
     zulu8
     zulu11
     zulu17
     zulu21
-    zulu24
     zulu25
     ;
   zulu = zulu21;

From db71a9ab95d72dec9ba80e13ecaf09fc57311469 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:36:29 +0100
Subject: [PATCH 17/38] komikku: 1.87.0 -> 1.92.0

---
 pkgs/by-name/ko/komikku/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index ab92ca3f4b1e..f01fe2f06c59 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -8,7 +8,7 @@
   blueprint-compiler,
   gtk4,
   libadwaita,
-  libnotify,
+  libglycin,
   webkitgtk_6_0,
   meson,
   ninja,
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.87.0";
+  version = "1.92.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-mFHoQtZJlo412g0ElvpNdLN+Ni2Mr882VC7lvV+EVTs=";
+    hash = "sha256-eNKNVS8uSzDdXM13dQoSPy88u55RMDCh/Do3wCkscxI=";
   };
 
   nativeBuildInputs = [
@@ -50,23 +50,25 @@ python3.pkgs.buildPythonApplication rec {
     glib
     gtk4
     libadwaita
-    libnotify
+    libglycin
     webkitgtk_6_0
   ];
 
   dependencies = with python3.pkgs; [
     beautifulsoup4
     brotli
+    colorthief
     dateparser
     emoji
     keyring
     lxml
-    modern-colorthief
     natsort
     piexif
     pillow
     curl-cffi
     pygobject3
+    pyjwt
+    pypdf
     python-magic
     rarfile
     requests

From 80875a7fcc10a83e65ef17c6e6eaa1a5bf4ebf3d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 14 Nov 2025 23:17:41 +0100
Subject: [PATCH 18/38] qt6Packages.qzxing: Fix build

Upstream QMake code doesn't use the correct functions for version-gating code.
---
 pkgs/development/libraries/qzxing/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/qzxing/default.nix b/pkgs/development/libraries/qzxing/default.nix
index e8ac307dfe0f..474267b3a365 100644
--- a/pkgs/development/libraries/qzxing/default.nix
+++ b/pkgs/development/libraries/qzxing/default.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ASgsF5ocNWAiIy2jm6ygpDkggBcEpno6iVNWYkuWcVI=";
   };
 
+  # greaterThan/lessThan don't handle versions, use versionAtLeast/versionAtMost instead
+  # Versions are different due to versionAtLeast/-Most using an inclusive limit, while greater-/lessThan use exclusive ones
+  postPatch = ''
+    substituteInPlace src/QZXing-components.pri \
+      --replace-fail 'lessThan(QT_VERSION, 6.2)' 'versionAtMost(QT_VERSION, 6.1)' \
+      --replace-fail 'greaterThan(QT_VERSION, 6.1)' 'versionAtLeast(QT_VERSION, 6.2)'
+  '';
+
   # QMake can't find qtmultimedia in buildInputs
   strictDeps = false;
 

From 575498d62884eda49f64594b2317597dc5e9b33b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 14 Nov 2025 23:19:08 +0100
Subject: [PATCH 19/38] {libsForQt5.qzxing,qt6Packages.qzxing}: Drop meta-wide
 with lib

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

diff --git a/pkgs/development/libraries/qzxing/default.nix b/pkgs/development/libraries/qzxing/default.nix
index 474267b3a365..1159a6c9819c 100644
--- a/pkgs/development/libraries/qzxing/default.nix
+++ b/pkgs/development/libraries/qzxing/default.nix
@@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Qt/QML wrapper library for the ZXing library";
     homepage = "https://github.com/ftylitak/qzxing";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix;
     pkgConfigModules = [
       "QZXing"
     ];

From 0ac148dc716e2f167f8db9ca588a7ecbd54667ac Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 23:36:51 +0100
Subject: [PATCH 20/38] signal-desktop-bin: 7.77.1 -> 7.79.0

---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 9a24b9586266..96e58176d6d7 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.77.1";
+  version = "7.79.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-57sm6wmtp0eXWCv7LviCiBEi5/IysubiuBYSP7eVkkU=";
+  hash = "sha256-LhYYJjiPjJAa/5cSe+x5ZnLuy7qx7L2hTh2kcW41vpQ=";
 }

From 7f69f9ceae7d893ff62066144580aca06795ee87 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 23:37:32 +0100
Subject: [PATCH 21/38] signal-desktop-bin(aarch64-linux): 7.77.1 -> 7.79.0

---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 546c213d48b7..a129c45583ff 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.77.1";
+  version = "7.79.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09751999-signal-desktop/signal-desktop-7.77.1-1.fc42.aarch64.rpm";
-  hash = "sha256-IkAJxq3JK3kKdtLy1lkVUfJNuEStMjn7iQEwsFurwOs=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09795013-signal-desktop/signal-desktop-7.79.0-1.fc42.aarch64.rpm";
+  hash = "sha256-1XH9gw5/1n10u9d67EM2Y//6+oywE0ziv2ZXafL+h0Q=";
 }

From e2b0b600092378a97e427471a19281e5fac8e236 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 23:37:53 +0100
Subject: [PATCH 22/38] signal-desktop-bin(darwin): 7.77.1 -> 7.79.0

---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 495b872e41a6..56270e3142ce 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.77.1";
+  version = "7.79.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-vnNR5KTdeTKUMlHnjfB+WkBtpcLP+KEmIPoTfk7Q1+w=";
+    hash = "sha256-gXXVj+63TyOqxVUeva48VBCYP45GTlxyDIBYZ7NDcZ8=";
   };
   sourceRoot = ".";
 

From e0c9146853797207c670f6bf0348338d29f0c568 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sat, 15 Nov 2025 07:36:32 +1100
Subject: [PATCH 23/38] 
 log4{j{-{detect,scan,sniffer,vuln-scanner},check},shell-detector}: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drops all of the Log4Shell vulnerability detectors, as the vulnerability
has been fixed for over three years now, and they are all unmaintained
upstream.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
Co-authored-by: Robert Schütz <nix@dotlambda.de>
---
 doc/release-notes/rl-2605.section.md          |  2 +
 pkgs/by-name/lo/log4j-detect/package.nix      | 39 ----------------
 pkgs/by-name/lo/log4j-scan/package.nix        | 46 -------------------
 pkgs/by-name/lo/log4j-sniffer/package.nix     | 38 ---------------
 .../by-name/lo/log4j-vuln-scanner/package.nix | 31 -------------
 pkgs/by-name/lo/log4jcheck/package.nix        | 36 ---------------
 .../by-name/lo/log4shell-detector/package.nix | 46 -------------------
 pkgs/top-level/aliases.nix                    |  6 +++
 8 files changed, 8 insertions(+), 236 deletions(-)
 delete mode 100644 pkgs/by-name/lo/log4j-detect/package.nix
 delete mode 100644 pkgs/by-name/lo/log4j-scan/package.nix
 delete mode 100644 pkgs/by-name/lo/log4j-sniffer/package.nix
 delete mode 100644 pkgs/by-name/lo/log4j-vuln-scanner/package.nix
 delete mode 100644 pkgs/by-name/lo/log4jcheck/package.nix
 delete mode 100644 pkgs/by-name/lo/log4shell-detector/package.nix

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index fa91fa408882..af5fde898449 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -11,6 +11,8 @@
 
 - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
 
+- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/by-name/lo/log4j-detect/package.nix b/pkgs/by-name/lo/log4j-detect/package.nix
deleted file mode 100644
index c896a16f234f..000000000000
--- a/pkgs/by-name/lo/log4j-detect/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "log4j-detect";
-  version = "0-unstable-2021-12-14";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "takito1812";
-    repo = "log4j-detect";
-    rev = "2f5b7a598a6d0b4aee8111bb574ea72c6a1c76d6";
-    sha256 = "sha256-fFKW7uPBfrnze0UoPL3Mfwd4sFOuHYuDP7kv6VtdM3o=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    requests
-  ];
-
-  postPatch = ''
-    sed -i "1 i #!/usr/bin/python" log4j-detect.py
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -vD log4j-detect.py $out/bin/log4j-detect
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Tool to detect the log4j vulnerability";
-    homepage = "https://github.com/takito1812/log4j-detect";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/by-name/lo/log4j-scan/package.nix b/pkgs/by-name/lo/log4j-scan/package.nix
deleted file mode 100644
index e8717c32e2fd..000000000000
--- a/pkgs/by-name/lo/log4j-scan/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "log4j-scan";
-  version = "unstable-2021-12-18";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "fullhunt";
-    repo = "log4j-scan";
-    rev = "070fbd00f0945645bd5e0daa199a554ef3884b95";
-    sha256 = "sha256-ORSc4KHyAMjuA7QHReDh6SYY5yZRunBBN1+lkCayqL4=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    pycryptodome
-    requests
-    termcolor
-  ];
-
-  postPatch = ''
-    substituteInPlace log4j-scan.py \
-      --replace "headers.txt" "../share/headers.txt"
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -vD log4j-scan.py $out/bin/log4j-scan
-    install -vD headers.txt headers-large.txt -t $out/share
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Scanner for finding hosts which are vulnerable for log4j";
-    mainProgram = "log4j-scan";
-    homepage = "https://github.com/fullhunt/log4j-scan";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix
deleted file mode 100644
index 649e4d20efdc..000000000000
--- a/pkgs/by-name/lo/log4j-sniffer/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  gitMinimal,
-}:
-
-buildGoModule rec {
-  pname = "log4j-sniffer";
-  version = "1.9.0";
-
-  src = fetchFromGitHub {
-    owner = "palantir";
-    repo = "log4j-sniffer";
-    rev = "v${version}";
-    sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU=";
-  };
-
-  vendorHash = null;
-
-  nativeCheckInputs = [
-    gitMinimal
-  ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d);
-    cd $HOME
-    git init
-  '';
-
-  meta = with lib; {
-    description = "Tool that scans archives to check for vulnerable log4j versions";
-    mainProgram = "log4j-sniffer";
-    homepage = "https://github.com/palantir/log4j-sniffer";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
deleted file mode 100644
index 784a3db24ec9..000000000000
--- a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "log4j-vuln-scanner";
-  version = "0.13";
-
-  src = fetchFromGitHub {
-    owner = "hillu";
-    repo = "local-log4j-vuln-scanner";
-    rev = "v${version}";
-    sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c=";
-  };
-
-  vendorHash = null;
-
-  postInstall = ''
-    mv $out/bin/scanner $out/bin/$pname
-    mv $out/bin/patcher $out/bin/log4j-vuln-patcher
-  '';
-
-  meta = with lib; {
-    description = "Local log4j vulnerability scanner";
-    homepage = "https://github.com/hillu/local-log4j-vuln-scanner";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/by-name/lo/log4jcheck/package.nix b/pkgs/by-name/lo/log4jcheck/package.nix
deleted file mode 100644
index 3726c7e24cba..000000000000
--- a/pkgs/by-name/lo/log4jcheck/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "log4jcheck";
-  version = "0-unstable-2021-12-14";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "NorthwaveSecurity";
-    repo = "log4jcheck";
-    rev = "736f1f4044e8a9b7bf5db515e2d1b819253f0f6d";
-    sha256 = "sha256-1al7EMYbE/hFXKV4mYZlkEWTUIKYxgXYU3qBLlczYvs=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    requests
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -vD nw_log4jcheck.py $out/bin/log4jcheck
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Tool to check for vulnerable Log4j (CVE-2021-44228) systems";
-    homepage = "https://github.com/NorthwaveSecurity/log4jcheck";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    mainProgram = "log4jcheck";
-  };
-}
diff --git a/pkgs/by-name/lo/log4shell-detector/package.nix b/pkgs/by-name/lo/log4shell-detector/package.nix
deleted file mode 100644
index b96a5df9a79a..000000000000
--- a/pkgs/by-name/lo/log4shell-detector/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "log4shell-detector";
-  version = "0-unstable-2021-12-16";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "Neo23x0";
-    repo = "log4shell-detector";
-    rev = "622b88e7ea36819da23ce6ac090785cd6cca77f9";
-    sha256 = "sha256-N81x9hq473LfM+bQIQLWizCAsVc/pzyB84PV7/N5jk4=";
-  };
-
-  build-system = with python3.pkgs; [
-    setuptools
-  ];
-
-  dependencies = with python3.pkgs; [
-    zstandard
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -vD log4shell-detector.py $out/bin/log4shell-detector
-    install -vd $out/${python3.sitePackages}/
-    cp -R Log4ShellDetector $out/${python3.sitePackages}
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Detector for Log4Shell exploitation attempts";
-    homepage = "https://github.com/Neo23x0/log4shell-detector";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    mainProgram = "log4shell-detector";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d85b11aaf15a..5046c6215219 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -961,6 +961,12 @@ mapAliases {
   llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27
+  log4j-detect = throw "'log4j-detect' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
+  log4j-scan = throw "'log4j-scan' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
+  log4j-sniffer = throw "'log4j-sniffer' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
+  log4j-vuln-scanner = throw "'log4j-vuln-scanner' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
+  log4jcheck = throw "'log4jcheck' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
+  log4shell-detector = throw "'log4shell-detector' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15
   lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
   LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27

From a21f800aa5932adb40bf48e5470ea724c507133c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 14 Nov 2025 23:53:08 +0100
Subject: [PATCH 24/38] edopro: Fix build after fmt bump

fmt::localtime was dropped, apply upstream patch.
---
 pkgs/by-name/ed/edopro/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index 0093f27fd1a7..8823fdc6d7ae 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   fetchzip,
   makeWrapper,
   premake5,
@@ -216,6 +217,16 @@ let
       sqlite
     ];
 
+    patches = [
+      # fmt::localtime was deprecated and removed
+      # Remove when version > 41.0.2
+      (fetchpatch {
+        name = "0001-edopro-No-longer-depend-on-fmt-for-localtime.patch";
+        url = "https://github.com/edo9300/edopro/commit/c40951ba09f8a8b88d1d4b9b15ca9338da01522c.patch";
+        hash = "sha256-wiZRCwSTp9/G97a+zaYjJgmDrc57/5bSBSYur1dcTfA=";
+      })
+    ];
+
     # nixpkgs' gcc stack currently appears to not support LTO
     # Override where bundled ocgcore get looked up in, so we can supply ours
     # (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)

From 30acdefe94da544888457faaba242b917ce39d86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 00:52:43 +0000
Subject: [PATCH 25/38] kdePackages.klevernotes: 1.2.4 -> 1.2.5

---
 pkgs/kde/misc/klevernotes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix
index 35e2ba4513bf..0dd22594a3d0 100644
--- a/pkgs/kde/misc/klevernotes/default.nix
+++ b/pkgs/kde/misc/klevernotes/default.nix
@@ -9,11 +9,11 @@
 }:
 mkKdeDerivation rec {
   pname = "klevernotes";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz";
-    hash = "sha256-btnCn9YhA0aIhg6PXYuxsZQa6JeHyIrYwSKvTuqrsj8=";
+    hash = "sha256-47iWAcW1IMC50ty0dF900rZvswhgoc78uvUlQate1ko=";
   };
 
   extraBuildInputs = [

From 7f320529d496de9cdeda7c9bcd56f1fdc7e3a265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 01:00:00 +0000
Subject: [PATCH 26/38] mitra: 4.12.0 -> 4.13.0

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

diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index 1844ae159c18..ccb166f46769 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "4.12.0";
+  version = "4.13.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-cVGOgMK8lQOMB9a7zwl2043uJzw3a+QBDMlnFduSR1U=";
+    hash = "sha256-GPePSGQ40PaLo6twejaIkksJ2CDfzQ/TYcT+4qojmBY=";
   };
 
-  cargoHash = "sha256-IdC5T73t3FHCXP6AWeQDcDnmZzhRvN2eyuYrko5F4+8=";
+  cargoHash = "sha256-KSwfDuyh6Qy2TpjylwrKTMlQI/u3kAJuyX1IVDkuICM=";
 
   # require running database
   doCheck = false;

From 32b3a6dbff1df3d2e5b17b921b89bd99f58734a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 02:04:35 +0000
Subject: [PATCH 27/38] python3Packages.disposable-email-domains: 0.0.147 ->
 0.0.149

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index ae8d406c4e2d..2e7f863c5236 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.147";
+  version = "0.0.149";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-sbMQ9izDOzrQOoYKpSLWO/+W2/3bGMhlyFP34oOff5g=";
+    hash = "sha256-bgGs6F41rKVAI6qIyNiqOr5hfCs6ardq6WFJtpZxFCc=";
   };
 
   build-system = [

From 426d08f1c77a40eb4ea713a2fa40411e448778c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 06:47:57 +0000
Subject: [PATCH 28/38] python3Packages.hcloud: 2.10.0 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 8f01aef21a2b..c458d692ce4c 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.10.0";
+  version = "2.11.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EIO8s47temWK/pgm/8Gi2xgQyoOQoi9LjEN4cTjosbo=";
+    hash = "sha256-8hL+H1PL+J7d2sDnAF7C6wIep4n4K+cJe9dM1wWynys=";
   };
 
   build-system = [ setuptools ];

From a7e5ba588baa66f2df56c741db5ae32ca63d1031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 14 Nov 2025 22:48:26 -0800
Subject: [PATCH 29/38] python3Packages.tesla-wall-connector: replace
 async-timeout with asyncio.timeout

---
 .../tesla-wall-connector/default.nix              | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix
index 0194e2d22761..d515c60845e9 100644
--- a/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -5,6 +5,7 @@
   backoff,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
@@ -25,6 +26,20 @@ buildPythonPackage rec {
     hash = "sha256-3jj3LU0xRIC6U5DmitkTNjejvSZJWguTS/TeotOD8oc=";
   };
 
+  patches = [
+    # https://github.com/einarhauks/tesla-wall-connector/pull/16
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/einarhauks/tesla-wall-connector/commit/4683738b4d2cccb2be337a383243ab3f7623bf8e.patch";
+      excludes = [
+        ".github/workflows/python-package.yml"
+        "poetry.lock"
+        "pyproject.toml"
+      ];
+      hash = "sha256-V9Ra7xA5JzBGe8tE8urVJNqCCdBkNmmqUcXo0cswSoY=";
+    })
+  ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [

From 553ed1e92954955e8e6d8ec67ffaf31d6ec5525d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 14 Nov 2025 23:04:04 -0800
Subject: [PATCH 30/38] python3Packages.pyspcwebgw: replace async-timeout with
 asyncio.timeout

---
 .../python-modules/pyspcwebgw/default.nix     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index 952f33739f24..e10b743b637e 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -5,18 +5,16 @@
   asynccmd,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pyspcwebgw";
   version = "0.7.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.9";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mbrrg";
@@ -25,9 +23,18 @@ buildPythonPackage rec {
     hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  patches = [
+    # https://github.com/pyspcwebgw/pyspcwebgw/pull/27
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/pyspcwebgw/pyspcwebgw/commit/22cacc8db53cf2a244c30c0e62a0dad90fbcb00b.patch";
+      hash = "sha256-Og0imZts49jwjbz7Yp41UIzwU/lVjKVc/Tp4+vNz32U=";
+    })
+  ];
 
-  propagatedBuildInputs = [
+  build-system = [ poetry-core ];
+
+  dependencies = [
     asynccmd
     aiohttp
   ];
@@ -38,8 +45,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlags = [ "--asyncio-mode=auto" ];
-
   pythonImportsCheck = [ "pyspcwebgw" ];
 
   meta = with lib; {

From 6198ab9288c403f0af0de4f67e989301ace439e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 14 Nov 2025 23:06:48 -0800
Subject: [PATCH 31/38] python3Packages.tesla-wall-connector: modernize

---
 .../tesla-wall-connector/default.nix           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix
index d515c60845e9..183bd151f9dc 100644
--- a/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -9,20 +9,17 @@
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "tesla-wall-connector";
   version = "1.1.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "einarhauks";
     repo = "tesla-wall-connector";
-    rev = version;
+    tag = version;
     hash = "sha256-3jj3LU0xRIC6U5DmitkTNjejvSZJWguTS/TeotOD8oc=";
   };
 
@@ -40,9 +37,9 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     backoff
   ];
@@ -55,10 +52,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "tesla_wall_connector" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/einarhauks/tesla-wall-connector/releases/tag/${src.tag}";
     description = "Library for communicating with a Tesla Wall Connector";
     homepage = "https://github.com/einarhauks/tesla-wall-connector";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 8481d92e29a7e4f8c76cde94511239a6c255ff91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 07:41:45 +0000
Subject: [PATCH 32/38] pv: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index 35611cd72ff6..6155b8d1812e 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-mY5xdBnALuc1rqC41X+cvhES9A9LlHo5uiYRpBW2TaA=";
+    hash = "sha256-INOHlLAPqThKHd+eOVqDV6B4LNlci3TPHfjfY4iVDuw=";
   };
 
   meta = {

From e28090bbd266aca9a12c5b462a490608c1d4d8b1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 15 Nov 2025 02:46:47 +0300
Subject: [PATCH 33/38] kdePackages: Frameworks 6.19 -> 6.20

---
 pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++-----------
 1 file changed, 216 insertions(+), 216 deletions(-)

diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 8afd6118bb0b..2a6c4d103434 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/attica-6.19.0.tar.xz",
-    "hash": "sha256-MIE++1d/dbh+7E8CMAqQbl85qN0sfnSIlYp//qqu4ag="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/attica-6.20.0.tar.xz",
+    "hash": "sha256-jvla0nmHYyAs3WWVIbvmTKWOyMpoRl6s5KgXov8uTcQ="
   },
   "baloo": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/baloo-6.19.0.tar.xz",
-    "hash": "sha256-rz1dhdTtIpY1ZPpsxVV9SJ8Xy6MNWDCLuoxMk9ToRog="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/baloo-6.20.0.tar.xz",
+    "hash": "sha256-BqDcJLnK4IxyKK68MhUYUEK1jE/FjvhsiGPld0k9ExQ="
   },
   "bluez-qt": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/bluez-qt-6.19.0.tar.xz",
-    "hash": "sha256-JC2gUwckI/4jpnaz1NCvC29bBWYDPC9KqhT94farC6Q="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/bluez-qt-6.20.0.tar.xz",
+    "hash": "sha256-aWuYVTE7Tqo68Ke67u3baRguVYN1TRopYC+iSZcS7jc="
   },
   "breeze-icons": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/breeze-icons-6.19.0.tar.xz",
-    "hash": "sha256-LKyjXEgnH9xkGzKBKemUSK4f2rxEcmKpLkgFMh0iqkw="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/breeze-icons-6.20.0.tar.xz",
+    "hash": "sha256-CkeyigSghsy1tK+1HWZ3GAAGgZ0NkwJSRyFom/pK0Tw="
   },
   "extra-cmake-modules": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/extra-cmake-modules-6.19.0.tar.xz",
-    "hash": "sha256-pPDB2BgfQ+mvS5tEaWx3dgtbydrlvbkh8JC85mTpyoQ="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/extra-cmake-modules-6.20.0.tar.xz",
+    "hash": "sha256-NxHehXLbXaYY7+PyjMCUyiWhq7C93/xj3O0SxPjKrl8="
   },
   "frameworkintegration": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/frameworkintegration-6.19.0.tar.xz",
-    "hash": "sha256-+2vBKzQrZoEb1SgSRI2KZ+H+bg038cZsVBaIUhR+WaQ="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/frameworkintegration-6.20.0.tar.xz",
+    "hash": "sha256-HuYcksEhQVmHfA4ROpI1hyT5rD7ldxChUDjIXcT9x9g="
   },
   "kapidox": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kapidox-6.19.0.tar.xz",
-    "hash": "sha256-fQ6FrtCRz4xyWuT7llxAOolEOiaeU56jySskd/hSjFM="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kapidox-6.20.0.tar.xz",
+    "hash": "sha256-7K8kuEuSRT7aCCLVrvGOBH5ihI+AsBnDCDLsVygvq9M="
   },
   "karchive": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/karchive-6.19.0.tar.xz",
-    "hash": "sha256-lEMy2ALQ4SjOvQh//VC3JtEANHlzwgN8YFHHLVRRKp4="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/karchive-6.20.0.tar.xz",
+    "hash": "sha256-9qUI1TfSg+KhBuhIqTnpcc3xoFl3mCXkSCYJqpgf+t0="
   },
   "kauth": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kauth-6.19.0.tar.xz",
-    "hash": "sha256-+GNjrrf5IjpCm2NW+qh9L9sazeTCdQs3mUMEtck3GqU="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kauth-6.20.0.tar.xz",
+    "hash": "sha256-qRhFX0LhafpV6WXkB1iMIssYvrVSnasyHUWsr9t71lI="
   },
   "kbookmarks": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kbookmarks-6.19.0.tar.xz",
-    "hash": "sha256-ej1/2/5Md4exoZQey/omH9RPp71NgnVnLg0iwqNQQ5A="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kbookmarks-6.20.0.tar.xz",
+    "hash": "sha256-OWfTkBVecYPdXeAIeqS7EiZJWDMawYofjEBaXtvcGhQ="
   },
   "kcalendarcore": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcalendarcore-6.19.0.tar.xz",
-    "hash": "sha256-nmVjbDLNS8jL9mDE3YGwcyGX729ZP2ugr4pheIcItvw="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcalendarcore-6.20.0.tar.xz",
+    "hash": "sha256-X2ECezRRDQ3i8rFRwnmwAKoX4cNJBv8F4PAIbu0vN4U="
   },
   "kcmutils": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcmutils-6.19.0.tar.xz",
-    "hash": "sha256-N2CkbM8ZbMUNDQsA1Ecb7HRo8Ta+V6GQNYvD5Dekj1M="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcmutils-6.20.0.tar.xz",
+    "hash": "sha256-otcmx7a4/q3f8p3A514cFUZ/AtHr5vjpbzXNhLI+Fu0="
   },
   "kcodecs": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcodecs-6.19.0.tar.xz",
-    "hash": "sha256-OmHCaLy8Tzr0FuLPbTCokaxwNUyXV1ifup7g6ulkrtE="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcodecs-6.20.0.tar.xz",
+    "hash": "sha256-FZILmoWTQbE4MebtSbrO6i5yjHlv3QghKOUfjhJ/86A="
   },
   "kcolorscheme": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcolorscheme-6.19.0.tar.xz",
-    "hash": "sha256-wnjPCG1Emdzr06oOYZBxZXjcBuyAxj2V3msMQEV2U/A="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcolorscheme-6.20.0.tar.xz",
+    "hash": "sha256-FQWsxpsswb6a0yWnCrlmm7jTFvxdYBzPQDK+Ivq4wMI="
   },
   "kcompletion": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcompletion-6.19.0.tar.xz",
-    "hash": "sha256-i3HW6Is446rNJZGAW/KtnBK3vwLX+b3kDYr4apBu3UA="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcompletion-6.20.0.tar.xz",
+    "hash": "sha256-OycAA7Zh24lPUOn5D93dMJw+qXAQ42O8VR91Lbbvzsw="
   },
   "kconfig": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kconfig-6.19.0.tar.xz",
-    "hash": "sha256-1P++zQaQgHEiN0kn8Zbra2XzdT8ipqFhCeBKp+mLMus="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kconfig-6.20.0.tar.xz",
+    "hash": "sha256-2uz0mJr5lYFEE55JGMIs0FtallJ8Udc36ufFdxgWfRU="
   },
   "kconfigwidgets": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kconfigwidgets-6.19.0.tar.xz",
-    "hash": "sha256-HXhbaDB8BUphM7jk5GK1afAux624qv4blfSVMbmof3w="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kconfigwidgets-6.20.0.tar.xz",
+    "hash": "sha256-XF6Nx+mG2Fw2ArilK42JCfkedDPsrYA3CZSRJQ9fTjY="
   },
   "kcontacts": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcontacts-6.19.0.tar.xz",
-    "hash": "sha256-ydAy89mIBQ40SbAJ2WHxN/+dgcwSj2O67KzLKnGPWUk="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcontacts-6.20.0.tar.xz",
+    "hash": "sha256-slPNSGSj89Q0NIXMS/4bA0TM9RNurSraNZ5pM+CSU94="
   },
   "kcoreaddons": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcoreaddons-6.19.0.tar.xz",
-    "hash": "sha256-flMza5BpC3C3GvI6sGlkx1yd6+o8182gl40yulhuk5o="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcoreaddons-6.20.0.tar.xz",
+    "hash": "sha256-wdRVh2Ft9eqjZnoCix9/kJyccjCsQtYtppz7KsRs1QU="
   },
   "kcrash": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kcrash-6.19.0.tar.xz",
-    "hash": "sha256-f+sBC3WgfFElsvNq2Jie7NtqXUHeFCxVLXHhzsQxYt0="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kcrash-6.20.0.tar.xz",
+    "hash": "sha256-H0LpxU6tny2Bs+xerPVatv9N0cOgchxo86s57UbzWXM="
   },
   "kdav": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdav-6.19.0.tar.xz",
-    "hash": "sha256-d1O5qH2bWpn/wKjFnpjb1mrK3lcp1a4vCm0/vmbqCpI="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdav-6.20.0.tar.xz",
+    "hash": "sha256-vRjVo9sBwnetydoy3SCkX8lbKLEfv/U5mEKwUkpJ0IQ="
   },
   "kdbusaddons": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdbusaddons-6.19.0.tar.xz",
-    "hash": "sha256-BfSupUzov55i69SHkems66XLxarxlaMs4kl/rCtkqg0="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdbusaddons-6.20.0.tar.xz",
+    "hash": "sha256-XbL2tyNSOAcCJO6KUiX0H/2zJJ1VioGnwGqOVNZ3Kfc="
   },
   "kdeclarative": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdeclarative-6.19.0.tar.xz",
-    "hash": "sha256-DHGpoI9EeyD6Br6DbQWbLNR5HpcuJ52ZRk4t0Nv/epA="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdeclarative-6.20.0.tar.xz",
+    "hash": "sha256-sBx/oCct0szMlipgbmMyiCW9O4yOwI7jbDzqdfqKMU0="
   },
   "kded": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kded-6.19.0.tar.xz",
-    "hash": "sha256-nFoEInv2PzbIeLfmklR2yMgFrL21Q7imwUw13kagvAI="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kded-6.20.0.tar.xz",
+    "hash": "sha256-HWyVAEjgW56AOM/fhJY9HUuL/F8ybzAedDIReR6an2U="
   },
   "kdesu": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdesu-6.19.0.tar.xz",
-    "hash": "sha256-Avku35BqOXsFVU/0vWcc1/WsbCzvVnMlQaLCfMA9IJ8="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdesu-6.20.0.tar.xz",
+    "hash": "sha256-3iMT9C9XuJafr/Ez8OKyFMW6lokcFhZFEhMPzLXz+4Q="
   },
   "kdnssd": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdnssd-6.19.0.tar.xz",
-    "hash": "sha256-mk6eZTxmcLRoFRbOrePSZk1Xf15vAXPXu5u+XdAJwnE="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdnssd-6.20.0.tar.xz",
+    "hash": "sha256-/GFuf51W/0MEpb3G0E5+915f99hDdRdfCyWkS6ia9go="
   },
   "kdoctools": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kdoctools-6.19.0.tar.xz",
-    "hash": "sha256-wgSLKXkkdUD5uiL9fG83LOhpaZw6PoGpevL6L3M8dLw="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kdoctools-6.20.0.tar.xz",
+    "hash": "sha256-9WU2JVynRVSpwC05X9eMi0oNKhx9ADzmIbMk6In4XA8="
   },
   "kfilemetadata": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kfilemetadata-6.19.0.tar.xz",
-    "hash": "sha256-XUZSJYJqBmByNPKaZESIMWftKpIccRXCLjCDQyEVQcE="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kfilemetadata-6.20.0.tar.xz",
+    "hash": "sha256-MxZQXcgmzt5AnGBizofKF2gBR6dgVEA2wxc5+/dVf5c="
   },
   "kglobalaccel": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kglobalaccel-6.19.0.tar.xz",
-    "hash": "sha256-G751AmWDGXZ8BIA56NrCvRe8EgQi2OWO9vIrpjhArkk="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kglobalaccel-6.20.0.tar.xz",
+    "hash": "sha256-7iq9kd9Hpq5Hj4bmf0Y0h+MAMvPA2M/Xfy1rlWfIbbQ="
   },
   "kguiaddons": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kguiaddons-6.19.0.tar.xz",
-    "hash": "sha256-rENBbFunkMiYzTuAbGur5FtB33LsxlpDKMwaUyyooeY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kguiaddons-6.20.0.tar.xz",
+    "hash": "sha256-M8r1rkbxpiFPVllhgODGzLSvLM4NyuBgrk+3B4JgpHY="
   },
   "kholidays": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kholidays-6.19.0.tar.xz",
-    "hash": "sha256-eHYRbcAi/nIilDBc1Y3eU/0hvNZkGIrSas7tY+Vd3IY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kholidays-6.20.0.tar.xz",
+    "hash": "sha256-spp6J/hfO1M8AgAr1e/Tdf7WQmjomMtA5tN3sNckOGQ="
   },
   "ki18n": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/ki18n-6.19.0.tar.xz",
-    "hash": "sha256-YI/yY0zRlzaoCRx1DHGyPbCzP9gegvufxLzOdnEihKY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/ki18n-6.20.0.tar.xz",
+    "hash": "sha256-8pyAUTevnO5qurQks4D+qWSlmwifkPuQlgHZ/HjfX3M="
   },
   "kiconthemes": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kiconthemes-6.19.0.tar.xz",
-    "hash": "sha256-sLZzcbphh0l2qE/v5ZLnhvx/+5xUVDkUq8IKMiQb4uk="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kiconthemes-6.20.0.tar.xz",
+    "hash": "sha256-YbkGBRzWbbHdJZ7HbQiIXT/nSeDTlHrqdJAh0sllN6U="
   },
   "kidletime": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kidletime-6.19.0.tar.xz",
-    "hash": "sha256-34LDhv743JjqWXb/7x2hFTnBkU0ht3POYvRTO1rRb2U="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kidletime-6.20.0.tar.xz",
+    "hash": "sha256-7LysXgYqJ9MWF0fWv0ndYDKBo3jSbASJFediqxlFQNk="
   },
   "kimageformats": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kimageformats-6.19.0.tar.xz",
-    "hash": "sha256-/IJTJqprjBMhlH/1I9PQBu70xl/eQPN5xpANBpZ/rhw="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kimageformats-6.20.0.tar.xz",
+    "hash": "sha256-vb2R8BuIthvFs+f2AVOui2PV8fKEDp6zGui3M597jXk="
   },
   "kio": {
-    "version": "6.19.1",
-    "url": "mirror://kde/stable/frameworks/6.19/kio-6.19.1.tar.xz",
-    "hash": "sha256-Lw6nr0yiJwMfDwNBojLRhtQNsAHVu2KH75+kvKEn7j8="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kio-6.20.0.tar.xz",
+    "hash": "sha256-fmfUcfwQt989dubOhZSAvl1uZ10xZZLnqEGbl/Ab1kk="
   },
   "kirigami": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kirigami-6.19.0.tar.xz",
-    "hash": "sha256-jGaF3eVfABzGIbOMYUhtDp4u9/sdUCyl3QSREiKep8w="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kirigami-6.20.0.tar.xz",
+    "hash": "sha256-tn/qciXM70zv0KnTpUdIMVASkWfEdZVzbqxFeYb3Cdk="
   },
   "kitemmodels": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kitemmodels-6.19.0.tar.xz",
-    "hash": "sha256-ludKExANAmasMb/RUnkBY38r9Na8fUakl+bckpG9uY4="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kitemmodels-6.20.0.tar.xz",
+    "hash": "sha256-RbbNVHj+NfCWanXjzFVKXbhBisfWOHdFoAcPOcr5Iak="
   },
   "kitemviews": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kitemviews-6.19.0.tar.xz",
-    "hash": "sha256-1YZVEu7jOZfpe3ZqysyzIja5Pg+BoaeRIGXMfAKz8lI="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kitemviews-6.20.0.tar.xz",
+    "hash": "sha256-Y/bWR4DT6xv90vL5A2Amos3BY7Z2Fowpwnl1RPmtYwU="
   },
   "kjobwidgets": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kjobwidgets-6.19.0.tar.xz",
-    "hash": "sha256-29STbQiZDNdnSWkiqhDor5iu7rofkjOpNwFWTgMurHU="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kjobwidgets-6.20.0.tar.xz",
+    "hash": "sha256-OTtutrNdaA1Ipcewk1lmi93B7YnU+nC4qKgfsthBzno="
   },
   "knewstuff": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/knewstuff-6.19.0.tar.xz",
-    "hash": "sha256-cJD7gvBPpjS6mK0VDIgSPIDBF9Wu2FWWM9gx4chZGv8="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/knewstuff-6.20.0.tar.xz",
+    "hash": "sha256-SUQ63U8cqs4uZP59y+TPeM1raSvwx3ugEILIJ2Hfork="
   },
   "knotifications": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/knotifications-6.19.0.tar.xz",
-    "hash": "sha256-hvJkXyvENEDxGQmb8lqlMp6EV3YahV5L1fCKX3gJsrY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/knotifications-6.20.0.tar.xz",
+    "hash": "sha256-qubZKOr1JUC2Qr2cfqYpPiwND1NhLl+08KYAFpL4BVo="
   },
   "knotifyconfig": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/knotifyconfig-6.19.0.tar.xz",
-    "hash": "sha256-zRkzumhjATnNG/RW8IWzPgw1T9Dx8OTEaCKwnrXFwx8="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/knotifyconfig-6.20.0.tar.xz",
+    "hash": "sha256-oCGW5Q9I2tCQhlbjJF1YvwOw05EC+pKwVr7n1QuRr6c="
   },
   "kpackage": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kpackage-6.19.0.tar.xz",
-    "hash": "sha256-muRBkwlV5eu8o2JDvzJmOLe628dMVvickGwIHAS3AJ0="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kpackage-6.20.0.tar.xz",
+    "hash": "sha256-YYhBFK9gT4J8S4NjRVHqZJIQUOIzycbV/EALl+QCUp4="
   },
   "kparts": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kparts-6.19.0.tar.xz",
-    "hash": "sha256-zdw7ak/Ao/QfpXkZl8nd9MqYhVg5vkZevl0MPO/jUNg="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kparts-6.20.0.tar.xz",
+    "hash": "sha256-nnHj0gyVJfZlM916WEbw2YLu/ddCW/ut7NaheQjr1wk="
   },
   "kpeople": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kpeople-6.19.0.tar.xz",
-    "hash": "sha256-VA/GQ5l8ShxNB+bDxbsrxeEfWtYQLglX+UNCKqki9zE="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kpeople-6.20.0.tar.xz",
+    "hash": "sha256-cvd1HViefXIEZloa34dRq9vb1uS1gmYsMT7HndsBP7I="
   },
   "kplotting": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kplotting-6.19.0.tar.xz",
-    "hash": "sha256-UgM0fVQ5oz0cLDMcWuIfvDKUBKp8AWkrLBxIuVCNgpI="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kplotting-6.20.0.tar.xz",
+    "hash": "sha256-UM2Jhqz0fpqMDfKxHwaKedJBoT9uQmdxcDqeGI5qpD8="
   },
   "kpty": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kpty-6.19.0.tar.xz",
-    "hash": "sha256-eFRMFs7Mfbz/0DNb+UXuyBAxFXhuEVgjVIGsFS9LtAw="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kpty-6.20.0.tar.xz",
+    "hash": "sha256-ZmbwXxc1IJ2m/K4f0h/5SuZ3LTKwok97hM21biIgKWY="
   },
   "kquickcharts": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kquickcharts-6.19.0.tar.xz",
-    "hash": "sha256-UPBHDpYflfq3XLSuiIvdQjm0YvGH1yWkdu8boM5q9DU="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kquickcharts-6.20.0.tar.xz",
+    "hash": "sha256-lPUs5CwVy33FFM6YaNukHtjwZFuUH/IlbQIid0YwF5I="
   },
   "krunner": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/krunner-6.19.0.tar.xz",
-    "hash": "sha256-1ZyhpxQlKb3KKPU53Hs3hPl1vmizbGnQw+aDWWbsMqs="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/krunner-6.20.0.tar.xz",
+    "hash": "sha256-c1ss8VPtG9IjOJ8ptLYZMZ+7MQBx2sbH6frdoRldOhw="
   },
   "kservice": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kservice-6.19.0.tar.xz",
-    "hash": "sha256-gV4IST5ruQ+C6Scmr/eL3PE1ipQpcvx1ES6Zy4QJYb0="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kservice-6.20.0.tar.xz",
+    "hash": "sha256-wzpbzSzhVOJ175RFkBooE8JJQ+JOryOC0khlcXiSNTw="
   },
   "kstatusnotifieritem": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kstatusnotifieritem-6.19.0.tar.xz",
-    "hash": "sha256-XkDLPu6a1WldUEx5BHUiNgHoVpz+X7w3F0gNovNVaUk="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kstatusnotifieritem-6.20.0.tar.xz",
+    "hash": "sha256-2w7bkosVcISH6orQB9tLzzlJMyaYzHi07XUSi+obL6Y="
   },
   "ksvg": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/ksvg-6.19.0.tar.xz",
-    "hash": "sha256-kqLLxGBKPqhtm4rZIa3/k2RhVgF7yPpcdZWO8yS16e8="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/ksvg-6.20.0.tar.xz",
+    "hash": "sha256-f/Qc8Yr50apIYqUukVHgoZaAmfcdoH2oRU2IDWdpVqg="
   },
   "ktexteditor": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/ktexteditor-6.19.0.tar.xz",
-    "hash": "sha256-8jgpEP4y6Sv9B9706PU9WNhXJRlKJEEj2TirDEKoB/E="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/ktexteditor-6.20.0.tar.xz",
+    "hash": "sha256-P1nRb9cd4lj+Uxtlcg12T6uF0LPPBCMgHJ9mxAQuZMw="
   },
   "ktexttemplate": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/ktexttemplate-6.19.0.tar.xz",
-    "hash": "sha256-QIc1OsION2o9zi70m8YviFbrO3kzcH+vYrsxsXnBHIM="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/ktexttemplate-6.20.0.tar.xz",
+    "hash": "sha256-FRWVkQX87XRoPJGqG7+JM4J5YUwe17F6vpVOARRPTBk="
   },
   "ktextwidgets": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/ktextwidgets-6.19.0.tar.xz",
-    "hash": "sha256-2fpJ7pXPAzIdKy2JvWlSc0Mjt1otmDuXcC0UvOSAnxY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/ktextwidgets-6.20.0.tar.xz",
+    "hash": "sha256-eB5/rVcg3n8xOAssSkWLwodZQESe2RaLSMYNR0tt8iA="
   },
   "kunitconversion": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kunitconversion-6.19.0.tar.xz",
-    "hash": "sha256-1PDjnidZbGVQ8/xy+2ew1JZqz9fXAqARoPykILb5s5M="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kunitconversion-6.20.0.tar.xz",
+    "hash": "sha256-WrTuOFPnew1qaaZkQ3JLCeqmEhq4Nf7UbQkdNeb+qj8="
   },
   "kuserfeedback": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kuserfeedback-6.19.0.tar.xz",
-    "hash": "sha256-Z2jnP9IaKQ+Si41XFPYjHKXfinLfYl9DrI96trtxH58="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kuserfeedback-6.20.0.tar.xz",
+    "hash": "sha256-Y4zU6SE3KE3hhiCUVEFEc5EXOk9nhbqp5rg4VbuoCLQ="
   },
   "kwallet": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kwallet-6.19.0.tar.xz",
-    "hash": "sha256-HeSj9gsMFw2NnQR27Y4M/fN/ZxG/TlB6j37EJo6txK0="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kwallet-6.20.0.tar.xz",
+    "hash": "sha256-tlZa0EGlfTkLNyimWZ/A4zl4TSpNq1mQrORauqUC5B4="
   },
   "kwidgetsaddons": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kwidgetsaddons-6.19.0.tar.xz",
-    "hash": "sha256-YiqW9pf4O4zw4qvocLNkivzhAVDL6/tGyzdpt3pphno="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kwidgetsaddons-6.20.0.tar.xz",
+    "hash": "sha256-OZdLhc3/2MbW4KXAaEknoh4HHB5j18zjiIMx8BaaSDc="
   },
   "kwindowsystem": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kwindowsystem-6.19.0.tar.xz",
-    "hash": "sha256-fvhwzGw3/JjkZVwmfNoGmygllkBSTRCI1ENDUIJ+Wdo="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kwindowsystem-6.20.0.tar.xz",
+    "hash": "sha256-g2vgBd88jPyB2coZnxnja6DfUV1p59iwY0NGVBL29Hc="
   },
   "kxmlgui": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kxmlgui-6.19.0.tar.xz",
-    "hash": "sha256-KcKdxxwWaK7xjc0KjIZXOfXcwuL1zqZr7HXSQIB/2e4="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/kxmlgui-6.20.0.tar.xz",
+    "hash": "sha256-oW/Tc0ESkU71DtJmahaQXYfmeVS8NoclzLHVsu3I+PE="
   },
   "modemmanager-qt": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/modemmanager-qt-6.19.0.tar.xz",
-    "hash": "sha256-NnFIx/fE7Ikjyvy6StDcUAQ0yV25Y3VXBKJSHMbC8NA="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/modemmanager-qt-6.20.0.tar.xz",
+    "hash": "sha256-GmBrJlMN5NnCcsuXk7Y7JegP56nAth5CI5lFP/Xlynk="
   },
   "networkmanager-qt": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/networkmanager-qt-6.19.0.tar.xz",
-    "hash": "sha256-g7oQYAgNwZPGKDdCHhy3llAKuzkxtQWugnXEQGdK/8Q="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/networkmanager-qt-6.20.0.tar.xz",
+    "hash": "sha256-aFb+yykzq82tCniaF55AVM8kkB3Cn5Q/ADaj4Vz0PoY="
   },
   "prison": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/prison-6.19.0.tar.xz",
-    "hash": "sha256-v9Yj+V4AryXsSZZmeQEMQR74eYt8GjHCWEhMMQZ9U1Y="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/prison-6.20.0.tar.xz",
+    "hash": "sha256-NuxvguzDwGYY1FXMFpirEXVNZC+rPxuFCnzwHOEbPR8="
   },
   "purpose": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/purpose-6.19.0.tar.xz",
-    "hash": "sha256-eZ/z5phyQA0vpuXiyR/tZu1r0NepFj78AE7uC/bQk6I="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/purpose-6.20.0.tar.xz",
+    "hash": "sha256-OjOgaVNPXPzXUeZ7fcN3hfO47J0CfPHXoNQvD/v8mFc="
   },
   "qqc2-desktop-style": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/qqc2-desktop-style-6.19.0.tar.xz",
-    "hash": "sha256-aPm5P26LD7okTwItg2fvRzVCK+dG5nUnZKs4h+BfhTU="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/qqc2-desktop-style-6.20.0.tar.xz",
+    "hash": "sha256-D50V/w3TuXRFYzYIYMux4Tex2biTdiEOcyiqoC7Uq34="
   },
   "solid": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/solid-6.19.0.tar.xz",
-    "hash": "sha256-OsmpiyAe7eGuB4KxoyCidVdnK+jTxcgbukRnUXk8o8s="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/solid-6.20.0.tar.xz",
+    "hash": "sha256-Ayg4GEWhHPz6jBjI1gyd97haB7zXsb02txx+s8w0ktY="
   },
   "sonnet": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/sonnet-6.19.0.tar.xz",
-    "hash": "sha256-SxAqNZxdoXloYtvCT7OVwSIIR/BYT6epdOwRjWRKz6A="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/sonnet-6.20.0.tar.xz",
+    "hash": "sha256-NWzdr3zyqryvhQMUuySPpWoVuChf6nTY86fH5N7CqDo="
   },
   "syndication": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/syndication-6.19.0.tar.xz",
-    "hash": "sha256-FhEQdE1bx7mw+GBo2FAY2mEpyMB6pHScmhi963XBcWY="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/syndication-6.20.0.tar.xz",
+    "hash": "sha256-4reeqVio7f1MnAeQklzEPR9AMexl7lRaYFkQCL4VkkI="
   },
   "syntax-highlighting": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/syntax-highlighting-6.19.0.tar.xz",
-    "hash": "sha256-E6cuibrgr5NqLVSwJHPpbepWDv/EsD/UPWnkWCwdvRk="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/syntax-highlighting-6.20.0.tar.xz",
+    "hash": "sha256-bihio4V8EemnWszG46z8wW9jTuh4WGtNKpe1c/Ur/cA="
   },
   "threadweaver": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/threadweaver-6.19.0.tar.xz",
-    "hash": "sha256-2NTQtuYrBnqM5P7Xrv7tAu1DpD+X8IXbO67fkhAHDaE="
+    "version": "6.20.0",
+    "url": "mirror://kde/stable/frameworks/6.20/threadweaver-6.20.0.tar.xz",
+    "hash": "sha256-kxPyWi6m4kMdNOCwD2ja1ogYScNPHkBRWlOacN1vuxk="
   }
 }
\ No newline at end of file

From e90c2d3e2938f70941ff937e9ee4fa14dc95a6f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Nov 2025 08:52:11 +0000
Subject: [PATCH 34/38] volanta: 1.13.3 -> 1.14.1

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

diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index 4ca71b69efc3..3801ffabedc7 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "volanta";
-  version = "1.13.3";
-  build = "cdb350c9";
+  version = "1.14.1";
+  build = "4f70dc47";
   src = fetchurl {
     url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
-    hash = "sha256-0q0ShXqN1xA4+bKOX5jebUV+pDh+BNok5WZLLPrq0ks=";
+    hash = "sha256-ZZqU3+yKI6gdnX6mdrNnY3JS0mkuas7OncHnAiZumBc=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in

From fe70fbf8f16a948d1099028b33eb9280dc474538 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 15 Nov 2025 02:47:05 +0300
Subject: [PATCH 35/38] kdePackages: metadata update

---
 .../gear/kdenetwork-filesharing/default.nix   |   2 -
 pkgs/kde/gear/keysmith/default.nix            |   2 -
 pkgs/kde/generated/dependencies.json          |  33 ++--
 pkgs/kde/generated/projects.json              | 176 ++++++++++++++++--
 pkgs/kde/plasma/systemsettings/default.nix    |   4 -
 5 files changed, 174 insertions(+), 43 deletions(-)

diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
index b72f4af7b955..0f51019ab274 100644
--- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix
+++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
@@ -3,7 +3,6 @@
   mkKdeDerivation,
   replaceVars,
   qtdeclarative,
-  kauth,
   samba,
   shadow,
 }:
@@ -22,7 +21,6 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     qtdeclarative
-    kauth
   ];
 
   # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to
diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix
index 2e65c6572a34..d73c66fdd6f3 100644
--- a/pkgs/kde/gear/keysmith/default.nix
+++ b/pkgs/kde/gear/keysmith/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   qtsvg,
-  kirigami-addons,
   pkg-config,
   libsodium,
 }:
@@ -15,7 +14,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtsvg
-    kirigami-addons
     libsodium
   ];
   meta.mainProgram = "keysmith";
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index bf2aada9b34b..30af08e22ceb 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -1818,6 +1818,7 @@
     ],
     "kdenetwork-filesharing": [
       "extra-cmake-modules",
+      "kauth",
       "kcompletion",
       "kcoreaddons",
       "ki18n",
@@ -2252,6 +2253,7 @@
       "kguiaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
       "kwidgetsaddons",
       "kwindowsystem",
       "prison",
@@ -2660,7 +2662,6 @@
       "ki18n",
       "kio",
       "libkexiv2",
-      "phonon",
       "plasma-activities",
       "plasma-activities-stats",
       "qcoro",
@@ -2754,16 +2755,6 @@
       "kirigami",
       "kirigami-addons"
     ],
-    "kiss": [
-      "extra-cmake-modules",
-      "kconfig",
-      "kcoreaddons",
-      "ki18n",
-      "kpackage",
-      "libkscreen",
-      "plasma-desktop",
-      "plasma-workspace"
-    ],
     "kitemmodels": [
       "extra-cmake-modules"
     ],
@@ -3418,11 +3409,6 @@
       "kwindowsystem",
       "kxmlgui"
     ],
-    "kontainer": [
-      "extra-cmake-modules",
-      "ki18n",
-      "kio"
-    ],
     "kontrast": [
       "extra-cmake-modules",
       "futuresql",
@@ -5579,6 +5565,16 @@
       "kirigami-addons",
       "kitemmodels"
     ],
+    "plasma-setup": [
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "ki18n",
+      "kpackage",
+      "libkscreen",
+      "plasma-desktop",
+      "plasma-workspace"
+    ],
     "plasma-systemmonitor": [
       "attica",
       "extra-cmake-modules",
@@ -5698,7 +5694,6 @@
       "kstatusnotifieritem",
       "ktexteditor",
       "ktextwidgets",
-      "kunitconversion",
       "kuserfeedback",
       "kwallet",
       "kwayland",
@@ -6269,6 +6264,7 @@
     ],
     "systemsettings": [
       "extra-cmake-modules",
+      "kauth",
       "kcmutils",
       "kcolorscheme",
       "kconfig",
@@ -6282,7 +6278,6 @@
       "kirigami",
       "kitemmodels",
       "kitemviews",
-      "knotifications",
       "krunner",
       "kservice",
       "kwidgetsaddons",
@@ -6515,5 +6510,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "4fa0d47e"
+  "version": "0bb9fa37"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index ec7937b31351..0ede96a3babd 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -1103,6 +1103,12 @@
     "project_path": "edu/gcompris-data",
     "repo_path": "education/gcompris-data"
   },
+  "gcompris-teachers-handbook": {
+    "description": "Official documentation for the GCompris-teachers tool",
+    "name": "gcompris-teachers-handbook",
+    "project_path": "documentation/gcompris-teachers-handbook",
+    "repo_path": "documentation/gcompris-teachers-handbook"
+  },
   "geonames-data": {
     "description": "Cache of geo name exports from geonames.org",
     "name": "geonames-data",
@@ -2873,12 +2879,6 @@
     "project_path": "base/kirogi",
     "repo_path": "utilities/kirogi"
   },
-  "kiss": {
-    "description": "KDE Initial System Setup",
-    "name": "kiss",
-    "project_path": "plasma/kiss",
-    "repo_path": "plasma/kiss"
-  },
   "kitemmodels": {
     "description": "KItemModels",
     "name": "kitemmodels",
@@ -3335,12 +3335,6 @@
     "project_path": "pim/kontactinterface",
     "repo_path": "pim/kontactinterface"
   },
-  "kontainer": {
-    "description": "Qt DistroBox GUI",
-    "name": "kontainer",
-    "project_path": "sysadmin/kontainer",
-    "repo_path": "system/kontainer"
-  },
   "kontaminuti": {
     "description": "Kontaminuti is a simple helper utility to time your activities according to the Pomodoro Technique.",
     "name": "kontaminuti",
@@ -3758,8 +3752,8 @@
   "krita-marketing": {
     "description": "Working together to creating marketing and introduction documents for Krita",
     "name": "krita-marketing",
-    "project_path": "others/krita-marketing",
-    "repo_path": "unmaintained/krita-marketing"
+    "project_path": "graphics/krita-marketing",
+    "repo_path": "graphics/krita-marketing"
   },
   "krita-pyramidalsharpening": {
     "description": "Use a pyramid to reconstruct a sharper image.",
@@ -4451,6 +4445,12 @@
     "project_path": "graphics/kxstitch",
     "repo_path": "graphics/kxstitch"
   },
+  "l10n-templates": {
+    "description": "Templates for localization of KDE software",
+    "name": "l10n-templates",
+    "project_path": "localization/l10n-templates",
+    "repo_path": "localization/l10n-templates"
+  },
   "labplot": {
     "description": "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone.",
     "name": "labplot",
@@ -4823,6 +4823,12 @@
     "project_path": "base/mark",
     "repo_path": "education/mark"
   },
+  "markdown-gettext": {
+    "description": "Command Line program to do i18n and l10n for individual Markdown files.",
+    "name": "markdown-gettext",
+    "project_path": "sdk/markdown-gettext",
+    "repo_path": "sdk/markdown-gettext"
+  },
   "markdownpart": {
     "description": "KPart for rendering Markdown content",
     "name": "markdownpart",
@@ -5009,6 +5015,18 @@
     "project_path": "libs/md4qt",
     "repo_path": "libraries/md4qt"
   },
+  "mdit-py-hugo": {
+    "description": "mdit-py-hugo",
+    "name": "mdit-py-hugo",
+    "project_path": "sdk/mdit-py-hugo",
+    "repo_path": "sdk/mdit-py-hugo"
+  },
+  "mdit-py-i18n": {
+    "description": "Markdown i18n and l10n using markdown-it-py",
+    "name": "mdit-py-i18n",
+    "project_path": "sdk/mdit-py-i18n",
+    "repo_path": "sdk/mdit-py-i18n"
+  },
   "melon": {
     "description": "Desktop QML file manager",
     "name": "melon",
@@ -5789,6 +5807,12 @@
     "project_path": "base/plasma-settings",
     "repo_path": "plasma-mobile/plasma-settings"
   },
+  "plasma-setup": {
+    "description": "Plasma first run setup tool",
+    "name": "plasma-setup",
+    "project_path": "workspace/plasma-setup",
+    "repo_path": "plasma/plasma-setup"
+  },
   "plasma-simplemenu": {
     "description": "Simplified menu for your Plasma Desktop",
     "name": "plasma-simplemenu",
@@ -6452,7 +6476,7 @@
   "spectacle": {
     "description": "Screenshot capture utility",
     "name": "spectacle",
-    "project_path": "kdeworkspace/spectacle",
+    "project_path": "workspace/spectacle",
     "repo_path": "plasma/spectacle"
   },
   "sprinter": {
@@ -7380,7 +7404,7 @@
     "repo_path": "websites/dot-kde-org"
   },
   "websites-download-kde-org": {
-    "description": "MirrorBrain configuration, templates, etc. - download.kde.org",
+    "description": "MirrorBits templates, etc. for download.kde.org",
     "name": "websites-download-kde-org",
     "project_path": "websites/download-kde-org",
     "repo_path": "websites/download-kde-org"
@@ -7517,6 +7541,12 @@
     "project_path": "websites/hugo-bootstrap",
     "repo_path": "websites/hugo-bootstrap"
   },
+  "websites-hugo-gettext": {
+    "description": "Hugo integration with Gettext",
+    "name": "websites-hugo-gettext",
+    "project_path": "websites/hugo-gettext",
+    "repo_path": "websites/hugo-gettext"
+  },
   "websites-hugo-i18n": {
     "description": "Tooling to help translate Hugo generated websites with gettext",
     "name": "websites-hugo-i18n",
@@ -7787,6 +7817,120 @@
     "project_path": "websites/lakademy-kde-org",
     "repo_path": "websites/lakademy-kde-org"
   },
+  "websites-libregraphicsmeeting-org-2006": {
+    "description": "Website for Libre Graphics Meeting 2006",
+    "name": "websites-libregraphicsmeeting-org-2006",
+    "project_path": "websites/libregraphicsmeeting-org-2006",
+    "repo_path": "websites/libregraphicsmeeting-org-2006"
+  },
+  "websites-libregraphicsmeeting-org-2007": {
+    "description": "Website for Libre Graphics Meeting 2007",
+    "name": "websites-libregraphicsmeeting-org-2007",
+    "project_path": "websites/libregraphicsmeeting-org-2007",
+    "repo_path": "websites/libregraphicsmeeting-org-2007"
+  },
+  "websites-libregraphicsmeeting-org-2008": {
+    "description": "Website for Libre Graphics Meeting 2008",
+    "name": "websites-libregraphicsmeeting-org-2008",
+    "project_path": "websites/libregraphicsmeeting-org-2008",
+    "repo_path": "websites/libregraphicsmeeting-org-2008"
+  },
+  "websites-libregraphicsmeeting-org-2009": {
+    "description": "Website for Libre Graphics Meeting 2009",
+    "name": "websites-libregraphicsmeeting-org-2009",
+    "project_path": "websites/libregraphicsmeeting-org-2009",
+    "repo_path": "websites/libregraphicsmeeting-org-2009"
+  },
+  "websites-libregraphicsmeeting-org-2010": {
+    "description": "Website for Libre Graphics Meeting 2010",
+    "name": "websites-libregraphicsmeeting-org-2010",
+    "project_path": "websites/libregraphicsmeeting-org-2010",
+    "repo_path": "websites/libregraphicsmeeting-org-2010"
+  },
+  "websites-libregraphicsmeeting-org-2011": {
+    "description": "Website for Libre Graphics Meeting 2011",
+    "name": "websites-libregraphicsmeeting-org-2011",
+    "project_path": "websites/libregraphicsmeeting-org-2011",
+    "repo_path": "websites/libregraphicsmeeting-org-2011"
+  },
+  "websites-libregraphicsmeeting-org-2012": {
+    "description": "Website for Libre Graphics Meeting 2012",
+    "name": "websites-libregraphicsmeeting-org-2012",
+    "project_path": "websites/libregraphicsmeeting-org-2012",
+    "repo_path": "websites/libregraphicsmeeting-org-2012"
+  },
+  "websites-libregraphicsmeeting-org-2013": {
+    "description": "Website for Libre Graphics Meeting 2013",
+    "name": "websites-libregraphicsmeeting-org-2013",
+    "project_path": "websites/libregraphicsmeeting-org-2013",
+    "repo_path": "websites/libregraphicsmeeting-org-2013"
+  },
+  "websites-libregraphicsmeeting-org-2014": {
+    "description": "Website for Libre Graphics Meeting 2014",
+    "name": "websites-libregraphicsmeeting-org-2014",
+    "project_path": "websites/libregraphicsmeeting-org-2014",
+    "repo_path": "websites/libregraphicsmeeting-org-2014"
+  },
+  "websites-libregraphicsmeeting-org-2015": {
+    "description": "Website for Libre Graphics Meeting 2015",
+    "name": "websites-libregraphicsmeeting-org-2015",
+    "project_path": "websites/libregraphicsmeeting-org-2015",
+    "repo_path": "websites/libregraphicsmeeting-org-2015"
+  },
+  "websites-libregraphicsmeeting-org-2016": {
+    "description": "Website for Libre Graphics Meeting 2016",
+    "name": "websites-libregraphicsmeeting-org-2016",
+    "project_path": "websites/libregraphicsmeeting-org-2016",
+    "repo_path": "websites/libregraphicsmeeting-org-2016"
+  },
+  "websites-libregraphicsmeeting-org-2017": {
+    "description": "Website for Libre Graphics Meeting 2017",
+    "name": "websites-libregraphicsmeeting-org-2017",
+    "project_path": "websites/libregraphicsmeeting-org-2017",
+    "repo_path": "websites/libregraphicsmeeting-org-2017"
+  },
+  "websites-libregraphicsmeeting-org-2018": {
+    "description": "Website for Libre Graphics Meeting 2018",
+    "name": "websites-libregraphicsmeeting-org-2018",
+    "project_path": "websites/libregraphicsmeeting-org-2018",
+    "repo_path": "websites/libregraphicsmeeting-org-2018"
+  },
+  "websites-libregraphicsmeeting-org-2019": {
+    "description": "Website for Libre Graphics Meeting 2019",
+    "name": "websites-libregraphicsmeeting-org-2019",
+    "project_path": "websites/libregraphicsmeeting-org-2019",
+    "repo_path": "websites/libregraphicsmeeting-org-2019"
+  },
+  "websites-libregraphicsmeeting-org-2020": {
+    "description": "Website for Libre Graphics Meeting 2020",
+    "name": "websites-libregraphicsmeeting-org-2020",
+    "project_path": "websites/libregraphicsmeeting-org-2020",
+    "repo_path": "websites/libregraphicsmeeting-org-2020"
+  },
+  "websites-libregraphicsmeeting-org-2021": {
+    "description": "Website for Libre Graphics Meeting 2021",
+    "name": "websites-libregraphicsmeeting-org-2021",
+    "project_path": "websites/libregraphicsmeeting-org-2021",
+    "repo_path": "websites/libregraphicsmeeting-org-2021"
+  },
+  "websites-libregraphicsmeeting-org-2024": {
+    "description": "Website for Libre Graphics Meeting 2024",
+    "name": "websites-libregraphicsmeeting-org-2024",
+    "project_path": "websites/libregraphicsmeeting-org-2024",
+    "repo_path": "websites/libregraphicsmeeting-org-2024"
+  },
+  "websites-libregraphicsmeeting-org-2025": {
+    "description": "Website for Libre Graphics Meeting 2025",
+    "name": "websites-libregraphicsmeeting-org-2025",
+    "project_path": "websites/libregraphicsmeeting-org-2025",
+    "repo_path": "websites/libregraphicsmeeting-org-2025"
+  },
+  "websites-libregraphicsmeeting-org-2026": {
+    "description": "Website for Libre Graphics Meeting 2026",
+    "name": "websites-libregraphicsmeeting-org-2026",
+    "project_path": "websites/libregraphicsmeeting-org-2026",
+    "repo_path": "websites/libregraphicsmeeting-org-2026"
+  },
   "websites-lists-kde-org": {
     "description": "Necessary code to redirect from lists.kde.org to appropriate mail archives",
     "name": "websites-lists-kde-org",
diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix
index 0773a7f7d428..c1de17e7322c 100644
--- a/pkgs/kde/plasma/systemsettings/default.nix
+++ b/pkgs/kde/plasma/systemsettings/default.nix
@@ -1,11 +1,7 @@
 {
   mkKdeDerivation,
-  kauth,
 }:
 mkKdeDerivation {
   pname = "systemsettings";
-
-  extraBuildInputs = [ kauth ];
-
   meta.mainProgram = "systemsettings";
 }

From 6fbe8b7ed0df3269e7a7335a0c0876c5b13571bc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 15 Nov 2025 12:47:01 +0300
Subject: [PATCH 36/38] lasuite-meet: 0.1.41 -> 0.1.42

---
 pkgs/by-name/la/lasuite-meet-frontend/package.nix | 6 +++---
 pkgs/by-name/la/lasuite-meet/package.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
index 4ef971de43d3..e212f8c931ab 100644
--- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.41";
+  version = "0.1.42";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
+    hash = "sha256-STb4JCEoKgzokIA5mWFqJkFH9mtdnIp8NcopLWYSbwQ=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-UJMyOCtjr7e6YaRdIrlL+p3alw4k/MzgqqFreLesAaE=";
+    hash = "sha256-SfAcGty6fT56eO7K3ZX87PiLiNlthl9UW3uAJmKM+lU=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index 98812a18cb67..cd0cab878064 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.41";
+  version = "0.1.42";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
+    hash = "sha256-STb4JCEoKgzokIA5mWFqJkFH9mtdnIp8NcopLWYSbwQ=";
   };
 
   sourceRoot = "source/src/backend";

From ae921d60d393bafb77901a08beaf93fef7409afc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 15 Nov 2025 13:01:48 +0300
Subject: [PATCH 37/38] mesa: 25.2.6 -> 25.3.0

---
 pkgs/development/libraries/mesa/common.nix    |  4 +-
 pkgs/development/libraries/mesa/default.nix   |  9 ++--
 .../libraries/mesa/gallivm-llvm-21.patch      | 53 -------------------
 3 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/gallivm-llvm-21.patch

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 732fc979c1cb..c3d91831ad7d 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.2.6";
+  version = "25.3.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-erfvNR1Yor3k8gVVClyiBJsgyaOv7BMFd1NSgieTY5I=";
+    hash = "sha256-MviXDRAbCEXM9dIzD94/CM0bjlF4zCJUVE91Xst/uII=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f548668644bf..5e99a1608664 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -13,6 +13,7 @@
   spirv-tools,
   intltool,
   jdupes,
+  libdisplay-info,
   libdrm,
   libgbm,
   libglvnd,
@@ -50,6 +51,7 @@
     "asahi" # Apple AGX
     "crocus" # Intel legacy
     "d3d12" # WSL emulated GPU (aka Dozen)
+    "ethosu" # ARM Ethos NPU
     "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
     "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
     "i915" # Intel extra legacy
@@ -61,6 +63,7 @@
     "r300" # very old AMD
     "r600" # less old AMD
     "radeonsi" # new AMD (GCN+)
+    "rocket" # Rockchip NPU
     "softpipe" # older software renderer
     "svga" # VMWare virtualized GPU
     "tegra" # Nvidia Tegra SoCs
@@ -75,7 +78,7 @@
     "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
     "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
     "gfxstream" # Android virtualized GPU
-    "imagination-experimental" # PowerVR Rogue (currently N/A)
+    "imagination" # PowerVR Rogue (currently N/A)
     "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
     "intel" # new Intel (aka ANV)
     "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
@@ -96,6 +99,7 @@
     "wayland"
   ],
   vulkanLayers ? [
+    "anti-lag"
     "device-select"
     "intel-nullhw"
     "overlay"
@@ -144,8 +148,6 @@ stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
-    # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37027
-    ./gallivm-llvm-21.patch
   ];
 
   postPatch = ''
@@ -256,6 +258,7 @@ stdenv.mkDerivation {
       elfutils
       expat
       spirv-tools
+      libdisplay-info
       libdrm
       libgbm
       libglvnd
diff --git a/pkgs/development/libraries/mesa/gallivm-llvm-21.patch b/pkgs/development/libraries/mesa/gallivm-llvm-21.patch
deleted file mode 100644
index 692a5c720d52..000000000000
--- a/pkgs/development/libraries/mesa/gallivm-llvm-21.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From eca19331d94005485de5246cfa87a21621486cd8 Mon Sep 17 00:00:00 2001
-From: no92 <no92.mail@gmail.com>
-Date: Wed, 27 Aug 2025 16:02:31 +0200
-Subject: [PATCH] gallivm: support LLVM 21
-
-LLVM PR#146819 changed the signature of `setObjectLinkingLayerCreator`,
-dropping the Triple argument. The PR was first included in the LLVM 21
-series, and the new signature is gated behind a version check for that.
-
-`LLVMOrcThreadSafeContextGetContext` was removed in LLVM commit b18e5b6,
-and the ORC examples in the LLVM tree seem to just create a context
-instead, which we replicate here.
-
-With this commit, mesa successfully builds the llvmpipe gallium driver
-on riscv64 with LLVM 21.1.0.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13785
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13852
-
-Reviewed-by: David Heidelberg <david@ixit.cz>
----
- src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-index 3d2b8cf81bc0c..0be69b02b6eef 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-@@ -340,7 +340,12 @@ LPJit::LPJit() :jit_dylib_count(0) {
-          .setJITTargetMachineBuilder(std::move(JTMB))
- #ifdef USE_JITLINK
-          .setObjectLinkingLayerCreator(
-+#if LLVM_VERSION_MAJOR >= 21
-+            /* LLVM 21 removed the Triple argument */
-+            [&](ExecutionSession &ES) {
-+#else
-             [&](ExecutionSession &ES, const llvm::Triple &TT) {
-+#endif
-                return std::make_unique<ObjectLinkingLayer>(
-                   ES, ExitOnErr(llvm::jitlink::InProcessMemoryManager::Create()));
-             })
-@@ -552,7 +557,7 @@ init_gallivm_state(struct gallivm_state *gallivm, const char *name,
-    gallivm->cache = cache;
- 
-    gallivm->_ts_context = context->ref;
--   gallivm->context = LLVMOrcThreadSafeContextGetContext(context->ref);
-+   gallivm->context = LLVMContextCreate();
- 
-    gallivm->module_name = LPJit::get_unique_name(name);
-    gallivm->module = LLVMModuleCreateWithNameInContext(gallivm->module_name,
--- 
-GitLab
-

From 1aa23f2e1bb86a603b397eb4a4a3b994a9dc02e5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 15 Nov 2025 13:38:04 +0300
Subject: [PATCH 38/38] mesa: gate NPU drivers on 64-bit targets only

ethosu fails to build entirely, rocket does a bunch of pointer-to-int64
and back casts that will be wildly unsafe on 32-bit.
---
 pkgs/development/libraries/mesa/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5e99a1608664..4320ea6d6360 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -51,7 +51,6 @@
     "asahi" # Apple AGX
     "crocus" # Intel legacy
     "d3d12" # WSL emulated GPU (aka Dozen)
-    "ethosu" # ARM Ethos NPU
     "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
     "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
     "i915" # Intel extra legacy
@@ -63,7 +62,6 @@
     "r300" # very old AMD
     "r600" # less old AMD
     "radeonsi" # new AMD (GCN+)
-    "rocket" # Rockchip NPU
     "softpipe" # older software renderer
     "svga" # VMWare virtualized GPU
     "tegra" # Nvidia Tegra SoCs
@@ -71,6 +69,10 @@
     "vc4" # Broadcom VC4 (Raspberry Pi 0-3)
     "virgl" # QEMU virtualized GPU (aka VirGL)
     "zink" # generic OpenGL over Vulkan, experimental
+  ]
+  ++ lib.optionals stdenv.hostPlatform.is64bit [
+    "ethosu" # ARM Ethos NPU, does not build on 32-bit
+    "rocket" # Rockchip NPU, probably horribly broken on 32-bit
   ],
   vulkanDrivers ? [
     "amd" # AMD (aka RADV)