From 30bd4e46cc8af5cafa41d9d1274ee0fcf16e1e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Tue, 6 May 2025 22:20:07 +0300
Subject: [PATCH 01/72] fritzing: 1.0.4 -> 1.0.5

---
 .../science/electronics/fritzing/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 8b0fd62a5564..e467656e5290 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -21,13 +21,13 @@
 let
   # SHA256 of the fritzing-parts HEAD on the master branch,
   # which contains the latest stable parts definitions
-  partsSha = "76235099ed556e52003de63522fdd74e61d53a36";
+  partsSha = "4f7d39b22a6c307e6cca62c7f78eae96696e8b2c";
 
   parts = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-parts";
     rev = partsSha;
-    hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y=";
+    hash = "sha256-mAzY5CVZJF5hAvWVlDiYRxoB+9mGDG9OI/8n9aY5aFE=";
   };
 
   # Header-only library
@@ -41,13 +41,13 @@ in
 
 stdenv.mkDerivation {
   pname = "fritzing";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-app";
-    rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25";
-    hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0=";
+    rev = "b9add9eaa7c426963de20c8514a69d3f15e83bdf";
+    hash = "sha256-OnIX+2eXT0JAs6VgSAIr1t+2DhpoUDgKVGPFjjZrKas=";
   };
 
   patches = [

From a06090e94a6a197545ffe23b538a0887c271a3a4 Mon Sep 17 00:00:00 2001
From: DJ_Laser <90146620+DJ-Laser@users.noreply.github.com>
Date: Tue, 2 Sep 2025 23:27:14 -0400
Subject: [PATCH 02/72] scdl: Add ffmpeg as a dependency of scdl

---
 pkgs/by-name/sc/scdl/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 81109ab74801..38e2c25dc41c 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchPypi,
+  ffmpeg-headless,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,6 +28,15 @@ python3Packages.buildPythonApplication rec {
     filelock
   ];
 
+  # Ensure ffmpeg is available in $PATH:
+  makeWrapperArgs =
+    let
+      packagesToBinPath = [ ffmpeg-headless ];
+    in
+    [
+      ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"''
+    ];
+
   # No tests in repository
   doCheck = false;
 

From ed8c7e0abbc0af47983f496483e95cd2e4f69e03 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:51:35 +0800
Subject: [PATCH 03/72] tflint: 0.58.1 -> 0.59.1

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

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 45dc9d696097..dcb1ebc37310 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   runCommand,
   makeWrapper,
@@ -11,19 +11,19 @@
 
 let
   pname = "tflint";
-  version = "0.58.1";
+  version = "0.59.1";
 in
-buildGoModule {
+buildGo125Module {
   inherit pname version;
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = "tflint";
     tag = "v${version}";
-    hash = "sha256-1SuNcqU8JtMypoltbNBZHZZi78jvbbAD+nmj2v8NU5g=";
+    hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg=";
   };
 
-  vendorHash = "sha256-8sHiCEtVs+rUnmJ9NPYJJcr4sDlFaEWklE3JaoXEu9w=";
+  vendorHash = "sha256-KVKxtH/Hgxe7We3K8ArovsRDPz6a2wEfQ8Zx3ScCo74=";
 
   doCheck = false;
 

From 9fa1a45d99b1beb20f73000971324a83d6ce9c2b Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:54:21 +0800
Subject: [PATCH 04/72] tflint: add versionCheckHook

---
 pkgs/by-name/tf/tflint/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index dcb1ebc37310..0c164ffb3d5b 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGo125Module,
   fetchFromGitHub,
+  versionCheckHook,
   runCommand,
   makeWrapper,
   tflint,
@@ -9,17 +10,14 @@
   symlinkJoin,
 }:
 
-let
+buildGo125Module (finalAttrs: {
   pname = "tflint";
   version = "0.59.1";
-in
-buildGo125Module {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = "tflint";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg=";
   };
 
@@ -34,6 +32,12 @@ buildGo125Module {
     "-w"
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";
+
   passthru.withPlugins =
     plugins:
     let
@@ -43,10 +47,10 @@ buildGo125Module {
         paths = [ actualPlugins ];
       };
     in
-    runCommand "tflint-with-plugins-${version}"
+    runCommand "tflint-with-plugins-${finalAttrs.version}"
       {
         nativeBuildInputs = [ makeWrapper ];
-        inherit version;
+        inherit (finalAttrs) version;
       }
       ''
         makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
@@ -57,8 +61,8 @@ buildGo125Module {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     mainProgram = "tflint";
     homepage = "https://github.com/terraform-linters/tflint";
-    changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ momeemt ];
   };
-}
+})

From b81f3da181ac2ea47efbd75f1b5bec03a9d0449f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 12 Sep 2025 12:42:55 +0200
Subject: [PATCH 05/72] doc/cmake: document cmakeBuildType

---
 doc/hooks/cmake.section.md | 8 ++++++++
 doc/redirects.json         | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md
index 427a03a73986..afaa5b21bcf1 100644
--- a/doc/hooks/cmake.section.md
+++ b/doc/hooks/cmake.section.md
@@ -30,6 +30,14 @@ This setting has no tangible effect when running the build in a sandboxed deriva
 
 The default value is `build`.
 
+#### `cmakeBuildType` {#cmake-build-type}
+
+Build type of cmake output.
+
+Internally populates the `CMAKE_BUILD_TYPE` cmake flag.
+
+The default value is `Release`.
+
 #### `dontUseCmakeConfigure` {#dont-use-cmake-configure}
 
 When set to true, don't use the predefined `cmakeConfigurePhase`.
diff --git a/doc/redirects.json b/doc/redirects.json
index 0442248c3e3e..ee5554d17073 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -2336,6 +2336,9 @@
   "cmake-build-dir": [
     "index.html#cmake-build-dir"
   ],
+  "cmake-build-type": [
+    "index.html#cmake-build-type"
+  ],
   "dont-use-cmake-configure": [
     "index.html#dont-use-cmake-configure"
   ],

From 4e668284ceaeca7b8e36f4f766fb374b0e5ae2a1 Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <mail@pascalj.de>
Date: Sat, 20 Sep 2025 11:04:16 +0200
Subject: [PATCH 06/72] fmt_12: init at 12.0.0

---
 pkgs/development/libraries/fmt/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix            | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index b789956dfe56..f0cc0dd8dc25 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -90,4 +90,9 @@ in
     version = "11.2.0";
     hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU=";
   };
+
+  fmt_12 = generic {
+    version = "12.0.0";
+    hash = "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd669e9b308c..3e728ac43394 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7473,7 +7473,12 @@ with pkgs;
   fltk = fltk13;
   fltk-minimal = fltk13-minimal;
 
-  inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11;
+  inherit (callPackages ../development/libraries/fmt { })
+    fmt_9
+    fmt_10
+    fmt_11
+    fmt_12
+    ;
 
   fmt = fmt_10;
 

From 05f632d5459615f83bb37bb4ca9fdf254616510d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Sep 2025 01:55:09 +0000
Subject: [PATCH 07/72] traccar: 6.9.1 -> 6.10.0

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

diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix
index 69a1795a5b7e..efb72643499f 100644
--- a/pkgs/by-name/tr/traccar/package.nix
+++ b/pkgs/by-name/tr/traccar/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "traccar";
-  version = "6.9.1";
+  version = "6.10.0";
   nativeBuildInputs = [ pkgs.makeWrapper ];
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
-    hash = "sha256-PR0crdEGYr4lVp5JSFSLGsR+uZKWulfp6LA57y9K88E=";
+    hash = "sha256-esXmcN3j7rZ6Sx9n772LC39hN25tHKq7RIn+j/PyISw=";
   };
 
   installPhase = ''

From 1a34a71fcad9b5bffb4829780953b6f725002e0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 16:44:27 +0000
Subject: [PATCH 08/72] kics: 2.1.13 -> 2.1.14

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

diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix
index 2a664e684694..4e44c1e698d5 100644
--- a/pkgs/by-name/ki/kics/package.nix
+++ b/pkgs/by-name/ki/kics/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kics";
-  version = "2.1.13";
+  version = "2.1.14";
 
   src = fetchFromGitHub {
     owner = "Checkmarx";
     repo = "kics";
     tag = "v${version}";
-    hash = "sha256-7ulu5PVCD6VoIj7RVpBGzsb9uWctOkVfYVb8qB5YMB0=";
+    hash = "sha256-VcVF0vqlMNpVR/KmeZV75j16NxWg5iuhEy54NeNK4pY=";
   };
 
-  vendorHash = "sha256-kKK3kSWjork6KZdPzKySsiHR0bOLKlzltP/u6ZQioqM=";
+  vendorHash = "sha256-tcJ1df9hetzDSxoTP3lvY8ixh6VWsliGJqzXHshmc9A=";
 
   subPackages = [ "cmd/console" ];
 

From 1057ba46cb15479791f670c53af8a296b2a0ea7d Mon Sep 17 00:00:00 2001
From: Prince527 <Prince527gaming@gmail.com>
Date: Fri, 26 Sep 2025 18:34:59 -0300
Subject: [PATCH 09/72] equicord: darwin support

---
 pkgs/by-name/eq/equicord/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 4af0e0485e5d..2d4fc238f02d 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Other cutest Discord client mod";
     homepage = "https://github.com/Equicord/Equicord";
     license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
     maintainers = [
       lib.maintainers.NotAShelf
     ];

From 84475bd184696d2d6e47f747036e3f5bedcc0735 Mon Sep 17 00:00:00 2001
From: Prince527 <Prince527gaming@gmail.com>
Date: Fri, 26 Sep 2025 22:40:11 -0300
Subject: [PATCH 10/72] equicord: change all to unix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/eq/equicord/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 2d4fc238f02d..646727334b6e 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Other cutest Discord client mod";
     homepage = "https://github.com/Equicord/Equicord";
     license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.unix;
     maintainers = [
       lib.maintainers.NotAShelf
     ];

From 9a67facd52ad1d27cd6ab43a992a32bbd205d52a Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 28 Sep 2025 11:15:38 +0900
Subject: [PATCH 11/72] apprun-cli: 0.3.2 -> 0.5.0

Diff: https://github.com/fujiwara/apprun-cli/compare/v0.3.2...v0.5.0

Changelog: https://github.com/fujiwara/apprun-cli/blob/v0.5.0/CHANGELOG.md
---
 pkgs/by-name/ap/apprun-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix
index 1ae19d83a0c5..59ecc2de345c 100644
--- a/pkgs/by-name/ap/apprun-cli/package.nix
+++ b/pkgs/by-name/ap/apprun-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "apprun-cli";
-  version = "0.3.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "fujiwara";
     repo = "apprun-cli";
     tag = "v${version}";
-    hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc=";
+    hash = "sha256-3M+kRXTQ0yaxQc9E5T9UThqEda2S1F77SJzX7burZlU=";
   };
 
-  vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ=";
+  vendorHash = "sha256-i3ZthsZVxAYQDX6ZA1bU81F4BbYSsWdu1sOAiY7FK7Y=";
 
   ldflags = [
     "-s"

From b218c5a44f787678f93b7fe90e94191c54658067 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 28 Sep 2025 11:25:55 +0900
Subject: [PATCH 12/72] apprun-cli: fix update script to exclude v0 prereleases

---
 pkgs/by-name/ap/apprun-cli/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix
index 59ecc2de345c..359b95048205 100644
--- a/pkgs/by-name/ap/apprun-cli/package.nix
+++ b/pkgs/by-name/ap/apprun-cli/package.nix
@@ -23,7 +23,14 @@ buildGoModule rec {
     "-w"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      # Until a stable version is released, v0 tags are incorrectly recognized as the latest,
+      # so specify minor releases
+      "^v0.([0-9.]+)$"
+    ];
+  };
 
   meta = {
     description = "CLI for sakura AppRun";

From b57aa149ef36d423fafab89aec6a2de227acb34d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 00:30:12 +0000
Subject: [PATCH 13/72] rapidyaml: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index 842f956d5e76..da05c8034151 100644
--- a/pkgs/by-name/ra/rapidyaml/package.nix
+++ b/pkgs/by-name/ra/rapidyaml/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rapidyaml";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "biojppm";
     repo = "rapidyaml";
     fetchSubmodules = true;
     tag = "v${version}";
-    hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE=";
+    hash = "sha256-r19PBS35mvAK2RoZGXaw6UU9EuEXVoUK6BV6cJnPyUs=";
   };
 
   nativeBuildInputs = [

From 110be74cc14ae73aca734d4d38b5612079ed10fd Mon Sep 17 00:00:00 2001
From: Diego <diego@strebel.com>
Date: Sun, 5 Oct 2025 15:44:50 +0200
Subject: [PATCH 14/72] bitbox: 4.48.1 -> 4.48.6

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

diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index 70d2a9bc4bb3..938bb3b458ee 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -21,14 +21,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.48.1";
+  version = "4.48.6";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-zpkjYnGsmPKjxUpp2H1qSzqthOO1mTmki3bPqo35sBo=";
+    hash = "sha256-qNcwBaJywWMo/Bb1QkOM9FQ76Sf2DqULUr+W583ufAk=";
   };
 
   postPatch = ''

From 721e2ad389677632de003d2a1fd24cbb3e86b31b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 16:09:16 +0000
Subject: [PATCH 15/72] liquibase: 4.33.0 -> 5.0.1

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

diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix
index aa01bb695842..b78ae4d23e72 100644
--- a/pkgs/by-name/li/liquibase/package.nix
+++ b/pkgs/by-name/li/liquibase/package.nix
@@ -26,11 +26,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquibase";
-  version = "4.33.0";
+  version = "5.0.1";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz";
-    hash = "sha256-aJrPzcl7rQ1MFQ0e+rnIUeJRs5jLPWMm916Kr+QO1Xg=";
+    hash = "sha256-OuEczc1MCA5CHl/QQ729Yk1W/PybKU1dnYmMuLB05Ek=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c600cd273b60414cf9008dfe83e53d6789ea6c68 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 6 Oct 2025 16:42:53 -0300
Subject: [PATCH 16/72] _1password-gui-beta: 8.11.14-19.BETA -> 8.11.14-20.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 b3e7dc491ceb..35bbf591fd53 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-19.BETA",
+      "version": "8.11.14-20.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz",
-          "hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz",
+          "hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz",
-          "hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz",
+          "hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc="
         }
       }
     },
     "darwin": {
-      "version": "8.11.14-19.BETA",
+      "version": "8.11.14-20.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip",
-          "hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip",
+          "hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip",
-          "hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip",
+          "hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM="
         }
       }
     }

From 6aa0e2cf50f82ca4e8439310e380d9d37394bd1c Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Thu, 9 Oct 2025 11:10:35 +0200
Subject: [PATCH 17/72] python3Packages.phart: init at 1.1.4

---
 pkgs/by-name/ph/phart/package.nix             |  3 +
 .../python-modules/phart/default.nix          | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ph/phart/package.nix
 create mode 100644 pkgs/development/python-modules/phart/default.nix

diff --git a/pkgs/by-name/ph/phart/package.nix b/pkgs/by-name/ph/phart/package.nix
new file mode 100644
index 000000000000..a2ff7cd98cef
--- /dev/null
+++ b/pkgs/by-name/ph/phart/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.phart
diff --git a/pkgs/development/python-modules/phart/default.nix b/pkgs/development/python-modules/phart/default.nix
new file mode 100644
index 000000000000..7f437fc3565b
--- /dev/null
+++ b/pkgs/development/python-modules/phart/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  networkx,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pydot,
+}:
+
+buildPythonPackage rec {
+  pname = "phart";
+  version = "1.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-JpHjEVKpOPSNUdUjZxWBHt6AFCpci1nSRWhDXxG6nyw=";
+  };
+
+  pyproject = true;
+
+  build-system = [
+    hatchling
+  ];
+
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  '';
+
+  postPatch = ''
+
+    # pythonRelaxDeps = true; didn't work
+    substituteInPlace pyproject.toml \
+      --replace-fail 'hatchling==1.26.3' 'hatchling'
+
+    # This line makes the cli tool not work, removing it fixes it
+    substituteInPlace src/phart/cli.py \
+      --replace-fail "renderer.options.use_ascii = args.ascii" ""
+
+  '';
+
+  dependencies = [
+    networkx
+  ];
+
+  disabledTestPaths = [
+    # Many of the tests are stale
+    "tests/test_cli.py"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pydot
+  ];
+
+  pythonImportsCheck = [
+    "phart"
+  ];
+
+  meta = {
+    description = "Python Hierarchical ASCII Representation Tool";
+    homepage = "https://github.com/scottvr/phart";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ b-rodrigues ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7fb3fe294f7..b6359b24e97e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11706,6 +11706,8 @@ self: super: with self; {
 
   pgvector = callPackage ../development/python-modules/pgvector { };
 
+  phart = callPackage ../development/python-modules/phart { };
+
   phe = callPackage ../development/python-modules/phe { };
 
   phik = callPackage ../development/python-modules/phik { };

From 3c3e8772c4d66492f459e0a6ccfc35da7bea51bf Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 7 Oct 2025 10:04:18 -0700
Subject: [PATCH 18/72] dockerTools: Tidied comments

Co-authored-by: commiterate <111539270+commiterate@users.noreply.github.com>
---
 pkgs/build-support/docker/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 909dc1321b76..2293ccae73f7 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1241,7 +1241,8 @@ rec {
     result
   );
 
-  # This function streams a docker image that behaves like a nix-shell for a derivation
+  # This function streams a docker image that behaves like a nix-shell for a derivation.
+  #
   # Docs: doc/build-helpers/images/dockertools.section.md
   # Tests: nixos/tests/docker-tools-nix-shell.nix
   streamNixShellImage =
@@ -1357,10 +1358,14 @@ rec {
         binSh
         usrBinEnv
         (fakeNss.override {
-          # Allows programs to look up the build user's home directory
+          # Allows programs to look up the build user's home directory.
+          #
           # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416
-          # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir.
-          # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379
+          #
+          # This slightly differs, however, since we use the passed-in `homeDirectory` instead of `sandboxBuildDir`.
+          # We're doing this because it is arguably a bug in Nix that `sandboxBuildDir` is used here.
+          #
+          # https://github.com/NixOS/nix/issues/6379
           extraPasswdLines = [
             "nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell"
           ];
@@ -1373,12 +1378,11 @@ rec {
       fakeRootCommands = ''
         # Effectively a single-user installation of Nix, giving the user full
         # control over the Nix store. Needed for building the derivation this
-        # shell is for, but also in case one wants to use Nix inside the
-        # image
+        # shell is for, but also in case one wants to use Nix inside the image.
         mkdir -p ./nix/{store,var/nix} ./etc/nix
         chown -R ${toString uid}:${toString gid} ./nix ./etc/nix
 
-        # Gives the user control over the build directory
+        # Gives the user control over the build directory.
         mkdir -p .${sandboxBuildDir}
         chown -R ${toString uid}:${toString gid} .${sandboxBuildDir}
       '';
@@ -1403,7 +1407,8 @@ rec {
       config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars;
     };
 
-  # Wrapper around streamNixShellImage to build an image from the result
+  # Wrapper around `streamNixShellImage` to build an image from the result.
+  #
   # Docs: doc/build-helpers/images/dockertools.section.md
   # Tests: nixos/tests/docker-tools-nix-shell.nix
   buildNixShellImage =

From 43759f5f96c7eb6fcfc3a19e32433d5d35c9f373 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 7 Oct 2025 12:32:24 -0700
Subject: [PATCH 19/72] dockerTools: Document streamNixShellImage homeDirectory
 argument

Co-authored-by: commiterate <111539270+commiterate@users.noreply.github.com>
---
 pkgs/build-support/docker/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 2293ccae73f7..9cd3aa0a7c18 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1252,6 +1252,9 @@ rec {
       tag ? null,
       uid ? 1000,
       gid ? 1000,
+      # Default to `/build` instead of a non-existent `/homeless-shelter` for backwards compatibility.
+      #
+      # https://github.com/NixOS/nix/issues/6379
       homeDirectory ? "/build",
       shell ? bashInteractive + "/bin/bash",
       command ? null,

From db13980434f7a5e13a5dca8560e1f3fa5972d8f1 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 7 Oct 2025 09:58:50 -0700
Subject: [PATCH 20/72] dockerTools: Updated Docker and OCI spec links

Co-authored-by: commiterate <111539270+commiterate@users.noreply.github.com>
---
 doc/build-helpers/images/dockertools.section.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md
index fc6cc0fb4d35..f0d240098c41 100644
--- a/doc/build-helpers/images/dockertools.section.md
+++ b/doc/build-helpers/images/dockertools.section.md
@@ -1,6 +1,6 @@
 # pkgs.dockerTools {#sec-pkgs-dockerTools}
 
-`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
+`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md).
 Docker itself is not used to perform any of the operations done by these functions.
 
 ## buildImage {#ssec-pkgs-dockerTools-buildImage}
@@ -130,7 +130,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 `config` (Attribute Set or Null; _optional_)
 
 : Used to specify the configuration of the containers that will be started off the generated image.
-  Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
+  Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md#image-json-field-descriptions).
 
   _Default value:_ `null`.
 
@@ -138,7 +138,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 
 : Used to specify the image architecture.
   This is useful for multi-architecture builds that don't need cross compiling.
-  If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties), which should still be compatible with Docker.
+  If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/v1.1.1/config.md#properties), which should still be compatible with Docker.
   According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`.
 
   _Default value:_ the same value from `pkgs.go.GOARCH`.

From 7f92acd21570e0ba4558e88d782dffb2d53f30b8 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 12:41:49 +0800
Subject: [PATCH 21/72] tytools: 0.9.8 -> 0.9.9

---
 pkgs/development/embedded/tytools/default.nix | 42 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 14fcec5ac5ea..8f459c038c2a 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -2,32 +2,50 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  installShellFiles,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tytools";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "Koromix";
-    repo = "tytools";
-    rev = "v${version}";
-    sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
+    repo = "rygel";
+    tag = "tytools/${version}";
+    hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA=";
   };
 
   nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapQtAppsHook
+    installShellFiles
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    qt6.qtbase
   ];
 
+  buildPhase = ''
+    runHook preBuild
+
+    ./bootstrap.sh
+    ./felix -pFast tycmd tycommander tyuploader
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin bin/Fast/tycmd bin/Fast/tycommander bin/Fast/tyuploader
+    install -D --mode 0644 src/tytools/tycommander/tycommander_linux.desktop $out/share/applications/tycommander.desktop
+    install -D --mode 0644 src/tytools/tyuploader/tyuploader_linux.desktop $out/share/applications/tyuploader.desktop
+    install -D --mode 0644 src/tytools/assets/images/tycommander.png $out/share/icons/hicolor/512x512/apps/tycommander.png
+    install -D --mode 0644 src/tytools/assets/images/tyuploader.png $out/share/icons/hicolor/512x512/apps/tyuploader.png
+
+    runHook postInstall
+  '';
+
   meta = with lib; {
     description = "Collection of tools to manage Teensy boards";
     homepage = "https://koromix.dev/tytools";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7929573bb49d..879cdff644f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6935,7 +6935,7 @@ with pkgs;
     withTeensyduino = true;
   };
 
-  tytools = libsForQt5.callPackage ../development/embedded/tytools { };
+  tytools = callPackage ../development/embedded/tytools { };
 
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)

From 0b9d155f2b79b6486166189707f8f06b51c792ce Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 13:21:51 +0800
Subject: [PATCH 22/72] tytools: use finalAttrs

---
 pkgs/development/embedded/tytools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 8f459c038c2a..cbc30ece670c 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -6,14 +6,14 @@
   qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tytools";
   version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = "rygel";
-    tag = "tytools/${version}";
+    tag = "tytools/${finalAttrs.version}";
     hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA=";
   };
 
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ ahuzik ];
   };
-}
+})

From 519811a3ca78659c49955b9053a3c990dc59e37a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 13:22:55 +0800
Subject: [PATCH 23/72] tytools: remove with lib

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

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index cbc30ece670c..b69880f20822 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Collection of tools to manage Teensy boards";
     homepage = "https://koromix.dev/tytools";
-    license = licenses.unlicense;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ahuzik ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ahuzik ];
   };
 })

From ce48753bf8d7128be8a7fa8dc926dea06776e89d Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sun, 12 Oct 2025 09:20:27 +0200
Subject: [PATCH 24/72] minecraft-server: 1.21.9 -> 1.21.10

---
 pkgs/games/minecraft-servers/versions.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json
index 1999edadd99f..62fb430f46ab 100644
--- a/pkgs/games/minecraft-servers/versions.json
+++ b/pkgs/games/minecraft-servers/versions.json
@@ -1,8 +1,8 @@
 {
   "1.21": {
-    "sha1": "11e54c2081420a4d49db3007e66c80a22579ff2a",
-    "url": "https://piston-data.mojang.com/v1/objects/11e54c2081420a4d49db3007e66c80a22579ff2a/server.jar",
-    "version": "1.21.9",
+    "sha1": "95495a7f485eedd84ce928cef5e223b757d2f764",
+    "url": "https://piston-data.mojang.com/v1/objects/95495a7f485eedd84ce928cef5e223b757d2f764/server.jar",
+    "version": "1.21.10",
     "javaVersion": 21
   },
   "1.20": {

From 0d6db520925af3c43f99c56cae0bd1872b388cec Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:33:37 +0200
Subject: [PATCH 25/72] sbomnix: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix
index 51ae36a7c9e8..1ff605248c1f 100644
--- a/pkgs/by-name/sb/sbomnix/package.nix
+++ b/pkgs/by-name/sb/sbomnix/package.nix
@@ -29,14 +29,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "sbomnix";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "sbomnix";
     tag = "v${version}";
-    hash = "sha256-eN0dn2TNVEPSfIiJM0NA+HT1l4DnFq1mrSOOUF0h9xY=";
+    hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4=";
 
     # Remove documentation as it contains references to nix store
     postFetch = ''

From e59a3811b84adecd5ae1b455b92e57ead59ca183 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 04:32:34 +0000
Subject: [PATCH 26/72] vermin: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix
index 3fe5c63dc1e8..4946cf4ee9a3 100644
--- a/pkgs/by-name/ve/vermin/package.nix
+++ b/pkgs/by-name/ve/vermin/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "vermin";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netromdk";
     repo = "vermin";
     rev = "v${version}";
-    hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ=";
+    hash = "sha256-9rEJSj/dsP6fMXTfbIhTMwfZnmfq9wdAE4mHdAxag7Y=";
   };
 
   build-system = with python3Packages; [

From c97166492f2d605249e75ff20e6bf32ea03c4395 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 16 Oct 2025 16:34:20 -0400
Subject: [PATCH 27/72] python3Packages.jobspy: fix build

ZHF: https://hydra.nixos.org/build/309098765
Checking runtime dependencies for python_jobspy-1.1.79-py3-none-any.whl
  - regex<2025.0.0,>=2024.4.28 not satisfied by version 2025.7.34

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/python-modules/jobspy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/jobspy/default.nix b/pkgs/development/python-modules/jobspy/default.nix
index 55b2623a9935..1f7bb1e47613 100644
--- a/pkgs/development/python-modules/jobspy/default.nix
+++ b/pkgs/development/python-modules/jobspy/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "numpy"
     "markdownify"
+    "regex"
   ];
 
   build-system = [ poetry-core ];

From e48e6e0d6af4d3fc61afcd611754c61699f330ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Oct 2025 22:50:44 +0200
Subject: [PATCH 28/72] python3Packages.pyopen-wakeword: init at 1.0.1

---
 .../pyopen-wakeword/default.nix               | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyopen-wakeword/default.nix

diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix
new file mode 100644
index 000000000000..79114e2b493a
--- /dev/null
+++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  autoPatchelfHook,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyopen-wakeword";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rhasspy";
+    repo = "pyopen-wakeword";
+    tag = "v${version}";
+    hash = "sha256-LJ0pHP4nsTx3GPuWUwOwNuXR9tUKABqSHnLSvMlfm1Y=";
+  };
+
+  postPatch = ''
+    python ./script/copy_lib
+  '';
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pyopen_wakeword"
+  ];
+
+  meta = {
+    description = "Alternative Python library for openWakeWord";
+    homepage = "https://github.com/rhasspy/pyopen-wakeword";
+    changelog = "https://github.com/rhasspy/pyopen-wakeword/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+    # vendors prebuilt libtensorflowlite_c.{so,dll,dylib}
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5655cb7d68b2..82d27929cb51 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13693,6 +13693,8 @@ self: super: with self; {
 
   pyomo = callPackage ../development/python-modules/pyomo { };
 
+  pyopen-wakeword = callPackage ../development/python-modules/pyopen-wakeword/default.nix { };
+
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 
   pyopengl = callPackage ../development/python-modules/pyopengl {

From 648502b9e4f96e0b62b25947ca4ac15daa245e3d Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Fri, 17 Oct 2025 14:02:08 -0700
Subject: [PATCH 29/72] everest{,-bin}: init at 5806 (work around
 nixpkgs-update bot)

---
 .../{celeste/default.nix => celeste.nix}      | 13 +++++-----
 pkgs/by-name/ce/celestegame/package.nix       | 22 ++++++++--------
 .../everest-bin/package.nix}                  |  2 +-
 .../{ce/celestegame => ev}/everest/deps.json  | 20 +++++++--------
 .../default.nix => ev/everest/package.nix}    | 25 ++++++-------------
 .../{ce/celestegame => ev/everest}/update.sh  |  7 +++---
 6 files changed, 40 insertions(+), 49 deletions(-)
 rename pkgs/by-name/ce/celestegame/{celeste/default.nix => celeste.nix} (94%)
 rename pkgs/by-name/{ce/celestegame/everest-bin/default.nix => ev/everest-bin/package.nix} (92%)
 rename pkgs/by-name/{ce/celestegame => ev}/everest/deps.json (98%)
 rename pkgs/by-name/{ce/celestegame/everest/default.nix => ev/everest/package.nix} (80%)
 rename pkgs/by-name/{ce/celestegame => ev/everest}/update.sh (70%)

diff --git a/pkgs/by-name/ce/celestegame/celeste/default.nix b/pkgs/by-name/ce/celestegame/celeste.nix
similarity index 94%
rename from pkgs/by-name/ce/celestegame/celeste/default.nix
rename to pkgs/by-name/ce/celestegame/celeste.nix
index e56467ec5e04..7158be54b3a6 100644
--- a/pkgs/by-name/ce/celestegame/celeste/default.nix
+++ b/pkgs/by-name/ce/celestegame/celeste.nix
@@ -8,10 +8,11 @@
   unzip,
   yq,
   dotnet-runtime_8,
+  everest,
 
   executableName ? "Celeste",
   desktopItems ? null,
-  everest ? null,
+  withEverest ? false,
   overrideSrc ? null,
   writableDir ? null,
   launchFlags ? "",
@@ -36,12 +37,12 @@ let
   phome = "$out/lib/Celeste";
 
   launchFlags' =
-    if launchFlags != "" && everest == null then
+    if launchFlags != "" && !withEverest then
       lib.warn "launchFlags is useless without Everest." ""
     else
       launchFlags;
   launchEnv' =
-    if launchEnv != "" && everest == null then
+    if launchEnv != "" && !withEverest then
       lib.warn "launchEnv is useless without Everest." ""
     else
       ''
@@ -91,7 +92,7 @@ stdenvNoCC.mkDerivation {
     mkdir -p ${phome}
     unzip -q $src -d ${phome}
   ''
-  + lib.optionalString (everest != null) ''
+  + lib.optionalString withEverest ''
     cp -r ${everest}/* $out
     chmod -R +w ${phome} # Files copied from other derivations are not writable by default
 
@@ -137,7 +138,7 @@ stdenvNoCC.mkDerivation {
       # https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201
       # It is hardcoded that it launches Celeste instead of Celeste-unwrapped.
       # Therefore, we need to prevent it from restarting.
-      lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
+      lib.optionalString withEverest "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
     } --chdir ${phome}
 
     icon=$out/share/icons/hicolor/512x512/apps/Celeste.png
@@ -149,7 +150,7 @@ stdenvNoCC.mkDerivation {
   dontStrip = true;
   dontPatchShebangs = true;
   postFixup =
-    lib.optionalString (everest != null) ''
+    lib.optionalString withEverest ''
       rm -r ${phome}/Mods # Currently it is empty.
       ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome}
     ''
diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix
index dd9afc490cff..0339ed298f2b 100644
--- a/pkgs/by-name/ce/celestegame/package.nix
+++ b/pkgs/by-name/ce/celestegame/package.nix
@@ -7,10 +7,11 @@
   writeShellScript,
   autoPatchelfHook,
   runtimeShell,
+  # Override this to everest-bin if you want to use steam-run.
+  everest,
 
+  withEverest ? false,
   overrideSrc ? null,
-  # A package. Omit to build without Everest.
-  everest ? null,
   # If build with Everest, must set writableDir to the path of a writable dir
   # so that the mods can be installed there.
   # It must be an absolute path.
@@ -29,8 +30,8 @@
 
 # For those who would like to use steam-run or alike to launch Celeste
 # (useful when using the `olympus` package with its `celesteWrapper` argument overridden),
-# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest,
-# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest`
+# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`,
+# and if you want Everest, override `everest` to `everest-bin`
 # (steam-run cannot launch the latter for some currently unclear reason).
 # For those who would like to launch Celeste without the need of any additional wrapper like steam-run,
 # install `celestegame` with the `writableDir` argument overridden.
@@ -41,7 +42,7 @@ let
   executableName = "Celeste";
 
   writableDir' =
-    if writableDir == null && everest != null then
+    if writableDir == null && withEverest then
       lib.warn "writableDir is not set, so mods will not work." "/tmp"
     else
       writableDir;
@@ -49,10 +50,11 @@ let
 
   everestLogFilename = "everest-log.txt";
 
-  celeste = callPackage ./celeste {
+  celeste = callPackage ./celeste.nix {
     inherit
       executableName
       everest
+      withEverest
       overrideSrc
       launchFlags
       launchEnv
@@ -77,7 +79,7 @@ let
 in
 buildFHSEnv {
   inherit pname executableName;
-  version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}");
+  version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}");
 
   multiPkgs =
     pkgs:
@@ -175,7 +177,7 @@ buildFHSEnv {
       exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste"
       chmod +x "${writableDir'}/Celeste"
     ''
-    + lib.optionalString (everest != null) ''
+    + lib.optionalString withEverest ''
       mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs}
       touch "${writableDir'}/${everestLogFilename}"
 
@@ -203,10 +205,6 @@ buildFHSEnv {
   );
 
   passthru.celeste-unwrapped = celeste;
-  passthru.everest = callPackage ./everest { };
-  passthru.everest-bin = callPackage ./everest-bin { };
-
-  passthru.updateScript = ./update.sh;
 
   meta = {
     inherit (celeste.meta)
diff --git a/pkgs/by-name/ce/celestegame/everest-bin/default.nix b/pkgs/by-name/ev/everest-bin/package.nix
similarity index 92%
rename from pkgs/by-name/ce/celestegame/everest-bin/default.nix
rename to pkgs/by-name/ev/everest-bin/package.nix
index 19909557f3f2..80387bdfd538 100644
--- a/pkgs/by-name/ce/celestegame/everest-bin/default.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
     autoPatchelf ${phome}/MiniInstaller-linux
   '';
   meta = {
-    description = "Celeste mod loader";
+    description = "Celeste mod loader (don't install; use celestegame instead)";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
diff --git a/pkgs/by-name/ce/celestegame/everest/deps.json b/pkgs/by-name/ev/everest/deps.json
similarity index 98%
rename from pkgs/by-name/ce/celestegame/everest/deps.json
rename to pkgs/by-name/ev/everest/deps.json
index b969cfd4b5a4..9fc14832db35 100644
--- a/pkgs/by-name/ce/celestegame/everest/deps.json
+++ b/pkgs/by-name/ev/everest/deps.json
@@ -51,8 +51,8 @@
   },
   {
     "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "8.0.19",
-    "hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw="
+    "version": "8.0.20",
+    "hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4="
   },
   {
     "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
@@ -81,8 +81,8 @@
   },
   {
     "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4="
+    "version": "8.0.20",
+    "hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE="
   },
   {
     "pname": "Microsoft.Build.Tasks.Git",
@@ -166,8 +166,8 @@
   },
   {
     "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak="
+    "version": "8.0.20",
+    "hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU="
   },
   {
     "pname": "Microsoft.NETCore.App.Ref",
@@ -196,8 +196,8 @@
   },
   {
     "pname": "Microsoft.NETCore.App.Ref",
-    "version": "8.0.19",
-    "hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc="
+    "version": "8.0.20",
+    "hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM="
   },
   {
     "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
@@ -226,8 +226,8 @@
   },
   {
     "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM="
+    "version": "8.0.20",
+    "hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no="
   },
   {
     "pname": "Microsoft.NETCore.DotNetAppHost",
diff --git a/pkgs/by-name/ce/celestegame/everest/default.nix b/pkgs/by-name/ev/everest/package.nix
similarity index 80%
rename from pkgs/by-name/ce/celestegame/everest/default.nix
rename to pkgs/by-name/ev/everest/package.nix
index 5ef0ee79b589..f32b1ad20f42 100644
--- a/pkgs/by-name/ce/celestegame/everest/default.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -6,7 +6,6 @@
   dotnetCorePackages,
   autoPatchelfHook,
   mono,
-  git,
   icu,
 }:
 
@@ -23,14 +22,12 @@ buildDotnetModule {
     repo = "Everest";
     rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040";
     fetchSubmodules = true;
-    leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git
-    hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E=";
+    # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
+    # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
+    hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY=";
   };
 
-  nativeBuildInputs = [
-    git
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
     icu # For autoPatchelf
@@ -39,7 +36,7 @@ buildDotnetModule {
 
   postPatch = ''
     # MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application.
-    sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_8_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
+    sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_9_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
 
     # Moving files after publishing somehow doesn't work. Will do this manually in postInstall.
     sed -i 's|<Move.*/>||' Celeste.Mod.mm/Celeste.Mod.mm.csproj
@@ -48,14 +45,6 @@ buildDotnetModule {
   '';
 
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
-
-  preConfigure = ''
-    # Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link.
-    cd external/MonoMod
-    git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git
-    cd ../..
-  '';
-
   nugetDeps = ./deps.json;
 
   # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814
@@ -93,8 +82,10 @@ buildDotnetModule {
   dontPatchShebangs = true;
   dontAutoPatchelf = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
-    description = "Celeste mod loader";
+    description = "Celeste mod loader (don't install; use celestegame instead)";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
diff --git a/pkgs/by-name/ce/celestegame/update.sh b/pkgs/by-name/ev/everest/update.sh
similarity index 70%
rename from pkgs/by-name/ce/celestegame/update.sh
rename to pkgs/by-name/ev/everest/update.sh
index 2a1aefdc7675..569f64ffc08b 100755
--- a/pkgs/by-name/ce/celestegame/update.sh
+++ b/pkgs/by-name/ev/everest/update.sh
@@ -18,6 +18,7 @@ commit=$(echo "$latest" | jq -r .commit)
 version=$(echo "$latest" | jq -r .version)
 url=$(echo "$latest" | jq -r .mainDownload)
 
-update-source-version celestegame.passthru.everest $version --rev=$commit
-"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)"
-update-source-version celestegame.passthru.everest-bin $version "" $url
+update-source-version everest $version --rev=$commit
+echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json"
+"$(nix-build --attr everest.fetch-deps --no-out-link)"
+update-source-version everest-bin $version "" $url

From 57fc275c475514560677fe92d849645e7820c0b9 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 18 Sep 2025 00:19:15 +0800
Subject: [PATCH 30/72] sqlpage: 0.34.0 -> 0.38.0

---
 pkgs/by-name/sq/sqlpage/package.nix | 59 +++++++++++++++++------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index a43e0ed50178..cb20579d8b93 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -4,30 +4,35 @@
   fetchFromGitHub,
   pkg-config,
   sqlite,
+  unixODBC,
   zstd,
   fetchurl,
 }:
 
 let
   apexcharts = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js";
-    hash = "sha256-D19uY7rZtzJPVsZWYpvTOoY2hXmgfg+Mlaf+ALYHTgg=";
+    url = "https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js";
+    hash = "sha256-OtfH8igG4/XVMWV1155dCl8kGhruowISVUm7ZZF0VwU=";
   };
   tablerCss = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css";
-    hash = "sha256-aO+4ZoyNPZHCexbbprDYU9LCxshqszQA0SINFYfos3M=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css";
+    hash = "sha256-fvdQvRBUamldCxJ2etgEi9jz7F3n2u+xBn+dDao9HJo=";
+  };
+  tomSelectCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css";
+    hash = "sha256-vW5UjM/Ka9/jIY8I5s5KcudaTRWh/cCGE1ZUsrJvlI0=";
   };
   tablerVendorsCss = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css";
-    hash = "sha256-MyRhKcnB54KIswGkkyYXzEjx3YPVTKG7zVBf4wE20QY=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css";
+    hash = "sha256-/VPz9GtiH1Es1KGLY706UIayEEgG93B6aIBa3WzwKYc=";
   };
   tablerJs = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js";
-    hash = "sha256-QoGNzPGpYrbyDynQUZxmnFFT8MEk/nkUCLyp71avhqw=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js";
+    hash = "sha256-tgx2Fg6XYkV027jPEKvmrummSTtgCW/fwV3R3SvZnrk=";
   };
   tablerIcons = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg";
-    hash = "sha256-CD5BvpwW4Db6C7bxjaWUrA3kz17BDJKVU4bTwOPP1kE=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg";
+    hash = "sha256-pCPkhrx0GnPg5/EthJ7pLdMxb7wbYMJ0R7WchDcffpg=";
   };
   tomselect = fetchurl {
     url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js";
@@ -35,55 +40,59 @@ let
   };
 in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sqlpage";
-  version = "0.34.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "SQLpage";
-    tag = "v${version}";
-    hash = "sha256-cqMXdAXc46DbbONz1A6uf2Oo2Cu4sig6ntuLqYlihR4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-sIbEyW1/EuZuspU9pBOe6y9Ktwvz9ZNEsQ4CU/yU278=";
   };
 
   postPatch = ''
     substituteInPlace sqlpage/apexcharts.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js */' \
       "$(cat ${apexcharts})"
     substituteInPlace sqlpage/sqlpage.css \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css */' \
-      "$(cat ${tablerCss})"
-    substituteInPlace sqlpage/sqlpage.css \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css */' \
-      "$(cat ${tablerVendorsCss})"
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css */' \
+      "$(cat ${tablerCss})" \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css */' \
+      "$(cat ${tablerVendorsCss})" \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css */' \
+      "$(cat ${tomSelectCss})"
     substituteInPlace sqlpage/sqlpage.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js */' \
       "$(cat ${tablerJs})"
     substituteInPlace sqlpage/tabler-icons.svg \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg */' \
       "$(cat ${tablerIcons})"
     substituteInPlace sqlpage/tomselect.js \
       --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \
       "$(cat ${tomselect})"
   '';
 
-  cargoHash = "sha256-NUbCSYUTXN8glw94Lr/+Jj54PukRXFlzTxq0d7znjwA=";
+  cargoHash = "sha256-uWdEzuEKxN50OM40i/BedgfoWf3oijks8tM5bs7qUao=";
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     sqlite
+    unixODBC
     zstd
   ];
 
   env.ZSTD_SYS_USE_PKG_CONFIG = true;
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
     homepage = "https://github.com/lovasoa/SQLpage";
-    changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/lovasoa/SQLpage/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "sqlpage";
   };
-}
+})

From 5f3dc280fcac2463d31ddb74b84c9a4545c3213f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 02:41:34 +0000
Subject: [PATCH 31/72] zeno: 2.0.15 -> 2.0.17

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

diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix
index fb0eee22c3cf..f553c0326ce3 100644
--- a/pkgs/by-name/ze/zeno/package.nix
+++ b/pkgs/by-name/ze/zeno/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "zeno";
-  version = "2.0.15";
+  version = "2.0.17";
 
   src = fetchFromGitHub {
     owner = "internetarchive";
     repo = "Zeno";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NLvpPM5AQx4svAFrZ+be+Xr0bErOg3Q8y2YxdpX9lYs=";
+    hash = "sha256-RPWvn4FEK1Fpkvvud/1CaSFFvTV1zxjzvXbBjqWRCIQ=";
   };
 
-  vendorHash = "sha256-sUd4rRq5KEbdj5Z6igmDeN1E2q9NXgyed0F4hW8De6E=";
+  vendorHash = "sha256-Zi7wmT72f8KJHkysGg8rWTUk8iMjlYDGeZUFvKmtQtk=";
 
   env.CGO_ENABLED = true;
   ldFlags = [

From 37f92ce51ef5c383fd839fac8a34f0bb8d6ce11a Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 18 Oct 2025 09:38:38 +0200
Subject: [PATCH 32/72] readest: 0.9.87 -> 0.9.88

Changelog: https://github.com/readest/readest/releases/tag/v0.9.88
Diff: https://github.com/readest/readest/compare/v0.9.87...v0.9.88
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 5bb9c95fb875..d6f1b65ee125 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.87";
+  version = "0.9.88";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-icTltmxgquOpWByo+7ZTIvD2WVuf+X6vF1ghmgs1pH0=";
+    hash = "sha256-z9bRRXQkXsqZRW1EPj0c8A9ZHWytYYtP6o40K86+Fio=";
     fetchSubmodules = true;
   };
 

From d2a3266ac88a2b72f347834576ed8129ea1b2487 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 08:03:35 +0000
Subject: [PATCH 33/72] peazip: 10.6.1 -> 10.7.0

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

diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index 6604103f89e9..3c85c4259532 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "peazip";
-  version = "10.6.1";
+  version = "10.7.0";
 
   src = fetchFromGitHub {
     owner = "peazip";
     repo = "peazip";
     rev = finalAttrs.version;
-    hash = "sha256-y+q4S3XHkN2dvHMaRxPQwK9l9LaA5rGvrzzZ+x76qUQ=";
+    hash = "sha256-JVSr4ztDHjJF+vzhaMSSAWt6PEtxNzfCRBQBlfLA4xs=";
   };
   sourceRoot = "${finalAttrs.src.name}/peazip-sources";
 

From e47455f51ddd99d4b031d85adfd7e297e3c2efa1 Mon Sep 17 00:00:00 2001
From: d068328 <hans-joachim.kliemeck@sap.com>
Date: Sat, 18 Oct 2025 20:41:01 +0000
Subject: [PATCH 34/72] Revert "stdenv: pURL implementation (#421125)"

This reverts commit 54271156702fc3a3f5d156df567a2a4a274bac6b, reversing
changes made to 88ee2ac331edc3ce9f9df92aaf824592473ed868.
---
 doc/redirects.json                            | 12 -----
 doc/release-notes/rl-2511.section.md          |  2 -
 doc/stdenv/meta.chapter.md                    | 19 -------
 pkgs/build-support/fetchgit/default.nix       | 13 +----
 pkgs/build-support/fetchgithub/default.nix    | 19 +------
 pkgs/build-support/fetchpypi/default.nix      | 16 +-----
 pkgs/by-name/jq/jq/package.nix                |  4 --
 pkgs/by-name/po/popt/package.nix              |  4 --
 pkgs/development/ruby-modules/gem/default.nix |  7 ---
 pkgs/stdenv/generic/check-meta.nix            | 50 ++-----------------
 10 files changed, 7 insertions(+), 139 deletions(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index 6a3d3e5138c8..46ccacdb3c17 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -237,9 +237,6 @@
   "sec-meta-identifiers-cpe": [
     "index.html#sec-meta-identifiers-cpe"
   ],
-  "sec-meta-identifiers-purl": [
-    "index.html#sec-meta-identifiers-purl"
-  ],
   "sec-modify-via-packageOverrides": [
     "index.html#sec-modify-via-packageOverrides"
   ],
@@ -664,15 +661,6 @@
   "var-meta-identifiers-possibleCPEs": [
     "index.html#var-meta-identifiers-possibleCPEs"
   ],
-  "var-meta-identifiers-purl": [
-    "index.html#var-meta-identifiers-purl"
-  ],
-  "var-meta-identifiers-purlParts": [
-    "index.html#var-meta-identifiers-purlParts"
-  ],
-  "var-meta-identifiers-purls": [
-    "index.html#var-meta-identifiers-purls"
-  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5136dea3355d..530350a032ad 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -238,8 +238,6 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Metadata identifier purl (Package URL, https://github.com/package-url/purl-spec) has been added for fetchgit, fetchpypi and fetchFromGithub fetchers and mkDerivation has been adjusted to reuse these informations. Package URL's enables a reliable identification and locatization of software packages. Maintainers of derivations using the adopted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. Maintainers using fetchurl for `drv.src` are urged to adopt their `drv.meta.identifiers.purlParts` for proper identification.
-
 - Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
 - Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`.
 
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index 55727bb84b8b..947009869ff1 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -319,22 +319,3 @@ A readonly attribute that concatenates all CPE parts in one string.
 #### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
 
 A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
-
-### Package URL {#sec-meta-identifiers-purl}
-
-[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages. Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management. Package URL's default to the mkDerivation.src, as the original consumed software package is the single point of truth.
-
-#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts}
-
-This attribute contains an attribute set of all parts of the PURL for this package.
-
-* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided
-* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md)
-
-#### `meta.identifiers.purl` {#var-meta-identifiers-purl}
-
-An extendable attribute which is built based on purlParts. It is the main identifier, consumers should consider using the PURL's list interface to be prepared for edge cases.
-
-#### `meta.identifiers.purls` {#var-meta-identifiers-purls}
-
-An extendable attribute list which defaults to a single element equal to the main PURL. It provides an interface for additional identifiers of mkDerivation.src and / or vendored dependencies inside mkDerivation.src, which maintainers can conciously decide to use on top. Identifiers different to the default src identifier are not recommended by default as they might cause maintenance overhead or may diverge (e.g. differences between source distribution pkg:github and binary distribution like pkg:pypi).
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 8e0c31334263..45c7599b1c74 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -190,18 +190,7 @@ lib.makeOverridable (
             "FETCHGIT_HTTP_PROXIES"
           ];
 
-        inherit preferLocalBuild allowedRequisites;
-
-        meta = meta // {
-          identifiers = {
-            purlParts = {
-              type = "generic";
-              # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
-              spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
-            };
-          }
-          // meta.identifiers or { };
-        };
+        inherit preferLocalBuild meta allowedRequisites;
 
         passthru = {
           gitRepoUrl = url;
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index a1235cd6e836..dfe210f32c41 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -47,28 +47,11 @@ lib.makeOverridable (
       meta
       // {
         homepage = meta.homepage or baseUrl;
-        identifiers = {
-          purlParts =
-            if githubBase == "github.com" then
-              {
-                type = "github";
-                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md
-                spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}";
-              }
-            else
-              {
-                type = "generic";
-                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
-                spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}";
-              };
-        }
-        // meta.identifiers or { };
       }
       // lib.optionalAttrs (position != null) {
         # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
         position = "${position.file}:${toString position.line}";
       };
-
     passthruAttrs = removeAttrs args [
       "owner"
       "repo"
@@ -172,12 +155,12 @@ lib.makeOverridable (
       // passthruAttrs
       // {
         inherit name;
-        meta = newMeta;
       };
   in
 
   fetcher fetcherArgs
   // {
+    meta = newMeta;
     inherit owner repo tag;
     rev = revWithTag;
   }
diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix
index 2d4f7e5a6391..d291c57429c1 100644
--- a/pkgs/build-support/fetchpypi/default.nix
+++ b/pkgs/build-support/fetchpypi/default.nix
@@ -51,8 +51,6 @@ makeOverridable (
     format ? "setuptools",
     sha256 ? "",
     hash ? "",
-    pname,
-    version,
     ...
   }@attrs:
   let
@@ -62,20 +60,8 @@ makeOverridable (
         "hash"
       ]
     );
-    meta = {
-      identifiers.purlParts = {
-        type = "pypi";
-        # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md
-        spec = "${pname}@${version}";
-      };
-    };
   in
   fetchurl {
-    inherit
-      url
-      sha256
-      hash
-      meta
-      ;
+    inherit url sha256 hash;
   }
 )
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 5ad75de67faf..b2a0941a79fe 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -134,9 +134,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     mainProgram = "jq";
-    identifiers.purlParts = {
-      type = "github";
-      spec = "jqlang/jq@jq-${finalAttrs.version}";
-    };
   };
 })
diff --git a/pkgs/by-name/po/popt/package.nix b/pkgs/by-name/po/popt/package.nix
index c40e17228f54..eb9e4f3685ed 100644
--- a/pkgs/by-name/po/popt/package.nix
+++ b/pkgs/by-name/po/popt/package.nix
@@ -49,9 +49,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ qyliss ];
     license = licenses.mit;
     platforms = platforms.unix;
-    identifiers.purlParts = {
-      type = "github";
-      spec = "rpm-software-management/popt@popt-${version}-release";
-    };
   };
 }
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index f6a9e25bf042..10ea06c415bd 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -77,13 +77,6 @@ lib.makeOverridable (
               attrs.source.remotes or [ "https://rubygems.org" ]
             );
             inherit (attrs.source) sha256;
-            meta = {
-              identifiers.purlParts = {
-                type = "gem";
-                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/gem-definition.md
-                spec = "${gemName}@${version}?platform=${platform}";
-              };
-            };
           }
         else if type == "git" then
           fetchgit {
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 3a35b750d5f3..1a3e65ea650d 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -34,8 +34,6 @@ let
     toList
     isList
     elem
-    flatten
-    filter
     ;
 
   inherit (lib.meta)
@@ -301,7 +299,7 @@ let
     let
       expectedOutputs = attrs.meta.outputsToInstall or [ ];
       actualOutputs = attrs.outputs or [ "out" ];
-      missingOutputs = filter (output: !builtins.elem output actualOutputs) expectedOutputs;
+      missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs;
     in
     ''
       The package ${getNameWithVersion attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs}
@@ -477,7 +475,7 @@ let
     let
       expectedOutputs = attrs.meta.outputsToInstall or [ ];
       actualOutputs = attrs.outputs or [ "out" ];
-      missingOutputs = filter (output: !builtins.elem output actualOutputs) expectedOutputs;
+      missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs;
     in
     if config.checkMeta then builtins.length missingOutputs > 0 else false;
 
@@ -712,54 +710,14 @@ let
                   cpe = makeCPE guessedParts;
                 }
               ) possibleCPEPartsFuns;
-
-          purlParts = attrs.meta.identifiers.purlParts or { };
-          purlPartsFormatted =
-            if purlParts ? type && purlParts ? spec then "pkg:${purlParts.type}/${purlParts.spec}" else null;
-
-          # search for a PURL in the following order:
-          purl =
-            # 1) locally set through API
-            if purlPartsFormatted != null then
-              purlPartsFormatted
-            else
-              # 2) locally overwritten through meta.identifiers.purl
-              (attrs.src.meta.identifiers.purl or null);
-
-          # search for a PURL in the following order:
-          purls =
-            # 1) locally overwritten through meta.identifiers.purls (e.g. extension of list)
-            attrs.meta.identifiers.purls or (
-              # 2) locally set through API
-              if purlPartsFormatted != null then
-                [ purlPartsFormatted ]
-              else
-                # 3) src.meta.PURL
-                (attrs.src.meta.identifiers.purls or (
-                  # 4) srcs.meta.PURL
-                  if !attrs ? srcs then
-                    [ ]
-                  else if isList attrs.srcs then
-                    concatMap (drv: drv.meta.identifiers.purls or [ ]) attrs.srcs
-                  else
-                    attrs.srcs.meta.identifiers.purls or [ ]
-                )
-                )
-            );
-
           v1 = {
-            inherit
-              cpeParts
-              possibleCPEs
-              purls
-              ;
+            inherit cpeParts possibleCPEs;
             ${if cpe != null then "cpe" else null} = cpe;
-            ${if purl != null then "purl" else null} = purl;
           };
         in
         v1
         // {
-          inherit v1 purlParts;
+          inherit v1;
         };
 
       # Expose the result of the checks for everyone to see.

From b081b1b1c50cfe93fb82a88746403df8d1f05bb5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 23:24:18 +0200
Subject: [PATCH 35/72] thunderbird-bin: throw on unsupported system

---
 .../networking/mailreaders/thunderbird-bin/default.nix        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 16602868fda4..d262481af354 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -45,7 +45,9 @@ let
     x86_64-darwin = "mac";
   };
 
-  arch = mozillaPlatforms.${stdenv.hostPlatform.system};
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+
+  arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem;
 
   isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix;
 

From 4c9c8457fd9e5c1b1434a83a598e831316905631 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 22:01:23 +0000
Subject: [PATCH 36/72] python3Packages.pbs-installer: 2025.10.10 -> 2025.10.14

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

diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index ce050e44956a..b2314cb041ca 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pbs-installer";
-  version = "2025.10.10";
+  version = "2025.10.14";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "frostming";
     repo = "pbs-installer";
     tag = version;
-    hash = "sha256-YqZPCzmmvcsP4tnYZS+nFZ9p+lnLtz/ivGhp2+4X3vU=";
+    hash = "sha256-Af3H8DWnDhAyiOIOHV7WYXO9fUkQW3eWkkFiZMkgJFw=";
   };
 
   build-system = [ pdm-backend ];

From 0afa0fafce2489f8641d9a8b656487e218ff74ec Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:50:37 +0800
Subject: [PATCH 37/72] ramalama: 0.12.3 -> 0.13.0

---
 pkgs/by-name/ra/ramalama/package.nix | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix
index 8b47d46fa573..07f493703910 100644
--- a/pkgs/by-name/ra/ramalama/package.nix
+++ b/pkgs/by-name/ra/ramalama/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   go-md2man,
 
-  # TODO: switch to llama-cpp-vulkan when moltenvk is upgraded to 1.3.0:
-  # https://github.com/NixOS/nixpkgs/pull/434130
-  llama-cpp,
+  llama-cpp-vulkan,
   podman,
   withPodman ? true,
 
@@ -14,32 +12,38 @@
   ramalama,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "ramalama";
-  version = "0.12.3";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "ramalama";
     tag = "v${version}";
-    hash = "sha256-PnuAPQ9RF7IRnmHtUrwDRXIKEzZBDEU2mWfG5FyfY0c=";
+    hash = "sha256-S4TZN+vExZ/5KJOgkhwlX0p+xPDI6tjmS2WDWgXzDOI=";
   };
 
-  build-system = with python3.pkgs; [
+  build-system = with python3Packages; [
     setuptools
     wheel
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     argcomplete
     pyyaml
+    jsonschema
+    jinja2
   ];
 
   nativeBuildInputs = [
     go-md2man
   ];
 
+  postPatch = ''
+    substituteInPlace ramalama/config.py --replace-fail "{sys.prefix}" "$out"
+  '';
+
   preBuild = ''
     make docs
   '';
@@ -49,11 +53,11 @@ python3.pkgs.buildPythonApplication rec {
       --prefix PATH : ${
         lib.makeBinPath (
           [
-            llama-cpp
+            llama-cpp-vulkan
             podman
           ]
           ++ (
-            with python3.pkgs;
+            with python3Packages;
             [
               huggingface-hub
             ]
@@ -68,13 +72,13 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [
-    python3.pkgs.pytestCheckHook
+    python3Packages.pytestCheckHook
+    podman
   ];
 
-  # Enable when https://github.com/containers/ramalama/pull/1891 is released
-  disabledTests = [
-    "test_ollama_model_pull"
-  ];
+  preCheck = ''
+    export PATH="$out/bin:$PATH"
+  '';
 
   passthru = {
     tests = {

From fe1bd33ef92f130ddfbd8ff711e5a649ee1e06f3 Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@protonmail.com>
Date: Sun, 19 Oct 2025 11:38:08 +0200
Subject: [PATCH 38/72] kdePackages.kirigami-gallery: Set mainProgram to
 kirigami2gallery

---
 pkgs/kde/gear/kirigami-gallery/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix
index bb739046baca..6be7d3fcdd89 100644
--- a/pkgs/kde/gear/kirigami-gallery/default.nix
+++ b/pkgs/kde/gear/kirigami-gallery/default.nix
@@ -10,4 +10,6 @@ mkKdeDerivation {
     qtsvg
     qttools
   ];
+
+  meta.mainProgram = "kirigami2gallery";
 }

From 9eb1f89232e6fad394133d00444dce27b65ef6a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Oct 2025 12:21:53 +0200
Subject: [PATCH 39/72] python313Packages.pbs-installer: remove disabled

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

diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index b2314cb041ca..af6359e62365 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pdm-backend,
   httpx,
   zstandard,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "2025.10.14";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "frostming";
     repo = "pbs-installer";

From b6a2e71f669412d5c858fadd4601b916ea36c3dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 19 Oct 2025 12:23:49 +0200
Subject: [PATCH 40/72] grype: 0.101.0 -> 0.101.1

Diff: https://github.com/anchore/grype/compare/v0.101.0...v0.101.1

Changelog: https://github.com/anchore/grype/releases/tag/v0.101.1
---
 pkgs/by-name/gr/grype/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 9debe2a11bab..3828a083b174 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.101.0";
+  version = "0.101.1";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20nl2mfU5PeEtUwyOUrKZ58nHyVvxZol4M37IPabx3A=";
+    hash = "sha256-EbRkK8qTEP1UICqHs4V4xteh/bUh3WxlRihPtUcJw6M=";
     # 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;
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-VbJKdd04S1aXXnflEZTtpIh4eJFe17WXZXqWDDo9YiI=";
+  vendorHash = "sha256-Zqtd10KrmAH5yOvKnCl8w8neLsQPylr4lFAU5OTm7Kk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 7fb2167a0f2c21ac7e0debbce1090f0dbf34f1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sat, 18 Oct 2025 10:35:28 +0200
Subject: [PATCH 41/72] grype: add missing test input

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

diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 3828a083b174..7511cfb7626f 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -6,6 +6,7 @@
   git,
   installShellFiles,
   openssl,
+  net-tools,
 }:
 
 buildGoModule (finalAttrs: {
@@ -38,6 +39,7 @@ buildGoModule (finalAttrs: {
   nativeCheckInputs = [
     git
     openssl
+    net-tools
   ];
 
   subPackages = [ "cmd/grype" ];

From a3f84726688e09f70d39ac49cdf0226297a1dff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 11:41:36 +0000
Subject: [PATCH 42/72] vscode-extensions.visualjj.visualjj: 0.17.1 -> 0.18.0

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index bcf31ed0bbfc..00f10447ca60 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-Jqi9NTrKSweDpZ+YtXeiH77XPRgsKVJXlA4Fds7m8T0=";
+          hash = "sha256-WhCUOHS2y1NNTEs3Oo6lHz1YcQmj/9zcLFNi7dIO2Hs=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-8inRXcCkKbEm3D6+o5pEyUkkjj+58CgIGufHG5Qsl5Y=";
+          hash = "sha256-M3ZC9lq0hVoBaxzaOuzeKRy7iAPsPgi+2IHU0KaujmI=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-sTwJVM6XxbT2JAJWqAhMA/GJvP1GOnMfIezj+MMaiJ8=";
+          hash = "sha256-ElqAiZGulYiSVay74UC04C0lKSHo1AwhtE05To8ir84=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-eJ/hKySxQDEh1hr36BAk0D7K6t4f9qj54T2Fc1Eq1t0=";
+          hash = "sha256-x7sZdxjouRBuCz5po+54HJ5Cdc9oEk5REplfQmNdvB4=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.17.1";
+      version = "0.18.0";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 2ceed4023bb6668b076b44ef9dc15a0f3f49b850 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 19 Oct 2025 19:42:13 +0800
Subject: [PATCH 43/72] pgroll: modernize

---
 pkgs/by-name/pg/pgroll/package.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index 424762e6fb1b..6e0e7ecd963c 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -4,16 +4,17 @@
   lib,
   libpg_query,
   xxHash,
+  testers,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "pgroll";
   version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "xataio";
     repo = "pgroll";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OqBgFeXpvoImoPMKHBCvsPQGhHSBZuNNMLh2/3DPPYo=";
   };
 
@@ -21,16 +22,29 @@ buildGoModule rec {
 
   vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw=";
 
-  excludedPackages = [ "dev" ];
+  excludedPackages = [
+    "dev"
+    "tools"
+  ];
 
   buildInputs = [
     libpg_query
     xxHash
   ];
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/xataio/pgroll/cmd.Version=${finalAttrs.version}"
+  ];
+
   # Tests require a running docker daemon
   doCheck = false;
 
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+  };
+
   meta = {
     description = "PostgreSQL zero-downtime migrations made easy";
     license = lib.licenses.asl20;
@@ -38,4 +52,4 @@ buildGoModule rec {
     homepage = "https://github.com/xataio/pgroll";
     maintainers = with lib.maintainers; [ ilyakooo0 ];
   };
-}
+})

From 3215f8581438b6747d85424621a64643753772e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 12:45:50 +0000
Subject: [PATCH 44/72] odhcp6c: 0-unstable-2025-10-03 -> 0-unstable-2025-10-17

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

diff --git a/pkgs/by-name/od/odhcp6c/package.nix b/pkgs/by-name/od/odhcp6c/package.nix
index 96326237c4e6..c156d412dbbd 100644
--- a/pkgs/by-name/od/odhcp6c/package.nix
+++ b/pkgs/by-name/od/odhcp6c/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation {
   pname = "odhcp6c";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-17";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/odhcp6c.git";
-    rev = "96d9e0b6e81330c61c954c6bc73a2302276fcda1";
-    hash = "sha256-EhkzSKf1t4MrGCN5oC1h0QJiY9w8VhMsa/jor4lEvD4=";
+    rev = "d7afeea2b9650c64fcf915cbb3369577247b96ed";
+    hash = "sha256-6L/yY8u5JBw1oywj2pg+0rW2397KBNAejrg5VKpYxLw=";
   };
 
   nativeBuildInputs = [ cmake ];

From fe033ab2252010325474a3661a3055cadede8ae1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Oct 2025 14:54:28 +0200
Subject: [PATCH 45/72] synadm: 0.48 -> 0.49.2

https://codeberg.org/synadm/synadm/releases/tag/v0.49
https://codeberg.org/synadm/synadm/releases/tag/v0.49.1
https://codeberg.org/synadm/synadm/releases/tag/v0.49.2
---
 pkgs/by-name/sy/synadm/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sy/synadm/package.nix b/pkgs/by-name/sy/synadm/package.nix
index 9abb85fb09bd..6cfcd2bcc48d 100644
--- a/pkgs/by-name/sy/synadm/package.nix
+++ b/pkgs/by-name/sy/synadm/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "synadm";
-  version = "0.48";
+  version = "0.49.2";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     owner = "synadm";
     repo = "synadm";
     tag = "v${version}";
-    hash = "sha256-6t4CXXt22/yR0gIxSsM/r+zJQeoKz5q/Ifg8PLNojLI=";
+    hash = "sha256-Nh4pzOXBXwbhq49Hq8vmPi6AS6N/tRqDBjIVKH3Gh6s=";
   };
 
   build-system = [ python3Packages.setuptools ];
@@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
     tabulate
     pyyaml
     requests
+    requests-unixsocket
   ];
 
   checkPhase = ''

From 1ab813c127bea90db94f96d81c2e2b4f0fc5d84a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 13:01:10 +0000
Subject: [PATCH 46/72] iosevka-bin: 33.3.1 -> 33.3.3

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 3ef3cbd5f879..9dd02abede27 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.3.1";
+  version = "33.3.3";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index a8d4c8cdd651..79050813b83e 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0p8f9z9ribn9zvbr0klg9q37w7z4v6r6gwz9kqc3cml6q0x4lv2n";
-  IosevkaAile = "1f18pnbp8vnsjzax43gijc95z1nx54l0vc2lqiqm9xvddhpam7ww";
-  IosevkaCurly = "01gzyqlg6n0fzi5kvwrz1slcr8pkdlg6yd61i059kzmw9sw8g7m5";
-  IosevkaCurlySlab = "0vxc3mb7ncvm4x7flrvlfkw1lw2pcv50344ias97j96gzaafr0mr";
-  IosevkaEtoile = "1qalf37fm3lxbg3y8ias92vyz19rhf20rjyn7zq9prmrx412sglv";
-  IosevkaSlab = "1kggrmkga333jknycbr27bziwaa6maw83wrkh60w7a78mp32a2fc";
-  IosevkaSS01 = "0yaly4pkilrrd7knqvv43976rnjvp2s2wd4c8zczc4fhmjw2b7j6";
-  IosevkaSS02 = "0h1hdynqfqmw6v49qnvspqw6y2ihqysrkcivjc9fvx4w876clr86";
-  IosevkaSS03 = "1mvn6ix5944kxmr1byx200ydzm9ny9qafv14nmssfqx7rhn71r29";
-  IosevkaSS04 = "0x0sfbd4g6rb5vndddxvqvjjhr43dnbywybb8n67sh40x22jcf5b";
-  IosevkaSS05 = "0fsscv5z9dn7934547cgq5082v25n94kcx8zdk5n99n7mnbc7gfy";
-  IosevkaSS06 = "1yyhvnxqbdmry6knd8jakz0jqhnphfip2a4rgb5l07vq1nrcb566";
-  IosevkaSS07 = "1w50ma10fzw4gy6im009i20dgvxlj3m4iasmj074k5mxfmazjcyv";
-  IosevkaSS08 = "1mh7h8dlk02rijlxbml5zpha2hvkhvir7j8hk6fd0pihzj3ybn0i";
-  IosevkaSS09 = "08mxsa67gpdzygj9vr0m6a6pz397ffbg77rfik5c46gqknd2y7mf";
-  IosevkaSS10 = "1k6xks2q7szmz3zsy9dd6bn7j6g60hf1whvp3c6j65m5rhi87z6v";
-  IosevkaSS11 = "1r8fk9m32kakclxxxingy6k1dwgvfizr0c68miqp2g6189mkz1lw";
-  IosevkaSS12 = "0amgwwq0yik9xhh7d12fmn7inimqzpmsmcjwnw1dsghrvf0mwdsa";
-  IosevkaSS13 = "1agaihxccj0k5wg7bd1lm5ix0mwdhj387i2wypc76q6az116a4ln";
-  IosevkaSS14 = "106fw5d3kqc389cnvcv00zfcfbzvavfym8mjhqrn0h23fpfy5na2";
-  IosevkaSS15 = "15rjgg8bi2ichisg5ri9hqr5rikfcvwdx2smw93vazn3shzzkn45";
-  IosevkaSS16 = "0ipdh5avia6gj1pb78ihhfydg9dn334kv0pir9h136f0bwxibjp0";
-  IosevkaSS17 = "08grkzyd4ssjzkkyljzc2mlnhrchxbw7y9425sgz8cq026f5cvd5";
-  IosevkaSS18 = "1052s4ijqhvb4h81nvx6m9sdlk3d51n7zqr0cr78ydl13g1qvdh9";
-  SGr-Iosevka = "0p7nd7x4zq4bfhdrvjhn0j5y6w217w8nlai9nc0flrwjh4qf14ih";
-  SGr-IosevkaCurly = "1qjv7zrr7113v2qq0fnkrxcslv2wy0x5nv8mjal5b710q9gppxfr";
-  SGr-IosevkaCurlySlab = "0bavl9z4j9n7hxch8acw89j8f070vwir1f15af1xb76q09ihi5r2";
-  SGr-IosevkaFixed = "0kgyn4da6a58fa6k9aqm1ndzlzjpbwip13pyb60jasrqf7wqm66z";
-  SGr-IosevkaFixedCurly = "1mzszgwp3xbkjvhqlsmwrr6mhv3czmsiz4vgxr615sfhyl24cjb7";
-  SGr-IosevkaFixedCurlySlab = "1dzww7084clp8ivsd74r638rh41zw6b5la0fif4xz01kvsz67wc6";
-  SGr-IosevkaFixedSlab = "11cc5gm7a69693b9j0lckbvwn0pnfhklrdvqa719m43d39wqhgas";
-  SGr-IosevkaFixedSS01 = "0bh62hlxc05wd33mf0ql3f8dxc6xriv4jzr8qcz6a64qiy12j6c0";
-  SGr-IosevkaFixedSS02 = "1z3yy7zv1iml3d2dj418aias4wgh4sk07gk6fsk068mxg2mlcpys";
-  SGr-IosevkaFixedSS03 = "1fdp7897m039r6qj40jq17gn602cfx5l9jkgfh29ghk7l6kh0za5";
-  SGr-IosevkaFixedSS04 = "0gamh519mrw4qvzs28r4gpsyfqwibbvwckfcsmm4i7g9idnwmmwn";
-  SGr-IosevkaFixedSS05 = "09bp6nxcc54s2g0s4icd1zlcjar87hqdyp2chys5agk69l1j9p2a";
-  SGr-IosevkaFixedSS06 = "160di7qxp8blyzjnakdqvkxy2dpiy7fxc5518hnk0jswg2d90ydp";
-  SGr-IosevkaFixedSS07 = "004hk72g086xhkb0rrpmk5kxf032j24is2r2lbp9hizrmw9x3dl0";
-  SGr-IosevkaFixedSS08 = "0i7k3bissz76idgwf5cpbk3s0ynhlgza07v3lwyvyxhgvyj9hp56";
-  SGr-IosevkaFixedSS09 = "1lih2kq9gnigchidibpdd2ym12hjpjlb42fbfzdc1s9fs7700d8i";
-  SGr-IosevkaFixedSS10 = "04paymx35g3dii4cgnsljdxi8778vn60jkqjx28bx5lvd9hkzc9k";
-  SGr-IosevkaFixedSS11 = "023mkvqvajpm59q5807snwyc9mqqvsmrzxa33mrgr0v2qs6zxsnm";
-  SGr-IosevkaFixedSS12 = "01d55hi9y5y1szd39ij7hiswkyzazb9k97wsh09sdx0442d1aydc";
-  SGr-IosevkaFixedSS13 = "1dxyj0pqxs4795ksmaw56dndj8s6s9isv6kmj8520cl6wmrgm5k7";
-  SGr-IosevkaFixedSS14 = "0hl6lmndcf13jm16n0hxn3w0qf4abddrmhq7im9l2zsplm241dz0";
-  SGr-IosevkaFixedSS15 = "1sz33rnxx288hasd0g3y2cid6v8vck8yrwallhpbs81sraj50nn9";
-  SGr-IosevkaFixedSS16 = "0fx6fwzmcx48ndfly0a7kks2ml6v0hfkvqm5qijwaxysz5cbzk4z";
-  SGr-IosevkaFixedSS17 = "03vyl438fx8zqdslhxsy2q86rkgl0dccvvy2hk7jniaswnxj5p69";
-  SGr-IosevkaFixedSS18 = "02z2m7qn9qkrkk9c9nk14d56j4kl8advpkgajmxn5nzlp35a4pc8";
-  SGr-IosevkaSlab = "1m06ylahl5ql2918cn44nr541lfaipyry4ihm059xx0skmm2qk6p";
-  SGr-IosevkaSS01 = "1z3ba34q3m8p6yp1qvsrh1hqvk263gg2dd0vz39nz6slm2h6qb9r";
-  SGr-IosevkaSS02 = "1wxflbh1b03q4dqqf0snr7w39vmnm26bpnpmx99ms7lj5p3390c1";
-  SGr-IosevkaSS03 = "128lj2kbc0kskq8ylr8713bh49rd3ms63vpgbgp82dnhfza5ql76";
-  SGr-IosevkaSS04 = "1gr8y0p1sqg87v2g6wk6ysbj88m3jmqbx2bczl1piwbl32mccci0";
-  SGr-IosevkaSS05 = "1g36pzz30jd1zihrwvkpm77cql34xk2bv4xangf19imnibp753dl";
-  SGr-IosevkaSS06 = "1aacbijz06rgphbxlv68ds3i8qkw32y9sa4a4fg2fni0naq0c05w";
-  SGr-IosevkaSS07 = "0kyg9cp95rw7c4wlpssf0y71c9nbg9nm5y3bzjh48mn5hgpzp762";
-  SGr-IosevkaSS08 = "0k6siq14r5gka50x99cily3v39slj9by2cxlsjd8nnvax3ar59ys";
-  SGr-IosevkaSS09 = "1gsxbi28jw21915aqn6qfydxh8f0xkxgnh6fmwk8qxb73bqwh9nf";
-  SGr-IosevkaSS10 = "0jm5mr0mf30qkfwqff7lgzfa25scafgfkg7w697qb6qz3bvka09n";
-  SGr-IosevkaSS11 = "0n7xmxgg4sg7japz8ajxdprqwx6shrh0y2vmp205aqw5lm6lc4g3";
-  SGr-IosevkaSS12 = "0mwcxg2ls8d8463ykc4byvk938ygaca0wc65gllr5jkccwfk5lxs";
-  SGr-IosevkaSS13 = "12gjkrvy1850dxmbhibgp49rdxj7bb8b8vliydxk4a0k48zn6bqc";
-  SGr-IosevkaSS14 = "090i5rhhqcc65k6b9sgbj2w5vs9jrd6qnmm99lp18akpsspm2w3r";
-  SGr-IosevkaSS15 = "1c96pckim333bmfqpj0v9jcklsi8az81m6jhzvy3b153p2di29r9";
-  SGr-IosevkaSS16 = "0xvv55zmjyly00ykaycndac3lyn2w7y2gvr908kql17lpnw3x0ya";
-  SGr-IosevkaSS17 = "1kilxf5f51fzxwpy4xjrb5jcrmdb70h3z04j9f1cpaccc8h654wk";
-  SGr-IosevkaSS18 = "0vyqa0b935js0i0fhaj071yjlgkxkdr2pybn8z2g4pv3ixyk6msh";
-  SGr-IosevkaTerm = "0pxa3zcnhfl1gpynx5mn3h21r6cr45lmax09vk8x6z23adxcgkrd";
-  SGr-IosevkaTermCurly = "1nv1xqsf9zf2j9xrrqlcjzy764mnfhmjp4xwsq391fl8vy7pwdbl";
-  SGr-IosevkaTermCurlySlab = "0nblg2ql79wi7vnn3akz7pm26mwjvqg3wgh6kwqbr1rvs4n7krwp";
-  SGr-IosevkaTermSlab = "12cav088hsml2x81ihpbnr0pcwargkh1kn7ijacqv3mgirdhfp52";
-  SGr-IosevkaTermSS01 = "056bs4r7ry7k2h7iwrldfkrani79bxkb2y38ibn15hdvmbw5k7xg";
-  SGr-IosevkaTermSS02 = "1f2ywnqz97i6pjg4na5344k4p4d0mvc9s30ylc6a2nwq64wl48wf";
-  SGr-IosevkaTermSS03 = "08l939ar4z1yw1pwsdfjkfymi476ms7738yvkgz7ycf5nifpp1w1";
-  SGr-IosevkaTermSS04 = "0jgkbdv9kjg7028f3lk4h4ph6i5icv80dmhkxi7r430khfdgq0h9";
-  SGr-IosevkaTermSS05 = "0n6zf2s8can1sknc5gnr2fhs86dnswrhjx6fk2n06grkf97srmzx";
-  SGr-IosevkaTermSS06 = "0krq3kp3ydxv2y5yi15gy517w8kwarxw3lkw0vwjlf5qplpl4s7b";
-  SGr-IosevkaTermSS07 = "1pm5ckgyr18mj13ih548n1awipbsaiqcvzgjgyg8jhydpvv25f1d";
-  SGr-IosevkaTermSS08 = "1qq19fz9ybk6wwj80vb2pcpaklr0nk3a9brc5iqzli4v42bvqqar";
-  SGr-IosevkaTermSS09 = "13ki9125qz5fszcg4mdmkcgz2w9p6w06n6d6aa96m4cvxf9b38g7";
-  SGr-IosevkaTermSS10 = "161cxv8my2g0yg5amawy0mp8hsdf3zwcvf4pb2w9wdm19k7pdgsy";
-  SGr-IosevkaTermSS11 = "0c2rrcnbp4wh2xwqzrvj2fxzz7ph2hz0j89p72a46lp939wjqllm";
-  SGr-IosevkaTermSS12 = "1wyih90ilpvms0w6s1hyqwvclhli1gwxbhc61qgnvkz4lf57j1aw";
-  SGr-IosevkaTermSS13 = "1jk7z6cbfkm4ljslvxysq1w95xv9573lgcb1lznzkd41p3vss9hy";
-  SGr-IosevkaTermSS14 = "1nv18klmp3npl70q5ffc1p59hqa2d60w677jqjvjl51q8cksms8y";
-  SGr-IosevkaTermSS15 = "1gjydq5zvcbjp55kgc19shjy5v8427m7kdv5wxf808kdm0cyl9cf";
-  SGr-IosevkaTermSS16 = "1v4cyci25bdpid1cag84yif38mkqz1d6bssdvw62y9p9xb4x1g4b";
-  SGr-IosevkaTermSS17 = "0nr9hrjgy3dhlacbdr8j5gxh6qbiy9l1m1c25dl9dqym7h9i2a2z";
-  SGr-IosevkaTermSS18 = "1k66xsw3c5izc334v24wf8xvpbxh3dikawghrgfqbkdd7ilp6y7a";
+  Iosevka = "1ml8abhvb6jishi3a2q3ysd5zj0153697wypzjkj5hzxwmx6r7nv";
+  IosevkaAile = "13m46frkmczcn94dx27gamf4jwnqlngqrk5bxmfxzn56pzyavpyh";
+  IosevkaCurly = "0i97zbfidqvzgxi6pr7qc50y5g740d4hgbg2fyjdiiyacp1a4bpq";
+  IosevkaCurlySlab = "1rp3z7083adc9l5cxwygc4ln58z6iy79hxbbf1lqmfi9p6vjgq97";
+  IosevkaEtoile = "1cc3kwq4skd5gg420l1599hzaxhs3fh33jwsrh4fclrqbhhsgdb9";
+  IosevkaSlab = "1q0bgz7a3jn59sjdaql13ij9sa3qbxcjnhnfvc9fb3v6vaxlhqmi";
+  IosevkaSS01 = "0fsbiisllg673359xfxn1izhcnhkdsfp2h6n7y58la692i967vjm";
+  IosevkaSS02 = "1wc1hcsmf6yl99rjk3ncmn7dbnylids68l21i21dfj4k13x6mvyi";
+  IosevkaSS03 = "125m32asdvdfks08dangmv86phkf0if4in6050klf45a7q9818ad";
+  IosevkaSS04 = "0m10d5l88dnsaxcb959g6g17kzrxh91hk083ip5mxq1wjrx1bcfq";
+  IosevkaSS05 = "0q34293px1gj9jgh810mhgidcf7lj2vdvdn48ljq9hg4ni7yvzn8";
+  IosevkaSS06 = "067pz09b9iminj2960qdqipaxgaawxnbxzndi1gw33kpl5lgrjak";
+  IosevkaSS07 = "1f078l8vxcyb6lbf1ywf3s4s0bdrni4my6n70m77vi7vgawvfwz0";
+  IosevkaSS08 = "0mk0il1c4h06xvgxgaqh2z79m7k286smjs4swl09skqjab3nmssx";
+  IosevkaSS09 = "1pcwbi6ajy4i0likmdfgs9c4nwa852fsz9cmcjw12dmf0zirv7cn";
+  IosevkaSS10 = "1lv58ypcz1d4azz9m9xnbw2n6l5fs67kyx5zrh5mqd51qcigr1bx";
+  IosevkaSS11 = "1w37535g96js8iy5r3s6xaz0mjjivv06rdazaxdx0j4frh743lng";
+  IosevkaSS12 = "1p9lwdbngpsm4a7viz04137ckbpimknznibln39sscykc6j93lqx";
+  IosevkaSS13 = "0p1ffg507xcclwp117ikjzbkixlh95a21l7mmpd9cnckdvj1xz45";
+  IosevkaSS14 = "1dcikdxbbr82amzhwn310qkzx95h4dprxw5rwlgn8wcvx9pk96sc";
+  IosevkaSS15 = "0lsgkc1qz4f1rqhasvadjl90qwyf2hxz2d0svwmig7q91jaii4nz";
+  IosevkaSS16 = "1a6k40i1p1l94fwr4mi2m82rspjc9l93vxilgla1kpqm40bsspng";
+  IosevkaSS17 = "0v9zvi8d0ll0kdryjjglf6m1a53hjnsj73bcdaxyprni5f88qpvy";
+  IosevkaSS18 = "0g8b6drc98l08zdp4by7c4zr6c5rkaxsplbm1csyhcrpaxc43r71";
+  SGr-Iosevka = "0g5lklzmyhpych8hkx4ssa3iir7dscc8q1jbzpfsla36r5sf91jl";
+  SGr-IosevkaCurly = "1h3vgshs6l92l8r87kji7ln6ncq36iwrf439vzzramb34izy8ixr";
+  SGr-IosevkaCurlySlab = "0rsl1f9bc1hhy3wzbq5ls6vkc0y0qaw5yb67i7rda5xv50m8bqxi";
+  SGr-IosevkaFixed = "0s6d7kprgrkmdwklzhv0hz85y9w5lgrwc5mams21akmnchjqrgzf";
+  SGr-IosevkaFixedCurly = "0q5n1axnpl5p51lg4zrarsjn5aglb5s0axn9qp7ddh5gxv2n0knq";
+  SGr-IosevkaFixedCurlySlab = "04pn89y4jpgdllk0xziigjf2p8836a6zmwvzkix2kqsmbvpjj4kn";
+  SGr-IosevkaFixedSlab = "1zm06h0z43j31qzd6ndgamr3r5b9av5qcp39sr16fxr8hhnjrqhn";
+  SGr-IosevkaFixedSS01 = "0jkv4f529y934il9qzdaav8acqqgnrgf4anf6zcgx52zrzgrkg0x";
+  SGr-IosevkaFixedSS02 = "1zkibhlsfyhxbi84dwc6w90n2p8w6zwkszk1z5a3db6lyz824z88";
+  SGr-IosevkaFixedSS03 = "15r5q0bg2109z52nwygr85vx3svg6q3j26q0y0syxnrxq4iksdg7";
+  SGr-IosevkaFixedSS04 = "0bhgd1mmsdlcwp3nz7wf992g75zwkp625xc7fbqwsrpd81111566";
+  SGr-IosevkaFixedSS05 = "1nmhs4ya6bm2j4bq5jz3m5r7gbwd4i16m3zsblvif1lb6flb89dj";
+  SGr-IosevkaFixedSS06 = "0a1wxqlm8fchbg68vzwac7p8nvx8hiy565qcqjjs73m33bpp00zj";
+  SGr-IosevkaFixedSS07 = "0s1jh060hkbb7idqzgvc3f6czfhdkiw8ylmyjfa3vh851lpnxym2";
+  SGr-IosevkaFixedSS08 = "0ncdhg8cha9imy6bb72p39bvadzmdrncr2p0di80yfiimdbcfbp4";
+  SGr-IosevkaFixedSS09 = "1wl0bf1phhjzw988r7v3fprb4ljwikpkn7yvs8hskmgi3fkvji9q";
+  SGr-IosevkaFixedSS10 = "08cr4zkfjrnj3105kj70dswaf8zjdhzbjwyav0x054s32j4yrs54";
+  SGr-IosevkaFixedSS11 = "0vgx6zycbqcnrar537ym7ra949q0f8zvrmb1d823rfavy0zkpv9q";
+  SGr-IosevkaFixedSS12 = "0jw73v1bci7w2z5354cfwqgxd3r56fa03i7mr19y6y8pi9i5l9yn";
+  SGr-IosevkaFixedSS13 = "1dy29fhjncsxgsqfyz091qssps4a6xbr27157bawvjn4nlm12cab";
+  SGr-IosevkaFixedSS14 = "047ql1fqsv98mp7ihg1r71y90qjk0sgkygjs79b20smzvzapcs7g";
+  SGr-IosevkaFixedSS15 = "14njl7x94yicb7nzjsv0j8h8f4ikawn01899pccr617mf3xxyap4";
+  SGr-IosevkaFixedSS16 = "14p00n6gw7fwqxdwrz2lxrjkicw1mk1qk8z5mazr45s5pq9sz7wf";
+  SGr-IosevkaFixedSS17 = "0gca50g55csx86wksa1ch1ay2chzj4p11dmhsf4pf4jyq3ziihw8";
+  SGr-IosevkaFixedSS18 = "18q8sjnz9dfv7whjjm4a6cqm8ffwz46bkwna8giqsplhyca1c9sd";
+  SGr-IosevkaSlab = "176pr90h53hf1cbgwaqbdd11pd5d3p14d5lll057dlmws63lhk71";
+  SGr-IosevkaSS01 = "05fwnmziyas7l53sywi6g39pdi6jpnalw35gjl3dvyp93jk5f9sn";
+  SGr-IosevkaSS02 = "00cyqsng2izf1cjkmz1pf2h1h17ph69f0nz38n9jlynsffp2rkv8";
+  SGr-IosevkaSS03 = "0xg4kss5kvl7ihzvdq9gcv869x8nr8ds8hw5lrvqx2010pfvzksc";
+  SGr-IosevkaSS04 = "0mpzyj404081in6ymgajcyy2ips6d12k9ng00cw92v7shjpz6cqh";
+  SGr-IosevkaSS05 = "1kzw92nb7wxrjfhp0cf29xny86ga6libsfy2pzdc7hs499f0fsss";
+  SGr-IosevkaSS06 = "12qw1grnwq8lgdgz25vx0pcdyd5zgwln99w8cafrl6y3ckrasnrx";
+  SGr-IosevkaSS07 = "0fjdnf0lr0kfbfddc1ar4wj2if9xsyqlp4cl2gmczy5b3zkmmhrn";
+  SGr-IosevkaSS08 = "1v7crn5i2v12dh8b34hbm418zxyc8xhh3bnbfgif3v36885rxd8g";
+  SGr-IosevkaSS09 = "0jipz18pgncwfb75c1bb6bh5ar33q8kk579l6zyvqm39w2ik98f6";
+  SGr-IosevkaSS10 = "0c1w2kgy4gk3a3979x47d5hjg19bbam3s4hzd0wyal1wn9m98xl6";
+  SGr-IosevkaSS11 = "1sqagzb28xbkpn30s24ydf2da8n2dvsqzfvkbc3p1469jihzfviq";
+  SGr-IosevkaSS12 = "1n1d85drb3m0f8cnrcqxh1la7y75z3a2k9af8q6z48843ddx4qmg";
+  SGr-IosevkaSS13 = "1ynr47avzywrpf5zdjwmpybs6kf71pmjbrvlssx60z6b4hc0w42i";
+  SGr-IosevkaSS14 = "0r87wlvrd7xgcsibymmdkwd0pqbf5wn2c7mcssqwi3zwxpi12s83";
+  SGr-IosevkaSS15 = "03av6w7x4w00hxyhmz1qp00aj5b47qkma666y3c7ylsfql2b5ybh";
+  SGr-IosevkaSS16 = "01m5sz7lid4v68v8vagyj6zd61hs969lc4igf48a4jz0ip9367sl";
+  SGr-IosevkaSS17 = "0rl4g8iv8hz25ns52zb2n2ymcf2l26dhza1glp79l9swk3xgvpx2";
+  SGr-IosevkaSS18 = "0zyjl2x8i8d5m4ymm6sa5nm3916nwykh718k02aii2gl2p33faqs";
+  SGr-IosevkaTerm = "0rkvwizyr3bhkm518kq57n7n3rygvbgjahi9r5nm6jhyvjjf85d6";
+  SGr-IosevkaTermCurly = "041xhkw4b379zkwbcbmsg7d0w434dy48ppmgpy5gxaa4fzxvfihl";
+  SGr-IosevkaTermCurlySlab = "0kc62bllcrzmlj2ynzk3n1z3znhlsbsy0pwnfjx80zbirnj19dwh";
+  SGr-IosevkaTermSlab = "00l8hzhsrqrsp8izh4mzg2gvzzpd54psn15v3fgc1bs1c84wgxw5";
+  SGr-IosevkaTermSS01 = "0mifbc9vm8yassfp5r5bv8a7jxq14dpnbby09dbfdg3273yx1dv9";
+  SGr-IosevkaTermSS02 = "0ami4zdg0cpgszp8c5xary6crfhx3vx3bdcbvnsmzr5zbaf189fi";
+  SGr-IosevkaTermSS03 = "1yfd99sb3y469qzszrgfdd3m6m6rg49kv5l2swf4yijr1zmb5wfa";
+  SGr-IosevkaTermSS04 = "14ccwjilzrrzikhaj5rnarvw9y78m4d8w7817akg4wg2gh5jsxvr";
+  SGr-IosevkaTermSS05 = "1byaypapwq1zai701sq8qyxp9sb4b62jjin9vgzqcchdy32gnr38";
+  SGr-IosevkaTermSS06 = "0qcwpw10qn34awv0w43xg3l81w3cn949hcsci8802layrwq7lfas";
+  SGr-IosevkaTermSS07 = "0nyrg2fqc6828mq72lhkjn8hdv5s5r5931y38wdriy81yl5lqm9j";
+  SGr-IosevkaTermSS08 = "02mjjz04pqyvaiwm5wsr7h3r2la3wfsi8nnq1njgbaglp25hx6f1";
+  SGr-IosevkaTermSS09 = "07w12z244iaic5cpqkxl20ya03pnirjh9n5yy30r6wx79d1p7q57";
+  SGr-IosevkaTermSS10 = "19w59qs3p5ww7bg5a0k9f6065311ngj583mx9xb8aawc2v9hrhjr";
+  SGr-IosevkaTermSS11 = "10l4sk924w94pah96xipwhqi6x43j62k75ng4lsy0rw3lbs9lyvk";
+  SGr-IosevkaTermSS12 = "018m8wwxip1l5argplcim513zvwrihdl7xbz5i8hsmjjvia225v6";
+  SGr-IosevkaTermSS13 = "1b7nca31yj0vc2j4h804wlllpzjjphnh1bfgv6zcgvd4qmpk4qna";
+  SGr-IosevkaTermSS14 = "1pqrsvnnqb86300hkil4x093r9ybrkpdxvhcp56ph4pshijypb08";
+  SGr-IosevkaTermSS15 = "0inrfcrajmlqxzm87l4l4myrz4bw4wz7y79ibwcjqa0f395jlms3";
+  SGr-IosevkaTermSS16 = "13w9j3sp1lg9wrsj9n5bf3cm38rkkjifk5kqbrkpg9p98k4lfsx5";
+  SGr-IosevkaTermSS17 = "0gcf73bs21phvrjg083l61s37glqvwzckm03gndbqyw7a64k9fdc";
+  SGr-IosevkaTermSS18 = "1aa8hy10wa4zgyrzsnmx4rkbrjjqv56nd4prijdn50qbc5qfw18a";
 }

From 10f56685aa8466f98a4f1f4e7f5bf3466151e802 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 16:19:00 +0000
Subject: [PATCH 47/72] libretro.dosbox-pure: 0-unstable-2025-09-28 ->
 0-unstable-2025-10-18

---
 pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 1d52812f13a1..24f19eda10f4 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-09-28";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "150a8e02ec53bfd5fc571587dab902c075f9e291";
-    hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M=";
+    rev = "fe0bdab8a04eedb912634d89ad8137de75529cff";
+    hash = "sha256-kF69s5rGp4XWtoaDWTu66VoUFjba0BFNBdKuA0OKkms=";
   };
 
   hardeningDisable = [ "format" ];

From 08057f1c6db1890f02d2d4152a95e159bf6b60bf Mon Sep 17 00:00:00 2001
From: mourogurt <maxis1191@gmail.com>
Date: Thu, 9 Oct 2025 18:21:35 +0300
Subject: [PATCH 48/72] qtcreator: added function to compose package with
 plug-ins

---
 pkgs/development/tools/qtcreator/default.nix  |  5 ++++
 .../tools/qtcreator/with-plugins.nix          | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/qtcreator/with-plugins.nix

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 603c69a4fc9f..cabba61c97cc 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -27,6 +27,7 @@
   rustc-demangle,
   elfutils,
   perf,
+  callPackage,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -104,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace ''${!outputDev}/lib/cmake/QtCreator/QtCreatorConfig.cmake --replace "$out/" ""
   '';
 
+  passthru = {
+    withPackages = callPackage ./with-plugins.nix { };
+  };
+
   meta = {
     description = "Cross-platform IDE tailored to the needs of Qt developers";
     longDescription = ''
diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/development/tools/qtcreator/with-plugins.nix
new file mode 100644
index 000000000000..6aa7b5f7d76b
--- /dev/null
+++ b/pkgs/development/tools/qtcreator/with-plugins.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  qtcreator,
+  ...
+}:
+f:
+let
+  plugins_arg = builtins.foldl' (
+    acc: val: acc + "-pluginpath ${val.outPath}/lib/qtcreator/plugins/"
+  ) "" f;
+  qtcreator_runner = pkgs.writeShellScriptBin "qtcreator" ''
+    exec ${lib.getExe qtcreator} ${plugins_arg} "$@"
+  '';
+in
+pkgs.symlinkJoin {
+  inherit (qtcreator) version meta;
+  name = "qtcreator-with-plugins";
+  paths = [
+    qtcreator_runner
+    qtcreator
+  ];
+}

From 4eb419e295309c30b48c167abd7c79e4fe9bc00a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 29 Sep 2025 13:34:55 -0400
Subject: [PATCH 49/72] gleam: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index 48980b3fc182..c19b47f20abb 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -5,7 +5,7 @@
   git,
   pkg-config,
   openssl,
-  erlang_27,
+  erlang,
   nodejs,
   bun,
   deno,
@@ -15,20 +15,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gleam";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = "gleam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qjl+I09tnBbGc771SVJVb6fzAZ2tVOnBNhGfrIUh824=";
+    hash = "sha256-06ap5z1vtv2Rsd98LcLRpvxff1NfkuHNdI844DZuEhQ=";
   };
 
-  cargoHash = "sha256-Ya0glVECB3cb9kgguuH4nY0ClK5NPH1mKAX9INDLzx4=";
+  cargoHash = "sha256-TzHjXW9sSbOJv7PrUaQzZ0jOPocVci1DjcmLzv7aaBY=";
 
   nativeBuildInputs = [
     pkg-config
-    erlang_27
+    erlang
   ];
 
   buildInputs = [ openssl ];

From 8707b9b87df55d59dc56a429ea10effb7a426efe Mon Sep 17 00:00:00 2001
From: mourogurt <maxis1191@gmail.com>
Date: Sun, 19 Oct 2025 19:18:31 +0300
Subject: [PATCH 50/72] qodeassist-plugin: add passthru test

---
 .../libraries/qodeassist-plugin/default.nix            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix
index edd9bf28dae0..07cad76954ed 100644
--- a/pkgs/development/libraries/qodeassist-plugin/default.nix
+++ b/pkgs/development/libraries/qodeassist-plugin/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  runCommand,
   cmake,
   pkg-config,
   qttools,
@@ -50,6 +51,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = "mkdir -p $out; cp -R lib $out/";
 
+  passthru.tests = {
+    test-version = runCommand "${finalAttrs.pname}-test" { } ''
+      QT_QPA_PLATFORM="offscreen" ${
+        lib.getExe (qtcreator.withPackages [ finalAttrs.finalPackage ])
+      } --version > $out
+      cat $out | grep 'qodeassist ${finalAttrs.version}'
+    '';
+  };
+
   meta = {
     description = "AI-powered coding assistant plugin for Qt Creator";
     longDescription = ''

From 958ff5d36ebdd7c2a2f2db3e69b3c81ddf9f5330 Mon Sep 17 00:00:00 2001
From: mourogurt <maxis1191@gmail.com>
Date: Sun, 19 Oct 2025 20:25:30 +0300
Subject: [PATCH 51/72] qt6Packages.qodeassist-plugin: specify same platforms
 whitch are supported by the QtC

---
 pkgs/development/libraries/qodeassist-plugin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix
index 07cad76954ed..489716c2dcc9 100644
--- a/pkgs/development/libraries/qodeassist-plugin/default.nix
+++ b/pkgs/development/libraries/qodeassist-plugin/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Palm1r/QodeAssist";
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.zatm8 ];
-    platforms = lib.platforms.linux;
+    platforms = qtcreator.meta.platforms;
   };
 })

From b35cbe8cc553294604b72d707d9fa8cfa28cf3ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 17:56:20 +0000
Subject: [PATCH 52/72] hath-rust: 1.12.1 -> 1.13.0

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

diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix
index 2f3662f41baa..ff75eaa3a185 100644
--- a/pkgs/by-name/ha/hath-rust/package.nix
+++ b/pkgs/by-name/ha/hath-rust/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hath-rust";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "james58899";
     repo = "hath-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4dbloi88oR84JnD1nepLTJNSgxgB337F3nxr7i4nZV8=";
+    hash = "sha256-81nt+epuZGWxmIEdTAsQJUxLOZjfMFl9SJNJILo9o+8=";
   };
 
-  cargoHash = "sha256-P975lZ6LgL+dT52td8uA8QVnuJd6QKWkpBCfoLpLW9E=";
+  cargoHash = "sha256-7529DN55X6XbAxqXhTYSBL0c+/2fOKc4oyFnvMmEDeU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 2ff3ed1c54aca5801f03900936e2a4992c971f99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 18:03:30 +0000
Subject: [PATCH 53/72] xenia-canary: 0-unstable-2025-10-06 ->
 0-unstable-2025-10-18

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 50650eba17f9..fe0f2a08303e 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "703531d541fb9391afed4fbb951db198c9193c28";
-    hash = "sha256-xLZBEnSxDhGWGscvE4Ht4wSAnSxY+0wBLAA2MVVobHg=";
+    rev = "a1a33b9939e8bc95555bbecafeac97413b73ddea";
+    hash = "sha256-2+YOYxmumSHV8gHvKlOGUahcA/p/8drqXqkgy7udVpk=";
   };
 
   dontConfigure = true;

From 8bdb8a5616b1982824b8813977871b8da98fe8e8 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 19 Oct 2025 20:25:11 +0200
Subject: [PATCH 54/72] fritzing: fix build on darwin

---
 .../science/electronics/fritzing/default.nix        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index e467656e5290..c4f3c7d86396 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -100,11 +100,14 @@ stdenv.mkDerivation {
   '';
 
   env = {
-    NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-      "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
-      "-I${svgpp}/include"
-      "-I${clipper}/include/polyclipping"
-    ];
+    NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+      [
+        "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
+        "-I${svgpp}/include"
+        "-I${clipper}/include/polyclipping"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${qt5compat}/lib" ]
+    );
     NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
   };
 

From 80afcb35c2e21fe9f9b98dc3893d1b7bb0c06cda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Oct 2025 20:27:39 +0200
Subject: [PATCH 55/72] nss_3_115: drop

All consumers have migrated to newer nss versions.
---
 pkgs/build-support/build-mozilla-mach/default.nix | 10 +---------
 pkgs/development/libraries/nss/3_115.nix          |  6 ------
 pkgs/top-level/all-packages.nix                   |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/nss/3_115.nix

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index b578050bf8c9..e484f6b0bde2 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -89,7 +89,6 @@ in
   nasm,
   nspr,
   nss_esr,
-  nss_3_115,
   nss_latest,
   onnxruntime,
   pango,
@@ -572,14 +571,7 @@ buildStdenv.mkDerivation {
       xorg.pixman
       xorg.xorgproto
       zlib
-      (
-        if (lib.versionAtLeast version "144") then
-          nss_latest
-        else if (lib.versionAtLeast version "143") then
-          nss_3_115
-        else
-          nss_esr
-      )
+      (if (lib.versionAtLeast version "144") then nss_latest else nss_esr)
     ]
     ++ lib.optional alsaSupport alsa-lib
     ++ lib.optional jackSupport libjack2
diff --git a/pkgs/development/libraries/nss/3_115.nix b/pkgs/development/libraries/nss/3_115.nix
deleted file mode 100644
index 7436aee6c513..000000000000
--- a/pkgs/development/libraries/nss/3_115.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-import ./generic.nix {
-  version = "3.115.1";
-  hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14=";
-  filename = "3_115.nix";
-  versionRegex = "NSS_(3)_(115)(?:_(\\d+))?_RTM";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..faeb0c86d7f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8227,7 +8227,6 @@ with pkgs;
   };
 
   nss_latest = callPackage ../development/libraries/nss/latest.nix { };
-  nss_3_115 = callPackage ../development/libraries/nss/3_115.nix { };
   nss_esr = callPackage ../development/libraries/nss/esr.nix { };
   nss = nss_esr;
   nssTools = nss.tools;

From 944fb34f0ba1975418248b9d45f901644a2b0743 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 19 Oct 2025 21:01:41 +0200
Subject: [PATCH 56/72] bat: 0.25.0 -> 0.26.0

Changelog: https://github.com/sharkdp/bat/releases/tag/v0.26.0
Diff: https://github.com/sharkdp/bat/compare/v0.25.0...v0.26.0
---
 pkgs/by-name/ba/bat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index e1f8bd59e419..9128100012ce 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bat";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
     rev = "v${version}";
-    hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
+    hash = "sha256-JWpdAO+OCqoWa6KVR8sxvHHy1SdR4BmRO0oU0ZAOWl0=";
   };
 
-  cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc=";
+  cargoHash = "sha256-wb86yWWnRHs1vG8+oyhs6bUD4x7AdWvIvPPNBcLs4Hs=";
 
   nativeBuildInputs = [
     pkg-config

From d37fd6419ceb67063df04b38fbd050f363fbe6b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 19:07:32 +0000
Subject: [PATCH 57/72] ghostfolio: 2.208.0 -> 2.209.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 52620e15ded7..1a2a7f5880a0 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.208.0";
+  version = "2.209.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-AZc9STEbM9QOa8vD3VzUkPINeP95B031yLxS8rQ1zvw=";
+    hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-ayuPQ7uKN9XZe2svr+CBGS/r4RjCOiCvS342AQSe82s=";
+  npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE=";
 
   nativeBuildInputs = [
     prisma

From bb7e296bf1a52d42d90b8d3040738a1ba192a50a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 19:13:14 +0000
Subject: [PATCH 58/72] home-assistant-custom-components.solax_modbus:
 2025.10.2 -> 2025.10.4

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

diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 1cf93d2e3a0f..5a27ddd671eb 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2025.10.2";
+  version = "2025.10.4";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-ZwhzvxjzFqB/ENamT2jBUsm/i6dfcKv2YTnuJMCaQNI=";
+    hash = "sha256-ai9Dt68TM2qDbWhypct6KdMwsLbrnDocL6GIR7D0guw=";
   };
 
   dependencies = [ pymodbus ];

From 1d2299408e6b90adbb990879a9706ce3a01cfbca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 19:22:34 +0000
Subject: [PATCH 59/72] python3Packages.uiprotect: 7.22.0 -> 7.23.0

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

diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 31f8593c3477..54a9c6d68609 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "7.22.0";
+  version = "7.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${version}";
-    hash = "sha256-RpEBXCkPUdqVqamz/eLOlN5y8cvlvT7dmo04fWJYzmc=";
+    hash = "sha256-UScv0RAIgkFYl3yJZDuSzXXV3iI/3maV42hN4EtfUio=";
   };
 
   build-system = [ poetry-core ];

From 873d2209f99aaacc5b507cf07717542676edbc67 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sun, 19 Oct 2025 21:41:13 +0200
Subject: [PATCH 60/72] phart: format

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

diff --git a/pkgs/development/python-modules/phart/default.nix b/pkgs/development/python-modules/phart/default.nix
index 7f437fc3565b..44b60a3f7680 100644
--- a/pkgs/development/python-modules/phart/default.nix
+++ b/pkgs/development/python-modules/phart/default.nix
@@ -29,7 +29,6 @@ buildPythonPackage rec {
   '';
 
   postPatch = ''
-
     # pythonRelaxDeps = true; didn't work
     substituteInPlace pyproject.toml \
       --replace-fail 'hatchling==1.26.3' 'hatchling'
@@ -37,7 +36,6 @@ buildPythonPackage rec {
     # This line makes the cli tool not work, removing it fixes it
     substituteInPlace src/phart/cli.py \
       --replace-fail "renderer.options.use_ascii = args.ascii" ""
-
   '';
 
   dependencies = [

From 00563071ee1b66b98f3d5b91497629c6f673a18d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Oct 2025 21:16:49 +0200
Subject: [PATCH 61/72] thunderbird-unwrapped: 143.0.1 -> 144.0.1

https://www.thunderbird.net/en-US/thunderbird/144.0/releasenotes/
https://www.thunderbird.net/en-US/thunderbird/144.0.1/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-84/

Fixes: CVE-2025-11708, CVE-2025-11709, CVE-2025-11710, CVE-2025-11711,
       CVE-2025-11712, CVE-2025-11713, CVE-2025-11714, CVE-2025-11715,
       CVE-2025-11721
---
 .../networking/mailreaders/thunderbird/packages.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index d3b9aec99a8a..7d6e9bff0f13 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -48,7 +48,7 @@ let
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
       ]
-      ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 {
+      ++ lib.optional (lib.versionAtLeast version "140" && lib.versionOlder version "144") (fetchpatch2 {
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
         name = "rustc-1.89.patch";
         url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
@@ -101,8 +101,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "143.0.1";
-    sha512 = "5f4fd5e4f5bc9fee9852d51b8e675f7c9c605660332c24aa0c90e5437301b468153c1788720bc80a53cfc1c3bf95a4bdb622a0533b8f11fb9853b290485c47c6";
+    version = "144.0.1";
+    sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From ce52e0de53cc39b5dc95a4edb288b23eb579ba39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 19:56:37 +0000
Subject: [PATCH 62/72] libretro.play: 0-unstable-2025-09-22 ->
 0-unstable-2025-10-01

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index 9d8380bc2644..e9f83de8e6fa 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-09-22";
+  version = "0-unstable-2025-10-01";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "a3d84f977b721cda752299739fec525addce1ef9";
-    hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk=";
+    rev = "2180be50f804952f94ce848fab8d3f8b6d76d027";
+    hash = "sha256-Fikcp2Bik4PNOFfu9FoEWJid/OoLYPJ6cZG4aA9jgEo=";
     fetchSubmodules = true;
   };
 

From 8ec487d390bc91277890b74bd4bccb142e6eaf8a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Oct 2025 20:05:18 +0000
Subject: [PATCH 63/72] vimPlugins.fff-nvim: remove unnecessary patch

---
 .../editors/vim/plugins/non-generated/fff-nvim/default.nix   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index cdc65b28f936..45a1fd7bf1a2 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -20,11 +20,6 @@ let
     pname = "fff-nvim-lib";
     inherit version src;
 
-    postPatch = ''
-      substituteInPlace $cargoDepsCopy/neo_frizbee*/src/lib.rs \
-        --replace-fail "#![feature(avx512_target_feature)]" ""
-    '';
-
     cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE=";
 
     nativeBuildInputs = [

From 16041e56cc386ec5d27e13602f86d2c58830f5d6 Mon Sep 17 00:00:00 2001
From: sweenu <contact@sweenu.xyz>
Date: Sun, 19 Oct 2025 22:24:39 +0200
Subject: [PATCH 64/72] nixos/immich: fix sql command on inexistant table

---
 nixos/modules/services/web-apps/immich.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index dd01dbd7c66c..194be5e89d75 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -322,15 +322,16 @@ in
           "vector"
           "vchord"
         ];
-        sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
-          ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
-
-          ALTER SCHEMA public OWNER TO ${cfg.database.user};
-          ${lib.optionalString cfg.database.enableVectors "ALTER SCHEMA vectors OWNER TO ${cfg.database.user};"}
-          GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
-
-          ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
-        '';
+        sqlFile =
+          pkgs.writeText "immich-pgvectors-setup.sql" ''
+            ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
+            ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
+            ALTER SCHEMA public OWNER TO ${cfg.database.user};
+          ''
+          + lib.optionalString cfg.database.enableVectors ''
+            ALTER SCHEMA vectors OWNER TO ${cfg.database.user};
+            GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
+          '';
       in
       [
         ''

From 0a35934a6895b92136f81f0599d946613303ffc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 20:37:34 +0000
Subject: [PATCH 65/72] cook-cli: 0.18.1 -> 0.18.2

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

diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index 80deaa80aad9..18b9242f45c9 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cook-cli";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
     rev = "v${version}";
-    hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg=";
+    hash = "sha256-uw1xwE7hIE00OADV9kOXR1/gKSzvleW1/5PwfhH4fvE=";
   };
 
-  cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY=";
+  cargoHash = "sha256-Yxln5eKNXONGd4Hy9Ru9t92iqK9zcTSpzu2j75bc3fk=";
 
   # Build without the self-updating feature
   buildNoDefaultFeatures = true;

From 8a564dd26e9d41a2f1dbaeb6b95915bc0da45430 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 21:03:52 +0000
Subject: [PATCH 66/72] python3Packages.fastmcp: 2.12.4 -> 2.12.5

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

diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index 17d7cb13353a..14a43b3fa688 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.12.4";
+  version = "2.12.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-d8DOdyoyYDxZOpiUSxsYXnGrgFYN9CjdmAeHmJiDBP0=";
+    hash = "sha256-F8NCp1Ku1EeI/YjbHuHcDYytTgqOFyLp+sZGBqayv6s=";
   };
 
   build-system = [

From bab9c3a5a8b5386a109a65821c239faf5b331fc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 21:07:25 +0000
Subject: [PATCH 67/72] home-assistant-custom-components.xiaomi_home: 0.4.2 ->
 0.4.3

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

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
index ab8f04fcf308..550928be1124 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "XiaoMi";
   domain = "xiaomi_home";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "XiaoMi";
     repo = "ha_xiaomi_home";
     rev = "v${version}";
-    hash = "sha256-X8AP2pFGhkh4f72+pORXBB8yOqgIqJ+SLrQx5gwKxEg=";
+    hash = "sha256-L5rFnbaggJbwLNo9a6ZpbPF58Ip8QSpHIiCGdjYxVqI=";
   };
 
   dependencies = [

From 21e867c31050e006ca718fe0013f80d3f8776ec5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Oct 2025 23:14:49 +0200
Subject: [PATCH 68/72] thunderbird-140-unwrapped: 140.3.0esr -> 140.4.0esr

https://www.thunderbird.net/en-US/thunderbird/140.4.0esr/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-85/

Fixes: CVE-2025-11708, CVE-2025-11709, CVE-2025-11710, CVE-2025-11711,
       CVE-2025-11712, CVE-2025-11713, CVE-2025-11714, CVE-2025-11715
---
 .../mailreaders/thunderbird/packages.nix      | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 7d6e9bff0f13..7e2698aee6da 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,23 +47,7 @@ let
       extraPatches = [
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
-      ]
-      ++ lib.optional (lib.versionAtLeast version "140" && lib.versionOlder version "144") (fetchpatch2 {
-        # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
-        name = "rustc-1.89.patch";
-        url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
-        extraPrefix = "";
-        hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4=";
-      })
-      ++ lib.optionals (lib.versionOlder version "139") [
-        # clang-19 fixes for char_traits build issue
-        # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
-        # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
-        # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
-        ./0001-Removed-lookup-against-basic_string-uint8_t.patch
-        ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
       ];
-
       extraPassthru = {
         icu73 = icu73';
         icu77 = icu77';
@@ -115,8 +99,8 @@ rec {
   thunderbird-140 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "140.3.0esr";
-    sha512 = "82a9c4aa250b01e0e4d53890b0337972e46504636831c1b6307b841c4c5aeec86482b2da3c1666c46e870a75f6cb54db9f759664688b382ad66efa647145d900";
+    version = "140.4.0esr";
+    sha512 = "23a7c99f51a346f9df6e0da257040a78da0b9afd70966a0fd5c0f5a4dcd4806520f8d510a382cf5d76a099aa889219a5eec185b774a6a9b65c4ccdcb75662554";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-140";

From 5f7f58ff8a3c17090fa8e2564797a16463191283 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Oct 2025 22:58:07 +0200
Subject: [PATCH 69/72] wyoming-openwakeword: 1.10.0 -> 2.0.0

https://github.com/rhasspy/wyoming-openwakeword/blob/v2.0.0/CHANGELOG.md
---
 .../home-automation/wyoming/openwakeword.nix  | 46 +++++++++----------
 .../wy/wyoming-openwakeword/package.nix       | 26 +++++------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/home-automation/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix
index 1b4e932c7b0f..cedca3e7330d 100644
--- a/nixos/modules/services/home-automation/wyoming/openwakeword.nix
+++ b/nixos/modules/services/home-automation/wyoming/openwakeword.nix
@@ -15,6 +15,7 @@ let
     mkEnableOption
     mkIf
     mkPackageOption
+    mkRemovedOptionModule
     types
     ;
 
@@ -28,8 +29,17 @@ let
 in
 
 {
+  imports = [
+    (mkRemovedOptionModule [
+      "services"
+      "wymoing"
+      "openwakeword"
+      "preLoadModels"
+    ] "Passing a list of models to preload was removed in wyoming-openwakeword 2.0")
+  ];
+
   options.services.wyoming.openwakeword = with types; {
-    enable = mkEnableOption "Wyoming openWakeWord server";
+    enable = mkEnableOption "Wyoming protocol server for openWakeWord wake word detection system";
 
     package = mkPackageOption pkgs "wyoming-openwakeword" { };
 
@@ -50,24 +60,6 @@ in
       '';
     };
 
-    preloadModels = mkOption {
-      type = listOf str;
-      default = [
-        "ok_nabu"
-      ];
-      example = [
-        # wyoming_openwakeword/models/*.tflite
-        "alexa"
-        "hey_jarvis"
-        "hey_mycroft"
-        "hey_rhasspy"
-        "ok_nabu"
-      ];
-      description = ''
-        List of wake word models to preload after startup.
-      '';
-    };
-
     threshold = mkOption {
       type = numbers.between 0.0 1.0;
       default = 0.5;
@@ -91,6 +83,16 @@ in
       apply = toString;
     };
 
+    refractorySeconds = mkOption {
+      type = either int float;
+      default = 2;
+      example = 1.5;
+      description = ''
+        Duration in seconds before a wake word can be detected again.
+      '';
+      apply = toString;
+    };
+
     extraArgs = mkOption {
       type = listOf str;
       default = [ ];
@@ -125,11 +127,9 @@ in
             cfg.threshold
             "--trigger-level"
             cfg.triggerLevel
+            "--refractory-seconds"
+            cfg.refractorySeconds
           ]
-          ++ (concatMap (model: [
-            "--preload-model"
-            model
-          ]) cfg.preloadModels)
           ++ (concatMap (dir: [
             "--custom-model-dir"
             (toString dir)
diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
index c1db4c30ad9f..2e626d246c86 100644
--- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix
+++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
@@ -1,26 +1,30 @@
 {
   lib,
-  python312Packages,
+  python3Packages,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
-let
-  # tensorflow-bin unsupported on Python 3.13
-  python3Packages = python312Packages;
-in
-
 python3Packages.buildPythonApplication rec {
   pname = "wyoming-openwakeword";
-  version = "1.10.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-openwakeword";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU=";
+    hash = "sha256-edSZ5W6oSPYLKuxjQerWRkAO/C+WeTiCosNnbS2sbh0=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Expose entrypoint as wyoming-openwakeword script
+      url = "https://github.com/rhasspy/wyoming-openwakeword/commit/a8c8419bc65fab07a554aa0925f898a7f3b65d79.patch";
+      hash = "sha256-GSViQA01RwkFYEH7CPdU1P0EQ2ml6Vp1OukQ/0VOm+Y=";
+    })
+  ];
+
   build-system = with python3Packages; [
     setuptools
   ];
@@ -29,12 +33,8 @@ python3Packages.buildPythonApplication rec {
     "wyoming"
   ];
 
-  pythonRemoveDeps = [
-    "tflite-runtime-nightly"
-  ];
-
   dependencies = with python3Packages; [
-    tensorflow-bin
+    pyopen-wakeword
     wyoming
   ];
 

From d2ac498e4bd5a5076e3a655eec2d5b2101fc337e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Oct 2025 00:32:12 +0200
Subject: [PATCH 70/72] evcc: don't specify a commit

This fixes the release notes link on the webinterface.

Closes: #453624
---
 pkgs/by-name/ev/evcc/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 22db71d9922e..5f4bbe34f18e 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -83,7 +83,6 @@ buildGo125Module rec {
 
   ldflags = [
     "-X github.com/evcc-io/evcc/util.Version=${version}"
-    "-X github.com/evcc-io/evcc/util.Commit=${src.tag}"
     "-s"
     "-w"
   ];

From 6442a6f847d63ecb55f094e30f9d541779c860df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 16:37:23 -0700
Subject: [PATCH 71/72] python3Packages.mdformat-footnote: fix hash

---
 pkgs/development/python-modules/mdformat-footnote/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix
index 2c153dc363d8..8a0c4be8d44c 100644
--- a/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "executablebooks";
     repo = "mdformat-footnote";
     tag = "v${version}";
-    hash = "sha256-JVxztVcp60LynacPw8tBrmSfe6Ool8zyK+aYwaKhyiA=";
+    hash = "sha256-QiekcxKfJGWog8rfSL6VIDHdo7rpw8ftl/dDJpVpdUg=";
   };
 
   nativeBuildInputs = [ flit-core ];

From ab9afce16151af9de8351cd71623c8e0d012171c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 16:38:56 -0700
Subject: [PATCH 72/72] python3Packages.mdformat-footnote: modernize

---
 .../python-modules/mdformat-footnote/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix
index 8a0c4be8d44c..761d5575af85 100644
--- a/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -19,20 +19,20 @@ buildPythonPackage rec {
     hash = "sha256-QiekcxKfJGWog8rfSL6VIDHdo7rpw8ftl/dDJpVpdUg=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mdformat
     mdit-py-plugins
   ];
 
   pythonImportsCheck = [ "mdformat_footnote" ];
 
-  meta = with lib; {
+  meta = {
     description = "Footnote format addition for mdformat";
     homepage = "https://github.com/executablebooks/mdformat-footnote";
     changelog = "https://github.com/executablebooks/mdformat-footnote/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aldoborrero ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aldoborrero ];
   };
 }