From b6cecb88b5448f21c8f4f7b4eeac8ef12960991c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 14 Oct 2025 19:13:37 +0200
Subject: [PATCH 01/76] vintagestory: 1.21.4 -> 1.21.5

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 2a72ca017194..2590f2cc3eb8 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.21.4";
+  version = "1.21.5";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-npffJgxgUMefX9OiveNk1r4kVqsMaVCC1jcWaibz9l8=";
+    hash = "sha256-dG1D2Buqht+bRyxx2ie34Z+U1bdKgi5R3w29BG/a5jg=";
   };
 
   nativeBuildInputs = [

From cc27c6f2b8238b22ceede2f59f33e6c068a1d631 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:24:26 -0400
Subject: [PATCH 02/76] tpm2-abrmd: add scottstephens to maintainers

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

diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
index 28e9069d983c..9b1275ab4f59 100644
--- a/pkgs/by-name/tp/tpm2-abrmd/package.nix
+++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [
+      matthiasbeyer
+      scottstephens
+    ];
   };
 }

From 7f6efaf59cfc0269ff2181b1eaa3b638616eb118 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:24:49 -0400
Subject: [PATCH 03/76] tpm2-tss: add scottstephens to maintainers

---
 pkgs/development/libraries/tpm2-tss/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 524a3c1a8657..87a13c7fc75b 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -171,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tpm2-software/tpm2-tss";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 })

From e28950323af0b0eb6e58eaa1b93eb584cf7901ff Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:25:15 -0400
Subject: [PATCH 04/76] tpm2-tools: add scottstephens to maintainers

---
 pkgs/by-name/tp/tpm2-tools/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tp/tpm2-tools/package.nix b/pkgs/by-name/tp/tpm2-tools/package.nix
index 363ba53c7b00..9c19a654a637 100644
--- a/pkgs/by-name/tp/tpm2-tools/package.nix
+++ b/pkgs/by-name/tp/tpm2-tools/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ scottstephens ];
   };
 }

From b80b0500c08caa5fa22e151f9711d7e8c280aef0 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:25:37 -0400
Subject: [PATCH 05/76] tpm2-pytss: add scottstephens to maintainers

---
 pkgs/development/python-modules/tpm2-pytss/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 35899915eb67..3f62db31b9db 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -107,6 +107,9 @@ buildPythonPackage rec {
     changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md";
     description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 }

From c704ac02d881640919c4be1032e7176c288798a3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 14:16:06 +0200
Subject: [PATCH 06/76] previewqt: fix build

---
 pkgs/by-name/pr/previewqt/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix
index cf11c5a3b3aa..ce17ed00c8b3 100644
--- a/pkgs/by-name/pr/previewqt/package.nix
+++ b/pkgs/by-name/pr/previewqt/package.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeFlags = [
+    (lib.cmakeBool "WITH_DEVIL" false)
     (lib.cmakeBool "WITH_FREEIMAGE" false)
   ];
 

From 620e6e2f3624377f2a5b679bd01faee79f85c9ac Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Oct 2025 20:28:08 +0200
Subject: [PATCH 07/76] panotools: 2.9.22 -> 2.9.23

---
 pkgs/by-name/pa/panotools/cmake4.patch | 32 --------------------------
 pkgs/by-name/pa/panotools/package.nix  |  6 ++---
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/pa/panotools/cmake4.patch

diff --git a/pkgs/by-name/pa/panotools/cmake4.patch b/pkgs/by-name/pa/panotools/cmake4.patch
deleted file mode 100644
index 13d12cc103f8..000000000000
--- a/pkgs/by-name/pa/panotools/cmake4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: Vendor upstream patches (mercurial/sourceforge)
-Author: Andreas Metzler
-
-From:
-- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/
-- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,8 +28,7 @@
- ## may need to edit the wxWidgets version number below.
- ##
- 
--# require at least cmake 3.0
--cmake_minimum_required(VERSION 3.0)
-+cmake_minimum_required(VERSION 3.12...4.0)
- if(POLICY CMP0074)
-   cmake_policy(SET CMP0074 NEW)
- endif()
-@@ -382,12 +382,12 @@
- endif()
- 
- # create TAGS file
--ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD
--                   COMMAND ctags-exuberant -e *.c *.h tools/*.c
-+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS
-+                   COMMAND ctags -e *.c *.h tools/*.c
-                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/
-                    COMMENT "Build TAGS file"
-                  )
--ADD_CUSTOM_TARGET( TAGS DEPENDS ctags)
-+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS)
diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix
index fe5e41c95c12..a5db44159eb3 100644
--- a/pkgs/by-name/pa/panotools/package.nix
+++ b/pkgs/by-name/pa/panotools/package.nix
@@ -11,15 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpano13";
-  version = "2.9.22";
+  version = "2.9.23";
 
   src = fetchurl {
     url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
-    hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
+    hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig=";
   };
 
-  patches = [ ./cmake4.patch ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From 6e9987b691521b08337899bf5dc19ca6a5b0bcea Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:24:11 +0200
Subject: [PATCH 08/76] python3Packages.pyngrok: 7.4.0 -> 7.4.1

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

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 9006101f4278..9a0fefb7cb67 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.4.0";
+  version = "7.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H3hv7Y0Va5m//XEwlqfsjIEYH5Scj1ySD2gg6S1rmHY=";
+    hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";
   };
 
   build-system = [

From 89107568862b2f21f790e955797f330589797980 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 12:42:29 +0200
Subject: [PATCH 09/76] python313Packages.pyngrok: remove disabled

---
 pkgs/development/python-modules/pyngrok/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 9a0fefb7cb67..f08e4fe6a250 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools,
   pyyaml,
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "7.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";

From e4e0b934c7709594fa90c9693f4e752c77ac5869 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Oct 2025 20:45:21 +0200
Subject: [PATCH 10/76] pslib: fix build

---
 pkgs/by-name/ps/pslib/cmake4.patch | 18 ++++++++++++++++++
 pkgs/by-name/ps/pslib/package.nix  |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ps/pslib/cmake4.patch

diff --git a/pkgs/by-name/ps/pslib/cmake4.patch b/pkgs/by-name/ps/pslib/cmake4.patch
new file mode 100644
index 000000000000..7fe5bc3d94e7
--- /dev/null
+++ b/pkgs/by-name/ps/pslib/cmake4.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 58a5b45..b41e6a3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 3.10)
++
+ PROJECT(pslib C)
+ option(ENABLE_BMP   "Build with BMP support" ON)
+
+@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists)
+ INCLUDE(TestBigEndian)
+ test_big_endian(WORDS_BIGENDIAN)
+
+-SUBDIRS( src )
+ SET(SOURCES
+        src/pslib.c
+        src/ps_memory.c
\ No newline at end of file
diff --git a/pkgs/by-name/ps/pslib/package.nix b/pkgs/by-name/ps/pslib/package.nix
index e11d87fc2db3..81bf538df8d9 100644
--- a/pkgs/by-name/ps/pslib/package.nix
+++ b/pkgs/by-name/ps/pslib/package.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64=";
   };
 
+  patches = [
+    ./cmake4.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -33,10 +37,6 @@ stdenv.mkDerivation rec {
     libtiff
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
-
   doCheck = true;
 
   outputs = [

From a5f9102dcd20203a1afea4d5217ef768f4151158 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:24:08 +0200
Subject: [PATCH 11/76] gnudatalanguage: fix build

---
 .../development/interpreters/gnudatalanguage/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 154c23aa18ac..328ecd9dfe02 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   wrapGAppsHook3,
   readline,
@@ -121,6 +122,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/gnudatalanguage/gdl/commit/b648a63c5070f38e90167f858a79ba6f01dad1d3.patch?full_index=1";
+      includes = [ "CMakeLists.txt" ];
+      hash = "sha256-lYtAstI21Up4RArf6pXnjiTwJ3Omoisw43Ih1H2Wc0s=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'FATAL_ERROR "The src' 'WARNING "The src' \

From dccb31d13758bb839bd74028c228251d4243f5d7 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Mon, 27 Oct 2025 12:26:49 +0800
Subject: [PATCH 12/76] typora: 1.11.5 -> 1.12.2; modernize

---
 pkgs/by-name/ty/typora/package.nix | 39 ++++++++++++++++++++++--------
 pkgs/by-name/ty/typora/update.sh   | 12 +++++++++
 2 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100755 pkgs/by-name/ty/typora/update.sh

diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index 9cf0bde5ae6c..4a87315d3a67 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -22,14 +22,27 @@
 
 let
   pname = "typora";
-  version = "1.11.5";
-  src = fetchurl {
-    urls = [
-      "https://download.typora.io/linux/typora_${version}_amd64.deb"
-      "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
-    ];
-    hash = "sha256-CpUF8pRLzR3RzFD85Cobbmo3BInaeCee0NWKsmelPGs=";
-  };
+  version = "1.12.2";
+
+  src =
+    fetchurl
+      {
+        x86_64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_amd64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
+          ];
+          hash = "sha256-g5GB4hc1cphnOXcVV+YR+YULJOzWAslio3yXjW9MGOk=";
+        };
+        aarch64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_arm64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
+          ];
+          hash = "sha256-br9kn3P4Pzbef6u581YcX8c0uiB/c1pKqGogLX3sruw=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   typoraBase = stdenv.mkDerivation {
     inherit pname version src;
@@ -116,7 +129,7 @@ let
 
 in
 stdenv.mkDerivation {
-  inherit pname version;
+  inherit pname version src;
 
   dontUnpack = true;
   dontConfigure = true;
@@ -132,11 +145,17 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "A minimal Markdown editor and reader.";
     homepage = "https://typora.io/";
+    changelog = "https://typora.io/releases/all";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ npulidomateo ];
+    maintainers = with lib.maintainers; [
+      npulidomateo
+      chillcicada
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "typora";
   };
diff --git a/pkgs/by-name/ty/typora/update.sh b/pkgs/by-name/ty/typora/update.sh
new file mode 100755
index 000000000000..21f2c63395c8
--- /dev/null
+++ b/pkgs/by-name/ty/typora/update.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -euo pipefail
+
+version=$(curl -s "https://typora.io/#linux" | sed -E -n 's/.*typora_([0-9.]+)_amd64.*/\1/p')
+
+amd64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_amd64.deb))
+update-source-version typora $version $amd64_hash --system=x86_64-linux --ignore-same-version
+
+arm64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_arm64.deb))
+update-source-version typora $version $arm64_hash --system=aarch64-linux --ignore-same-version

From 6b79c98c5a7508c3598dcca4f5bf549a7c10fbcf Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 31 Oct 2025 18:32:37 +0900
Subject: [PATCH 13/76] awsebcli: 3.25.1 -> 3.25.2

Changelog: https://github.com/aws/aws-elastic-beanstalk-cli/blob/3.25.2/CHANGES.rst
---
 pkgs/by-name/aw/awsebcli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 951ffa898bce..e8df0f738cdc 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -25,14 +25,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.25.1";
+  version = "3.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = version;
-    hash = "sha256-objIzpYMyuFjEc85H9dXhQez3MZfNu3lWSWm6+E2iJs=";
+    hash = "sha256-6PeOn0owjEjTWdEwgXILiGq+6T5GBBc61viiG5GNeYo=";
   };
 
   pythonRelaxDeps = [

From 52b705c097dba110f6418a411370d75e2a2fee0d Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Fri, 31 Oct 2025 17:40:22 +0200
Subject: [PATCH 14/76] maintainers: drop thammers

---
 maintainers/maintainer-list.nix         | 6 ------
 pkgs/by-name/fl/flvstreamer/package.nix | 2 +-
 pkgs/by-name/tm/tmux/package.nix        | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3197d3c90b29..3915f7193ba2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25743,12 +25743,6 @@
     githubId = 102452;
     name = "Niclas Thall";
   };
-  thammers = {
-    email = "jawr@gmx.de";
-    github = "tobias-hammerschmidt";
-    githubId = 2543259;
-    name = "Tobias Hammerschmidt";
-  };
   thanegill = {
     email = "me@thanegill.com";
     github = "thanegill";
diff --git a/pkgs/by-name/fl/flvstreamer/package.nix b/pkgs/by-name/fl/flvstreamer/package.nix
index d16f0ea23951..dfe18eebd698 100644
--- a/pkgs/by-name/fl/flvstreamer/package.nix
+++ b/pkgs/by-name/fl/flvstreamer/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://savannah.nongnu.org/projects/flvstreamer";
 
-    maintainers = [ lib.maintainers.thammers ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 830bb3aad435..ab6ccad03b37 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -118,7 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "tmux";
     maintainers = with lib.maintainers; [
-      thammers
       fpletz
     ];
   };

From dc6af80bc1ab513dd45d4d60acb67f6f06f6a347 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 07:17:20 +0000
Subject: [PATCH 15/76] =?UTF-8?q?gthumb:=203.12.7=20=E2=86=92=203.12.8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.7...3.12.8.1

Also clean up mesonFlags since they are identical to upstream's default.
---
 pkgs/by-name/gt/gthumb/package.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 946782f8e0ff..9e2069a3a996 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   meson,
   ninja,
-  adwaita-icon-theme,
   exiv2,
   libheif,
   libjpeg,
@@ -22,8 +21,10 @@
   libX11,
   lcms2,
   bison,
+  brasero,
   flex,
   clutter-gtk,
+  colord,
   wrapGAppsHook3,
   shared-mime-info,
   python3,
@@ -33,13 +34,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gthumb";
-  version = "3.12.7";
+  version = "3.12.8.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-7hLSTPIxAQJB91jWyVudU6c4Enj6dralGLPQmzce+uw=";
+    sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     bison
     desktop-file-utils
@@ -53,10 +56,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    brasero
     clutter-gtk
+    colord
     exiv2
     glib
-    adwaita-icon-theme
     gsettings-desktop-schemas
     gst_all_1.gst-plugins-base
     (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
@@ -75,14 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
   ];
 
-  mesonFlags = [
-    "-Dlibjxl=true"
-    # Depends on libsoup2.
-    # https://gitlab.gnome.org/GNOME/gthumb/-/issues/244
-    "-Dlibchamplain=false"
-    "-Dwebservices=false"
-  ];
-
   postPatch = ''
     chmod +x gthumb/make-gthumb-h.py
 

From a0f652db496fbba51ab114c9937dfc68f78ddfa2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:40:50 +0000
Subject: [PATCH 16/76] papermc: 1.21.9-41 -> 1.21.10-91

---
 pkgs/games/papermc/versions.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 1a6a735d7de1..81377f8dccd0 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -88,7 +88,11 @@
         "version": "1.21.8-60"
     },
     "1.21.9": {
-        "hash": "sha256-YXZVx7iTC3EViKM8r4SKBLgArd0JcZ9jziZuBtWBYOc=",
-        "version": "1.21.9-41"
+        "hash": "sha256-rsAC53x1ZuSUlP3wVDC5YHj/0ddDDmUtTzOP75UeehA=",
+        "version": "1.21.9-59"
+    },
+    "1.21.10": {
+        "hash": "sha256-9tjYDSWmh8xSoCodBMsl8We7OoqCgnGiY74vRK2pEsw=",
+        "version": "1.21.10-91"
     }
 }

From 68c86c1d3b8eaabb8466e9e3ccb7ac8f495c4b64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 09:09:41 +0000
Subject: [PATCH 17/76] parallel: 20250822 -> 20251022

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

diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix
index b9ff9d0d9e85..028c0524267c 100644
--- a/pkgs/by-name/pa/parallel/package.nix
+++ b/pkgs/by-name/pa/parallel/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parallel";
-  version = "20250822";
+  version = "20251022";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno=";
+    hash = "sha256-R0Mm1ZaI0vwHjPiaewtKEcyWhCKbP6AVj+i8A/G2nuE=";
   };
 
   outputs = [

From 5e43b8b62e3b75ee07a31ed7219bed425e79f4b4 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:14:40 +0200
Subject: [PATCH 18/76] koboldcpp: 1.100.1 -> 1.101

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.101
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.100.1...v1.101
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 02d441eca883..949081fc8774 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.100.1";
+  version = "1.101";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z3yPsC7WDFHwXVInnu96ZVWAjn6XyN0aVviwGkvoe1A=";
+    hash = "sha256-WwTl+u7FJ4E+x+jjwh0wmPM7fjsPxu7+TrEwKQQfyLA=";
   };
 
   enableParallelBuilding = true;

From 8cd6da015178c5f25f2317c17cf655c81284dbf6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 1 Nov 2025 10:28:01 -0700
Subject: [PATCH 19/76] python3Packages.psycopg: disable flaky test

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

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index c360a08e7791..b6558b5ff693 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -199,6 +199,8 @@ buildPythonPackage rec {
     "test_connect_error_multi_hosts_each_message_preserved"
     # Flaky, fails intermittently
     "test_break_attempts"
+    # ConnectionResetError: [Errno 104] Connection reset by peer
+    "test_wait_r"
   ];
 
   disabledTestPaths = [

From cabace071c787cd4b2eadf3cae94ded0fd2b8d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 18:32:33 -0700
Subject: [PATCH 20/76] python3Packages.flake8-deprecated: 2.2.1 -> 2.3.0

Diff: https://github.com/gforcada/flake8-deprecated/compare/2.2.1...2.3.0

Changelog: https://github.com/gforcada/flake8-deprecated/blob/2.3.0/CHANGES.rst
---
 .../flake8-deprecated/default.nix             | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix
index e7601e6190bf..1c7fd6615d48 100644
--- a/pkgs/development/python-modules/flake8-deprecated/default.nix
+++ b/pkgs/development/python-modules/flake8-deprecated/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   hatchling,
   flake8,
@@ -10,15 +9,14 @@
 
 buildPythonPackage rec {
   pname = "flake8-deprecated";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    pname = "flake8_deprecated";
-    inherit version;
-    hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI=";
+  src = fetchFromGitHub {
+    owner = "gforcada";
+    repo = "flake8-deprecated";
+    tag = version;
+    hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU=";
   };
 
   build-system = [ hatchling ];
@@ -31,10 +29,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "flake8_deprecated" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/gforcada/flake8-deprecated/blob/${src.tag}/CHANGES.rst";
     description = "Flake8 plugin that warns about deprecated method calls";
     homepage = "https://github.com/gforcada/flake8-deprecated";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ lopsided98 ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lopsided98 ];
   };
 }

From eaf80a754462f7df023cc232d2900bda067c85e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:42:39 -0700
Subject: [PATCH 21/76] udisks: modernize

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

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index e3b9ea635d73..0514dac00904 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "udisks";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
+    tag = "udisks-${version}";
+    hash = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
   };
 
   outputs = [
@@ -154,15 +154,15 @@ stdenv.mkDerivation rec {
     tests.vm = nixosTests.udisks2;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
     homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl2Plus
       gpl2Plus
     ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
-    maintainers = with maintainers; [ johnazoidberg ];
-    teams = [ teams.freedesktop ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
+    teams = [ lib.teams.freedesktop ];
+    platforms = lib.platforms.linux;
   };
 }

From 772dc221ae01f5de99f24d55b3692178937ddf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:45:24 -0700
Subject: [PATCH 22/76] udisks: move to pkgs/by-name

---
 pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch  | 0
 pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch | 0
 .../udisks/2-default.nix => by-name/ud/udisks/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch (100%)
 rename pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch (100%)
 rename pkgs/{os-specific/linux/udisks/2-default.nix => by-name/ud/udisks/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/by-name/ud/udisks/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/fix-paths.patch
rename to pkgs/by-name/ud/udisks/fix-paths.patch
diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/by-name/ud/udisks/force-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/force-path.patch
rename to pkgs/by-name/ud/udisks/force-path.patch
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/by-name/ud/udisks/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/udisks/2-default.nix
rename to pkgs/by-name/ud/udisks/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a3db1de03a..5c32a5a4f265 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10337,8 +10337,7 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
-  udisks = udisks2;
+  udisks2 = udisks;
 
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };

From 702ded4de3c915bcbb49c82ad11388efa743873a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 10:09:15 -0700
Subject: [PATCH 23/76] udisks2: turn into alias

---
 nixos/modules/services/hardware/udisks2.nix                   | 2 +-
 nixos/modules/services/misc/devmon.nix                        | 2 +-
 pkgs/applications/misc/cubocore-packages/libcsys/default.nix  | 4 ++--
 pkgs/by-name/bu/budgie-control-center/package.nix             | 4 ++--
 pkgs/by-name/ca/cantata/package.nix                           | 4 ++--
 pkgs/by-name/gn/gnome-control-center/package.nix              | 4 ++--
 pkgs/by-name/gn/gnome-disk-utility/package.nix                | 4 ++--
 pkgs/by-name/gv/gvfs/package.nix                              | 4 ++--
 pkgs/by-name/me/mediawriter/package.nix                       | 4 ++--
 pkgs/by-name/sp/spaceFM/package.nix                           | 4 ++--
 pkgs/by-name/ud/udiskie/package.nix                           | 4 ++--
 pkgs/by-name/us/usermount/package.nix                         | 4 ++--
 pkgs/by-name/vi/vifm/package.nix                              | 4 ++--
 pkgs/desktops/enlightenment/enlightenment/default.nix         | 4 ++--
 pkgs/desktops/mate/mate-control-center/default.nix            | 4 ++--
 pkgs/desktops/mate/mate-utils/default.nix                     | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-monitor/default.nix    | 4 ++--
 .../pantheon/apps/switchboard-plugs/about/default.nix         | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 pkgs/top-level/all-packages.nix                               | 4 +---
 20 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index cbde9ca600d0..02edf5c8c259 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -25,7 +25,7 @@ in
 
       enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
 
-      package = lib.mkPackageOption pkgs "udisks2" { };
+      package = lib.mkPackageOption pkgs "udisks" { };
 
       mountOnMedia = lib.mkOption {
         type = lib.types.bool;
diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix
index 7bf801c6a4f5..64b356daae00 100644
--- a/nixos/modules/services/misc/devmon.nix
+++ b/nixos/modules/services/misc/devmon.nix
@@ -22,7 +22,7 @@ in
       path = [
         pkgs.udevil
         pkgs.procps
-        pkgs.udisks2
+        pkgs.udisks
         pkgs.which
       ];
       serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index 0a028ddb8351..6948ca925f1e 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  udisks2,
+  udisks,
   qt6,
   cmake,
   ninja,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     qt6.qtbase
-    udisks2
+    udisks
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index b638f9246ba0..0ac083351767 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -61,7 +61,7 @@
   shared-mime-info,
   testers,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   webp-pixbuf-loader,
   wrapGAppsHook3,
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     networkmanager
     polkit
     samba
-    udisks2
+    udisks
     upower
   ];
 
diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 35482d168b9d..7f64c6c1d881 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -32,7 +32,7 @@
   libmtp,
   withOnlineServices ? true,
   withDevices ? true,
-  udisks2,
+  udisks,
   withDynamic ? true,
   withHttpServer ? true,
   withLibVlc ? true,
@@ -156,7 +156,7 @@ let
     {
       names = [ "UDISKS2" ];
       enable = withUdisks;
-      pkgs = [ udisks2 ];
+      pkgs = [ udisks ];
     }
   ];
 
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2d5710716277..9b54758a8489 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -63,7 +63,7 @@
   tinysparql,
   localsearch,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   wayland-scanner,
   libepoxy,
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     samba
     tinysparql
     localsearch # for search locations dialog
-    udisks2
+    udisks
     upower
     # For animations in Mouse panel.
     gst_all_1.gst-plugins-base
diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 5231521e2431..5d0e571627ae 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -24,7 +24,7 @@
   ninja,
   pkg-config,
   systemd,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   xz,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libpwquality
     libsecret
     systemd
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index e1d23355789c..e8e383077aee 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -11,7 +11,7 @@
   glib,
   udevSupport ? stdenv.hostPlatform.isLinux,
   libgudev,
-  udisks2,
+  udisks,
   libgcrypt,
   libcap,
   polkit,
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals udevSupport [
     libgudev
-    udisks2
+    udisks
     fuse3
     libcdio
     samba
diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index 4f6cee140794..fdcf965a896c 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -6,7 +6,7 @@
   cmake,
   fetchFromGitHub,
   qt6,
-  udisks2,
+  udisks,
   xz,
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtsvg
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index e7180c74a156..7a00979d9b47 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -16,7 +16,7 @@
   ifuseSupport ? false,
   ifuse ? null,
   lsof,
-  udisks2,
+  udisks,
 }:
 
 stdenv.mkDerivation rec {
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     ffmpegthumbnailer
     jmtpfs
     lsof
-    udisks2
+    udisks
   ]
   ++ (lib.optionals ifuseSupport [ ifuse ]);
   # Introduced because ifuse doesn't build due to CVEs in libplist
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 1fa8d58a5c8c..eeb66d548513 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -9,7 +9,7 @@
   libnotify,
   librsvg,
   python3Packages,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   testers,
   udiskie,
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     libappindicator-gtk3
     libnotify
     librsvg # SVG icons
-    udisks2
+    udisks
   ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/by-name/us/usermount/package.nix b/pkgs/by-name/us/usermount/package.nix
index 3c8478000037..f1d02de14496 100644
--- a/pkgs/by-name/us/usermount/package.nix
+++ b/pkgs/by-name/us/usermount/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   dbus,
   libnotify,
-  udisks2,
+  udisks,
   gdk-pixbuf,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [
     dbus
     libnotify
-    udisks2
+    udisks
     gdk-pixbuf
   ];
 
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index 542cd901e8c6..b7b828443966 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -13,7 +13,7 @@
   # adds support for handling removable media (vifm-media). Linux only!
   mediaSupport ? false,
   python3 ? null,
-  udisks2 ? null,
+  udisks ? null,
   lib ? null,
   gitUpdater,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   postFixup =
     let
       path = lib.makeBinPath [
-        udisks2
+        udisks
         (python3.withPackages (p: [ p.dbus-python ]))
       ];
 
diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
index 8521e6ff85cd..cbbe5d32c719 100644
--- a/pkgs/desktops/enlightenment/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/enlightenment/default.nix
@@ -14,7 +14,7 @@
   libexif,
   pam,
   xkeyboard_config,
-  udisks2,
+  udisks,
   waylandSupport ? false,
   wayland-protocols,
   xwayland,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     libexif
     pam
     xkeyboard_config
-    udisks2 # for removable storage mounting/unmounting
+    udisks # for removable storage mounting/unmounting
   ]
   ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
   ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 4a4126538b12..0ff0deef6bc3 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -28,7 +28,7 @@
   mate-menus,
   mate-panel,
   mate-settings-daemon,
-  udisks2,
+  udisks,
   systemd,
   hicolor-icon-theme,
   wrapGAppsHook3,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     mate-menus
     mate-panel # for org.mate.panel schema, see m-c-c#678
     mate-settings-daemon
-    udisks2
+    udisks
     systemd
   ];
 
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index ced2cfb68fb5..ac75a4848548 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -12,7 +12,7 @@
   libgtop,
   libcanberra-gtk3,
   inkscape,
-  udisks2,
+  udisks,
   mate-desktop,
   mate-panel,
   hicolor-icon-theme,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     libgtop
     libcanberra-gtk3
     libxml2
-    udisks2
+    udisks
     mate-desktop
     mate-panel
     hicolor-icon-theme
diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
index 0bcd1ea66166..bc03018529f3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
@@ -22,7 +22,7 @@
   linuxPackages,
   live-chart,
   pciutils,
-  udisks2,
+  udisks,
   wingpanel,
   nix-update-script,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     live-chart
     pciutils
-    udisks2
+    udisks
     wingpanel
   ];
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 91d7fb794fb0..fe14c2553960 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -19,7 +19,7 @@
   packagekit,
   polkit,
   switchboard,
-  udisks2,
+  udisks,
   fwupd,
   appstream,
   elementary-settings-daemon,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     packagekit
     polkit
     switchboard
-    udisks2
+    udisks
   ];
 
   passthru = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..47bc57b53499 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1524,6 +1524,7 @@ mapAliases {
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
+  udisks2 = udisks; # added 2025-10-30
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c32a5a4f265..47d28220b825 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1419,7 +1419,7 @@ with pkgs;
 
   vifm-full = vifm.override {
     mediaSupport = true;
-    inherit lib udisks2 python3;
+    inherit lib udisks python3;
   };
 
   xfe = callPackage ../by-name/xf/xfe/package.nix {
@@ -10337,8 +10337,6 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  udisks2 = udisks;
-
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 

From 3a4305bc6bd168a9edba5e3d786534dc1752dcd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 08:28:11 +0000
Subject: [PATCH 24/76] python3Packages.scooby: 0.10.2 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index e3285ca6ddac..0649f928efd0 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "scooby";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "banesullivan";
     repo = "scooby";
     tag = "v${version}";
-    hash = "sha256-vOcCs8U8HeBgO86bgS/kqYrNai1IsQ0upQveV06YfoE=";
+    hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
   };
 
   build-system = [ setuptools-scm ];

From 2113555142f53614af6b79bdf6b95a3c35bf5a30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:29:37 +0000
Subject: [PATCH 25/76] python3Packages.nats-py: 2.11.0 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 4eb1555f61b2..77c57c6a37e8 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "nats-py";
-  version = "2.11.0";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "nats-io";
     repo = "nats.py";
     tag = "v${version}";
-    hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg=";
+    hash = "sha256-HQtoFyw3Gi/lIQFVrFvRtWWzHTY+TchZYKqTiHfUWFk=";
   };
 
   build-system = [ setuptools ];

From 4d08539533708f83f27a4198b855b0315369f7f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 20:00:45 +0000
Subject: [PATCH 26/76] idris2: 0.7.0 -> 0.8.0

---
 pkgs/by-name/id/idris2/package.nix |  4 ++--
 pkgs/by-name/id/idris2/tests.nix   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 1b296d002c1f..f119eb143e4c 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -11,12 +11,12 @@ let
     in
     {
       # Compiler version & repo
-      idris2-version = "0.7.0";
+      idris2-version = "0.8.0";
       idris2-src = fetchFromGitHub {
         owner = "idris-lang";
         repo = "Idris2";
         rev = "v${self.idris2-version}";
-        hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
+        hash = "sha256-MvFNSPpgONSTjACH3HGWEiNgz9aAeBPmyQwFe21+fe0=";
       };
       # Prelude libraries
       mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
diff --git a/pkgs/by-name/id/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
index 152b055ceefd..079ac6edc614 100644
--- a/pkgs/by-name/id/idris2/tests.nix
+++ b/pkgs/by-name/id/idris2/tests.nix
@@ -149,9 +149,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = false; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   `-- pkg.ipkg
@@ -186,9 +186,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = true; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr
@@ -224,9 +224,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library'.withSource;
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr

From a6482039f563b1a4dbaa8fd921058926fb2e3c74 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Sun, 2 Nov 2025 17:54:00 +0000
Subject: [PATCH 27/76] python3Packages.bitsandbytes: add missing CUDA include
 outputs

The CUDA manifest restructuring in 29ce0536172 moved headers to separate `include` outputs. Add the `include` outputs from libcublas and libcusparse to cuda-common-redist to fix the build failure reported in https://github.com/NixOS/nixpkgs/issues/456713.
---
 pkgs/development/python-modules/bitsandbytes/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 1cd1ef0b98e7..16d12a9091b7 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -45,10 +45,12 @@ let
     (lib.getDev cuda_cccl) # <thrust/*>
     (lib.getDev libcublas) # cublas_v2.h
     (lib.getLib libcublas)
+    (lib.getInclude libcublas) # cublasLt.h
     libcurand
     libcusolver # cusolverDn.h
     (lib.getDev libcusparse) # cusparse.h
     (lib.getLib libcusparse) # cusparse.h
+    (lib.getInclude libcusparse) # cusparse.h
     (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
   ];
 

From 8783460610fbd68cdca5363cab11690c9ab28c3e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 17:57:18 -0300
Subject: [PATCH 28/76] zdelta: mark as broken on darwin

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

diff --git a/pkgs/by-name/zd/zdelta/package.nix b/pkgs/by-name/zd/zdelta/package.nix
index fd0cf1ae08b4..41f3573b5450 100644
--- a/pkgs/by-name/zd/zdelta/package.nix
+++ b/pkgs/by-name/zd/zdelta/package.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation {
     homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
     platforms = platforms.all;
     license = licenses.zlib;
+    # last successful hydra build on darwin was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From ed9152aa1275b34a0f2af2934d9a28a31b3bd4db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Nov 2025 23:55:39 +0100
Subject: [PATCH 29/76] python313Packages.nats-py: remove disabled

---
 pkgs/development/python-modules/nats-py/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 77c57c6a37e8..ea16db8dfc1d 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -8,7 +8,6 @@
   nats-server,
   nkeys,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   uvloop,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "2.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.py";
@@ -71,7 +68,7 @@ buildPythonPackage rec {
     description = "Python client for NATS.io";
     homepage = "https://github.com/nats-io/nats.py";
     changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From ac324844a38b766f7d434aea815025ab678fa828 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 15:18:48 -0800
Subject: [PATCH 30/76] python3Packages.certipy-ad: relax dependency on
 dnspython

---
 pkgs/development/python-modules/certipy-ad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index a384399b0d9e..671a40ed4ede 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -34,8 +34,9 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "argcomplete"
     "cryptography"
-    "pycryptodome"
+    "dnspython"
     "ldap3"
+    "pycryptodome"
     "pyopenssl"
   ];
 

From da61fd19169ce364a6e088814e60128c254a04eb Mon Sep 17 00:00:00 2001
From: Mathew Polzin <mpolzin@workwithopal.com>
Date: Sun, 2 Nov 2025 10:39:15 -0600
Subject: [PATCH 31/76] idris2Packages.idris2Lsp: 2024-01-21 -> 2025-09-10

---
 pkgs/development/compilers/idris2/idris2-lsp.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix
index 68f7084df45e..388bcb77b3a3 100644
--- a/pkgs/development/compilers/idris2/idris2-lsp.nix
+++ b/pkgs/development/compilers/idris2/idris2-lsp.nix
@@ -22,24 +22,24 @@ let
   inherit (idris2Packages) idris2Api;
   lspLib = idris2Packages.buildIdris {
     ipkgName = "lsp-lib";
-    version = "2024-01-21";
+    version = "2025-08-14";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "LSP-lib";
-      rev = "03851daae0c0274a02d94663d8f53143a94640da";
-      hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
+      rev = "ca77e80a392b8cfeee3aaeb150069957699cdb82";
+      hash = "sha256-maXHx/OrflIdV7XPfDCRShUGZekLbLOSFQPHnL6DxnI=";
     };
     idrisLibraries = [ ];
   };
 
   lspPkg = idris2Packages.buildIdris {
     ipkgName = "idris2-lsp";
-    version = "2024-01-21";
+    version = "2025-09-10";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "idris2-lsp";
-      rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
-      hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
+      rev = "81344545c134c8e7105ecf1fdd7a1caae6647035";
+      hash = "sha256-uYmg9Jd98RiO5SpRFox2xNAxY4nocPuK//zxuaIi/DM=";
     };
     idrisLibraries = [
       idris2Api

From 14ccade9389abaf2fba60659d634ac201eabfaed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 23:43:25 +0000
Subject: [PATCH 32/76] python3Packages.typst: 0.13.7 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index bbeed6182aea..8f820d103f02 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "typst";
-  version = "0.13.7";
+  version = "0.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     owner = "messense";
     repo = "typst-py";
     tag = "v${version}";
-    hash = "sha256-kbdYiWix1gDZPTkmjtrSRV/g60bLKxGbv776ezPaSCA=";
+    hash = "sha256-O6pjw0rVdpVn4PooKjI0deQ+upzL0E7uHTA6wUz40UY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-IhTrGAgGgSPCD1d3pblCOME0AHv5GMV9xRUNSGTXEws=";
+    hash = "sha256-LHaAHoF/7znQ6WFJyxEFo7TRBtqAlPBuSCfOe6GhjQ0=";
   };
 
   build-system = [

From 2c5b420dd8a23dcc9ec6b02eef69d0d367bbc902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 03:54:25 +0000
Subject: [PATCH 33/76] yoda: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index 79ee27477386..8990711ad726 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = "yoda";
     rev = "yoda-${version}";
-    hash = "sha256-cYJNB4Nk6r9EbTbMrhUFvj6s0VR/QH2o9wl/cUw9jQ0=";
+    hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From a64a5a06301fd874b7da99d9a7c1991be89ffa04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 20:10:03 -0800
Subject: [PATCH 34/76] python3Packages.librehardwaremonitor-api: init at 1.4.0

---
 .../librehardwaremonitor-api/default.nix      | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/librehardwaremonitor-api/default.nix

diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
new file mode 100644
index 000000000000..8e41c7041328
--- /dev/null
+++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
@@ -0,0 +1,40 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "librehardwaremonitor-api";
+  version = "1.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Sab44";
+    repo = "librehardwaremonitor-api";
+    tag = "v${version}";
+    hash = "sha256-yYJOizO6blfwRBWD9oFnaein7DK1F8Kl744ErehXU0Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "librehardwaremonitor_api" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python API client for LibreHardwareMonitor";
+    homepage = "https://github.com/Sab44/librehardwaremonitor-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96b412d8e7a5..d644bb62eb65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8377,6 +8377,8 @@ self: super: with self; {
     }
   );
 
+  librehardwaremonitor-api = callPackage ../development/python-modules/librehardwaremonitor-api { };
+
   librepo = lib.pipe pkgs.librepo [
     toPythonModule
     (

From a9cbabfa4fb9f1b2b4fa8d0afe466fedf8559bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 20:10:49 -0800
Subject: [PATCH 35/76] home-assistant: support libre_hardware_monitor
 component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e02277331f0d..d8b05c3a638c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3282,7 +3282,8 @@
       ];
     "libre_hardware_monitor" =
       ps: with ps; [
-      ]; # missing inputs: librehardwaremonitor-api
+        librehardwaremonitor-api
+      ];
     "lidarr" =
       ps: with ps; [
         aiopyarr
@@ -7450,6 +7451,7 @@
     "lg_netcast"
     "lg_soundbar"
     "lg_thinq"
+    "libre_hardware_monitor"
     "lidarr"
     "life360"
     "lifx"

From a4e561000b4d7d9aed352c6724a337d7458662f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:29:59 +0000
Subject: [PATCH 36/76] globalping-cli: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index d8d220d8306d..b4ae966e8c29 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "globalping-cli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = "globalping-cli";
     rev = "v${version}";
-    hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
+    hash = "sha256-muWhiKqPdNVhy7c7MSRHACGzOn5pIVRdqSdfdCJw2CA=";
   };
 
   vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E=";

From 9fe1e0d3429bc3bc1220232d2f962f933e1bc11d Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 3 Nov 2025 09:42:35 +0800
Subject: [PATCH 37/76] arkenfox-userjs: 140.0 -> 140.1

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

diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix
index cb9b12a48148..35eafcb5edb2 100644
--- a/pkgs/by-name/ar/arkenfox-userjs/package.nix
+++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arkenfox-userjs";
-  version = "140.0";
+  version = "140.1";
 
   src = fetchurl {
-    url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js";
-    hash = "sha256-/cz0dnQXKa3c/DqUTAEwBV0I9Tc3x6uzU6rtYijg3Zo=";
+    url = "https://raw.githubusercontent.com/arkenfox/user.js/refs/tags/${finalAttrs.version}/user.js";
+    hash = "sha256-jxzIiARi+GXD+GSGPr1exeEHjR/LsXSUQPGZ+hF36xg=";
   };
 
   dontUnpack = true;
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/arkenfox/user.js/releases/tag/${finalAttrs.version}";
     description = "Comprehensive user.js template for configuration and hardening";
     homepage = "https://github.com/arkenfox/user.js";
     license = lib.licenses.mit;

From fa1c27e4378da09308df7f8e95b7ca862946292a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:38:39 +0000
Subject: [PATCH 38/76] openhue-cli: 0.20 -> 0.21

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

diff --git a/pkgs/by-name/op/openhue-cli/package.nix b/pkgs/by-name/op/openhue-cli/package.nix
index 1c0ec32a1fe1..390524892449 100644
--- a/pkgs/by-name/op/openhue-cli/package.nix
+++ b/pkgs/by-name/op/openhue-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openhue-cli";
-  version = "0.20";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "openhue";
     repo = "openhue-cli";
     tag = finalAttrs.version;
-    hash = "sha256-vUmJjuBcOjIhhtWrzq+y0fDlh+wQhgBwxnfuod27CBA=";
+    hash = "sha256-u6ulk+qv1FlZ7PdUiO9UXtRqWWp2MMRAnc8F9vHnRBo=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-DhTe0fSWoAwzoGr8rZMsbSE92jJFr4T7aVx/ULMfVFo=";
+  vendorHash = "sha256-3930OjQ26n7J3XDWjCthfQjORP5wpJ3ZZK/m6/wi2X4=";
 
   env.CGO_ENABLED = 0;
 

From 9d58a228a78758202610d343fff33528a04bc84d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:54:59 +0000
Subject: [PATCH 39/76] python3Packages.petsc4py: 3.24.0 -> 3.24.1

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 4a0837cba019..43e53cd79758 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -110,11 +110,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5jqYTo5sfwLNByOlpry0zpI+q3u7ErwJJ97h7w5bvNQ=";
+    hash = "sha256-E/KPoTeeEfvsqfqjflpDTZFSI534YdtfVVWZ/Xa029I=";
   };
 
   patches = [

From 3692ce043710796d7d1eec4651530dc067c72489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:06:00 +0000
Subject: [PATCH 40/76] hddfancontrol: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index 0ea029465a22..b00524358deb 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hddfancontrol";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "hddfancontrol";
     tag = finalAttrs.version;
-    hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo=";
+    hash = "sha256-VnHXRheqh+NwbFBWsX9XUbRuto7weyX7aHZ+BDi2Vns=";
   };
 
-  cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY=";
+  cargoHash = "sha256-lm4ARffPOYCewNyREb1PQ8M5icqh8c+z6ZNXZKpBlRE=";
 
   nativeBuildInputs = [
     makeWrapper

From aa42b52e91ee601b9ae9df6005e82b1eb0ceedba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:40:35 +0000
Subject: [PATCH 41/76] chirp: 0.4.0-unstable-2025-10-23 ->
 0.4.0-unstable-2025-10-30

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

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index dcdc2a67546c..2b8bcba2d8f1 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-10-23";
+  version = "0.4.0-unstable-2025-10-30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "8116c3782a6b6b7112cc372f0b423853d3645f5a";
-    hash = "sha256-64QKsdNL5HcjYHMH1H03Nm5PqH5ypkpeX9uqN2GdnuI=";
+    rev = "a3b973cceb46e431423b3599fb365668958963d5";
+    hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M=";
   };
 
   nativeBuildInputs = [

From 775f9673fba498067dea36490c1c41e669f0adf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:57:58 +0000
Subject: [PATCH 42/76] qrtool: 0.12.1 -> 0.13.1

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

diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 2856348749d0..deaef3d36bb4 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qrtool";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
+    hash = "sha256-ckdtmnUupnKAaspLm/l+nmPNdQ/sFAusQehzWikxq7A=";
   };
 
-  cargoHash = "sha256-c1sw0zyJZDvJe3Hcn1W4UPkqTKqRhywHpR6HLrqAN+A=";
+  cargoHash = "sha256-RGEHsMay7+sjmrKz4g6uFXt6fUFiu0xIjr4fQaARKIM=";
 
   nativeBuildInputs = [
     asciidoctor

From 143040786bf299f7e04c2d276835d29f9f119309 Mon Sep 17 00:00:00 2001
From: Benedikt Hiemer <ben.email@posteo.de>
Date: Sun, 2 Nov 2025 13:57:45 +0100
Subject: [PATCH 43/76] nixos/journald-gateway: change default of user and
 system option to false

Until now, both options are set to true as default. But the systemd-journal-gatewayd
service defaults them to false. To match the origin behaviour, the defaults have been
changed.
---
 nixos/doc/manual/release-notes/rl-2511.section.md      | 2 ++
 nixos/modules/system/boot/systemd/journald-gateway.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2e73fe06aa0e..852c4811c0fd 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -257,6 +257,8 @@
 
 - The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version.
 
+- `services.journald.gateway.user` and `services.journald.gateway.system` now defaults to `false`. This new behaviour matches the default behaviour of the [`systemd-journal-gatewayd`](https://www.freedesktop.org/software/systemd/man/latest/systemd-journal-gatewayd.service.html) service itself.
+
 - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
 
 - The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index 952177f85805..b8c0a1a25d6d 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -75,7 +75,7 @@ in
     };
 
     system = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from system services and the kernel.
@@ -85,7 +85,7 @@ in
     };
 
     user = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from services for the current user.

From 020eb012db8e89a0f1cfefadaf28db10c24cc9cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:08:55 +0000
Subject: [PATCH 44/76] phoenixd: 0.6.3 -> 0.7.0

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

diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index 985dd32f2099..95c7cbe2a198 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoenixd";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src =
     let
@@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     fetchurl {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
-        aarch64-darwin = "sha256-6yZmvoVCCW3ulYB8khJ8khtk8o/AiN/0tbwGwpH8ekA=";
-        x86_64-darwin = "sha256-aZy984ttf1NaCo+5LU/03CTPmcpb2N2rfRd3H5Vc0hA=";
-        x86_64-linux = "sha256-2ir2mfjp+2ExdT6drrbrTJcJzauXD7wtE3oTJ+J0WpI=";
-        aarch64-linux = "sha256-zXJ4fihwM2a04Uv2LcctcmN2PiZLtjGQwpxUVP/Sn6Y=";
+        aarch64-darwin = "sha256-8j3fzT2KWlspp4+5vplbvO6nrd1G+Fox6B6+YB+NE1k=";
+        x86_64-darwin = "sha256-f7OwOr0PRkfX6rdddoW4GNvIv16wjAU0G7LiI+oS+xQ=";
+        x86_64-linux = "sha256-2oVnY/BjSC3HxfOMlqWyI/Yue3PT+vNWten4ty2DZVk=";
+        aarch64-linux = "sha256-oRUXFZwGShZzqNiY18gKm1ZNVJ/zfARhr9d7S4hN8XQ=";
       };
     };
 

From d8d1b48c36ef2df648e38faf0e939b8871ac6c88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:21:45 +0000
Subject: [PATCH 45/76] python3Packages.bentoml: 1.4.27 -> 1.4.28

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

diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index b17d9fcac1ae..8aad4cf469d3 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -80,7 +80,7 @@
 }:
 
 let
-  version = "1.4.27";
+  version = "1.4.28";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -130,7 +130,7 @@ let
     owner = "bentoml";
     repo = "BentoML";
     tag = "v${version}";
-    hash = "sha256-B1slcxNIqT6+xRQkTTCXFjUyFfiBv5En+gYY6lAJJuU=";
+    hash = "sha256-9hxAsTy3e9BDWhJCB5N2RaEFIO0Lc6FK2XKgJC78VUg=";
   };
 in
 buildPythonPackage {

From 2f03402764e11a5e2394104f143d81b9fb612c6e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:44:35 +0100
Subject: [PATCH 46/76] rectangle: 0.91 -> 0.92

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

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index de29f20ec721..3a67dd7ee333 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.91";
+  version = "0.92";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
-    hash = "sha256-MOpg8N2mMNB81dmtgQc7KRax+g4d1Xedh9dkC/zYhLw=";
+    hash = "sha256-0Yv2DroNvk2U17U5vzrhfEcr9xAVpV0ivFVIDviI11s=";
   };
 
   sourceRoot = ".";

From 1fb263deddf4cc88f6d9eefc7353cbf4b8dae18a Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 29 Sep 2025 08:36:23 +0200
Subject: [PATCH 47/76] rocq-core: 9.0.0 -> 9.0.1

---
 pkgs/applications/science/logic/coq/default.nix       | 1 +
 pkgs/applications/science/logic/rocq-core/default.nix | 1 +
 pkgs/development/coq-modules/metacoq/default.nix      | 1 -
 pkgs/development/coq-modules/metarocq/default.nix     | 3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index c58c52007b21..a07a3bf556f9 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -70,6 +70,7 @@ let
     "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
     "8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index e4d6845360e0..1f0a8b063d6a 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -23,6 +23,7 @@ let
 
   release = {
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index c62587e9d964..86898967dd71 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -26,7 +26,6 @@ let
       (case "8.18" "1.3.1-8.18")
       (case "8.19" "1.3.3-8.19")
       (case "8.20" "1.3.4-8.20")
-      (case "9.0" "1.3.4-9.0")
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix
index 6f7ac6b11b44..952ed86ddbf2 100644
--- a/pkgs/development/coq-modules/metarocq/default.nix
+++ b/pkgs/development/coq-modules/metarocq/default.nix
@@ -15,10 +15,11 @@ let
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
-      (case "9.0" "1.4-9.0")
+      (case "9.0" "1.4-9.0.1")
     ] null;
   release = {
     "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
+    "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
   };
   releaseRev = v: "v${v}";
 

From c99035ccef66bf6d08e33cc6be6d6c87474b140a Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:51:58 +0100
Subject: [PATCH 48/76] nixos/tests/nix-store-veritysetup: fix warnings

---
 nixos/tests/nix-store-veritysetup.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/nix-store-veritysetup.nix b/nixos/tests/nix-store-veritysetup.nix
index 3b6a5e6a734f..031e1260e947 100644
--- a/nixos/tests/nix-store-veritysetup.nix
+++ b/nixos/tests/nix-store-veritysetup.nix
@@ -18,7 +18,7 @@
         partitions = {
           "nix-store" = {
             storePaths = [ config.system.build.toplevel ];
-            stripNixStorePrefix = true;
+            nixStorePrefix = "/";
             repartConfig = {
               Type = "linux-generic";
               Label = "nix-store";
@@ -89,7 +89,7 @@
         "-f",
         "qcow2",
         "-b",
-        "${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}",
+        "${nodes.machine.system.build.image}/${nodes.machine.image.fileName}",
         "-F",
         "raw",
         tmp_disk_image.name,

From 51989ac4bafe4b76ef525f74544b5399340677fc Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:52:20 +0100
Subject: [PATCH 49/76] nix-store-veritysetup-generator: 0.1.0 -> 1.0.0

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

diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 729ede08f014..746f24097372 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-store-veritysetup-generator";
-  version = "0.1.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "nix-store-veritysetup-generator";
     rev = version;
-    hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
+    hash = "sha256-RTGdcLn4zuZAcC1Td4gJcywIerCYyaD0JYz8g5ybmho=";
   };
 
   sourceRoot = "${src.name}/rust";

From faa785b02291b95aceeab3c1e638c992a79189b0 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:59:44 +0100
Subject: [PATCH 50/76] nix-store-veritysetup-generator: add VM test to
 passthru

---
 pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 746f24097372..bff81aff6347 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   systemd,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {
 
   stripAllList = [ "bin" ];
 
+  passthru.tests = {
+    inherit (nixosTests) nix-store-veritysetup;
+  };
+
   meta = with lib; {
     description = "Systemd unit generator for a verity protected Nix Store";
     homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";

From fc3665f74a7b9f8a8a241bc783d8817a826d452b Mon Sep 17 00:00:00 2001
From: WilliButz <willibutz@posteo.de>
Date: Mon, 3 Nov 2025 13:50:24 +0100
Subject: [PATCH 51/76] botan3: fix selection of stdenv variant for static
 builds

Apparently with the move to by-name broke stdenv selection in such a way
that the resulting library archive from `pkgsStatic.botan3` no longer
was suitable for static linking, resulting in linking errors:

```
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -lbz2: No such file
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -ljitterentropy: No
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -lz: No such file or
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
```

Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
---
 pkgs/by-name/bo/botan3/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
index 084eb1face8b..df822c92caa7 100644
--- a/pkgs/by-name/bo/botan3/package.nix
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildPackages,
+  libcxxStdenv,
   fetchurl,
   pkgsStatic,
   python3,
@@ -9,7 +9,6 @@
   bzip2,
   zlib,
   jitterentropy,
-  darwin,
   esdm,
   tpm2-tss,
   static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
@@ -20,7 +19,7 @@
   # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
   withTpm2 ? false,
   policy ? null,
-}:
+}@args:
 
 assert lib.assertOneOf "policy" policy [
   # no explicit policy is given. The defaults by the library are used
@@ -32,11 +31,10 @@ assert lib.assertOneOf "policy" policy [
   # only allow "modern" algorithms
   "modern"
 ];
-
 let
-  stdenv' = if static then buildPackages.libcxxStdenv else stdenv;
+  stdenv = if static then libcxxStdenv else args.stdenv;
 in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   version = "3.9.0";
   pname = "botan";
 

From c8a230069b95520abc24a2c3daa51956e21411a8 Mon Sep 17 00:00:00 2001
From: WilliButz <willibutz@posteo.de>
Date: Mon, 3 Nov 2025 11:44:45 +0100
Subject: [PATCH 52/76] botan3: fix static cli build through empty-libgcc_eh
 workaround

Prior to this commit the build of `pkgsStatic.botan3.bin` produced a
dynamically linked binary, indenpendently of the move to
`pkgs/by-name`. Previous commit message and comments also suggest this
it was expected for the static build to only produce the static library,
not the statically linked cli.
---
 pkgs/by-name/bo/botan3/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
index df822c92caa7..04fdafff9153 100644
--- a/pkgs/by-name/bo/botan3/package.nix
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -4,6 +4,8 @@
   libcxxStdenv,
   fetchurl,
   pkgsStatic,
+  runCommandLocal,
+  binutils,
   python3,
   docutils,
   bzip2,
@@ -11,7 +13,7 @@
   jitterentropy,
   esdm,
   tpm2-tss,
-  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
+  static ? stdenv.hostPlatform.isStatic,
   windows,
 
   # build ESDM RNG plugin
@@ -33,6 +35,21 @@ assert lib.assertOneOf "policy" policy [
 ];
 let
   stdenv = if static then libcxxStdenv else args.stdenv;
+
+  # (based on same workaround from capnproto package)
+  #
+  # HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
+  # Though this is an issue between Clang and GCC,
+  # so it may not get fixed anytime soon...
+  empty-libgcc_eh =
+    runCommandLocal "empty-libgcc_eh"
+      {
+        nativeBuildInputs = [ binutils ];
+      }
+      ''
+        mkdir -p "$out"/lib
+        ${stdenv.cc.targetPrefix}ar r "$out"/lib/libgcc_eh.a
+      '';
 in
 stdenv.mkDerivation (finalAttrs: {
   version = "3.9.0";
@@ -80,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
     windows.pthreads
   ];
 
+  propagatedBuildInputs = lib.optional static empty-libgcc_eh;
+
   buildTargets = [
     "cli"
   ]

From 60196255173026b2d1fa2618c1d3f8630903f84b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 13:44:59 +0000
Subject: [PATCH 53/76] openlist: 4.1.5 -> 4.1.6

---
 pkgs/by-name/op/openlist/frontend.nix | 8 ++++----
 pkgs/by-name/op/openlist/package.nix  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix
index 4b3f85879b93..e2bb2ee73d16 100644
--- a/pkgs/by-name/op/openlist/frontend.nix
+++ b/pkgs/by-name/op/openlist/frontend.nix
@@ -10,18 +10,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openlist-frontend";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList-Frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J/6ZebKn7z5oagXF8in4PX9kMbdzBtqiwOgQdznYNzM=";
+    hash = "sha256-XvlnsBq3LtOs7uOl505uXjADukgKOl7JYYtJHmbD1lY=";
   };
 
   i18n = fetchzip {
     url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-rpLHflA5EHxmc2ST0AhDnFOXbI5aE4jdedHOEFZ9+RY=";
+    hash = "sha256-oSWkOouUpWWM7d8TilFKHur5rbC+6AM0OUHxG/LZJRg=";
     stripRoot = false;
   };
 
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-Ge+uwFGvEtRgYf5zkwYbNfBONXoVxlw4pmu25nY4HTc=";
+    hash = "sha256-1TCgJIBh3KEBTau5EG+oreCrFSZovmQgPpuZ3IcruCc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix
index eb6bb8ec2754..26b5b328a4a1 100644
--- a/pkgs/by-name/op/openlist/package.nix
+++ b/pkgs/by-name/op/openlist/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openlist";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x4cuymUzfMe49R9PRyD14f6piP4iR8AoYkvEfdRBKcE=";
+    hash = "sha256-6GO8xcTw05OrKpfiRmVD75rbI2OtmXjpf3pWjGg3AdM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

From ddf53abd21a45a2f3ba3e909c8ef7125ae991198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Oct 2025 17:05:14 +0200
Subject: [PATCH 54/76] nixos/facter: add virtualization and firmware support

This adds automatic virtualization detection (virtualisation.nix) and firmware management (firmware.nix).

Builds on PR #455151 (networking).
Part of incremental upstreaming from nixos-facter-modules.
---
 nixos/modules/hardware/facter/default.nix     |   2 +
 nixos/modules/hardware/facter/firmware.nix    |  24 ++++
 .../hardware/facter/virtualisation.nix        | 104 ++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/hardware/facter/firmware.nix
 create mode 100644 nixos/modules/hardware/facter/virtualisation.nix

diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index f2719b55b8ce..f3bd58443dc7 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -6,9 +6,11 @@
 {
   imports = [
     ./disk.nix
+    ./firmware.nix
     ./keyboard.nix
     ./networking
     ./system.nix
+    ./virtualisation.nix
   ];
 
   meta.maintainers = with lib.maintainers; [ mic92 ];
diff --git a/nixos/modules/hardware/facter/firmware.nix b/nixos/modules/hardware/facter/firmware.nix
new file mode 100644
index 000000000000..10962018890c
--- /dev/null
+++ b/nixos/modules/hardware/facter/firmware.nix
@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+  isBaremetal = config.hardware.facter.detected.virtualisation.none.enable;
+  hasAmdCpu = facterLib.hasAmdCpu report;
+  hasIntelCpu = facterLib.hasIntelCpu report;
+in
+{
+  config = lib.mkIf isBaremetal {
+    # none (e.g. bare-metal)
+    # provide firmware for devices that might not have been detected by nixos-facter
+    hardware.enableRedistributableFirmware = lib.mkDefault true;
+
+    # update microcode
+    hardware.cpu.amd.updateMicrocode = lib.mkIf hasAmdCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+    hardware.cpu.intel.updateMicrocode = lib.mkIf hasIntelCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+  };
+}
diff --git a/nixos/modules/hardware/facter/virtualisation.nix b/nixos/modules/hardware/facter/virtualisation.nix
new file mode 100644
index 000000000000..15cf6bab5aee
--- /dev/null
+++ b/nixos/modules/hardware/facter/virtualisation.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  config,
+  options,
+  ...
+}:
+let
+  inherit (config.hardware.facter) report;
+  cfg = config.hardware.facter.detected.virtualisation;
+in
+{
+  options.hardware.facter.detected.virtualisation = {
+    virtio_scsi.enable = lib.mkEnableOption "Enable the Facter Virtualisation Virtio SCSI module" // {
+      default = lib.any (
+        { vendor, device, ... }:
+        # vendor (0x1af4) Red Hat, Inc.
+        (vendor.value or 0) == 6900
+        &&
+          # device (0x1004, 0x1048) Virtio SCSI
+          (lib.elem (device.value or 0) [
+            4100
+            4168
+          ])
+      ) (report.hardware.scsi or [ ]);
+      defaultText = "hardware dependent";
+    };
+    oracle.enable = lib.mkEnableOption "Enable the Facter Virtualisation Oracle module" // {
+      default = report.virtualisation or null == "oracle";
+      defaultText = "environment dependent";
+    };
+    parallels.enable = lib.mkEnableOption "Enable the Facter Virtualisation Parallels module" // {
+      default = report.virtualisation or null == "parallels";
+      defaultText = "environment dependent";
+    };
+    qemu.enable = lib.mkEnableOption "Enable the Facter Virtualisation Qemu module" // {
+      default = builtins.elem (report.virtualisation or null) [
+        "qemu"
+        "kvm"
+        "bochs"
+      ];
+      defaultText = "environment dependent";
+    };
+    hyperv.enable = lib.mkEnableOption "Enable the Facter Virtualisation Hyper-V module" // {
+      default = report.virtualisation or null == "microsoft";
+      defaultText = "environment dependent";
+    };
+    # no virtualisation detected
+    none.enable = lib.mkEnableOption "Enable the Facter Virtualisation None module" // {
+      default = report.virtualisation or null == "none";
+      defaultText = "environment dependent";
+    };
+  };
+
+  config = {
+
+    # KVM support
+    boot.kernelModules =
+      let
+        hasCPUFeature =
+          feature: lib.any ({ features, ... }: lib.elem feature features) (report.hardware.cpu or [ ]);
+      in
+      lib.mkMerge [
+        (lib.mkIf (hasCPUFeature "vmx") [ "kvm-intel" ])
+        (lib.mkIf (hasCPUFeature "svm") [ "kvm-amd" ])
+      ];
+
+    # virtio & qemu
+    boot.initrd = {
+      kernelModules = lib.optionals cfg.qemu.enable [
+        "virtio_balloon"
+        "virtio_console"
+        "virtio_rng"
+        "virtio_gpu"
+      ];
+
+      availableKernelModules = lib.mkMerge [
+        (lib.mkIf cfg.qemu.enable [
+          "virtio_net"
+          "virtio_pci"
+          "virtio_mmio"
+          "virtio_blk"
+          "9p"
+          "9pnet_virtio"
+        ])
+        (lib.mkIf cfg.virtio_scsi.enable [
+          "virtio_scsi"
+        ])
+      ];
+    };
+
+    virtualisation = {
+      # oracle
+      virtualbox.guest.enable = lib.mkIf cfg.oracle.enable (lib.mkDefault true);
+      # hyper-v
+      hypervGuest.enable = lib.mkIf cfg.hyperv.enable (lib.mkDefault true);
+    };
+
+    # parallels
+    hardware.parallels.enable = lib.mkIf cfg.parallels.enable (lib.mkDefault true);
+    nixpkgs.config = lib.mkIf (!options.nixpkgs.pkgs.isDefined && cfg.parallels.enable) {
+      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "prl-tools" ];
+    };
+  };
+}

From 7ef13f718dc6299a8b5f92c42a5b4bd04f90b796 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:48:45 +0000
Subject: [PATCH 55/76] yara-x: 1.8.1 -> 1.9.0

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

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index dc46416df19d..43d596d448c4 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yara-x";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dl2uxMo81K2ZEAfZk2OP0FXTY4lKGmzqZe0QQo/YIsA=";
+    hash = "sha256-yoQoAtgXBgniNebU9HMxF1m0UHFD6iU095he9tCNNIo=";
   };
 
-  cargoHash = "sha256-+Bva1uch6fd6gl2MH2ss3S6Ea1QkvgVePhdUVUDuIE8=";
+  cargoHash = "sha256-/HMyNofKpeYaFfRcZ1LAb3vfW/TQy+DsILXRCpJFlCQ=";
 
   nativeBuildInputs = [
     installShellFiles

From 3afc17a9d4d30813f8d35a563e76b6583e15106a Mon Sep 17 00:00:00 2001
From: dawnofmidnight <dawnofmidnight@duck.com>
Date: Fri, 31 Oct 2025 19:23:41 -0400
Subject: [PATCH 56/76] vicinae: v0.15.5 -> v0.16.1

Release notes:
- v0.15.6: https://github.com/vicinaehq/vicinae/releases/tag/v0.15.6
- v0.15.7: https://github.com/vicinaehq/vicinae/releases/tag/v0.15.7
- v0.16.0: https://github.com/vicinaehq/vicinae/releases/tag/v0.16.0
- v0.16.1: https://github.com/vicinaehq/vicinae/releases/tag/v0.16.1
---
 pkgs/by-name/vi/vicinae/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 4d1821001131..ccdabb49d74e 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -20,23 +20,23 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.15.5";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3pKexTUWfohL/S/yWsVMShmtMlBFI9zsd7NFzySKG0w=";
+    hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U=";
   };
 
   apiDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/typescript/api";
-    hash = "sha256-dSHEzw15lSRRbldl9PljuWFf2htdG+HgSeKPAB88RBg=";
+    hash = "sha256-VrtxQG1wQGcRHbJWPPt6aS7x1hAHc4Z1+0l+cKv3YdI=";
   };
 
   extensionManagerDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/typescript/extension-manager";
-    hash = "sha256-TCT7uZRZn4rsLA/z2yLeK5Bt4DJPmdSC4zkmuCxTtc8=";
+    hash = "sha256-krDFHTG8irgVk4a79LMz148drLgy2oxEoHCKRpur1R4=";
   };
 
   cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {

From 5b2d9e359d3ee181fc04e86ef88377863a2e0f55 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 3 Nov 2025 14:52:24 +0100
Subject: [PATCH 57/76] nextcloud-notify_push: 1.2.0 -> 1.2.1

---
 pkgs/servers/nextcloud/notify_push.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index bcd148dce727..55f39fe8aba3 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
   # in nixpkgs!
   # For that, check the `<dependencies>` section of `appinfo/info.xml`
   # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "notify_push";
     tag = "v${version}";
-    hash = "sha256-zefoazreNUc3agbdeQRusYWwGNDZnC375ZlLlG+SPeg=";
+    hash = "sha256-yEls1s7tD/fcqul/BmEsRf2g5mqD74M8TKG+Na3jlcM=";
   };
 
   cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     app = fetchNextcloudApp {
       appName = "notify_push";
       appVersion = version;
-      hash = "sha256-KIgXruwYPTLmpO3bMbEcm9jlRYjqX8JgTJt5hd7QugM=";
+      hash = "sha256-Yad1+kc0uCHRV4q7IDbQT8Ea2423YWGy9k42DHB0R1Q=";
       license = "agpl3Plus";
       homepage = "https://github.com/nextcloud/notify_push";
       url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";

From 0a0059b4994e94646c578e88191aee02f4f68fe6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:07:19 +0000
Subject: [PATCH 58/76] mdfried: 0.12.9 -> 0.13.0

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

diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix
index 25e62257ecc7..33c4019dabdf 100644
--- a/pkgs/by-name/md/mdfried/package.nix
+++ b/pkgs/by-name/md/mdfried/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.12.9";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0vAPUmG11Qvds3g2iaH7umZpo4b2/Dtvcm6I8WfM8jw=";
+    hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA=";
   };
 
-  cargoHash = "sha256-3jx4sIXETEsgTBcTTbedEv0BXoSejLe4oEaudhQIN6s=";
+  cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk=";
 
   doCheck = true;
 

From f861cd4d207f9f82d4f56c00713f18518ec64ed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:09:15 +0000
Subject: [PATCH 59/76] fastcdr: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix
index e62ca49c2666..fca49e3b30a8 100644
--- a/pkgs/by-name/fa/fastcdr/package.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2xaiyF3dK4BfSa7u5kwYGYaXY0c9/MLiV34jmvTzI4k=";
+    hash = "sha256-KXQRQieyDPuSmLltf7iOVO4QdsHgaek+x1vneZyEg0E=";
   };
 
   patches = [

From 74d7b6244723cbee61ecfd0490240f80d17b1137 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:42:30 +0000
Subject: [PATCH 60/76] compose2nix: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix
index d6da37a19c5d..25fe02a5e476 100644
--- a/pkgs/by-name/co/compose2nix/package.nix
+++ b/pkgs/by-name/co/compose2nix/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "compose2nix";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "aksiksi";
     repo = "compose2nix";
     rev = "v${version}";
-    hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw=";
+    hash = "sha256-0QCYgzxg0upnrVGDXbX9GgSHyzeMP3yqNor2t8DVwiU=";
   };
 
-  vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges=";
+  vendorHash = "sha256-8boWHIGvenGugKq+8ysPCsUib7QQ0ov+jbKFDKpls3g=";
 
   passthru.tests = {
     version = testers.testVersion {

From 74432d9de5fb1d1899500eaabaafad5aed2d87af Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 3 Nov 2025 08:46:29 -0600
Subject: [PATCH 61/76] _3llo: migrate to by-name

---
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile              | 0
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile.lock         | 0
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/gemset.nix           | 0
 .../misc/3llo/default.nix => by-name/_3/_3llo/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile (100%)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile.lock (100%)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/gemset.nix (100%)
 rename pkgs/{tools/misc/3llo/default.nix => by-name/_3/_3llo/package.nix} (100%)

diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/by-name/_3/_3llo/Gemfile
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile
rename to pkgs/by-name/_3/_3llo/Gemfile
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/by-name/_3/_3llo/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile.lock
rename to pkgs/by-name/_3/_3llo/Gemfile.lock
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/by-name/_3/_3llo/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/3llo/gemset.nix
rename to pkgs/by-name/_3/_3llo/gemset.nix
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/by-name/_3/_3llo/package.nix
similarity index 100%
rename from pkgs/tools/misc/3llo/default.nix
rename to pkgs/by-name/_3/_3llo/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10362b1780b1..643d53c839fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -966,8 +966,6 @@ with pkgs;
 
   ### TOOLS
 
-  _3llo = callPackage ../tools/misc/3llo { };
-
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
   acquire = with python3Packages; toPythonApplication acquire;

From aaf821b4208b829d6a398cdd6b8db795daf4eb6d Mon Sep 17 00:00:00 2001
From: zapashcanon <leo@ndrs.fr>
Date: Sun, 21 Sep 2025 23:42:22 +0200
Subject: [PATCH 62/76] mdbook-plugins: init at 0.2.3

---
 pkgs/by-name/md/mdbook-plugins/package.nix | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/md/mdbook-plugins/package.nix

diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix
new file mode 100644
index 000000000000..4ab03088820b
--- /dev/null
+++ b/pkgs/by-name/md/mdbook-plugins/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  curl,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdbook-plugins";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "RustForWeb";
+    repo = "mdbook-plugins";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-IyIUJH5pbuvDarQf7yvrStMIb5HdimudYF+Tq/+OtvY=";
+  };
+
+  cargoHash = "sha256-/UM85Lhq52MFTjczPRuXENPJOQkjiHLWGPPW/VD9kBQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    curl
+    openssl
+  ];
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  cargoBuildFlags = [
+    "--bin=mdbook-tabs"
+    "--bin=mdbook-trunk"
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Plugins for mdBook";
+    homepage = "https://mdbook-plugins.rustforweb.org/";
+    changelog = "https://github.com/RustForWeb/mdbook-plugins/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ redianthus ];
+    mainProgram = "mdbook-tabs";
+  };
+})

From 2102e1abf6e186474f1b59b521b6e2143accfbb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 15:24:55 +0000
Subject: [PATCH 63/76] unrar: 7.1.10 -> 7.2.1

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

diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index 24e9dee0d0ad..5fc8a2ca57ec 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.1.10";
+  version = "7.2.1";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-qUqUJ7NZyF+/skmdYMeE+u6KoHswcJvQSnRQ8rAKXp8=";
+    hash = "sha256-er4F+TUFZ7Iv48PbV5FT371CPQ93Zorc5fCxfqGmij0=";
   };
 
   sourceRoot = finalAttrs.src.name;

From f3eb29e4be6f195cdeb520999b71a3958d4c89a7 Mon Sep 17 00:00:00 2001
From: redianthus <l@ndrs.fr>
Date: Mon, 3 Nov 2025 14:44:45 +0100
Subject: [PATCH 64/76] ocamlPackages.directories: 0.6 -> 0.7

---
 .../ocaml-modules/directories/default.nix     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
index 158c890aec42..a33e4c17d9c6 100644
--- a/pkgs/development/ocaml-modules/directories/default.nix
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -5,17 +5,17 @@
   fpath,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "directories";
-  version = "0.6";
+  version = "0.7";
 
   minimalOCamlVersion = "4.14";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
-    repo = pname;
-    tag = version;
-    hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c=";
+    repo = "directories";
+    tag = finalAttrs.version;
+    hash = "sha256-6qPdHqkZ0xREOTFOe5sGfz2ysDX+9JZDrEmJvenBcqw=";
   };
 
   propagatedBuildInputs = [
@@ -35,8 +35,11 @@ buildDunePackage rec {
       xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
       macOS.
     '';
-    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ bcc32 ];
+    maintainers = with lib.maintainers; [
+      bcc32
+      redianthus
+    ];
   };
-}
+})

From 4af54f44911da97ba156aca3d25f771ee48fe16e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 3 Nov 2025 09:50:44 -0600
Subject: [PATCH 65/76] _3llo: fix formatting, qualify lib section

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

diff --git a/pkgs/by-name/_3/_3llo/package.nix b/pkgs/by-name/_3/_3llo/package.nix
index 45c1e633d050..42ea5c65b4b7 100644
--- a/pkgs/by-name/_3/_3llo/package.nix
+++ b/pkgs/by-name/_3/_3llo/package.nix
@@ -1,4 +1,7 @@
-{ lib, bundlerApp }:
+{
+  lib,
+  bundlerApp,
+}:
 
 bundlerApp {
   pname = "3llo";
@@ -7,9 +10,9 @@ bundlerApp {
 
   exes = [ "3llo" ];
 
-  meta = with lib; {
+  meta = {
     description = "Trello interactive CLI on terminal";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/qcam/3llo";
     maintainers = [ ];
   };

From 6d97f3cf4aa2cb955f5785ce2a6e2264022d25ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:32:56 -0800
Subject: [PATCH 66/76] python3Packages.python-open-router: 0.3.1 -> 0.3.2

Diff: https://github.com/joostlek/python-open-router/compare/v0.3.1...v0.3.2

Changelog: https://github.com/joostlek/python-open-router/releases/tag/v0.3.2
---
 .../development/python-modules/python-open-router/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix
index 76abdf1da097..72f389d779e3 100644
--- a/pkgs/development/python-modules/python-open-router/default.nix
+++ b/pkgs/development/python-modules/python-open-router/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "python-open-router";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-open-router";
     tag = "v${version}";
-    hash = "sha256-EoLBlgXKrAo2DKOuLGvN3MbWIJIG+Ehtznegnq3VX44=";
+    hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso=";
   };
 
   build-system = [ poetry-core ];

From 6b5c92e273b634220f828735366334ac6614ecdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:36:45 -0800
Subject: [PATCH 67/76] python3Packages.reolink-aio: 0.16.2 -> 0.16.3

Diff: https://github.com/starkillerOG/reolink_aio/compare/0.16.2...0.16.3

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.16.3
---
 pkgs/development/python-modules/reolink-aio/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 710461a1ae02..2ed4e83d2da3 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -6,23 +6,20 @@
   fetchFromGitHub,
   orjson,
   pycryptodomex,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.16.2";
+  version = "0.16.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-Vkjt+/dG9m3sf9sQM++I+IgWdsBe338VjqoVr2pD3C0=";
+    hash = "sha256-lfkQtVnaEge6Upvd73fqBtXf5NQIq7vhTP4IOwWjNBw=";
   };
 
   build-system = [ setuptools ];

From 04d40bd838dd8c191c4f95f93d92700e933604d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:55:06 -0800
Subject: [PATCH 68/76] immich: 2.2.1 -> 2.2.2

Diff: https://github.com/immich-app/immich/compare/v2.2.1...v2.2.2

Changelog: https://github.com/immich-app/immich/releases/tag/v2.2.2
---
 pkgs/by-name/im/immich-cli/package.nix | 2 +-
 pkgs/by-name/im/immich/package.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index 57c223e9e794..db841758850f 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "immich-cli";
-  version = "2.2.99";
+  version = "2.2.100";
   inherit (immich) src pnpmDeps;
 
   postPatch = ''
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index ec7dae1eb449..c12872da602d 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -34,7 +34,7 @@
 }:
 let
   pnpm = pnpm_10;
-  version = "2.2.1";
+  version = "2.2.2";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -108,7 +108,7 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8=";
+    hash = "sha256-0ibXs4c61CEp6s/gOCsIj2A7VTnA+72jTMXoo4kkt74=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From d1592595e2f61d00f4615719203f09ac35e37a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 09:02:38 -0800
Subject: [PATCH 69/76] python3Packages.eheimdigital: 1.3.2 -> 1.4.0

Diff: https://codeberg.org/autinerd/eheimdigital/compare/1.3.2...1.4.0

Changelog: https://codeberg.org/autinerd/eheimdigital/releases/tag/1.4.0
---
 pkgs/development/python-modules/eheimdigital/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix
index 2267fd230aa4..da38c94c2b32 100644
--- a/pkgs/development/python-modules/eheimdigital/default.nix
+++ b/pkgs/development/python-modules/eheimdigital/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "eheimdigital";
-  version = "1.3.2";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "autinerd";
     repo = "eheimdigital";
     tag = version;
-    hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8=";
+    hash = "sha256-skr5KEUQp3fSfTgTHPIxVdT8v9WnPp2NrzA+zhtudlg=";
   };
 
   build-system = [ hatchling ];

From ce6168d85887a97a708abf4175e85ef3b9dfeb63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Nov 2025 18:10:25 +0100
Subject: [PATCH 70/76] python313Packages.typst: modernize

---
 pkgs/development/python-modules/typst/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index 8f820d103f02..88cf0d02f89f 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
-  pythonOlder,
   rustc,
   rustPlatform,
 }:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.14.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "messense";
     repo = "typst-py";
@@ -52,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python binding to typst";
     homepage = "https://github.com/messense/typst-py";
-    changelog = "https://github.com/messense/typst-py/releases/tag/v${version}";
+    changelog = "https://github.com/messense/typst-py/releases/tag/v${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };

From d090b2662e9ccebe657442b07330cd679841abaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:03:02 -0800
Subject: [PATCH 71/76] python3Packages.python-jsonpath: fix src fetching

---
 .../development/python-modules/python-jsonpath/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/python-jsonpath/default.nix b/pkgs/development/python-modules/python-jsonpath/default.nix
index af58dc59b57a..fbc94587688a 100644
--- a/pkgs/development/python-modules/python-jsonpath/default.nix
+++ b/pkgs/development/python-modules/python-jsonpath/default.nix
@@ -17,6 +17,13 @@ buildPythonPackage rec {
     repo = "python-jsonpath";
     tag = "v${version}";
     fetchSubmodules = true;
+    preFetch = ''
+      # can't clone using ssh
+      # https://github.com/jg-rp/python-jsonpath/pull/122
+      export GIT_CONFIG_COUNT=1
+      export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
+      export GIT_CONFIG_VALUE_0=git@github.com:
+    '';
     hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io=";
   };
 

From c768b4243eacf2a965338fe7f4fbdaf7f83d931d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 19:28:43 +0100
Subject: [PATCH 72/76] ci/github-script/bot: fix infinite labeling cycle

When we recently refactored the code to use the maintainer map for
related labels, we made a mistake: When a PR has no packages with
maintainers returned from eval, the label would internally be set to `0`
instead of `false`.

The code would then go on compare the before and after labels with
strict equality - and assume a difference, because `0 !== false`. Thus,
it seemed like new labels needed to be set, so the PUT request was
actually sent. Of course, the labels were actually the same - when
filtering the labels to be set, the `0` would also be treated as falsy,
so the label would not be set. This would result in no visible change in
the PR, but internall GitHub would replace the `updated_at` timestamp
for that PR - after all we replaced all labels.

Repeatedly updating *all* PRs we're looking at quickly causes problems,
because we are going to look at the same PRs *again* in the next cycle -
essentially causing infinite recursion. The bot became slower and slower
over time, because it had to process more and more PRs each run.

Simply casting this to a proper Boolean, should get us out of the mess
soon.
---
 ci/github-script/bot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index a40b3b227957..fb5e79e54239 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -322,7 +322,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
       Object.assign(prLabels, evalLabels, {
         '11.by: package-maintainer':
-          packages.length &&
+          Boolean(packages.length) &&
           packages.every((pkg) =>
             maintainers[pkg]?.includes(pull_request.user.id),
           ),

From 5fc8325608cb6972236d514066d5978f18f7bbaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:49:32 +0000
Subject: [PATCH 73/76] sigsum: 0.11.2 -> 0.12.0

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

diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
index 03bf0d55345b..acf609234b0b 100644
--- a/pkgs/by-name/si/sigsum/package.nix
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "sigsum";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitLab {
     domain = "git.glasklar.is";
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
     owner = "core";
     repo = "sigsum-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw=";
+    hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg=";
   };
 
   postPatch = ''
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "info.Main.Version" '"${finalAttrs.version}"'
   '';
 
-  vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM=";
+  vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY=";
 
   ldflags = [
     "-s"

From ceaf58465f081d0b90dbfa51929be09acb2355af Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:59:32 -0300
Subject: [PATCH 74/76] arguments: fix build with cmake4

---
 pkgs/by-name/ar/arguments/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ar/arguments/package.nix b/pkgs/by-name/ar/arguments/package.nix
index 39ce653de6a5..eb23f0d13cca 100644
--- a/pkgs/by-name/ar/arguments/package.nix
+++ b/pkgs/by-name/ar/arguments/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/${owner}/arguments";
     description = "Library for argument handling for MINC programs";

From eb57af1c259fb81d7a10014749c99656cebcd919 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Nov 2025 20:13:19 +0100
Subject: [PATCH 75/76] forgejo-runner: mark broken on darwin

The tests currently fail to execute on darwin, which may indicate a
sandboxing issue. Likely needs someone to care for forgejo ci/cd on
darwin.
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index e1e7f11d8e47..3fe8cc8d9787 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -92,6 +92,8 @@ buildGoModule rec {
   };
 
   meta = with lib; {
+    # Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin'
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Runner for Forgejo based on act";
     homepage = "https://code.forgejo.org/forgejo/runner";
     changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}";

From df09fd8e795a5ddf143dbaedb79074a7af2a3b77 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 17:00:55 -0300
Subject: [PATCH 76/76] _1password-gui-beta: 8.11.14-20.BETA -> 8.11.18-30.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index f0da36a7578b..c9dab6f3bf8a 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,28 +29,28 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.14-20.BETA",
+      "version": "8.11.18-30.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz",
-          "hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz",
+          "hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz",
-          "hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz",
+          "hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y="
         }
       }
     },
     "darwin": {
-      "version": "8.11.14-20.BETA",
+      "version": "8.11.18-30.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip",
-          "hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip",
+          "hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip",
-          "hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip",
+          "hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k="
         }
       }
     }