From 5d57f609916b8c475b9616be756bcd01116bf3ad Mon Sep 17 00:00:00 2001
From: name_snrl <Demogorgon-74@ya.ru>
Date: Sat, 26 Jul 2025 03:13:24 +0900
Subject: [PATCH 01/68] nixos/github-runner: use apply to override package

These changes allow users to reference the final package
---
 .../continuous-integration/github-runner/options.nix      | 8 ++++++--
 .../continuous-integration/github-runner/service.nix      | 8 ++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix
index e20e8c5931fb..60aec5751e38 100644
--- a/nixos/modules/services/continuous-integration/github-runner/options.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/options.nix
@@ -26,7 +26,7 @@
     default = { };
     type = lib.types.attrsOf (
       lib.types.submodule (
-        { name, ... }:
+        { name, config, ... }:
         {
           options = {
             enable = lib.mkOption {
@@ -186,7 +186,11 @@
               default = { };
             };
 
-            package = lib.mkPackageOption pkgs "github-runner" { };
+            package = lib.mkPackageOption pkgs "github-runner" { } // {
+              apply =
+                # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.
+                pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; });
+            };
 
             ephemeral = lib.mkOption {
               type = lib.types.bool;
diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix
index d40b51da0eef..aaf8083dc5b9 100644
--- a/nixos/modules/services/continuous-integration/github-runner/service.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/service.nix
@@ -41,10 +41,6 @@
         currentConfigTokenFilename = ".current-token";
 
         workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;
-        # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.
-        package = cfg.package.override (
-          old: lib.optionalAttrs (lib.hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; }
-        );
       in
       lib.nameValuePair svcName {
         description = "GitHub Actions runner";
@@ -77,7 +73,7 @@
 
         serviceConfig = lib.mkMerge [
           {
-            ExecStart = "${package}/bin/Runner.Listener run --startuptype service";
+            ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";
 
             # Does the following, sequentially:
             # - If the module configuration or the token has changed, purge the state directory,
@@ -196,7 +192,7 @@
                         else
                           args+=(--token "$token")
                         fi
-                        ${package}/bin/Runner.Listener configure "''${args[@]}"
+                        ${cfg.package}/bin/Runner.Listener configure "''${args[@]}"
                         # Move the automatically created _diag dir to the logs dir
                         mkdir -p  "$STATE_DIRECTORY/_diag"
                         cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"

From 692c64c10cb1f70cad92f9fdd4a88ba6b2209372 Mon Sep 17 00:00:00 2001
From: nanoknot <nanoknot2@proton.me>
Date: Thu, 19 Jun 2025 18:10:34 +0000
Subject: [PATCH 02/68] nixos/sddm: add example for option sddm.theme

---
 nixos/modules/services/display-managers/sddm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
index 9f70867be423..a53c56ab174a 100644
--- a/nixos/modules/services/display-managers/sddm.nix
+++ b/nixos/modules/services/display-managers/sddm.nix
@@ -259,6 +259,7 @@ in
       theme = mkOption {
         type = types.str;
         default = "";
+        example = lib.literalExpression "\"\${pkgs.where-is-my-sddm-theme.override { variants = [ \"qt5\" ]; }}/share/sddm/themes/where_is_my_sddm_theme_qt5\"";
         description = ''
           Greeter theme to use.
         '';

From 3749d1efccac49b5f4d31c1f6daefbb0908f5976 Mon Sep 17 00:00:00 2001
From: hackeryarn <artemchernyak@gmail.com>
Date: Sun, 21 Sep 2025 09:31:59 -0500
Subject: [PATCH 03/68] kustomize-sops: add binary

---
 pkgs/development/tools/kustomize/kustomize-sops.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix
index 9db6c4d19ccf..12f356002eed 100644
--- a/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/pkgs/development/tools/kustomize/kustomize-sops.nix
@@ -18,10 +18,12 @@ buildGoModule rec {
   vendorHash = "sha256-UyDW4WgDgEygMxrxbCATxlPk9KAuc9lO/ldSFyydZUA=";
 
   installPhase = ''
+    mkdir -p $out/bin
     mkdir -p $out/lib/viaduct.ai/v1/ksops/
     mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
-    mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops/ksops
-    ln -s $out/lib/viaduct.ai/v1/ksops/ksops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec
+    mv $GOPATH/bin/kustomize-sops $out/bin/ksops
+    ln -s $out/bin/ksops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec
+    ln -s $ous/bin/ksops $out/lib/viaduct.ai/v1/ksops/ksops
   '';
 
   # Tests are broken in a nix environment

From 82d68ff851a4130eab2df43740b0075a43341fba Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 22:01:33 +0200
Subject: [PATCH 04/68] mlocate: use `finalAttrs` pattern

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

diff --git a/pkgs/by-name/ml/mlocate/package.nix b/pkgs/by-name/ml/mlocate/package.nix
index 3a3bd207764f..b095b45bb67e 100644
--- a/pkgs/by-name/ml/mlocate/package.nix
+++ b/pkgs/by-name/ml/mlocate/package.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mlocate";
   version = "0.26";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/mlocate/mlocate-${version}.tar.xz";
+    url = "https://releases.pagure.org/mlocate/mlocate-${finalAttrs.version}.tar.xz";
     sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
   };
 
@@ -24,4 +24,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ ];
   };
-}
+})

From c864826e523ca468ba1a1f0eeab6922036133248 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 22:08:17 +0200
Subject: [PATCH 05/68] mlocate: replace `sha256` with `hash`

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

diff --git a/pkgs/by-name/ml/mlocate/package.nix b/pkgs/by-name/ml/mlocate/package.nix
index b095b45bb67e..12703d4600b0 100644
--- a/pkgs/by-name/ml/mlocate/package.nix
+++ b/pkgs/by-name/ml/mlocate/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://releases.pagure.org/mlocate/mlocate-${finalAttrs.version}.tar.xz";
-    sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
+    hash = "sha256-MGPfef4Zj7lhjhgMVLrzEFsz2I/mAv8thXCq+UTxJj4=";
   };
 
   makeFlags = [

From 197ec790d5d426429b29107e90eea8d3344c4b34 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 22:08:51 +0200
Subject: [PATCH 06/68] mlocate: refactor `meta`

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

diff --git a/pkgs/by-name/ml/mlocate/package.nix b/pkgs/by-name/ml/mlocate/package.nix
index 12703d4600b0..2f2bc4803f5c 100644
--- a/pkgs/by-name/ml/mlocate/package.nix
+++ b/pkgs/by-name/ml/mlocate/package.nix
@@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     "dbfile=/var/cache/locatedb"
   ];
 
-  meta = with lib; {
-    description = "Merging locate is an utility to index and quickly search for files";
+  meta = {
+    description = "Utility to index and quickly search for files";
     homepage = "https://pagure.io/mlocate";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 })

From f732cddf3d7089d2f6ce1625a6ba5cf20bf5ca8d Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:50:52 +0200
Subject: [PATCH 07/68] tomb: add missing phase hooks

---
 pkgs/by-name/to/tomb/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index 171751e5f84f..4af247624d18 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -69,11 +69,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 tomb $out/bin/tomb
     install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
     wrapProgram $out/bin/tomb \
       --prefix PATH : $out/bin:${lib.makeBinPath runtimeDependencies}
+
+    runHook postInstall
   '';
 
   passthru = {

From 0c6a587b9e8e77d8e866d1ad232559cdf39594ed Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:52:00 +0200
Subject: [PATCH 08/68] tomb: use `versionCheckHook`

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

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index 4af247624d18..aea8b2922474 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -17,8 +17,8 @@
   nix-update-script,
   pinentry,
   stdenvNoCC,
-  testers,
   util-linux,
+  versionCheckHook,
   zsh,
 }:
 
@@ -80,11 +80,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+
   passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "tomb -v";
-    };
     updateScript = nix-update-script { };
   };
 

From 03ba08102b6aba9e9b9bbaf6a4f9c7147c269e8c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 21:53:44 +0200
Subject: [PATCH 09/68] tomb: use `makeBinaryWrapper`

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

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index aea8b2922474..ffce2e543906 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -13,7 +13,7 @@
   lib,
   libargon2,
   lsof,
-  makeWrapper,
+  makeBinaryWrapper,
   nix-update-script,
   pinentry,
   stdenvNoCC,
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-z7LkCes0wg+1bZrNXXy4Lh5VwMotCULJQy5DmCisu+Q=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   buildInputs = [
     pinentry

From d3cd37e8912514b6767f9ef3ee30be737402fdc9 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 22:00:44 +0200
Subject: [PATCH 10/68] tomb: update `install` commands in `installPhase`

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

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index ffce2e543906..266e19601dd2 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -71,8 +71,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 tomb $out/bin/tomb
-    install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
+    install -D -m755 -t $out/bin tomb
+    install -D -m644 -t $out/share/man/man1/ doc/tomb.1
 
     wrapProgram $out/bin/tomb \
       --prefix PATH : $out/bin:${lib.makeBinPath runtimeDependencies}

From 46753fc9d6ffde1ee338b048e2a37b293f274a87 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 25 Sep 2025 22:17:26 +0200
Subject: [PATCH 11/68] tomb: use `util-linuxMinimal`

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

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index 266e19601dd2..1ebfad7df23d 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -17,7 +17,7 @@
   nix-update-script,
   pinentry,
   stdenvNoCC,
-  util-linux,
+  util-linuxMinimal,
   versionCheckHook,
   zsh,
 }:
@@ -37,7 +37,7 @@ let
     libargon2
     lsof
     pinentry
-    util-linux
+    util-linuxMinimal
   ];
 
 in

From 84ea09ca869b6848e50cd8e50dbc598b5661ec97 Mon Sep 17 00:00:00 2001
From: Zain Kergaye <zain4utah@gmail.com>
Date: Mon, 29 Sep 2025 15:16:23 -0600
Subject: [PATCH 12/68] maintainers: add Zain Kergaye

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ad373cd39fc5..37e87c887d24 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28701,6 +28701,12 @@
     githubId = 10415894;
     name = "Zahrun";
   };
+  zainkergaye = {
+    email = "zain@zkergaye.me";
+    github = "zainkergaye";
+    githubId = 62440012;
+    name = "Zain Kergaye";
+  };
   zakame = {
     email = "zakame@zakame.net";
     github = "zakame";

From ce6787c9c3460fced10e7f816963f3c7728c6942 Mon Sep 17 00:00:00 2001
From: Zain Kergaye <zain4utah@gmail.com>
Date: Mon, 29 Sep 2025 15:59:25 -0600
Subject: [PATCH 13/68] quartus-prime-lite: 23.1std.1.993 -> 24.1std.0.1077

---
 .../by-name/qu/quartus-prime-lite/quartus.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
index bacef122db89..2349d765b3cd 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
@@ -40,15 +40,15 @@ let
   ) deviceIds;
 
   componentHashes = {
-    "arria_lite" = "sha256-PNoc15Y5h+2bxhYFIxkg1qVAsXIX3IMfEQSdPLVNUp4=";
-    "cyclone" = "sha256-2huDuTkXt6jszwih0wzusoxRvECi6+tupvRcUvn6eIA=";
-    "cyclone10lp" = "sha256-i8VJKqlIfQmK2GWhm0W0FujHcup4RjeXughL2VG5gkY=";
-    "cyclonev" = "sha256-HoNJkcD96rPQEZtjbtmiRpoKh8oni7gOLVi80c1a3TM=";
-    "max" = "sha256-qh920mvu0H+fUuSJBH7fDPywzll6sGdmEtfx32ApCSA=";
-    "max10" = "sha256-XOyreAG3lYEV7Mnyh/UnFTuOwPQsd/t23Q8/P2p6U+0=";
+    "arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU=";
+    "cyclone" = "sha256-iNA4S5mssffgn29NUhibJk6iKnmJ+vG9LYY3W+nnqcI=";
+    "cyclone10lp" = "sha256-247yR2fm5A3LWRjePJU99z1NBYziV8WkPL05wHJ4Z1Q=";
+    "cyclonev" = "sha256-Fa1PQ3pp9iTPYQljeKGyxHIXHaSolJZR8vXVb3gEN7g=";
+    "max" = "sha256-lAA1CgSfAjfilLDhRzfU2OkzGAChk7TMFckeboMB4mI=";
+    "max10" = "sha256-edycBj0P3qwLN2YS//QpCHQeGOW8WM0RqTIWdGAkEv8=";
   };
 
-  version = "23.1std.1.993";
+  version = "24.1std.0.1077";
 
   download =
     { name, sha256 }:
@@ -62,12 +62,12 @@ let
     [
       {
         name = "QuartusLiteSetup-${version}-linux.run";
-        sha256 = "sha256-OCp2hZrfrfp1nASuVNWgg8/ODRrl67SJ+c6IWq5eWvY=";
+        sha256 = "sha256-NFWT1VWcb3gun7GhpPbHzR3SIYBMpK40jESXS/vC5II=";
       }
     ]
     ++ lib.optional withQuesta {
       name = "QuestaSetup-${version}-linux.run";
-      sha256 = "sha256-Dne4MLFSGXUVLMd+JgiS/d5RX9t5gs6PEvexTssLdF4=";
+      sha256 = "sha256-4+Y34UiJwenlIp/XKzMs+2aYZt/Y6XmNmiYyXVmOQkc=";
     }
   );
   components = map (
@@ -133,6 +133,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [
       bjornfor
       kwohlfahrt
+      zainkergaye
     ];
   };
 }

From c608c3b8b4fd89ee3e6ed1c0ebe09f2f3e38c52e Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 30 Sep 2025 09:08:01 +0200
Subject: [PATCH 14/68] libomemo-c: 0.5.0 -> 0.5.1; build with meson

---
 pkgs/by-name/li/libomemo-c/package.nix | 27 ++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libomemo-c/package.nix b/pkgs/by-name/li/libomemo-c/package.nix
index e1f87d39b180..3d9a9da507d0 100644
--- a/pkgs/by-name/li/libomemo-c/package.nix
+++ b/pkgs/by-name/li/libomemo-c/package.nix
@@ -2,24 +2,39 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
+  meson,
+  ninja,
+  pkg-config,
   openssl,
+  protobuf_25,
+  protobufc,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libomemo-c";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "libomemo-c";
     rev = "v${version}";
-    hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4=";
+    hash = "sha256-HoZykdGVDsj4L5yN3SHGF5tjMq5exJyC15zTLBlpX/c=";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildsInputs = [ openssl ];
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    protobuf_25
+    protobufc
+  ];
+  buildInputs = [
+    openssl
+    protobufc
+  ];
+  mesonFlags = [
+    "-Dtests=false"
+  ];
 
   meta = with lib; {
     description = "Fork of libsignal-protocol-c adding support for OMEMO XEP-0384 0.5.0+";

From 4fabc37f049374badd19453eff58fcad07e70e8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 12:32:36 +0000
Subject: [PATCH 15/68] python3Packages.pipx: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index bed59c001b8e..a6f5a98a36fd 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pipx";
-  version = "1.7.1";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pypa";
     repo = "pipx";
     tag = version;
-    hash = "sha256-diHWzrSpXWbNosXKN5nj2FM09HicDhHWKxQDXc+AZ4o=";
+    hash = "sha256-TEF5zBAB0tvfY0dsZOnu2r9P+pheMr/OOI6CCY8PItg=";
   };
 
   build-system = [

From 361f4839ff80a0eff4a50a70655dc60f185654e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 16:48:14 +0000
Subject: [PATCH 16/68] python3Packages.apispec: 6.8.3 -> 6.8.4

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

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index f3744f6ec2a8..7d6e14079f73 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "apispec";
-  version = "6.8.3";
+  version = "6.8.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CCMjWqFxGH/A+x39KCEevPX+d2iyp+GSnQZnHhYkOa4=";
+    hash = "sha256-/Q7RSvcaKUnZrrlrcs4VF8tKSKXFVmfNBIO37TMVaio=";
   };
 
   build-system = [ flit-core ];

From e0ff0dbef3817459cc66f0319d8b946e845f4e94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 17:48:53 +0000
Subject: [PATCH 17/68] pik: 0.26.0 -> 0.26.1

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

diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 08496a4ef5f4..7f6b5efb2604 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pik";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
     rev = version;
-    hash = "sha256-uvfCMXCbU0SGia1lLz9jkPnZ9Nmohd3sTgxHUbW6/Y8=";
+    hash = "sha256-qpSQ920nAWqta3aPxl9dVHFRBtgETtUye+D2yU33ZFw=";
   };
 
-  cargoHash = "sha256-IQX3lS8Fl6zNKTYlvoPXPzBx+J8bbyH9ZYMzyu2mF9o=";
+  cargoHash = "sha256-5/ympn4z1R7dYG4jR+0zEgvaYr0AbcIbUIrMac5Tj7A=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
 

From 7ac64a587b86fa5a0df431bcebc03d8eb5e395e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 18:06:01 +0000
Subject: [PATCH 18/68] kubeone: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index b64b3bc12c29..58da9e54c13b 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "kubeone";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
     rev = "v${version}";
-    hash = "sha256-TDT7qAwd9wewnfICEX+ZI4z9jma0L+SZcZJeQOuv9dc=";
+    hash = "sha256-afAyjBalBdWAnTAedAYh3GslLx//aAHQAsEbBIpiczg=";
   };
 
   vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk=";

From cfc06bbcf99e79d72dd3660103f3c789082b212b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 18:09:27 +0000
Subject: [PATCH 19/68] python3Packages.datamodel-code-generator: 0.33.0 ->
 0.34.0

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

diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix
index 1338520fdb30..24d17d60da1a 100644
--- a/pkgs/development/python-modules/datamodel-code-generator/default.nix
+++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "datamodel-code-generator";
-  version = "0.33.0";
+  version = "0.34.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "koxudaxi";
     repo = "datamodel-code-generator";
     tag = version;
-    hash = "sha256-SyRF4Rn9LdcMTEH0xphDNIfEABknwvUoN2BYlNJFbrA=";
+    hash = "sha256-fJ7+TtWLJXBaTil0LGsCyu9njDuj1pOVUZYN2huoKao=";
   };
 
   pythonRelaxDeps = [

From 6e65747b8f4b1947397f91379be3853c0cf9d52c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 18:09:48 +0000
Subject: [PATCH 20/68] gnmic: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix
index 34e558286453..deca628d8c34 100644
--- a/pkgs/by-name/gn/gnmic/package.nix
+++ b/pkgs/by-name/gn/gnmic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "gnmic";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = "gnmic";
     tag = "v${version}";
-    hash = "sha256-tuEkpuUs245jj0/wzZjqTWeMZNJhiylZD7e0XOc/c14=";
+    hash = "sha256-qN5EnZR1sXni2m1nyH61xLIX7c9sk5SGtAxrolfNHzs=";
   };
 
-  vendorHash = "sha256-piHSVATQjHjKIWNIjm8p2A0ivQzDR2PQj0ovfYDk/FA=";
+  vendorHash = "sha256-QHqsL2XMkIB+CN7uXdn3gpVoaxEfDjdf1ADhd/bYVis=";
 
   ldflags = [
     "-s"

From 052036a32c2d40c76c8c3b0b2824d13f11ac0a19 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 30 Sep 2025 20:46:22 +0200
Subject: [PATCH 21/68] qt6ct: fix PLUGINDIR path

Closes https://github.com/NixOS/nixpkgs/issues/447457

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/tools/misc/qt6ct/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/qt6ct/default.nix b/pkgs/tools/misc/qt6ct/default.nix
index 25c2b67ddb63..04fdb056b67c 100644
--- a/pkgs/tools/misc/qt6ct/default.nix
+++ b/pkgs/tools/misc/qt6ct/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "PLUGINDIR" "$out/${qtbase.qtPluginPrefix}")
+    (lib.cmakeFeature "PLUGINDIR" "${placeholder "out"}/${qtbase.qtPluginPrefix}")
   ];
 
   meta = {

From f347887bce461a8814d96e9c3376b90725aea77d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 19:12:41 +0000
Subject: [PATCH 22/68] workshop-runner: 0.2.3 -> 0.2.5

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

diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix
index 4c24da977500..594591c7cf8c 100644
--- a/pkgs/by-name/wo/workshop-runner/package.nix
+++ b/pkgs/by-name/wo/workshop-runner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "workshop-runner";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "mainmatter";
     repo = "rust-workshop-runner";
     rev = "v${version}";
-    hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI=";
+    hash = "sha256-vaCMnytN3GidEzn3r0zDyD2uBTLaLSnaho/j1Ti3yHE=";
   };
 
-  cargoHash = "sha256-opV2IrqMIwdgrXY6V0jxFtrdP8NVmdlUdsLdfFNimt0=";
+  cargoHash = "sha256-/Oj4B2W+fprOML1KdiU8fHkeGj1JXq8o0GlKxa46/64=";
 
   meta = {
     description = "CLI tool to drive test-driven Rust workshops";

From d8838f2d41e746af644ae4be883738cd94ddf030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 19:23:04 +0000
Subject: [PATCH 23/68] horizon-eda: 2.7.0 -> 2.7.1

---
 pkgs/by-name/ho/horizon-eda/base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 2c9c6c652a20..63b2477849b4 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -24,13 +24,13 @@ in
 # This base is used in horizon-eda and python3Packages.horizon-eda
 rec {
   pname = "horizon-eda";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
     rev = "v${version}";
-    hash = "sha256-Y2oopRycYSxtiKuQZSfTBVP7RmpZ0JA+QyZgnrpoAes=";
+    hash = "sha256-gigfwam7+KvmGAxex7Bi7a8xAmiNZ+YBZ5iMXneD4cw=";
   };
 
   nativeBuildInputs = [

From c003b0b413ea317e8f7484e463548b147437bd3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 20:31:14 +0000
Subject: [PATCH 24/68] python3Packages.streamdeck: 0.9.7 -> 0.9.8

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

diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix
index 16ba119d7ca2..a980c1a0a05b 100644
--- a/pkgs/development/python-modules/streamdeck/default.nix
+++ b/pkgs/development/python-modules/streamdeck/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "streamdeck";
-  version = "0.9.7";
+  version = "0.9.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jVhuZihvjuA5rwl55JAmtFq+h/f5M68Vo44jh8HjUI4=";
+    hash = "sha256-rO5K0gekDUzCJW06TCK59ZHjw5DvvlFeQ5zlGLMdASU=";
   };
 
   patches = [

From f3aa24062d9c3401e1a139a7ef54c8c95cae2fd0 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:03:04 +0200
Subject: [PATCH 25/68] linuxPackages.nvidiaPackages.production: 580.82.09 ->
 580.95.05

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 17841e6a60f3..e10e803b0159 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -72,12 +72,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
 
   production = generic {
-    version = "580.82.09";
-    sha256_64bit = "sha256-Puz4MtouFeDgmsNMKdLHoDgDGC+QRXh6NVysvltWlbc=";
-    sha256_aarch64 = "sha256-6tHiAci9iDTKqKrDIjObeFdtrlEwjxOHJpHfX4GMEGQ=";
-    openSha256 = "sha256-YB+mQD+oEDIIDa+e8KX1/qOlQvZMNKFrI5z3CoVKUjs=";
-    settingsSha256 = "sha256-um53cr2Xo90VhZM1bM2CH4q9b/1W2YOqUcvXPV6uw2s=";
-    persistencedSha256 = "sha256-lbYSa97aZ+k0CISoSxOMLyyMX//Zg2Raym6BC4COipU=";
+    version = "580.95.05";
+    sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc=";
+    sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk=";
+    openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI=";
+    settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
+    persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
   };
 
   latest = selectHighestVersion production (generic {

From 47ef8c73a84a46d3c14ef08129ddfc3deaa6f4b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 21:55:05 +0000
Subject: [PATCH 26/68] vscode-extensions.cweijan.vscode-database-client2:
 8.4.0 -> 8.4.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 346501691d98..feb281766a68 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1123,8 +1123,8 @@ let
         mktplcRef = {
           name = "vscode-database-client2";
           publisher = "cweijan";
-          version = "8.4.0";
-          hash = "sha256-ly54itCpVdirU6GmK2GM7A749wt2SbHR/TidutTwCUE=";
+          version = "8.4.2";
+          hash = "sha256-SfvpR1ldrvo/q0nt0cLu55bzNXjwNNdqdSwBORN2Bjw=";
         };
         meta = {
           description = "Database Client For Visual Studio Code";

From 9197cc5350cdfabc9e94e981e7a8104d3a78a01a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 23:10:06 +0000
Subject: [PATCH 27/68] cargo-shuttle: 0.57.1 -> 0.57.3

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

diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index c6819a7d0507..a7c4216409fa 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-shuttle";
-  version = "0.57.1";
+  version = "0.57.3";
 
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = "shuttle";
     rev = "v${version}";
-    hash = "sha256-R+vThHlPVquwTTM4ZufQzgjKfdxGhavUN7f9ucTvWoQ=";
+    hash = "sha256-qPevl75wmOYVhTgMiJOi+6j8LBWKzM7HPhd5mdf2B+8=";
   };
 
-  cargoHash = "sha256-RYjRqpm1n45x2ccTjS1WeqfR7gRyOVLCilc/K4G63gM=";
+  cargoHash = "sha256-H2fy2NQvLQEzbQik+nrUvoYZaWQRXX6PpO9LcYfiF2I=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 2e4222fa7c535f269698c770c09f03b94149e346 Mon Sep 17 00:00:00 2001
From: Lena Pastwa <126529524+acuteenvy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 01:28:22 +0200
Subject: [PATCH 28/68] tlrc: 1.11.1 -> 1.12.0

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

diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index cc204df4afc5..feedfe12411f 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tlrc";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
     rev = "v${version}";
-    hash = "sha256-SPYLQ7o3sbrjy3MmBAB0YoVJI1rSmePbrZY0yb2SnFE=";
+    hash = "sha256-Q0vRrCNpbG6LihCi9+uI25PnpFuPfoY2MZmyB/IN/SQ=";
   };
 
-  cargoHash = "sha256-i2nSwsQnwhiMhG8QJb0z0zPuNxTLwuO1dgJxI4e4FqY=";
+  cargoHash = "sha256-IrRhj3Tv8rLTJki+Wd4Xfmf74OnYInUytMnYuvre7mw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a7ad617b8e30fa8e22ed18492b9b7302358185f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 00:27:20 +0000
Subject: [PATCH 29/68] mtail: 3.2.16 -> 3.2.18

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

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index e447cc6269a0..904aaed6012c 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.2.16";
+  version = "3.2.18";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-yugtprUVSy9+a7YGtgIffafE8hQrKku1RMHn2tq64KU=";
+    hash = "sha256-Z3FPZNWGyXtY2KLRF/oJIuN+lXE14SQce72pTKBsZEk=";
   };
 
   vendorHash = "sha256-SMdEowzg53uori/Ge+GE4542wswBU2kgdyAXxeKQiiU=";

From a2fcc129c2960ae21fd17810b39469b8714113a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 04:05:53 +0000
Subject: [PATCH 30/68] avbroot: 3.22.0 -> 3.23.0

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

diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix
index 3c2ae64c1f98..08d4c5981165 100644
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "avbroot";
-  version = "3.22.0";
+  version = "3.23.0";
 
   src = fetchFromGitHub {
     owner = "chenxiaolong";
     repo = "avbroot";
     tag = "v${version}";
-    hash = "sha256-Ijyw6fUf5jW5di7gvnV0Eh1kG4q/x8GbG4R0q74rWLs=";
+    hash = "sha256-P7t1Tuux04D1tEaMjFPWhaYz4NP3hk5hoJ6kKiHM1S8=";
   };
 
-  cargoHash = "sha256-eYnKxMwdk4nlDFvzoMoWSH4NO753IY68dN/Ok0BZf0Q=";
+  cargoHash = "sha256-ahBzMU8R520EMUgdETr0+gz2fuxKcOV+6fuH4SiRz8U=";
 
   nativeBuildInputs = [
     pkg-config

From 33cf67d6263f5c7ea4c64b3d1f52eba5af4dd3e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 05:18:07 +0000
Subject: [PATCH 31/68] python3Packages.pyinstaller-hooks-contrib: 2025.8 ->
 2025.9

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

diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
index fefa0bc3cdf5..a161f54482e0 100644
--- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-hooks-contrib";
-  version = "2025.8";
+  version = "2025.9";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyinstaller_hooks_contrib";
     inherit version;
-    hash = "sha256-NAKtQd/ptREK8TRCLjf8XUIbo0LGy5gL1nyzC3QVZBw=";
+    hash = "sha256-VulyvarU6a92ftR9EyNi0WIRImDL5IjJ2n/uAfIopaY=";
   };
 
   build-system = [ setuptools ];

From 7ac45f4553eda4555e676cfedf269a4ccc5ea88d Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Wed, 1 Oct 2025 08:15:55 +0200
Subject: [PATCH 32/68] stalwart-mail: 0.13.2 -> 0.13.4

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

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index b147be39f8d8..f1d9a2a723f7 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
-  version = "0.13.2";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "stalwart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VdeHb1HVGXA5RPenhhK4r/kkQiLG8/4qhdxoJ3xIqR4=";
+    hash = "sha256-1WKmSgDZ3c6+fFKH9+kgrxFYthKQqE1455bFHlVCGhU=";
   };
 
-  cargoHash = "sha256-Wu6skjs3Stux5nCX++yoQPeA33Qln67GoKcob++Ldng=";
+  cargoHash = "sha256-i6AvyX4RObB9aa+TYvsOW8i9WTcYx8ddP/Jmyr8PWMY=";
 
   nativeBuildInputs = [
     pkg-config

From 32ff85be3038f9e7bffa367b7f23d9903fcd83e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 06:42:37 +0000
Subject: [PATCH 33/68] python3Packages.cantools: 40.7.0 -> 40.7.1

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

diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 474722bc39ba..807804da6a19 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "cantools";
-  version = "40.7.0";
+  version = "40.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V3kROwaKsEMUDqlEGtd9RK1NOC7tiN4WZ4+zIOMhRuw=";
+    hash = "sha256-Rn4EzIbgdjBzda6bzYNwcQjpmOPqYBm/lodzWAuaqV8=";
   };
 
   nativeBuildInputs = [

From cabaf20875e382d33d053911d78f47829bb5f76a Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Wed, 1 Oct 2025 08:44:15 +0200
Subject: [PATCH 34/68] kitty: 0.43.0->0.43.1

---
 pkgs/by-name/ki/kitty/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index b0dfc4c01647..2109e9759c36 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -51,14 +51,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.43.0";
+  version = "0.43.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-wPLXuZWhaA51J7jGHffh/xnXzWDKCXV2G3Uvrg7G8Kg=";
+    hash = "sha256-Wd61Q1sG55oDxPuHJpmvSWuptwJIuzgn2sB/dzNRc1c=";
   };
 
   goModules =
@@ -142,13 +142,6 @@ buildPythonApplication rec {
     # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
     # OSError: master_fd is in error condition
     ./disable-test_ssh_bootstrap_with_different_launchers.patch
-
-    # Fix test failure with fish >= 4.1
-    # See: https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66
-    (fetchpatch {
-      url = "https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66.patch";
-      hash = "sha256-LIQz3e2qgiwpsMd5EbEcvd7ePEEPJvIH4NmNpxydQiU=";
-    })
   ];
 
   hardeningDisable = [

From 29c1e9e8b18198c2d7a4cb6db92758f7b08e66b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 07:23:25 +0000
Subject: [PATCH 35/68] python3Packages.blake3: 1.0.6 -> 1.0.7

---
 .../python-modules/blake3/Cargo.lock          | 46 +++++++++----------
 .../python-modules/blake3/default.nix         |  4 +-
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock
index 9adde9f9b2b4..51c44b074a00 100644
--- a/pkgs/development/python-modules/blake3/Cargo.lock
+++ b/pkgs/development/python-modules/blake3/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "arrayref"
@@ -22,13 +22,12 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "blake3"
-version = "1.0.6"
+version = "1.0.7"
 dependencies = [
  "blake3 1.8.2",
  "hex",
  "pyo3",
  "rayon",
- "rayon-core",
 ]
 
 [[package]]
@@ -48,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.38"
+version = "1.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
+checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -125,9 +124,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "memmap2"
@@ -170,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
  "indoc",
  "libc",
@@ -187,19 +186,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -207,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -219,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -232,18 +230,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -251,9 +249,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix
index b70fc76201d0..ff6dfe06ceb3 100644
--- a/pkgs/development/python-modules/blake3/default.nix
+++ b/pkgs/development/python-modules/blake3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "blake3";
-  version = "1.0.6";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "blake3-py";
     tag = version;
-    hash = "sha256-YeIRY/3S/onlc9ip7oCZ7FHln6MmHJ49STwORsX3nzs=";
+    hash = "sha256-km4vN/xKvjNd/bdHEIsUR9+Hmi0K5ju+wlQ2kuuDzzI=";
   };
 
   postPatch = ''

From b953f2928714b69dca70e4987874c22f6a65ee3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 07:49:17 +0000
Subject: [PATCH 36/68] vscode-extensions.prisma.prisma: 6.16.2 -> 6.16.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4c7bfd58c56d..efa2132c30aa 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3782,8 +3782,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "6.16.2";
-          hash = "sha256-woL6jWlrNb9lsQ6NqXx3YOo/eAinpAuz2bXw6mJw8Dc=";
+          version = "6.16.3";
+          hash = "sha256-xJ2SQgXZfVXjn6JCsjBr2SkaCpkGS2Fk1mjcW6WPnS0=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

From dd4e5b4a6510c977b0383b9c30cb35c5fe8c5dfd Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 30 Sep 2025 18:40:24 +0200
Subject: [PATCH 37/68] hpipm: 0.1.3-unstable-2025-09-25 ->
 0.1.3-unstable-2025-07-25

Back in time to unbreak casadi.
I must have failed something while retesting after https://github.com/NixOS/nixpkgs/pull/444660#discussion_r2379636210
---
 pkgs/by-name/hp/hpipm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hp/hpipm/package.nix b/pkgs/by-name/hp/hpipm/package.nix
index ad220cdb2b50..d818a4c05140 100644
--- a/pkgs/by-name/hp/hpipm/package.nix
+++ b/pkgs/by-name/hp/hpipm/package.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "hpipm";
   #version = "0.1.3";  not building, use master instead
-  version = "0.1.3-unstable-2025-09-25";
+  version = "0.1.3-unstable-2025-07-25";
 
   src = fetchFromGitHub {
     owner = "giaf";
     repo = "hpipm";
-    rev = "8f3a2d00f6d1bd7101fb651391fba79377915288";
-    hash = "sha256-XtnUs1RiB7zJOv7zdRzB31hnxDYaiH+Q4SLyE6/kuEg=";
+    rev = "00c2a084e059e2e1b79877f668e282d0c4282110";
+    hash = "sha256-Lg7po7xTs9jc8FiYFMbNFJooTjOpzBFiyd5f+TPMWQA=";
   };
 
   nativeBuildInputs = [ cmake ];

From d2d5f2d8757d04251e5368a42e16979857ea3d9f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 30 Sep 2025 18:33:26 +0200
Subject: [PATCH 38/68] casadi: drop abandoned clang_compiler interface

Co-authored-by: Luna <782440+LunNova@users.noreply.github.com>
---
 pkgs/by-name/ca/casadi/clang-19.diff | 35 ----------------------------
 pkgs/by-name/ca/casadi/package.nix   | 18 +++-----------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/ca/casadi/clang-19.diff

diff --git a/pkgs/by-name/ca/casadi/clang-19.diff b/pkgs/by-name/ca/casadi/clang-19.diff
deleted file mode 100644
index e7706cb320ba..000000000000
--- a/pkgs/by-name/ca/casadi/clang-19.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/casadi/interfaces/clang/clang_compiler.hpp b/casadi/interfaces/clang/clang_compiler.hpp
-index 7f54853..9f8d4b1 100644
---- a/casadi/interfaces/clang/clang_compiler.hpp
-+++ b/casadi/interfaces/clang/clang_compiler.hpp
-@@ -52,7 +52,7 @@
- #include "llvm/IR/LLVMContext.h"
- //#include "llvm/IR/Verifier.h"
- #include <llvm/Support/FileSystem.h>
--#include <llvm/Support/Host.h>
-+#include <llvm/TargetParser/Host.h>
- #include <llvm/Support/ManagedStatic.h>
- #include <llvm/Support/Path.h>
- #include <llvm/Support/TargetSelect.h>
-diff --git a/cmake/FindCLANG.cmake b/cmake/FindCLANG.cmake
-index 4edf60b..f23a348 100644
---- a/cmake/FindCLANG.cmake
-+++ b/cmake/FindCLANG.cmake
-@@ -16,7 +16,7 @@ set(CLANG_CXX_FLAGS "-fPIC -fvisibility-inlines-hidden -ffunction-sections -fdat
- set(CLANG_INCLUDE_DIR ${LLVM_INSTALL_PREFIX}/include)
- 
- # All clang libraries
--set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP})
-+set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP})
- 
- # Get libraries
- set(CLANG_LIBRARIES)
-@@ -86,7 +86,7 @@ set(CLANG_INCLUDE_DIR ${CLANG_LLVM_INCLUDE_DIR})
- 
- # All clang libraries
- set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization
--              clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic)
-+              clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic)
- 
- # Get libraries
- foreach(D ${CLANG_DEP})
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index c2a247525efc..fbaf8cf27e3c 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # update include file path and link with clangAPINotes
-    # https://github.com/casadi/casadi/issues/3969
-    ./clang-19.diff
-
     # Add missing include
     # ref. https://github.com/casadi/casadi/pull/4192
     (fetchpatch {
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
       "FATROP HPIPM" \
       "FATROP hpipm"
 
-    # nix provide lib/clang headers in libclang, not in llvm.
-    substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
-      '$'{CLANG_LLVM_LIB_DIR} \
-      ${lib.getLib llvmPackages.libclang}/lib
-
     # help casadi find its own libs
     substituteInPlace casadi/core/casadi_os.cpp --replace-fail \
       "std::vector<std::string> search_paths;" \
@@ -108,11 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \
       "d_print_exp_tran_mat" \
       "//d_print_exp_tran_mat"
-
-    # fix missing symbols
-    substituteInPlace cmake/FindCLANG.cmake --replace-fail \
-      "clangBasic)" \
-      "clangBasic clangASTMatchers clangSupport)"
   '';
 
   nativeBuildInputs = [
@@ -189,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_TINYXML" true)
     (lib.cmakeBool "WITH_BUILD_DSDP" true) # not sure where this come from
     (lib.cmakeBool "WITH_DSDP" true)
-    (lib.cmakeBool "WITH_CLANG" true)
+    # "clang_compiler.cpp has basically been abandonded for several years", ref.
+    # https://github.com/casadi/casadi/issues/4225#issuecomment-3352552113
+    (lib.cmakeBool "WITH_CLANG" false) 
     (lib.cmakeBool "WITH_LAPACK" true)
     (lib.cmakeBool "WITH_QPOASES" true)
     (lib.cmakeBool "WITH_BLOCKSQP" true)

From 78ea5008dcf419fe049ce00a10a673dc00c197c8 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 30 Sep 2025 20:24:29 +0200
Subject: [PATCH 39/68] casadi: add changelog

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

diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index fbaf8cf27e3c..bd8e2ce0dea4 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -211,6 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
       Python or Matlab/Octave
     '';
     homepage = "https://github.com/casadi/casadi";
+    changelog = "https://github.com/casadi/casadi/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ nim65s ];
     platforms = lib.platforms.all;

From 141759de4ebcbde592d6de1cbff33d2419ac1e7e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 1 Oct 2025 09:53:22 +0200
Subject: [PATCH 40/68] casadi: 3.7.1 -> 3.7.2

Diff: https://github.com/casadi/casadi/compare/3.7.1...3.7.2

Changelog: https://github.com/casadi/casadi/releases/tag/3.7.2
---
 pkgs/by-name/ca/casadi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index bd8e2ce0dea4..73df0e0d930b 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -38,13 +38,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "casadi";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "casadi";
     repo = "casadi";
     tag = finalAttrs.version;
-    hash = "sha256-554ZN+GfkGHN0cthsb/fPWdo+U2IqLz4q+x60SxRAfk=";
+    hash = "sha256-I6CYtKVvE67NSYH/JGJFP5wHhm1xACctz7uTwOFFihA=";
   };
 
   patches = [
@@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WITH_DSDP" true)
     # "clang_compiler.cpp has basically been abandonded for several years", ref.
     # https://github.com/casadi/casadi/issues/4225#issuecomment-3352552113
-    (lib.cmakeBool "WITH_CLANG" false) 
+    (lib.cmakeBool "WITH_CLANG" false)
     (lib.cmakeBool "WITH_LAPACK" true)
     (lib.cmakeBool "WITH_QPOASES" true)
     (lib.cmakeBool "WITH_BLOCKSQP" true)

From 2c373672a05b3a153f825760ff2a96471f702f62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 09:09:01 +0000
Subject: [PATCH 41/68] osv-scanner: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index f5f8b696368c..4f5c2f0635f8 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-gleQ/Bh+oLYy3iP6FsqtihoLz4jerRnx14dB2cBbf60=";
+    hash = "sha256-YdtTF1u5uyXERRZXidumBFoWq4yA5L7cwIaoYJ4ktSM=";
   };
 
-  vendorHash = "sha256-F1QioqSFQvSJd7JByyUakjn9QSpF2hqEkyx10ei/sKk=";
+  vendorHash = "sha256-/+VtmLnceOzcqWvpBnihtsAf9Q4x/56Zk6UjjejzWHQ=";
 
   subPackages = [
     "cmd/osv-scanner"

From 02a889f18aefb0b922f4a7ee2854e96e62760e47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 09:56:31 +0000
Subject: [PATCH 42/68] whisperx: 3.4.2 -> 3.4.3

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

diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index e6ad813d8e33..335ad245075e 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -35,14 +35,14 @@ let
 in
 buildPythonPackage rec {
   pname = "whisperx";
-  version = "3.4.2";
+  version = "3.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
     tag = "v${version}";
-    hash = "sha256-7MjrtvZGWfgtdQNotzdVMjj0sYfab/6PLQcZCOoqoNM=";
+    hash = "sha256-zx77Fx8KYTWCFcC6Uy6pbe8LJtXP3b6lkwuOSEEYJfU=";
   };
 
   build-system = [ setuptools ];

From 090ba28a9e96509ba0d3a0aaa7633059d360ff55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 10:52:29 +0000
Subject: [PATCH 43/68] libretro-shaders-slang: 0-unstable-2025-09-14 ->
 0-unstable-2025-09-26

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

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 60d581976885..5306a4035e40 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-09-14";
+  version = "0-unstable-2025-09-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "39ca959b131e75dcd0cb4016e545b4e91b7081ae";
-    hash = "sha256-8G54UuuuZpi/sqEWfK/XNXEjjL9LGmffNAnQ+g/XQPM=";
+    rev = "7e3c2ccde32aaa327e109318d275dc16d44653b0";
+    hash = "sha256-MkA/pQQhQseoVEOrv/Nfv4gYfx/LmEMN2eFF6McvQnk=";
   };
 
   dontConfigure = true;

From eedcc51c7d46e057ae82f2ceb3cee3b57e93f44f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 11:25:33 +0000
Subject: [PATCH 44/68] mackerel-agent: 0.85.1 -> 0.85.2

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

diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix
index 111b2b956b0c..fb802c55dfc4 100644
--- a/pkgs/by-name/ma/mackerel-agent/package.nix
+++ b/pkgs/by-name/ma/mackerel-agent/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.85.1";
+  version = "0.85.2";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = "mackerel-agent";
     rev = "v${version}";
-    sha256 = "sha256-ngBBpvDk5HsMNoZy45mlEBn3dgG8j1b98tShdR6QmQQ=";
+    sha256 = "sha256-3A3x32JytJGXebgZeJcToHXNqRB+rbyziT5Zwgc9rEM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7a27cd59ec192b88743b5648fd064260e3c0cabc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 12:05:56 +0000
Subject: [PATCH 45/68] di-tui: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index 249a7b61a222..9201fc2b853a 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "di-tui";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "acaloiaro";
     repo = "di-tui";
     rev = "v${version}";
-    hash = "sha256-YXTVJN8t58MS0Q4kKbasFNkmB/Jz4ctebBnbKqOP2is=";
+    hash = "sha256-Qd+Rwyw0aC5RGucvl3v3mHbV6dB9VHvk9/nh/glWU90=";
   };
 
   vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";

From 0781899332b61a7145a21303352963b953fdf3a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 12:33:48 +0000
Subject: [PATCH 46/68] python3Packages.cynthion: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index 77d51cdeeb98..ebaaea6079cf 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -27,14 +27,14 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
     tag = version;
-    hash = "sha256-NAsELeOnWgMa6iWCJ0+hpbHIO3BsZBv0N/nK1XP+IpU=";
+    hash = "sha256-ebd2L7o6GO57TpwJ7+MOhVSb+I/E8kD7d7DqPj4B3FM=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";

From 640ee975568941846000aa4e31597b13ff057a15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 13:07:41 +0000
Subject: [PATCH 47/68] python3Packages.django-import-export: 4.3.9 -> 4.3.10

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

diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index d2c9a7c91f04..15890451fe7a 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "django-import-export";
-  version = "4.3.9";
+  version = "4.3.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = "django-import-export";
     tag = version;
-    hash = "sha256-qcxvXq+pC2leDhaeor2hrWll8bQ+x6xN99pDlnmtUic=";
+    hash = "sha256-amc5Qp3tdtqUGGN+DMT/r/CKMkMNnx5ryA+HlzQEejk=";
   };
 
   pythonRelaxDeps = [ "tablib" ];

From 36dddbb1cd9b2092c9af9e7c2ece35b311b5916b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 13:30:40 +0000
Subject: [PATCH 48/68] ocamlPackages.hxd: 0.3.4 -> 0.3.5

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

diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
index 530351a27dac..42ce81f3af77 100644
--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -10,13 +10,13 @@
 
 buildDunePackage rec {
   pname = "hxd";
-  version = "0.3.4";
+  version = "0.3.5";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz";
-    sha256 = "sha256-jor8KLUvHqgt37Dnh3JRB/eMIYSevVzGEBsvG4quDmI=";
+    sha256 = "sha256-E1I198ErT9/Cpvdk/Qjpq360OIVuAsbmaNc7qJzndEM=";
   };
 
   propagatedBuildInputs = lib.optional withLwt lwt;

From 7e310754cedad9054669ab8fa9d8ab6c58e2eee7 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 30 Sep 2025 11:38:14 -0400
Subject: [PATCH 49/68] openspeedrun: init at 0.3.3

---
 pkgs/by-name/op/openspeedrun/package.nix | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/op/openspeedrun/package.nix

diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix
new file mode 100644
index 000000000000..468a3b199b5b
--- /dev/null
+++ b/pkgs/by-name/op/openspeedrun/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  wayland,
+  libxkbcommon,
+  libGL,
+  autoPatchelfHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "openspeedrun";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "SrWither";
+    repo = "OpenSpeedRun";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0=";
+  };
+
+  cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM=";
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  runtimeDependencies = [
+    wayland
+    libxkbcommon
+    libGL
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libgcc_s.so.1"
+  ];
+
+  meta = {
+    changelog = "https://github.com/SrWither/OpenSpeedRun/releases/tag/v${finalAttrs.version}";
+    description = "Modern and minimalistic open-source speedrun timer";
+    homepage = "https://github.com/SrWither/OpenSpeedRun";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.pyrox0 ];
+    mainProgram = "openspeedrun";
+  };
+})

From b60109ab98a704fcca87119adae3613527bb0340 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 14:33:02 +0000
Subject: [PATCH 50/68] python3Packages.langsmith: 0.4.29 -> 0.4.31

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

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index e2ab1f82f2b1..ee956d45e690 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.29";
+  version = "0.4.31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-/x8e9ZfHhAQYPtGpp4PRW92QAeLNCPs9p+TnviGg6bY=";
+    hash = "sha256-lHehU+qJBl1pX7H0QmmmVuMYrcbopQZhmCiyQ6D3k2Q=";
   };
 
   sourceRoot = "${src.name}/python";

From 207deec2a820b364ce0a815d772bd51b7332d60b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 14:50:38 +0000
Subject: [PATCH 51/68] dablin: 1.16.0 -> 1.16.1

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

diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix
index a86a6d505721..a989199bd2fa 100644
--- a/pkgs/by-name/da/dablin/package.nix
+++ b/pkgs/by-name/da/dablin/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dablin";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "Opendigitalradio";
     repo = "dablin";
     rev = version;
-    sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc=";
+    sha256 = "sha256-dx+KPPFCx78HtNvEb00URX/eu49Wtj7fksPjDtpkk5Q=";
   };
 
   nativeBuildInputs = [

From a9a5762117788b7d55d1412cbe4f19c0f95738ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 14:51:45 +0000
Subject: [PATCH 52/68] ddns-go: 6.12.4 -> 6.12.5

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

diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index ea4c6ffe7f3e..9b9df7745c68 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.12.4";
+  version = "6.12.5";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-MtnX8/xrslpQYyj2/TIG6x6BNWSLw0dajTB/D02+sRY=";
+    hash = "sha256-8k3WxNSt+DvfdmWH/V3rAlOSHeyf+g5mmXQZghCf7K4=";
   };
 
   vendorHash = "sha256-f94Ox/8MQgy3yyLRTK0WFHebntSUAGlbr4/IY+wrz4w=";

From f046bacde32c2e9217adafd33dd8d9d35f4565d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 15:01:14 +0000
Subject: [PATCH 53/68] cni-plugin-flannel: 1.7.1-flannel2 -> 1.8.0-flannel1

---
 pkgs/tools/networking/flannel/plugin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix
index ef6720116328..caf9d5862671 100644
--- a/pkgs/tools/networking/flannel/plugin.nix
+++ b/pkgs/tools/networking/flannel/plugin.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cni-plugin-flannel";
-  version = "1.7.1-flannel2";
+  version = "1.8.0-flannel1";
 
   src = fetchFromGitHub {
     owner = "flannel-io";
     repo = "cni-plugin";
     rev = "v${version}";
-    sha256 = "sha256-vKHkgdmfG7jf0avwcJsNNCYlERH71ULPBHI3ObtwrIM=";
+    sha256 = "sha256-DaE8T/c1n5Mx/MvPXw+bXO+91Ux/bcWWAdbVmNhQXIo=";
   };
 
-  vendorHash = "sha256-hDodGat/aZyDSRHN6K4J8Pq9LFlclbnEmYVwxCbraKk=";
+  vendorHash = "sha256-x4QoAXrMhzEqSNBvWl3/9Lb4JjDgwcoV9a0xEYcwKFI=";
 
   ldflags = [
     "-s"

From 9ee55f63c5ccaf52e56a6fb6a53209d3d655037c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 15:35:32 +0000
Subject: [PATCH 54/68] bngblaster: 0.9.24 -> 0.9.25

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

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index af5bc8eda93b..4f7db4c8d37d 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.24";
+  version = "0.9.25";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-flPMDpAEAICLR9TYz0vD62e26pJH2p/3u20sOEuKNx4=";
+    hash = "sha256-imbTZLq7yFxh/qaigySNaBBLqkJS1zY/gwjLslj3Jv4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4b4987c5c29d0c26ca629208ee4ddd95f6206b89 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Oct 2025 08:38:15 -0700
Subject: [PATCH 55/68] nixos/tools: remove deprecated accessors for
 pkgs.nixos-option and pkgs.nixos-enter

These warnings were added in 5dcbab6. It has been a full year since they were added -- time to remove them.
---
 nixos/modules/installer/tools/tools.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index aa3aaed54cea..bf8a27419ae2 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -341,8 +341,6 @@ in
     system.build = {
       inherit nixos-generate-config nixos-install;
       nixos-rebuild = if config.system.rebuild.enableNg then nixos-rebuild-ng else nixos-rebuild;
-      nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
-      nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
     };
   };
 }

From 713691f9ea04cbe760e589c99531244fbc393749 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 26 Sep 2025 20:07:08 +0200
Subject: [PATCH 56/68] chromium: remove no longer needed version conditionals

The minimum versions for both chromium and electron-source are higher
than the version bounds of those conditionals.
As such, they can be safely removed.

This is a no-op.
---
 .../networking/browsers/chromium/common.nix   | 45 ++-----------------
 .../patches/webrtc-pipewire-1.4.patch         | 20 ---------
 2 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a6d28e16ed86..1f0e300ae001 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -439,12 +439,6 @@ let
       # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
       ./patches/no-build-timestamps.patch
     ]
-    ++ lib.optionals (!chromiumVersionAtLeast "136") [
-      # Fix build with Pipewire 1.4
-      # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
-      # Got merged, started shipping with M136+.
-      ./patches/webrtc-pipewire-1.4.patch
-    ]
     ++ lib.optionals (packageName == "chromium") [
       # This patch is limited to chromium and ungoogled-chromium because electron-source sets
       # enable_widevine to false.
@@ -489,29 +483,6 @@ let
       # https://chromium-review.googlesource.com/c/chromium/src/+/6665907
       ./patches/chromium-140-rust.patch
     ]
-    ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
-      # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
-      # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
-      # because that's when this revert stopped applying cleanly and defer fully dropping it for
-      # the next cleanup to bundle rebuilding all of chromium and electron.
-      #
-      # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
-      # and std::hardware_constructive_interference_size.
-      # So let's revert the change for now and hope that our rustc.llvmPackages and
-      # nixpkgs-stable catch up sooner than later.
-      # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4
-      # https://chromium-review.googlesource.com/c/chromium/src/+/5767325
-      # Note: We exclude the changes made to the partition_allocator (PA), as the revert
-      # would otherwise not apply because upstream reverted those changes to PA already
-      # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
-      # Note: ungoogled-chromium already reverts this as part of its patchset.
-      (githubPatch {
-        commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
-        hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
-        excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];
-        revert = true;
-      })
-    ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # Reverts decommit pooled pages which causes random crashes of tabs on systems
       # with page sizes different than 4k. It 'supports' runtime page sizes, but has
@@ -528,7 +499,7 @@ let
         hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
       })
     ]
-    ++ lib.optionals (chromiumVersionAtLeast "136") [
+    ++ [
       # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038
       # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for
       # preventing compilations of chromium with versions below their intended version, not about running the very
@@ -562,8 +533,6 @@ let
         chmod u+w build/config/gclient_args.gni
         echo 'checkout_mutter = false' >> build/config/gclient_args.gni
         echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
-      ''
-      + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") ''
         echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni
       ''
       + lib.optionalString (!isElectron) ''
@@ -770,20 +739,16 @@ let
 
         use_qt5 = false;
         use_qt6 = false;
-      }
-      // lib.optionalAttrs (chromiumVersionAtLeast "136") {
+
         # LLVM < v21 does not support --warning-suppression-mappings yet:
         clang_warning_suppression_file = "";
-      }
-      // {
+
         # To fix the build as we don't provide libffi_pic.a
         # (ld.lld: error: unable to find library -l:libffi_pic.a):
         use_system_libffi = true;
         # Use nixpkgs Rust compiler instead of the one shipped by Chromium.
         rust_sysroot_absolute = "${buildPackages.rustc}";
         rust_bindgen_root = "${buildPackages.rust-bindgen}";
-      }
-      // {
         enable_rust = true;
         # While we technically don't need the cache-invalidation rustc_version provides, rustc_version
         # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).
@@ -841,9 +806,7 @@ let
     # Mute some warnings that are enabled by default. This is useful because
     # our Clang is always older than Chromium's and the build logs have a size
     # of approx. 25 MB without this option (and this saves e.g. 66 %).
-    env.NIX_CFLAGS_COMPILE =
-      "-Wno-unknown-warning-option"
-      + lib.optionalString (chromiumVersionAtLeast "135") " -Wno-unused-command-line-argument -Wno-shadow";
+    env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow";
     env.BUILD_CC = "$CC_FOR_BUILD";
     env.BUILD_CXX = "$CXX_FOR_BUILD";
     env.BUILD_AR = "$AR_FOR_BUILD";
diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch
deleted file mode 100644
index a614188a9689..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-+++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }

From 658df016886973832d928b9e3a78227025ba595d Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 26 Sep 2025 20:12:48 +0200
Subject: [PATCH 57/68] chromium: remove redundant `run_mksnapshot_default`
 build target

This build target, mksnapshot, was added all the way back in 2014 in
8d54dc6d13ac3b42e45d95a2cfb971e7c01ad39c to add support for grsecurity.

A few years later in 2017, grsecurity made their free testing patches
private, forcing nixpkgs to drop the grsecurity-flavored linux
kernel in 32b8512e54b864ecf8c2b1e115c1a3f18e90a8c3.

Roughtly another year later, 1b146a8c6f55b23981c3817d8346f95bb3a799fe
removed paxutils from the stdenv and the remaining paxmark invocations
in various build expressions. The explicit mksnapshot build target,
however, remained, for no reason.

In 2023, 0a05fbb9a010337454b942011bfa92168b2efc17 renamed the target
from mksnapshot to run_mksnapshot_default for cross-compilation reasons.

Note that removing it does not improve compile times in any meaningful
way. This is because mksnapshot is implicitly pulled in by the main
build target, chrome. It does, however, make the ninja task count
more accurate and build dependency errors that would previously only
happen in chrome but not mksnapshot, no longer require to first build
mksnapshot and instead fail immediately.
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 9006e143ed6e..99d0f4bd1a68 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -10,7 +10,6 @@ mkChromiumDerivation (base: rec {
   name = "chromium-browser";
   packageName = "chromium";
   buildTargets = [
-    "run_mksnapshot_default"
     "chrome_sandbox"
     "chrome"
   ];

From d394ed871017f99b0edd1f1e9ba54f5a7e9bb28d Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 30 Sep 2025 22:32:39 +0200
Subject: [PATCH 58/68] chromium,chromedriver: 140.0.7339.207 -> 141.0.7390.54

https://developer.chrome.com/blog/new-in-chrome-141

https://developer.chrome.com/release-notes/141

https://chromereleases.googleblog.com/2025/09/stable-channel-update-for-desktop_30.html
---
 .../networking/browsers/chromium/common.nix   |  25 +-
 .../networking/browsers/chromium/info.json    | 274 +++++++++---------
 .../chromium/patches/chromium-141-rust.patch  |  21 ++
 3 files changed, 186 insertions(+), 134 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 1f0e300ae001..feac9db09d2e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -478,11 +478,16 @@ let
       # allowing us to use our rustc and our clang.
       ./patches/chromium-129-rust.patch
     ]
-    ++ lib.optionals (chromiumVersionAtLeast "140") [
+    ++ lib.optionals (versionRange "140" "141") [
       # Rebased variant of the patch above due to
       # https://chromium-review.googlesource.com/c/chromium/src/+/6665907
       ./patches/chromium-140-rust.patch
     ]
+    ++ lib.optionals (chromiumVersionAtLeast "141") [
+      # Rebased variant of the patch above due to
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6897026
+      ./patches/chromium-141-rust.patch
+    ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # Reverts decommit pooled pages which causes random crashes of tabs on systems
       # with page sizes different than 4k. It 'supports' runtime page sizes, but has
@@ -523,6 +528,17 @@ let
       # Rebased variant of the patch above for
       # electron 35 (M134) and 36 (M136)
       ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "141") [
+      (fetchpatch {
+        # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"
+        # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157
+        name = "chromium-141-Revert-Remove-unnecessary-include-in-tree_scope.h.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/0fc0e71aa1ca0419fae6d14255025543980d2cba^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";
+      })
     ];
 
     postPatch =
@@ -736,7 +752,12 @@ let
         # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
         chrome_pgo_phase = 0;
         clang_base_path = "${llvmCcAndBintools}";
-
+      }
+      // lib.optionalAttrs (chromiumVersionAtLeast "141") {
+        # TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md
+        use_clang_modules = false;
+      }
+      // {
         use_qt5 = false;
         use_qt6 = false;
 
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 71b9f2aa7573..6e59ffb26c30 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,28 +1,28 @@
 {
   "chromium": {
-    "version": "140.0.7339.207",
+    "version": "141.0.7390.54",
     "chromedriver": {
-      "version": "140.0.7339.208",
-      "hash_darwin": "sha256-sdBwwXl63vOkkGHsXG5BFWmXj2pbgA5bk2J5mNwEnGA=",
-      "hash_darwin_aarch64": "sha256-pL/7kHVv0e4X7bSCcjqQdI/myzgKqU858WPVJ5XZmKw="
+      "version": "141.0.7390.55",
+      "hash_darwin": "sha256-wo68N1aftGGyZR4rYI+96lXKJqPAYro3g4s/OL/CUco=",
+      "hash_darwin_aarch64": "sha256-5uUklsYRFhpLIAKoPl5EU5dQJcxwXVpJp0lyQ4SkspY="
     },
     "deps": {
       "depot_tools": {
-        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
-        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
+        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
+        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
       },
       "gn": {
-        "version": "0-unstable-2025-07-29",
-        "rev": "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
-        "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
+        "version": "0-unstable-2025-08-29",
+        "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
+        "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
       },
-      "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
+      "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "17230b545fd18b35aad49122e5af97a463bc7a9c",
-        "hash": "sha256-TPO2tCz3pkYAlZW0u5xfyBEUjqZvu7n+2Pr7KD8MfMQ=",
+        "rev": "b95610d5c4a562d9cd834bc0a098d3316e2f533f",
+        "hash": "sha256-jraDPodJBdyFFHS30BcQTZOEUD+h9SFHQrO0GoMhtk8=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -32,28 +32,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
-        "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8="
+        "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e",
+        "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
-        "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M="
+        "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e",
+        "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
-        "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70="
+        "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524",
+        "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
-        "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw="
+        "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129",
+        "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "6adc0aa946a413c124758a3a0ac12e5a536c7dd3",
-        "hash": "sha256-C5ZmMzhGdRAd9tpad8hnqM6RoXsunKSuYUoUQdsYclI="
+        "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f",
+        "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "a89f6810f6a5b0e11e4ec00387e9f97e8f6c23ae",
-        "hash": "sha256-LH4TlXPBULUamqTDitDEXiB37705BzEAqX1Lan87eoM="
+        "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d",
+        "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,8 +82,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "42832178b3b6ae20f0d1c9634c040c528614f45f",
-        "hash": "sha256-ImjvS826eyo82TIDw6M/7h3lrwbCwxQ+oKJr8RaqDTc="
+        "rev": "62826931e84c49c94192065c896931576d8273c8",
+        "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "a8c8a6febe630c6239a5e207530e9fac651ae373",
-        "hash": "sha256-GxWTdzSf7/9WIqrECdAEkibXve/ZpKpxJcNS+KnfNc0="
+        "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6",
+        "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -107,8 +107,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "ad59a18f2ce08e60c9f4ab0aaf9b62679ab8c626",
-        "hash": "sha256-42ShMIXq9CnOlmwXcUvupPpQSNggdlXEkR3mdthsGzg="
+        "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb",
+        "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -117,8 +117,8 @@
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
-        "rev": "04fd32f72b448c12b02ba6c40928b67e510bac49",
-        "hash": "sha256-yUf4UTwcJ7H0tuN+e6c92F4UUSXjmTNOIKqNZA4+zAo="
+        "rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197",
+        "hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0="
       },
       "src/third_party/content_analysis_sdk/src": {
         "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
@@ -127,13 +127,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
-        "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc="
+        "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
+        "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08",
-        "hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc="
+        "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd",
+        "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -142,8 +142,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "50764bac3d4048144e9ada5f5a742c82cc97cc9a",
-        "hash": "sha256-rs5cw/kpRq0Bcr2ov5kKsupwqkIQDvuvUMbZbAdOmGI="
+        "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867",
+        "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -162,8 +162,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "5b477670f53e5fefcf4bd829a2952013ef9d1953",
-        "hash": "sha256-os0yeQb6snDvUjYghrIYAy9nUi1j8Y2YoTfsiQ7SlpA="
+        "rev": "0558b1933531e6379ac5875129b92aac9d1ce035",
+        "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
@@ -182,13 +182,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "0a0009998fa180695f3e2071805dc03c9a5f3124",
-        "hash": "sha256-hYUbfUo00gHqYKac0vOpmBHtb5/FBsgXL+UQtrHxGaM="
+        "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96",
+        "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
-        "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok="
+        "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4",
+        "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -197,8 +197,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
-        "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM="
+        "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0",
+        "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -222,8 +222,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "33ed0be77d7767d0e2010e2c3cf972ef36c7c307",
-        "hash": "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU="
+        "rev": "e414c0446436ed34151de3158d18f8ae32e55d03",
+        "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -232,13 +232,13 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "07b9fafa3fff468afa2960789d2b28444c38db3e",
-        "hash": "sha256-JpimNp8PmsROMiQLy8H39n8l+KDwaivZiIOgSjLF3U4="
+        "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4",
+        "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "69b7e2bb8e1d8d92d4efbb92bcddba3af2716577",
-        "hash": "sha256-1cyXu5fSHWLWt3qdafWQu1WyeZ+fT/be7seiv/MDPdQ="
+        "rev": "b560604e8f2261a2c685c28359b69af74b92a196",
+        "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js="
       },
       "src/third_party/crossbench-web-tests": {
         "url": "https://chromium.googlesource.com/chromium/web-tests.git",
@@ -247,13 +247,13 @@
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
-        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
+        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
+        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "725edaaf06b966e670194d0376d50be0c25deb13",
-        "hash": "sha256-7YwrN+MizCnfcwDHWsYkZaTbN2qmCHcixX6KHhCPrXs="
+        "rev": "65f160d43dc97a2e8eb5e1c2814179a519313884",
+        "hash": "sha256-VLMJ/WWCIzk92mmuBdx+P6Gi0ouiXuMGkiR0KVK5GWI="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -280,15 +280,20 @@
         "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
         "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
       },
+      "src/third_party/federated_compute/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
+        "rev": "cf49f95f941eb872f596522890055878240c3a22",
+        "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg="
+      },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
-        "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY="
+        "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f",
+        "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
-        "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-        "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs="
+        "rev": "807e251d9f8c5dd6059e547931e9c6a4251967af",
+        "hash": "sha256-Y5TXyJ8lVh8TaVC5S4BVxOmFxySBzPbJYEe8YJS6ZR4="
       },
       "src/third_party/flatbuffers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
@@ -302,8 +307,8 @@
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
-        "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-        "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY="
+        "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
+        "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4="
       },
       "src/third_party/gemmlowp/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git",
@@ -312,8 +317,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "27c1cb10a52420515ce66729dfca897be21691b8",
-        "hash": "sha256-2ialoA/hqlTwnbBkBlgz5CT2nzpUVXVMtEOxSxifiXQ="
+        "rev": "61a423426089e65c27699d824303f209026b2f05",
+        "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -322,8 +327,8 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
-        "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4="
+        "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
+        "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
@@ -345,6 +350,11 @@
         "rev": "955936be8b391e00835257059607d7c5b72ce744",
         "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE="
       },
+      "src/third_party/oak/src": {
+        "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
+        "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040",
+        "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c="
+      },
       "src/third_party/ots/src": {
         "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
         "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
@@ -357,8 +367,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "373af2e3df71599b87a40ce0e37164523849166b",
-        "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw="
+        "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
+        "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -387,8 +397,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
-        "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk="
+        "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61",
+        "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -402,18 +412,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
-        "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo="
+        "rev": "4703185b29b381e5651eb1caed66630f623bf752",
+        "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "644c9d84c123ac811a611760a9adc807e3eb5be5",
-        "hash": "sha256-snogXm3EMmDJoL2ikoaxeODYfmTaVEsAb5cMcRU7uC4="
+        "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5",
+        "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "a8889d12a27ef7006d1a47dfefc272e0815f5c41",
-        "hash": "sha256-pFcusmbij3OsSAmaKhuI8/bo3AlfP7DuTo/W/6mAZs8="
+        "rev": "5f27145da57a32eb8db215c40fe867a20beea987",
+        "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -422,8 +432,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "fe1f348226d4b7c3447e606577960a606cc058e4",
-        "hash": "sha256-kznek87yenGR9Ft3D06LGDOy7+VPRhSUFru340mvES4="
+        "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c",
+        "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -432,8 +442,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "87f9ed88c8f8abe3a3bb19b9ec5ea49623d803ad",
-        "hash": "sha256-eIrkM7UxuaZox3A8pqEgvgpQCkcBO3zJWFwK45fgWm0="
+        "rev": "06449bdc34789a7459393405dd777e02d78a3743",
+        "hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY="
       },
       "src/third_party/speedometer/v3.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -517,8 +527,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
-        "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8="
+        "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c",
+        "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -527,13 +537,13 @@
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "4fa21912338357f89e4fd51cf2368325b59e9bd9",
-        "hash": "sha256-eaGWMpF6ENrKxGxqXccQ0P1G0X+nQI0EoL0Y0R2VVZ0="
+        "rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6",
+        "hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg="
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
-        "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus="
+        "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba",
+        "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -567,8 +577,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "f51be2dd676c855bc588a439f002bc941b87db6b",
-        "hash": "sha256-7AmfZjugPKty0lpinOR/Q22M7F34p57tl+gs6s2BJhY="
+        "rev": "9756d3a568a78213678eeb52e044b9658e195e15",
+        "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -582,18 +592,18 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "1afaa1a380fcd06cec420f3e5b6ec1d2ccb920dc",
-        "hash": "sha256-kx2jF4kHeGECdf6WzcRKTmwhvmoKl+rIVQ2Ep8Y9rs8="
+        "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453",
+        "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "4ab725613a8ee64e9acd7930eceb8995e24df562",
-        "hash": "sha256-V16Fm389yRNn0b13n70828c8xTdwxoQ6GW8iKLyy0qE="
+        "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26",
+        "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
-        "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
-        "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0="
+        "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024",
+        "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM="
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
@@ -617,8 +627,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
-        "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ="
+        "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
+        "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -627,13 +637,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "5c5db51f8c13cb42379d8b333890971f1a1a1797",
-        "hash": "sha256-Z4ykCZkUVatvkH3ytIdGOp0zEYLKIqr8fta0MnovZKw="
+        "rev": "629f034fd4473fca4ee8886ed886943672fc72fa",
+        "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "f3ff281f2330f2948888a9cc0ba921bbdc107da8",
-        "hash": "sha256-88ezOArtEdPJZACmgyjJ2Jf5biSlyoDYMJBZ7wwPt7Q="
+        "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601",
+        "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -647,13 +657,13 @@
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
-        "rev": "cc08c79629643fdd5b592f1391e738815f5577b6",
-        "hash": "sha256-1Q2+NyCJb0GIMC30YNbVqVYHnP62tmKqBRfr9Xw5Z4A="
+        "rev": "7d348fc79216a09b864ff881d8561a6222301666",
+        "hash": "sha256-13HMEpzzcFx/UKqt4V68619R+0j4B/GOl6NYlhpBk0c="
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "fdb6700ecb04103b658d2e4623d6bc663ba80ea8",
-        "hash": "sha256-jJT0hF1k5a6na+9aH1yHuUo6go/PzgKibP/k60m6+xM="
+        "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f",
+        "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -667,13 +677,13 @@
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "c466059b72815c7fbce8bb3ab4832407aabc5dc5",
-        "hash": "sha256-MEMOJBBMBeA0kBlU5ZhkPbfRpn1PSL1950IsU1rWaJ8="
+        "rev": "a493d027dfa1ebf220dea834757f5114494f0f92",
+        "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "38f6708b6b6f213010c51ffa8f577a7751e12ce7",
-        "hash": "sha256-HeH7j7IsjeP2vFPhX9cKzZ2O54eIGSCoSnPT4pumA00="
+        "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5",
+        "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -682,38 +692,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "97e96f9e9defeb4bba3cfbd034dec516671dd7a3",
-        "hash": "sha256-/OT6//yu8VmQMXs3DSgwEx2lMDTPlUuXJDjboNdLjrI="
+        "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8",
+        "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "3aeaaa088d37b86cff036eee1a9bf452abad7d9d",
-        "hash": "sha256-bkoD3/4o/CjNBAp49vnRq4ZtY7TNgYkVPI5gESM8CUI="
+        "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3",
+        "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "a01329f307fa6067da824de9f587f292d761680b",
-        "hash": "sha256-LCRK6UzqvcRoa3sr6nsfkDf3aILXj8zjb48lirsLTIw="
+        "rev": "d1cd37e925510a167d4abef39340dbdea47d8989",
+        "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "f2389e27734347c1d9f40e03be53f69f969976b1",
-        "hash": "sha256-NIBn5HkAKzNaSruw742QBWPgCkrxQdmITvTASagYlKM="
+        "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485",
+        "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "f766b30b2de3ffe2cf6b656d943720882617ec58",
-        "hash": "sha256-9sF9syF7d28J5yzGsIHUcJ1QB2JmJZpAVqDt92ZZOY4="
+        "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d",
+        "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "b0a40d2e50310e9f84327061290a390a061125a3",
-        "hash": "sha256-bj9YCZfIFeaQ9TVpyyztRs3LOIaJkKpkGKbU5g9hEzg="
+        "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d",
+        "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "6b1b8e3d259241a68c0944ca0a7bb5320d086191",
-        "hash": "sha256-Do+6/v8Ysp1Wnnmdi5I+UKHpBcEG4xMeRROCWgLmJbY="
+        "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3",
+        "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -752,8 +762,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "07f4412e935c988d60fad2e373287d6450bcd231",
-        "hash": "sha256-yb7NqciuvXi7crCqpN+7hgJ+JXfDF9x48gkYI2uSTtA="
+        "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f",
+        "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -762,8 +772,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "36ea4535a500ac137dbf1f577ce40dc1aaa774ef",
-        "hash": "sha256-/3V/V0IrhOKcMAgs/C1qraqq+1pfopW8HKvGRmqLE0Q="
+        "rev": "bc7452c444245f7999be5711b1802e900f25540b",
+        "hash": "sha256-Bqsd8b14ORREk/J3Tfs7OJXny0FdwUHO/sfCSEMEUSE="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -782,18 +792,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "ae40b1a2d93d5c516bc7657c6c3eea1470f917ae",
-        "hash": "sha256-w+8aCRTlBWQcDh4EvAF87eiLmQWsIsxD9adPTnuA12E="
+        "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63",
+        "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "f9938c217da17ec3e9dcd2a2d99c5cf39536aeb9",
-        "hash": "sha256-emmJF7XLq5CxXFd0KUrtUtw1YGOHDSiz39vtgVoEPd0="
+        "rev": "e128976193546dceb24249206a02ff8f444f7120",
+        "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "b7ed978e41b4bac7802b206404d0e2f3d09f31ac",
-        "hash": "sha256-/XuTD8ENQutrbBt5sJYHuG/87q00J2fACSBBkeEHTYs="
+        "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8",
+        "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY="
       }
     }
   },
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch
new file mode 100644
index 000000000000..dfaf83da60ed
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch
@@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 516f7d85fc5718a26707d988389081cd86da49bd..f4b5284ad90591a57cb803353bbe57fd4e213159 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1911,16 +1911,6 @@ config("runtime_library") {
+     configs += [ "//build/config/c++:runtime_library" ]
+   }
+ 
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
+-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
+-  # library. The Rust symbols are marked as weak, so that they can be replaced by
+-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
+-  # order to cause that replacement to occur by explicitly linking in clang's
+-  # compiler-rt library.
+-  if (is_clang && !(is_a_target_toolchain && is_cronet_build)) {
+-    configs += [ "//build/config/clang:compiler_builtins" ]
+-  }
+-
+   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+   # configuration.
+   if (is_posix || is_fuchsia) {

From e10ac4585476c6f27234cfa0fbcb62d0e993078f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 16:15:28 +0000
Subject: [PATCH 59/68] dotenvx: 1.50.1 -> 1.51.0

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

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 0674bd40a886..f6f0c720a8ff 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.50.1";
+  version = "1.51.0";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-fh819FxXugCUF9TMxCAIog0SP52YnPHL6gvVtoS6fN8=";
+    hash = "sha256-vRvcsh4b/QlU+f7646t8O5F8VT/K6zBxbUpos+hh0fw=";
   };
 
-  npmDepsHash = "sha256-P7BSVGoHBJrR5AUT70a10BqKNJxG+GW8FpkaKTEUA/c=";
+  npmDepsHash = "sha256-AT9ZE7ip63t6vK/GBVM9JCmir68jrxMN54RoREmjSIk=";
 
   dontNpmBuild = true;
 

From 33349db0ee642a94e9933bb4612474f29bc5abc1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 1 Oct 2025 16:20:01 +0000
Subject: [PATCH 60/68] python3Packages.textual: 6.2.0 -> 6.2.1

Diff: https://github.com/Textualize/textual/compare/v6.2.0...v6.2.1

Changelog: https://github.com/Textualize/textual/blob/v6.2.1/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index b050d2212b3f..20d04b0a03b1 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "6.2.0";
+  version = "6.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-XvuKwQwaNwgwKScgHNQyxkPXzDQtOA690Dt+VndmZ6o=";
+    hash = "sha256-2myMafLHxJNw3EWLvlvg0wWznY6m04BOQjhYtRvYTP8=";
   };
 
   build-system = [ poetry-core ];

From f6496fe0146299a4867703da0f7e901779dc32cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 17:47:18 +0000
Subject: [PATCH 61/68] python3Packages.trimesh: 4.8.2 -> 4.8.3

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 0019d714b2d9..4853f7735218 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.8.2";
+  version = "4.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "mikedh";
     repo = "trimesh";
     tag = version;
-    hash = "sha256-9D3cuQ6parDq2pWSJmGlMzUyxUOs6Nn9T4l8Fpz50nw=";
+    hash = "sha256-ywLbXOE3qO3+hrqy/+cVGZA4V202eHaMUnn3Wz1iNLI=";
   };
 
   build-system = [ setuptools ];

From 8080f4f3370375ca50f525ef85109da7286d41c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 18:07:51 +0000
Subject: [PATCH 62/68] pkarr: 2.0.0 -> 4.0.0

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

diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index a342709b910e..45b2256e15f2 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pkarr";
-  version = "2.0.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "pubky";
     repo = "pkarr";
     rev = "v${version}";
-    hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks=";
+    hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA=";
   };
 
-  cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE=";
+  cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs=";
 
   meta = {
     description = "Public Key Addressable Resource Records (sovereign TLDs) ";

From 1fbf1f1b93b6c2834f0b2486fe0eb91d88ba1996 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 18:11:44 +0000
Subject: [PATCH 63/68] polarity: latest-unstable-2025-09-17 ->
 latest-unstable-2025-09-25

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

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index b58b658595cf..2c768099c79a 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-09-17";
+  version = "latest-unstable-2025-09-25";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "20a0394d99752947f78e152854efd19852616968";
-    hash = "sha256-Gu9PwRqMjFzubFkyRRbxcfG6mmID8HIJclkW7sDDWYo=";
+    rev = "e582716daae20d534f7c7ecc58569bfd28d679f2";
+    hash = "sha256-L9eBD8rA8cBdd2FFeyFKSl8/lse1OlgogEOTkVYkxHo=";
   };
 
   cargoHash = "sha256-EB6DlhD+0oneAGhLHi3bWnnFUIfNdKeW52umWHZEP7c=";

From 20e131d7ad6c7378f93fed9c31ce3e4b5aa42a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 1 Oct 2025 20:52:54 +0200
Subject: [PATCH 64/68] diffoscope: 303 -> 304

Changes: https://diffoscope.org/news/diffoscope-304-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index f71d576652a7..0410978a4393 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,12 +106,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "303";
+  version = "304";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-kalURmsdYl0HOnzAkJ6aGRvYcjnb8BeWimokmpqE+Ds=";
+    hash = "sha256-lJdZRIyoVq1PsmiicsSxJ0Mgsy5IcAUar6l8QvJoxOw=";
   };
 
   outputs = [

From c9e171db36af96fc239a6bc3b9ab47a3fd908510 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 19:14:44 +0000
Subject: [PATCH 65/68] scip-go: 0.1.25 -> 0.1.26

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

diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 7b4615fd8768..22e07287513b 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "scip-go";
-  version = "0.1.25";
+  version = "0.1.26";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
     rev = "v${version}";
-    hash = "sha256-qzLDqHnZpJtdBZa/YOLZCiS+V52a1Lxc0TLsfSeRCG8=";
+    hash = "sha256-4Xm/o4hl94vCAEpFbaKDMDhv6ZyANCg2HDC6EIwyzsI=";
   };
 
   vendorHash = "sha256-J/97J/VXmQAYHu1qr9KiTUrB6/SVFcahihRatCKgaD8=";

From 043b1baf6094f20a45248ac81019bc6fed041df5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 19:36:59 +0000
Subject: [PATCH 66/68] argocd: 3.1.6 -> 3.1.8

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

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 3b8b9108386e..0dd904c7cd23 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "3.1.6";
+  version = "3.1.8";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-RdqMkyQBJaAJv660bCe+C84BFQNu06t3AaYSz4aMlBA=";
+    hash = "sha256-xySxnRw8MvMi4BJ/h8+4Lhf2ontC05hAliMG2e3xnQg=";
   };
 
   ui = stdenv.mkDerivation {

From 3bdfcf7a101231c4952d851f4a25e98f3adb2a59 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 1 Oct 2025 14:42:42 -0300
Subject: [PATCH 67/68] wesnoth: move to pkgs/by-name

---
 .../default.nix => by-name/we/wesnoth/package.nix} | 14 ++++++++++++--
 pkgs/top-level/all-packages.nix                    | 12 ------------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename pkgs/{games/wesnoth/default.nix => by-name/we/wesnoth/package.nix} (92%)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/by-name/we/wesnoth/package.nix
similarity index 92%
rename from pkgs/games/wesnoth/default.nix
rename to pkgs/by-name/we/wesnoth/package.nix
index 1db4ae430e28..a50355909457 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -12,7 +12,7 @@
   SDL2_ttf,
   pango,
   gettext,
-  boost,
+  boost186,
   libvorbis,
   fribidi,
   dbus,
@@ -20,11 +20,21 @@
   pcre,
   openssl,
   icu,
-  lua,
+  lua5_4,
   curl,
   nix-update-script,
 }:
 
+let
+  boost = boost186;
+  # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
+  lua = lua5_4.override {
+    postConfigure = ''
+      makeFlagsArray+=("CC=$CXX")
+    '';
+  };
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "wesnoth";
   version = "1.18.5";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e39009dfeb3a..b68b2fe15612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13917,18 +13917,6 @@ with pkgs;
 
   warsow = callPackage ../games/warsow { };
 
-  wesnoth = callPackage ../games/wesnoth {
-    boost = boost186;
-    # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
-    lua = lua5_4.override {
-      postConfigure = ''
-        makeFlagsArray+=("CC=$CXX")
-      '';
-    };
-  };
-
-  wesnoth-dev = wesnoth;
-
   inherit (callPackage ../games/xonotic { })
     xonotic-data
     xonotic

From 8c34dffa76790d69da8bccfe2035fed67b06228c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 1 Oct 2025 14:52:13 -0300
Subject: [PATCH 68/68] wesnoth: add maintainer iedame

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

diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix
index a50355909457..16663c625477 100644
--- a/pkgs/by-name/we/wesnoth/package.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       niklaskorz
+      iedame
     ];
     platforms = lib.platforms.unix;
     mainProgram = "wesnoth";