From ce313d7143011086dc0c8b7697a1e6af20e2d15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 21 Apr 2025 04:15:08 +0200
Subject: [PATCH 01/51] nixos/limesurvey: fix default config merging when
 config is defined, set userquestionthemerootdir default

Picked from #325665
---
 nixos/modules/services/web-apps/limesurvey.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index c1d4d01b6a6a..802a8f506208 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -45,7 +45,7 @@ let
 
   limesurveyConfig = pkgs.writeText "config.php" ''
     <?php
-      return \array_merge(
+      return \array_merge_recursive(
         \json_decode('${builtins.toJSON cfg.config}', true),
         [
           'config' => [
@@ -304,6 +304,7 @@ in
       config = {
         tempdir = "${stateDir}/tmp";
         uploaddir = "${stateDir}/upload";
+        userquestionthemerootdir = "${stateDir}/upload/themes/question";
         force_ssl = mkIf (
           cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL
         ) "on";

From ffb1364bcf0ec304419eb5bb8bfbb875fdc7774f Mon Sep 17 00:00:00 2001
From: Ananth Bhaskararaman <antsub@gmail.com>
Date: Fri, 19 Sep 2025 02:26:40 +0530
Subject: [PATCH 02/51] home-assistant-custom-components.hassio-ecoflow-cloud:
 init at 1.3.0

---
 .../hassio-ecoflow-cloud/package.nix          | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix b/pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix
new file mode 100644
index 000000000000..c575a7ab9ba3
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  jsonpath-ng,
+  paho-mqtt,
+  protobuf,
+  nix-update-script,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "tolwi";
+  domain = "ecoflow_cloud";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "tolwi";
+    repo = "hassio-ecoflow-cloud";
+    tag = "v${version}";
+    hash = "sha256-CVm5+zLWN/ayhHRNFUr4PLwedwf4GJXvLOFgrh2qxAc=";
+  };
+
+  dependencies = [
+    jsonpath-ng
+    paho-mqtt
+    protobuf
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/tolwi/hassio-ecoflow-cloud/releases/tag/v${version}";
+    description = "Home Assistant component for EcoFlow Cloud";
+    homepage = "https://github.com/tolwi/hassio-ecoflow-cloud";
+    maintainers = with lib.maintainers; [ ananthb ];
+    # license = lib.licenses.asl20;
+  };
+}

From 0ef3c0736e6e2e560796e359cbaf5bc1363ed78e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 14:21:59 +0000
Subject: [PATCH 03/51] xpar: 0.6 -> 0.7

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

diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
index 162305064523..938c60d45278 100644
--- a/pkgs/by-name/xp/xpar/package.nix
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpar";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "kspalaiologos";
     repo = "xpar";
     rev = finalAttrs.version;
-    hash = "sha256-cvt5fXg3mKzh0GlL1qkA7G17p2ZA0PpFnE2cLYwlmUM=";
+    hash = "sha256-uZfOrhXEDBvALd+rCluzcMPDW/no9t8PqGBuoZm6MtA=";
   };
 
   nativeBuildInputs = [

From c457a6294e2389539e448240590eb977f8073413 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 14:41:50 +0800
Subject: [PATCH 04/51] sjasmplus: 1.18.3 -> 1.21.0

Diff: https://github.com/z00m128/sjasmplus/compare/v1.18.3...v1.21.0
---
 pkgs/by-name/sj/sjasmplus/package.nix | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix
index 51ef3793cc03..50cd0a0ff972 100644
--- a/pkgs/by-name/sj/sjasmplus/package.nix
+++ b/pkgs/by-name/sj/sjasmplus/package.nix
@@ -2,19 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  luabridge,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sjasmplus";
-  version = "1.18.3";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "z00m128";
     repo = "sjasmplus";
-    rev = "v${version}";
-    sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iPtH/Uviw9m3tcbG44aZO+I6vR95/waXUejpwPPCpqo=";
   };
 
+  buildInputs = [ luabridge ];
+
   buildFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
     "CXX=${stdenv.cc.targetPrefix}c++"
@@ -22,16 +25,18 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -D sjasmplus $out/bin/sjasmplus
+
+    install -D --mode=0755 sjasmplus $out/bin/sjasmplus
+
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://z00m128.github.io/sjasmplus/";
-    description = "Z80 assembly language cross compiler. It is based on the SjASM source code by Sjoerd Mastijn";
+    description = "Z80 assembly language cross compiler based on the SjASM source code by Sjoerd Mastijn";
     mainProgram = "sjasmplus";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ electrified ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ electrified ];
   };
-}
+})

From 8eb3e62473c55efc4dfb3980fd72c61eb3b63378 Mon Sep 17 00:00:00 2001
From: Jaiden Douglas <contact@ja1den.me>
Date: Fri, 26 Sep 2025 22:43:19 +0930
Subject: [PATCH 05/51] include-what-you-use: add ja1den as maintainer

---
 .../tools/analysis/include-what-you-use/default.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 2249596d30c9..7ce978428eb1 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -63,6 +63,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://include-what-you-use.org";
     license = licenses.bsd3;
+    maintainers = [
+      maintainers.ja1den
+    ];
     platforms = platforms.unix;
   };
 }

From 0a933af6848899b705e9326401d47299cbc14974 Mon Sep 17 00:00:00 2001
From: Jaiden Douglas <contact@ja1den.me>
Date: Fri, 26 Sep 2025 22:43:37 +0930
Subject: [PATCH 06/51] include-what-you-use: 0.24 -> 0.25

---
 .../tools/analysis/include-what-you-use/default.nix           | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 7ce978428eb1..620c682e3f20 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   pname = "include-what-you-use";
   # Make sure to bump `llvmPackages` in "pkgs/top-level/all-packages.nix" to the supported version:
   # https://github.com/include-what-you-use/include-what-you-use?tab=readme-ov-file#clang-compatibility
-  version = "0.24";
+  version = "0.25";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
-    hash = "sha256-ojQhzv9gHT6iFej6kpK/qMo56xrCCY277fxs/mVUHBA=";
+    hash = "sha256-voH51UmIgUYkZQYN3Ci1h8ASVCVccG05fRpJTWnrXv0=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d92634cb035..bea88464bc34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6827,7 +6827,7 @@ with pkgs;
   iaca = iaca_3_0;
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
-    llvmPackages = llvmPackages_20;
+    llvmPackages = llvmPackages_21;
   };
 
   inherit (callPackage ../applications/misc/inochi2d { })

From e7513aca60a0cac2ca3ded5d0a0452bd9b72ab55 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 8 Sep 2025 03:57:25 +0100
Subject: [PATCH 07/51] speedcrunch: migrate to pkgs/by-name

---
 .../sp/speedcrunch/package.nix}               | 25 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 14 deletions(-)
 rename pkgs/{applications/science/math/speedcrunch/default.nix => by-name/sp/speedcrunch/package.nix} (77%)

diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/by-name/sp/speedcrunch/package.nix
similarity index 77%
rename from pkgs/applications/science/math/speedcrunch/default.nix
rename to pkgs/by-name/sp/speedcrunch/package.nix
index 0dde53043f80..4f3b79eb1982 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/by-name/sp/speedcrunch/package.nix
@@ -1,14 +1,12 @@
 {
   stdenv,
-  mkDerivation,
   lib,
   fetchFromBitbucket,
   cmake,
-  qtbase,
-  qttools,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "speedcrunch";
   version = "unstable-2021-10-09";
 
@@ -19,19 +17,22 @@ mkDerivation {
     sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
   };
 
-  buildInputs = [
+  sourceRoot = "source/src";
+
+  buildInputs = with libsForQt5; [
     qtbase
     qttools
   ];
 
-  nativeBuildInputs = [ cmake ];
-
-  preConfigure = ''
-    cd src
-  '';
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ [
+    libsForQt5.wrapQtAppsHook
+  ];
 
   meta = with lib; {
-    homepage = "http://speedcrunch.org";
+    homepage = "https://speedcrunch.org";
     license = licenses.gpl2Plus;
     description = "Fast power user calculator";
     mainProgram = "speedcrunch";
@@ -44,7 +45,7 @@ mkDerivation {
     maintainers = with maintainers; [
       j0hax
     ];
-    inherit (qtbase.meta) platforms;
+    inherit (libsForQt5.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7a82f49c6f7..d3de0b25a3be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14525,8 +14525,6 @@ with pkgs;
     enableJupyter = false;
   };
 
-  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };

From 280635f07c968e5ee58cdbf205cc1741c468b5fb Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 8 Sep 2025 04:28:23 +0100
Subject: [PATCH 08/51] speedcrunch: unstable-2021-10-09 ->
 0.12-unstable-2024-12-02

Upstream:
https://bitbucket.org/heldercorreia/speedcrunch/commits/branch/master

- Update the version of Speedcrunch to the penultimate latest upstream
  commit. The actual latest upstream commit enforces the use of Qt6, and
  the build fails if Qt6 is used.
---
 pkgs/by-name/sp/speedcrunch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/speedcrunch/package.nix b/pkgs/by-name/sp/speedcrunch/package.nix
index 4f3b79eb1982..5bfe19feb52a 100644
--- a/pkgs/by-name/sp/speedcrunch/package.nix
+++ b/pkgs/by-name/sp/speedcrunch/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "speedcrunch";
-  version = "unstable-2021-10-09";
+  version = "0.12-unstable-2024-12-02";
 
   src = fetchFromBitbucket {
     owner = "heldercorreia";
     repo = "speedcrunch";
-    rev = "74756f3438149c01e9edc3259b0f411fa319a22f";
-    sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
+    rev = "db51fc5e547aa83834761d874d3518c06d0fec9e";
+    hash = "sha256-rnl4z/HU3lAF9Y1JvdM8LZWIV1NGfR4q5gOMxlNU2EA=";
   };
 
   sourceRoot = "source/src";

From c0cdc080d2d16557a57050ae3488586480bb7c73 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Mon, 29 Sep 2025 16:53:18 +0200
Subject: [PATCH 09/51] python3Packages.pgpy-dtc: fix building with current
 cryptography library version

Same change as b8e282093d2fd1c336661d6704eae08c85a1362e
---
 ...Fix-compat-with-current-cryptography.patch | 34 +++++++++++++++++++
 .../python-modules/pgpy-dtc/default.nix       |  7 ++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/pgpy-dtc/Fix-compat-with-current-cryptography.patch

diff --git a/pkgs/development/python-modules/pgpy-dtc/Fix-compat-with-current-cryptography.patch b/pkgs/development/python-modules/pgpy-dtc/Fix-compat-with-current-cryptography.patch
new file mode 100644
index 000000000000..1440990d3f52
--- /dev/null
+++ b/pkgs/development/python-modules/pgpy-dtc/Fix-compat-with-current-cryptography.patch
@@ -0,0 +1,34 @@
+--- a/pgpy_dtc/_curves.py
++++ b/pgpy_dtc/_curves.py
+@@ -75,26 +75,31 @@
+     class BrainpoolP256R1(ec.EllipticCurve):
+         name = 'brainpoolP256r1'
+         key_size = 256
++        group_order = 0xa9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7
+ 
+ 
+     class BrainpoolP384R1(ec.EllipticCurve):  # noqa: E303
+         name = 'brainpoolP384r1'
+         key_size = 384
++        group_order = 0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7cf3ab6af6b7fc3103b883202e9046565
+ 
+ 
+     class BrainpoolP512R1(ec.EllipticCurve):  # noqa: E303
+         name = 'brainpoolP512r1'
+         key_size = 512
++        group_order = 0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069
+ 
+ 
+     class X25519(ec.EllipticCurve):  # noqa: E303
+         name = 'X25519'
+         key_size = 256
++        group_order = 0x1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
+ 
+ 
+     class Ed25519(ec.EllipticCurve):  # noqa: E303
+         name = 'ed25519'
+         key_size = 256
++        group_order = 0x1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
+ 
+ 
+ # add these curves to the _CURVE_TYPES list
diff --git a/pkgs/development/python-modules/pgpy-dtc/default.nix b/pkgs/development/python-modules/pgpy-dtc/default.nix
index f59c3b01c949..5258c585d9f4 100644
--- a/pkgs/development/python-modules/pgpy-dtc/default.nix
+++ b/pkgs/development/python-modules/pgpy-dtc/default.nix
@@ -30,6 +30,13 @@ buildPythonPackage rec {
     cryptography
   ];
 
+  patches = [
+    # NOTE: This is the same patch file as Fix-compat-with-current-cryptography.patch
+    #       from the pgpy packaging, with the base directory modified for pgpy-dtc.
+    # https://github.com/SecurityInnovation/PGPy/pull/474
+    ./Fix-compat-with-current-cryptography.patch
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pgpy_dtc" ];

From 9ea1f78ff8ddaf9e57cf50ca9c60f499a1682e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 2 Oct 2025 11:25:01 +0200
Subject: [PATCH 10/51] Add an Agda team

---
 ci/OWNERS                 |  7 +++++++
 maintainers/team-list.nix | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 65fca06c3879..49a4b4c7dbb7 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -333,6 +333,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/development/dhall-modules      @Gabriella439 @Profpatsch
 /pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch
 
+# Agda
+/pkgs/build-support/agda                  @NixOS/agda
+/pkgs/top-level/agda-packages.nix         @NixOS/agda
+/pkgs/development/libraries/agda          @NixOS/agda
+/doc/languages-frameworks/agda.section.md @NixOS/agda
+/nixos/tests/agda.nix                     @NixOS/agda
+
 # Idris
 /pkgs/development/idris-modules @Infinisil
 /pkgs/development/compilers/idris2 @mattpolzin
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 4091318ce1ff..d279a5834d78 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -45,6 +45,17 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  agda = {
+    members = [
+      alexarice
+      ncfavier
+      phijor
+      turion
+    ];
+    scope = "Maintain Agda-related packages and modules.";
+    shortName = "Agda";
+  };
+
   android = {
     members = [
       adrian-gierakowski

From b89e10d0a9d6cd9a311d30f47dcf11ce8d430c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 2 Oct 2025 11:39:28 +0200
Subject: [PATCH 11/51] haskellPackages.agda2hs: adopt

---
 .../haskell-modules/configuration-hackage2nix/main.yaml          | 1 +
 pkgs/development/haskell-modules/hackage-packages.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 0f06aa577172..6eb523c28113 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -364,6 +364,7 @@ package-maintainers:
     - amazonka
   ncfavier:
     - Agda
+    - agda2hs
     - irc-client
     - lambdabot
     - shake
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 06b7b99e5cd7..4ce35d6cff63 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -56700,6 +56700,7 @@ self: {
       description = "Compiling Agda code to readable Haskell";
       license = lib.licenses.bsd3;
       mainProgram = "agda2hs";
+      maintainers = [ lib.maintainers.ncfavier ];
     }
   ) { };
 

From ae9d0a646cd94e1b310fce01c40a1a120fc79ea6 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Fri, 3 Oct 2025 11:40:19 -0400
Subject: [PATCH 12/51] fortanix-sgx-tools: 0.5.1 -> 0.6.1

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

diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
index 7100f5a51aa5..1916af6c65ed 100644
--- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
+++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
@@ -8,7 +8,7 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "fortanix-sgx-tools";
-  version = "0.5.1";
+  version = "0.6.1";
   nativeBuildInputs = [
     pkg-config
     protobuf
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl_3 ];
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-F0lZG1neAPVvyOxUtDPv0t7o+ZC+aQRtpFeq55QwcmE=";
+    hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ=";
   };
 
-  cargoHash = "sha256-FNMNHn1M0JzsgFqxXLUU3sEn7VB+YHVsWQCYVSxbUEg=";
+  cargoHash = "sha256-jYd9KRZgdBoVepmV4x4E3Y7h1SzSLv2clB0uPSWv8tE=";
   meta = {
     description = "Tools for building and running enclaves for the Fortanix SGX ABI";
     homepage = "https://github.com/fortanix/rust-sgx";

From 90a47fd7df77067357d7739455601e170565fd0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 03:46:20 +0000
Subject: [PATCH 13/51] gat: 0.25.2 -> 0.25.3

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

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 8f7bd428662a..8805a6a58c33 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gat";
-  version = "0.25.2";
+  version = "0.25.3";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${version}";
-    hash = "sha256-pfR7sjN1LrZ9+x3uqMyOAWMRQSSzlUa/q918yFaY17M=";
+    hash = "sha256-LQr3iC4yXrs8Bdfznu2fR2jjeQh/ZAwlo6zoMwvjlL4=";
   };
 
-  vendorHash = "sha256-amF8TQ+BEZN9A0c43pDTKaJ1FcfZ1FzRdfKRlpocPr8=";
+  vendorHash = "sha256-287u3zjlEOuc45stq7k1v5IINRUASw83sw6Dmqv9aUs=";
 
   env.CGO_ENABLED = 0;
 

From 21d81266c2f792308e64d60aae48ccb66aeae496 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 4 Oct 2025 11:44:05 +0200
Subject: [PATCH 14/51] nixos/murmur: Enable PrivateMounts hardening in service
 config

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 692868c8a790..c192a8f35231 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -347,6 +347,7 @@ in
         MemoryDenyWriteExecute = true;
         NoNewPrivileges = true;
         PrivateDevices = true;
+        PrivateMounts = true;
         PrivateTmp = true;
         ProtectClock = true;
         ProtectControlGroups = true;

From 70fa9f4c42b23376301b10b64d4dcf0ebe199351 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 4 Oct 2025 14:27:20 +0200
Subject: [PATCH 15/51] limesurvey: 6.10.2+250127 -> 6.15.14+250924

Multiple security issues are mentionned in the changelog:
```
Fixed issue #20271: [security] Reflected XSS in CSRF token handling
Fixed issue [security]: Export survey/label set resources with limited permissions
Fixed issue #20008: XSS on survey theme description
Fixed issue #19965: Lot of security issue in jspdf
```

Changes:
https://github.com/LimeSurvey/LimeSurvey/blob/6.15.14%2B250924/docs/release_notes.txt
---
 pkgs/by-name/li/limesurvey/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/limesurvey/package.nix b/pkgs/by-name/li/limesurvey/package.nix
index d8b44edb8470..5fad276e4eda 100644
--- a/pkgs/by-name/li/limesurvey/package.nix
+++ b/pkgs/by-name/li/limesurvey/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "limesurvey";
-  version = "6.10.2+250127";
+  version = "6.15.14+250924";
 
   src = fetchFromGitHub {
     owner = "LimeSurvey";
     repo = "LimeSurvey";
-    rev = version;
-    hash = "sha256-2ZRN2zbrrGWTXgsPeRWsQbg1qw2vVIAwzUI0LWgCL9g=";
+    tag = version;
+    hash = "sha256-xxK6JEgeBVIj8CGb0qSzwfO1Se9+jMtGB9V3rsc9bBU=";
   };
 
   phpConfig = writeText "config.php" ''

From c7a38187b4217900f92146fbc957ec53e1dfbb52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 14:20:43 +0000
Subject: [PATCH 16/51] vscode-extensions.github.vscode-pull-request-github:
 0.118.1 -> 0.118.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 cf9385c81345..f0e771400b99 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1949,8 +1949,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.118.1";
-          hash = "sha256-k3fz2PPXS85Xb0emVPyiQ4yGf1hmBZSU8LQ7lgLQ4JU=";
+          version = "0.118.2";
+          hash = "sha256-DB1O6Rpwo1VfwddgiUFFbOoOpxxTOLJ/JEQExBpK5fU=";
         };
         meta = {
           license = lib.licenses.mit;

From 652d1da90b182a02b4cb2c9ad418a25cb0119d46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 17:43:38 +0000
Subject: [PATCH 17/51] paretosecurity: 0.3.8 -> 0.3.11

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

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 0a8a9eae63d1..1e1ba8b50c26 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.3.8";
+  version = "0.3.11";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-pqqcyWFyJX5IJkkLxAafbQu/8yygBsQL1/BAENFdk4g=";
+    hash = "sha256-BYSbLeWW0DSVNAgBvWKRLgwDg47QjTbvloGfyCDYIOU=";
   };
 
-  vendorHash = "sha256-6OQ9SPr9z+uoGeeJwo3jrr1nMECcHgULMvjn2G4uLx4=";
+  vendorHash = "sha256-hH+4rYvFuDsCa90C1uNM2WaQSYK9n0PpVv6P+o54RoU=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From c002c6a3110e8fe8c0fd08b831aa1dae2f6f73c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 19:56:45 +0000
Subject: [PATCH 18/51] signal-desktop: 7.72.1 -> 7.73.0

---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 10 +++++-----
 pkgs/by-name/si/signal-desktop/ringrtc.nix        |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index cb5190abb930..860f757df341 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.81.0";
+  version = "0.81.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SOQyps+iGVQ3RWPLmQHzXwmMwmR1PrGIbViCmNg60P4=";
+    hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w=";
   };
 
-  cargoHash = "sha256-O4v9GgNrs4+HpfgoHh6YLy4dNF1LrF1ZS50RaEHh1iM=";
+  cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-KvMEQ9nJunqF2CDjiP3s3CMoeF+nbUpZDzSIMsImbPg=";
+    hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index e369ffaf2c6b..27295d8335fb 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.72.1";
+  version = "7.73.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-X+ENbHnlr9VL+flaZAHsOjRSBnXHa32qLNEXntxnRLA=";
+    hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-7VDIUyQBhFNrAmpfemKcNgjJEuvQ355uU6oZdWM1Hk8="
+        "sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA="
       else
-        "sha256-gpK4WZjD//jZkxLvhAzXVAKmLjya8D1MVCPD4KKJJdA=";
+        "sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1758811882;
+    SOURCE_DATE_EPOCH = 1759413120;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 7a2ddc5c7c09..b1cf5cbe4644 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.57.1";
+  version = "2.58.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U3sfNjJInT7QBqLLNK1j/0xzmwi/pfZZGOtL/JZ5gZM=";
+    hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA=";
   };
 
-  cargoHash = "sha256-DcaZmOPVO/eAMZ9NsqmwnI2d7Vdz/aVmvI4COivvDBM=";
+  cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q=";
 
   cargoBuildFlags = [
     "-p"

From 11e960c73d89396f5fc49311006a5339e05469ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 21:21:03 +0000
Subject: [PATCH 19/51] wordpress: 6.8.2 -> 6.8.3

---
 pkgs/servers/web-apps/wordpress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index fc3422913324..744243f19793 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -6,7 +6,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
     hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY=";
   };
   wordpress_6_8 = {
-    version = "6.8.2";
-    hash = "sha256-2Fpy45K/6GaBazwuvGpEaZByqlDMOmIPHE7S8TtkXis=";
+    version = "6.8.3";
+    hash = "sha256-kto0yZYOZNElhlLB73PFF/fkasbf0t/HVDbThVr0aww=";
   };
 }

From af12b1992d0af676ef55c67bfdaf538f1558b162 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 23:03:11 +0000
Subject: [PATCH 20/51] haproxy: 3.2.5 -> 3.2.6

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 176ac5855649..609739fab792 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.2.5";
+  version = "3.2.6";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dzFqPhtsOSRbwR71j01trdBjwBTBuuyPDYF5jFGeBys=";
+    hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
   };
 
   buildInputs = [

From fcb4e4480c548aaf5f3d775feea50840e549b4ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Oct 2025 01:07:55 +0200
Subject: [PATCH 21/51] python313Packages.pytest-pycodestyle: init at 2.5.0

Pytest plugin to run pycodestyle

https://github.com/henry0312/pytest-pycodestyle
---
 .../pytest-pycodestyle/default.nix            | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-pycodestyle/default.nix

diff --git a/pkgs/development/python-modules/pytest-pycodestyle/default.nix b/pkgs/development/python-modules/pytest-pycodestyle/default.nix
new file mode 100644
index 000000000000..f51e8d124a39
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-pycodestyle/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pycodestyle,
+  pytest-isort,
+  pytest,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-pycodestyle";
+  version = "2.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "henry0312";
+    repo = "pytest-pycodestyle";
+    tag = "v${version}";
+    hash = "sha256-X/vacxI0RFHIqlZ2omzvvFDePS/SZYSFQHEmfcbvf/4=";
+  };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ pytest ];
+
+  dependencies = [ pycodestyle ];
+
+  nativeCheckInputs = [
+    pytest-isort
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pytest_pycodestyle" ];
+
+  meta = {
+    description = "Pytest plugin to run pycodestyle";
+    homepage = "https://github.com/henry0312/pytest-pycodestyle";
+    changelog = "https://github.com/henry0312/pytest-pycodestyle/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57a9b0966e50..1782cf5592fa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14565,6 +14565,8 @@ self: super: with self; {
 
   pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };
 
+  pytest-pycodestyle = callPackage ../development/python-modules/pytest-pycodestyle { };
+
   pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
 
   pytest-pytestrail = callPackage ../development/python-modules/pytest-pytestrail { };

From c2a560bee32dea42708684e2602a9971c594dd81 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Oct 2025 01:38:05 +0200
Subject: [PATCH 22/51] python313Packages.pytest-docker: init at 3.2.3

Docker-based integration tests

https://github.com/avast/pytest-docker
---
 .../python-modules/pytest-docker/default.nix  | 64 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-docker/default.nix

diff --git a/pkgs/development/python-modules/pytest-docker/default.nix b/pkgs/development/python-modules/pytest-docker/default.nix
new file mode 100644
index 000000000000..e16888e1b635
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-docker/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  attrs,
+  buildPythonPackage,
+  fetchFromGitHub,
+  py,
+  pytest-mypy,
+  pytest-pycodestyle,
+  pytest-pylint,
+  pytest,
+  pytestCheckHook,
+  requests,
+  setuptools,
+  types-requests,
+  types-setuptools,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-docker";
+  version = "3.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "avast";
+    repo = "pytest-docker";
+    tag = "v${version}";
+    hash = "sha256-LV4v4vyfXwFHOYJdS3kPyPbFWpwXfx1rKZQfFQ0pdQ4=";
+  };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ pytest ];
+
+  dependencies = [ attrs ];
+
+  nativeCheckInputs = [
+    py
+    pytest-mypy
+    pytest-pycodestyle
+    pytest-pylint
+    pytestCheckHook
+    requests
+    types-requests
+    types-setuptools
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "pytest_docker" ];
+
+  disabledTests = [
+    # Tests wants to run docker
+    "test_containers_and_volumes_get_cleaned_up"
+    "test_main_fixtures_work"
+  ];
+
+  meta = {
+    description = "Docker-based integration tests";
+    homepage = "https://github.com/avast/pytest-docker";
+    changelog = "https://github.com/avast/pytest-docker/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1782cf5592fa..560ecc8aa937 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14451,6 +14451,8 @@ self: super: with self; {
 
   pytest-django = callPackage ../development/python-modules/pytest-django { };
 
+  pytest-docker = callPackage ../development/python-modules/pytest-docker { };
+
   pytest-docker-tools = callPackage ../development/python-modules/pytest-docker-tools { };
 
   pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };

From de8ec6019ba9059f94a13536b19829efd32519d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Oct 2025 01:45:57 +0200
Subject: [PATCH 23/51] python313Packages.zundler: init at 0.3.0

Bundle assets of distributed HTML docs into one self-contained
HTML file

https://github.com/AdrianVollmer/Zundler
---
 .../python-modules/zundler/default.nix        | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/zundler/default.nix

diff --git a/pkgs/development/python-modules/zundler/default.nix b/pkgs/development/python-modules/zundler/default.nix
new file mode 100644
index 000000000000..2a1ac8f8195f
--- /dev/null
+++ b/pkgs/development/python-modules/zundler/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
+  lxml,
+  nox,
+  pytest-docker,
+  pytest-selenium,
+  pytestCheckHook,
+  python-magic,
+  selenium,
+  sphinx,
+}:
+
+buildPythonPackage rec {
+  pname = "zundler";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AdrianVollmer";
+    repo = "Zundler";
+    tag = version;
+    hash = "sha256-RUzVeJLRB9y6lS0tCkseoFgND1MXT7s2o7vNuUpdRDE=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    lxml
+    python-magic
+    sphinx
+  ];
+
+  nativeCheckInputs = [
+    nox
+    pytestCheckHook
+    pytest-docker
+    pytest-selenium
+    selenium
+  ];
+
+  # Tests are container-based
+  doCheck = false;
+
+  pythonImportsCheck = [ "zundler" ];
+
+  meta = {
+    description = "Bundle assets of distributed HTML docs into one self-contained HTML file";
+    homepage = "https://github.com/AdrianVollmer/Zundler";
+    changelog = "https://github.com/AdrianVollmer/Zundler/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 560ecc8aa937..91b707f653e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20617,6 +20617,8 @@ self: super: with self; {
 
   zulip-emoji-mapping = callPackage ../development/python-modules/zulip-emoji-mapping { };
 
+  zundler = callPackage ../development/python-modules/zundler { };
+
   zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { };
 
   zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { };

From d78f8a5999f0fed81012af9a994478a8df585464 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Oct 2025 01:52:50 +0200
Subject: [PATCH 24/51] smbcrawler: init at 1.2.0

Tool that takes credentials and a list of hosts and crawls
through shares

https://github.com/SySS-Research/smbcrawler
---
 pkgs/by-name/sm/smbcrawler/package.nix | 60 ++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/sm/smbcrawler/package.nix

diff --git a/pkgs/by-name/sm/smbcrawler/package.nix b/pkgs/by-name/sm/smbcrawler/package.nix
new file mode 100644
index 000000000000..4938f1953c75
--- /dev/null
+++ b/pkgs/by-name/sm/smbcrawler/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "smbcrawler";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SySS-Research";
+    repo = "smbcrawler";
+    tag = version;
+    hash = "sha256-9hom/4wNCiBp70s0a3K4dq1BOcoVV+yAeiPQlvQ7yUw=";
+  };
+
+  build-system = with python3.pkgs; [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = with python3.pkgs; [
+    click
+    impacket
+    lxml
+    peewee
+    python-libnmap
+    python-magic
+    pyyaml
+    xdg-base-dirs
+    zundler
+  ];
+
+  optional-dependencies = with python3.pkgs; {
+    binary-conversion = [
+      markitdown
+    ];
+  };
+
+  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "smbcrawler" ];
+
+  disabledTests = [
+    # Tests are container-based
+    "test_base_guest_access"
+    "test_full"
+  ];
+
+  meta = {
+    description = "Tool that takes credentials and a list of hosts and crawls through shares";
+    homepage = "https://github.com/SySS-Research/smbcrawler";
+    changelog = "https://github.com/SySS-Research/smbcrawler/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "smbcrawler";
+  };
+}

From 20f68e9d4c643c8f7d3786ab03b9cf4e1b907e77 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sun, 5 Oct 2025 14:40:16 +0900
Subject: [PATCH 25/51] podman-desktop: 1.21.0 -> 1.22.0

https://github.com/podman-desktop/podman-desktop/releases/tag/v1.22.0
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/po/podman-desktop/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 87aaec7f1d78..1a57c1f94d72 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   copyDesktopItems,
-  electron_37,
+  electron_38,
   nodejs,
   pnpm_10,
   makeDesktopItem,
@@ -19,12 +19,12 @@
 }:
 
 let
-  electron = electron_37;
+  electron = electron_38;
   appName = "Podman Desktop";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
-  version = "1.21.0";
+  version = "1.22.0";
 
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (nix-update-script { })
@@ -57,13 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "containers";
     repo = "podman-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wio+lETdsDhcZvluKV6gUqjT0lTE9nYL5TqPLCR4Kr0=";
+    hash = "sha256-gq4RMODR7AESMAGpg6ga5LS5SrpWD6pPe6dZ+Rx7a/g=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-yteFC4/raBdL4gjBtsGL/lVRpo11BuhS7Xm0mFgz3t4=";
+    hash = "sha256-tWWqnxPO27RcYeix5B+R3CyyyHYQL9PMPRhlse8FyVk=";
   };
 
   patches = [

From dd83c22fcd9d147cfa204b68885a9bac8d7cc570 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Sun, 5 Oct 2025 09:35:45 +0200
Subject: [PATCH 26/51] winbox: 3.41 -> 3.43

---
 pkgs/tools/admin/winbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix
index da1736889db3..752522c436c8 100644
--- a/pkgs/tools/admin/winbox/default.nix
+++ b/pkgs/tools/admin/winbox/default.nix
@@ -18,18 +18,18 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "winbox";
-  version = "3.41";
+  version = "3.43";
 
   src = fetchurl (
     if (wine.meta.mainProgram == "wine64") then
       {
         url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";
-        hash = "sha256-i8Ps8fNZUmAOyxo4DDjIjp1jwIGjIgT9CU1YgjAHC/Y=";
+        hash = "sha256-W0HPUf2B6NCCaH9rUiFZz0q6IubfjtxIZyHU4JUHtuk=";
       }
     else
       {
         url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox.exe";
-        hash = "sha256-NypSEC5YKpqldlkSIRFtWVD4xJZcjGcfjnphSg70wmE=";
+        hash = "sha256-pAOOTgmjQoXI2o2MKTDuOOpb7q0rb/zWATDNyAMOLms=";
       }
   );
 

From b8c41335e080ef83a5510b146479b4cfb9893711 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 08:25:37 +0000
Subject: [PATCH 27/51] python3Packages.pyunormalize: 16.0.0 -> 17.0.0

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

diff --git a/pkgs/development/python-modules/pyunormalize/default.nix b/pkgs/development/python-modules/pyunormalize/default.nix
index 450eb8ebd4e2..53f11f755a4f 100644
--- a/pkgs/development/python-modules/pyunormalize/default.nix
+++ b/pkgs/development/python-modules/pyunormalize/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pyunormalize";
-  version = "16.0.0";
+  version = "17.0.0";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Lh37tKEYFUrib3BxBCalKjZLkmyRkfdkYB9ajLEnYfc=";
+    hash = "sha256-CUmj5WgX4of+vK8bDMS1rfC7EHYo03kzWTgECUfux5I=";
   };
 
   build-system = [ setuptools ];

From 64bf9f281eb4edb210ec38eafa1699ce327ce0a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:31:50 +0200
Subject: [PATCH 28/51] python313Packages.pyvicare: 2.51.0 -> 2.52.0

Diff: https://github.com/openviess/PyViCare/compare/2.51.0...2.52.0

Changelog: https://github.com/openviess/PyViCare/releases/tag/2.52.0
---
 pkgs/development/python-modules/pyvicare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix
index 169bfd9dc06a..0b9c3d1dffa8 100644
--- a/pkgs/development/python-modules/pyvicare/default.nix
+++ b/pkgs/development/python-modules/pyvicare/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.51.0";
+  version = "2.52.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openviess";
     repo = "PyViCare";
     tag = version;
-    hash = "sha256-WKu9f59Fc0i4MoGGaTP8s94pD4cYNrQvDt2kyQZ+f1U=";
+    hash = "sha256-Fq4XRJIN7f5SgSkSh0EveQHSHT35NVvCbPEEeW8h+vc=";
   };
 
   postPatch = ''

From 42622dd0ea5423b5eef871183c226ef492decd5b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:36:18 +0200
Subject: [PATCH 29/51] python313Packages.habluetooth: 5.6.4 -> 5.7.0

Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/v5.6.4...v5.7.0

Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v5.7.0/CHANGELOG.md
---
 pkgs/development/python-modules/habluetooth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index f48cfbd621bf..edb99a84f127 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "habluetooth";
-  version = "5.6.4";
+  version = "5.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
     tag = "v${version}";
-    hash = "sha256-j3g0MLVfA8r02EM3rT5GuNE70TdYtdT+5XzqWqi/JM0=";
+    hash = "sha256-1/KbehOIQdclPskp2HtJ3fut4DqkKw/+FdqwmVvfZmU=";
   };
 
   build-system = [

From a965ee3552ff00b2c53c11eede7f395001f41c11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:37:47 +0200
Subject: [PATCH 30/51] python313Packages.bleak-esphome: 3.3.0 -> 3.4.0

Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/v3.4.0/CHANGELOG.md
---
 pkgs/development/python-modules/bleak-esphome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix
index eeaeb6254ec8..66f10c7b5422 100644
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "bleak-esphome";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "bleak-esphome";
     tag = "v${version}";
-    hash = "sha256-1rsTXIWowwxycJYs2Aw2FXwQHSK1T7t2RODxqq1KxOs=";
+    hash = "sha256-BFF4SqJxrQ+aaFtrNqS9fNqTV2Q+pOu5FFdYKeHkKj8=";
   };
 
   postPatch = ''

From 4dbac80dbe7284f0179e519a512f6b68ac9a6221 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:49:53 +0200
Subject: [PATCH 31/51] python313Packages.zeroconf: 0.147.2 -> 0.148.0

Diff: https://github.com/jstasiak/python-zeroconf/compare/0.147.2...0.148.0

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 4eabf3c53925..f87b2173b662 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.147.2";
+  version = "0.148.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "jstasiak";
     repo = "python-zeroconf";
     tag = version;
-    hash = "sha256-t1++u+2+Pe/61MXzq5+9ayVl7ot3RrJUGCTNtHicpF8=";
+    hash = "sha256-odjuJrUXQXn3WeF/oS8DLO937p2nHpSk9QGO4Tgsd8o=";
   };
 
   build-system = [

From de6c4e479f15ee4d85758d5527cd125e1d7af168 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 28 Sep 2025 18:22:19 +0200
Subject: [PATCH 32/51] orca-slicer: 2.3.0 -> 2.3.1

---
 pkgs/by-name/or/orca-slicer/package.nix       | 11 ++++----
 ...-CMakeLists-Link-against-webkit2gtk-.patch | 25 +++----------------
 .../patches/dont-link-opencv-world-orca.patch | 22 ++++++++--------
 .../or/orca-slicer/patches/no-osmesa.patch    | 13 ----------
 4 files changed, 21 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 244ac7fcd3c7..81127c4863e0 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -26,6 +26,7 @@
   gtk3,
   hicolor-icon-theme,
   ilmbase,
+  libsecret,
   libpng,
   mpfr,
   nlopt,
@@ -57,13 +58,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "orca-slicer";
-  version = "v2.3.0";
+  version = "v2.3.1";
 
   src = fetchFromGitHub {
     owner = "SoftFever";
     repo = "OrcaSlicer";
     tag = finalAttrs.version;
-    hash = "sha256-MEa57jFBJkqwoAkqI7wXOn1X1zxgLQt3SNeanfD88kU=";
+    hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";
   };
 
   nativeBuildInputs = [
@@ -105,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     hicolor-icon-theme
     ilmbase
+    libsecret
     libpng
     mpfr
     nlopt
@@ -126,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
     # Link opencv_core and opencv_imgproc instead of opencv_world
     ./patches/dont-link-opencv-world-orca.patch
-    # Don't link osmesa
-    ./patches/no-osmesa.patch
     # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged
     # Allows disabling the update nag screen
     (fetchpatch {
@@ -181,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
   prePatch = ''
     sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
     sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/PerimeterGenerator.cpp
+    sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
   '';
 
   cmakeFlags = [
@@ -199,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # Generate translation files
-  postBuild = "( cd .. && ./run_gettext.sh )";
+  postBuild = "( cd .. && ./scripts/run_gettext.sh )";
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
index 8cf334513144..797f2e13fe33 100644
--- a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+++ b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
@@ -1,26 +1,11 @@
-From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001
-From: Zhaofeng Li <hello@zhaofeng.li>
-Date: Tue, 22 Nov 2022 13:00:39 -0700
-Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in
- libslic3r_gui
-
-WebView.cpp uses symbols from webkitgtk directly. Upstream setup
-links wxGTK statically so webkitgtk is already pulled in.
-
-> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish'
-> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line
----
- src/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9c5cb96..e92a0e3 100644
+index 33cf83734..03bc82235 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -175,6 +175,11 @@ if (WIN32)
-     target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
+@@ -179,6 +179,11 @@ if (WIN32)
+     target_link_libraries(OrcaSlicer_app_gui PRIVATE boost_headeronly)
  endif ()
-
+ 
 +# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
 +if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 +    target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.1")
@@ -29,5 +14,3 @@ index 9c5cb96..e92a0e3 100644
  # Link the resources dir to where Slic3r GUI expects it
  set(output_dlls_Release "")
  set(output_dlls_Debug "")
---
-2.38.1
diff --git a/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch b/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
index 426fd0298d93..8fed51b7f45e 100644
--- a/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
+++ b/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
@@ -1,14 +1,14 @@
 diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index 64e0a9e87..e14f29488 100644
+index d85c65fd5..07914f69f 100644
 --- a/src/libslic3r/CMakeLists.txt
 +++ b/src/libslic3r/CMakeLists.txt
-@@ -576,7 +576,8 @@ target_link_libraries(libslic3r
-     mcut
-     JPEG::JPEG
-     qoi
--    opencv_world
-+    opencv_core
-+    opencv_imgproc
-     noise::noise
-     )
- 
+@@ -557,7 +557,8 @@ target_link_libraries(libslic3r
+         libigl
+         libnest2d
+         miniz
+-        opencv_world
++        opencv_core
++        opencv_imgproc
+     PRIVATE
+         ${CMAKE_DL_LIBS}
+         ${EXPAT_LIBRARIES}
diff --git a/pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch b/pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch
deleted file mode 100644
index 09298b3e55b6..000000000000
--- a/pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
-index e695acd48..174e233e6 100644
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-     FIND_LIBRARY(WAYLAND_EGL_LIBRARIES    NAMES wayland-egl)
-     FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client)
-     find_package(CURL REQUIRED)
--    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa)
-+    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})
-     target_link_libraries(libslic3r_gui
-         OpenGL::EGL
-         ${WAYLAND_SERVER_LIBRARIES}

From 847dc6cf5a1adab71004931f4dbbae47e01b21c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 12:24:59 +0200
Subject: [PATCH 33/51] python313Packages.pyunormalize: enable tests

- modernize
- add changelog to meta
---
 .../python-modules/pyunormalize/default.nix   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyunormalize/default.nix b/pkgs/development/python-modules/pyunormalize/default.nix
index 53f11f755a4f..ab3520d52a00 100644
--- a/pkgs/development/python-modules/pyunormalize/default.nix
+++ b/pkgs/development/python-modules/pyunormalize/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  # nativeCheckInputs
+  fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -12,25 +11,23 @@ buildPythonPackage rec {
   version = "17.0.0";
   pyproject = true;
 
-  # No tags on GitHub
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-CUmj5WgX4of+vK8bDMS1rfC7EHYo03kzWTgECUfux5I=";
+  src = fetchFromGitHub {
+    owner = "mlodewijck";
+    repo = "pyunormalize";
+    tag = "v${version}";
+    hash = "sha256-JDcMWaA6r8YRZYJseyKUyPAInrqHHYhQXYmw9rr3ls4=";
   };
 
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  # The pypi archive does not contain the tests.
-  # NOTE: one should review this for each future update.
-  doCheck = false;
-
   pythonImportsCheck = [ "pyunormalize" ];
 
   meta = {
     description = "Unicode normalization forms (NFC, NFKC, NFD, NFKD) independent of the Python core Unicode database";
     homepage = "https://github.com/mlodewijck/pyunormalize";
+    changelog = "https://github.com/mlodewijck/pyunormalize/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hellwolf ];
   };

From f300319a389893390b845da1266b70dab36c0297 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 12:46:33 +0200
Subject: [PATCH 34/51] python313Packages.cvelib: 1.7.1 -> 1.8.0

Changelog: https://github.com/RedHatProductSecurity/cvelib/blob/1.8.0/CHANGELOG.md
---
 .../python-modules/cvelib/default.nix            | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix
index 9a8fb1232c27..967fc991ab17 100644
--- a/pkgs/development/python-modules/cvelib/default.nix
+++ b/pkgs/development/python-modules/cvelib/default.nix
@@ -8,13 +8,13 @@
   pytestCheckHook,
   pythonOlder,
   requests,
-  setuptools,
+  hatchling,
   testers,
 }:
 
 buildPythonPackage rec {
   pname = "cvelib";
-  version = "1.7.1";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,16 +23,10 @@ buildPythonPackage rec {
     owner = "RedHatProductSecurity";
     repo = "cvelib";
     tag = version;
-    hash = "sha256-AhA+2lEI/hsbIVCfSWO0vI6eWkObjsq5xYOSqVvUPkU=";
+    hash = "sha256-lbwrZSzJaP+nKFwt7xiq/LTzgOuf8aELxjrxEKkYpfc=";
   };
 
-  postPatch = ''
-    # collective.checkdocs is unmaintained for over 10 years
-    substituteInPlace pyproject.toml \
-      --replace-fail '"collective.checkdocs",' ""
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     click
@@ -49,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library and a command line interface for the CVE Services API";
     homepage = "https://github.com/RedHatProductSecurity/cvelib";
-    changelog = "https://github.com/RedHatProductSecurity/cvelib/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/RedHatProductSecurity/cvelib/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ raboof ];
     mainProgram = "cve";

From 5259defc039269a658d1b569aa2e5fb23ba1cd4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 13:10:13 +0200
Subject: [PATCH 35/51] python313Packages.django-cms: 5.0.2 -> 5.0.4

Diff: https://github.com/django-cms/django-cms/compare/5.0.2...5.0.4

Changelog: https://github.com/django-cms/django-cms/releases/tag/5.0.4
---
 pkgs/development/python-modules/django-cms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix
index ca3034af5512..8057e33e6b19 100644
--- a/pkgs/development/python-modules/django-cms/default.nix
+++ b/pkgs/development/python-modules/django-cms/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "django-cms";
-  version = "5.0.2";
+  version = "5.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "django-cms";
     tag = version;
-    hash = "sha256-qv6eVs5jKJXQczEa6+H5n4+pw1JFTkb7XJD+0DBVFM0=";
+    hash = "sha256-bhF1FJO+EHg49ZnwykVmyM/kkdXMCyfoV+EFQ5IZFF4=";
   };
 
   build-system = [ setuptools ];

From b733671f7b8ac789395809cc61cb0244dca26e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 11:33:43 +0000
Subject: [PATCH 36/51] iosevka: 33.3.0 -> 33.3.1

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

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 0b404132c52d..6bbd714f5f05 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.3.0";
+  version = "33.3.1";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-6Ys9OzZ9/k8VOD9rbU7QBbJumJMWKq/GFHtPWJGqJ+M=";
+    hash = "sha256-qbC1FVhnkVlsT+lOSeM6wDbKV2c5iTHgBxZENGEBnUI=";
   };
 
-  npmDepsHash = "sha256-UGEl+RFNPZ+3Cnp6vtxbcuZbs86T3VDgDAF0J++83/w=";
+  npmDepsHash = "sha256-/HxMh5v3CfCpPCF8cf8Z2NXDBovJFvMaQfYFZvuyNX0=";
 
   nativeBuildInputs = [
     remarshal

From 8eab1f0891e79d0f7b252866528500a023858657 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Oct 2025 14:01:27 +0200
Subject: [PATCH 37/51] mdserve: 0.4.0 -> 0.4.1

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/md/mdserve/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
index bb56674ce6df..b2cfdd5a3ee3 100644
--- a/pkgs/by-name/md/mdserve/package.nix
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdserve";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "jfernandez";
     repo = "mdserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OCdWoQzmCvKo8EfLAczBud1FfY3vRMk7mivjhsqE840=";
+    hash = "sha256-C9D6tr88EROo2rzu7t9HAeyKAxFOCZyN+sl7QpFgmI8=";
   };
 
-  cargoHash = "sha256-7J+a3Yt5sLtZb6xfWLS/eZXZtZRmeXmTqUcPKXqtOLY=";
+  cargoHash = "sha256-RFCGb7wjO8/RsOlsABem5dy+ZfheZNihktqUCX3oDZo=";
 
   __darwinAllowLocalNetworking = true;
 

From cff42bd46003045425ee59b0531c1bfc90ebe802 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Oct 2025 14:03:55 +0200
Subject: [PATCH 38/51] mdserve: Add myself as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/md/mdserve/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
index b2cfdd5a3ee3..227218955b9c 100644
--- a/pkgs/by-name/md/mdserve/package.nix
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -36,7 +36,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/jfernandez/mdserve";
     changelog = "https://github.com/jfernandez/mdserve/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vinnymeller ];
+    maintainers = with lib.maintainers; [
+      vinnymeller
+      matthiasbeyer
+    ];
     mainProgram = "mdserve";
   };
 })

From 9f35dc735b0a5d5a403eae6be3579d2d6cba89fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 12:45:36 +0000
Subject: [PATCH 39/51] bruno: 2.11.0 -> 2.12.0

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

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 7ea87f3c5001..b6d25b670993 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,20 +19,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-U6q82T/xqwREGsUcCdeAzvk9DWu9579MtF/JE0OIBW4=";
+    hash = "sha256-5yYcclJBb5kKaDr9irkLQBa6Tg8yO1LWh89ntBiMQho=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-i7bT6ZvdkHwqw+LkMqCdSMCNUsz1LPOHuF+u//lUYJ8=";
+  npmDepsHash = "sha256-mLl8igkdujzI4Fz4SoUrCdnI2KUo6DsNtPdAhwjYpac=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [

From 9b9cace1c5b9be5f6e9a56f778c309a03e031442 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 5 Oct 2025 10:16:23 +0200
Subject: [PATCH 40/51] industrializer: fix build

---
 pkgs/by-name/in/industrializer/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/industrializer/package.nix b/pkgs/by-name/in/industrializer/package.nix
index ec16b8b80101..0d6b8916697c 100644
--- a/pkgs/by-name/in/industrializer/package.nix
+++ b/pkgs/by-name/in/industrializer/package.nix
@@ -6,6 +6,7 @@
   audiofile,
   autoconf,
   automake,
+  autoreconfHook,
   gettext,
   gnome2,
   gtk2,
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     autoconf
     automake
+    autoreconfHook
     gettext # autopoint
     libxml2 # AM_PATH_XML2
     alsa-lib # AM_PATH_ALSA
@@ -49,7 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  preConfigure = "./autogen.sh";
+  postPatch = ''
+    # Replace obsolete AM_PATH_XML2 with PKG_CHECK_MODULES
+    substituteInPlace configure.ac \
+      --replace-fail 'AM_PATH_XML2(2.6.0, [], AC_MSG_ERROR(Fatal error: Need libxml2 >= 2.6.0))' \
+                     'PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.6.0])' \
+      --replace-fail 'XML_CPPFLAGS' 'XML_CFLAGS'
+  '';
 
   # jack.c:190:5: error: initialization of 'const gchar * (*)(int)' {aka 'const char * (*)(int)'} from incompatible pointer type 'const char * (*)(int * (*)())
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";

From 5483b5b9dadd28ac2ef2cb884a072834f9920371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 14:04:56 +0000
Subject: [PATCH 41/51] velocity: 3.4.0-unstable-2025-09-24 ->
 3.4.0-unstable-2025-09-29

---
 pkgs/by-name/ve/velocity/deps.json   | 9 ++++-----
 pkgs/by-name/ve/velocity/package.nix | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index 9d2f3fec0516..ea0c77471f86 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -1538,15 +1538,14 @@
   }
  },
  "https://repo.papermc.io/repository/maven-public/com": {
-  "velocitypowered#velocity-brigadier/1.0.0-20230303.213659-2/SNAPSHOT": {
-   "jar": "sha256-kwnYIPdEibFYc5srZRBm69Lp5vNjPP4sOUzT23NoU8Q=",
-   "module": "sha256-Y1WaUO1rVqE0fomcKNELdBWTNtSQ/VUdQgN/5w+QeFg=",
-   "pom": "sha256-Rl70+G0lYH/5UveIfbEfSvsuEv2m2wZqUJ50oNbifN0="
+  "velocitypowered#velocity-brigadier/1.0.0-20210613.082804-10/SNAPSHOT": {
+   "jar": "sha256-LWZG7UbYBS/J8NUEMJoClNCKfHXVNP2E8R2whQzv3LI=",
+   "pom": "sha256-BVrnovDZ13pawpqN9FM3RyX2Z0yx2FkwjNbaxVI3mQM="
   },
   "velocitypowered/velocity-brigadier/1.0.0-SNAPSHOT/maven-metadata": {
    "xml": {
     "groupId": "com.velocitypowered",
-    "lastUpdated": "20230303213659"
+    "lastUpdated": "20250925232314"
    }
   }
  }
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index d886b1e7013b..1552a26a1d9a 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-09-24";
+  version = "3.4.0-unstable-2025-09-29";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "ec793a9fdbbf66fcce31fe544e8f0208cb9f9520";
-    hash = "sha256-pxk239uN7U+qfEElGTja/4VHR0wbw4RW0Mritx1P00w=";
+    rev = "c8c27af7c3da99987e4f5be18ffe5830eaf98538";
+    hash = "sha256-zotVbXvuMDDykkWSkXrIV+2UgUhhwX6KeF+zMRBeb8E=";
   };
 
   nativeBuildInputs = [

From f36d0db5e3b6a5c5a817b4ce6f9e50af99e2e49e Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 5 Oct 2025 16:04:57 +0200
Subject: [PATCH 42/51] python3Packages.pyocr: disable cuneiform support

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 doc/release-notes/rl-2511.section.md              | 2 ++
 pkgs/development/python-modules/pyocr/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 081daf8cbdb7..21019846c89b 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -172,6 +172,8 @@
 
 - `neovimUtils.makeNeovimConfig` now uses `customLuaRC` parameter instead of accepting `luaRcContent`. The old usage is deprecated but still works with a warning.
 
+- `python3Packages.pyocr` no longer supports `cuneiform` on Linux by default. It is still possible to enable it using `withCuneiformSupport` override.
+
 - `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms.
 
 - `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index 8305e308918e..4065747bbd18 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -12,7 +12,7 @@
   setuptools,
   setuptools-scm,
   withTesseractSupport ? true,
-  withCuneiformSupport ? stdenv.hostPlatform.isLinux,
+  withCuneiformSupport ? false,
 }:
 
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
         tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}";
       }
     ))
-    ++ (lib.optional stdenv.hostPlatform.isLinux (
+    ++ (lib.optional withCuneiformSupport (
       replaceVars ./paths-cuneiform.patch {
         inherit cuneiform;
       }

From d5ace73b50a87b14d7de4e48727a43e96241a0a3 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 5 Oct 2025 16:11:32 +0200
Subject: [PATCH 43/51] cuneiform: fix building with CMake 4

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cuneiform/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/cu/cuneiform/package.nix b/pkgs/by-name/cu/cuneiform/package.nix
index 2a677a51923b..17c9648982ba 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     rm cuneiform_src/Kern/hhh/tigerh/h/strings.h
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.6.2)' \
+      'cmake_minimum_required(VERSION 3.10)'
   '';
 
   # make the install path match the rpath

From e58353399bcbc966379f4e59f87f191ed65d7d7c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 5 Oct 2025 16:15:11 +0200
Subject: [PATCH 44/51] cuneiform: soft-deprecate

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cuneiform/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cu/cuneiform/package.nix b/pkgs/by-name/cu/cuneiform/package.nix
index 17c9648982ba..01ede4ac0d3b 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -7,6 +7,7 @@
   testers,
 }:
 
+# Deprecated: unmaintained, no consumers in nixpkgs as of 2025-10-05, and doesn't compile with gcc 15.
 stdenv.mkDerivation (finalAttrs: {
   pname = "cuneiform";
   version = "1.1.0";

From 4e5b7d0d28af0e42cac379404f51b6e03e7f6d39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 15:03:57 +0000
Subject: [PATCH 45/51] firefoxpwa: 2.16.0 -> 2.17.0

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

diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 1a4e71e9411a..d3211f897137 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -29,19 +29,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "firefoxpwa";
-  version = "2.16.0";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
     rev = "v${version}";
-    hash = "sha256-kFhnlWiNCbs0arJfQRRWubnIrdXKrwyJNLAN1KlDHoc=";
+    hash = "sha256-GKK5PYWSO+rWtuZuHgDQx3V7f8bEX8JHvvFK8sQRli4=";
   };
 
   sourceRoot = "${src.name}/native";
   buildFeatures = [ "immutable-runtime" ];
 
-  cargoHash = "sha256-3o/Ub452PbiicmgyW6z9BP2PaECfFYN+Tx24/Go2N2M=";
+  cargoHash = "sha256-aV6Wvv+GzPLsWtdsS3ki82ju1Fh4IgFnIOF4OTEV7uQ=";
 
   preConfigure = ''
     sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml

From 440580bcb0b7c770954a454cc6f36ddc898499b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 15:12:47 +0000
Subject: [PATCH 46/51] ruffle: 0.2-nightly-2025-09-24 ->
 0.2-nightly-2025-10-05

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

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index b7562ecba84e..d1728d030498 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -21,16 +21,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2-nightly-2025-09-24";
+  version = "0.2-nightly-2025-10-05";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
-    hash = "sha256-3QvkNmNeY+UnpUl1m2gWIatSJNpGdTstNMSh6gj+5oE=";
+    hash = "sha256-u12Qfc0fmcs7TU35/gqfRxjSpw9SDbc4+ebR7lGpvJI=";
   };
 
-  cargoHash = "sha256-cDECuJwBNzC0gzWGfoN+IApd52vtVq/NSJLxT9vLKNA=";
+  cargoHash = "sha256-v/3vf7YYJiz+PMBsznvOJsNLtv6bEQ9pffAI33rLVuw=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

From 59dfbb0400b5783c26e9d0277ca02d9cde341b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 15:38:30 +0000
Subject: [PATCH 47/51] vault-bin: 1.20.3 -> 1.20.4

---
 pkgs/by-name/va/vault-bin/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index 0c12e09eb137..d9ea8d8c3d15 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vault-bin";
-  version = "1.20.3";
+  version = "1.20.4";
 
   src =
     let
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-3IE0WJ3JmzeUwC6OcorebHOD858SKiBR2Rv6KhKewXU=";
-        aarch64-linux = "sha256-DsqOf3yeOz3SI+CCvS2KcCJ6k18o4H+LI1Z39i9ezb0=";
-        i686-linux = "sha256-ONrB+Gwm0dMAK8lvCg5ljC2KApkugA8zX9HcmV0QzFM=";
-        x86_64-darwin = "sha256-cbxdyuLhc8+Ux2ZOX1zncsP2KGqWruuno/Yzct/cyII=";
-        aarch64-darwin = "sha256-zWuI+KFNyqoxnEKI25N4igXnXjoz+AXMU1WgGDKyfog=";
+        x86_64-linux = "sha256-n687yeuM1+1m2TfgT3AaMBOfE8cqbbG0Gq9Imb9olno=";
+        aarch64-linux = "sha256-+MRuCMkskd29xaoAjj42Re1eRra3SKMiciUOG9HwsN4=";
+        i686-linux = "sha256-L1zYFc2nam/pFq/groxeWvyK+ujHOHqvUkR96hPC7jU=";
+        x86_64-darwin = "sha256-t0j3Wr6IrFfN6FcZ3ZF+9qYjR/K6R8o06ebLJohr54w=";
+        aarch64-darwin = "sha256-F/M9ULCkfArlBcLqfR8i1gVcspfe8XEag6etdFXQmqA=";
       };
     in
     fetchzip {

From 2b7df7b2f3c310282da2501e31efc4a8c1bccb9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 18:43:56 +0000
Subject: [PATCH 48/51] tweeny: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/by-name/tw/tweeny/package.nix b/pkgs/by-name/tw/tweeny/package.nix
index e17e0cafe28a..0ab9a342374a 100644
--- a/pkgs/by-name/tw/tweeny/package.nix
+++ b/pkgs/by-name/tw/tweeny/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tweeny";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "mobius3";
     repo = "tweeny";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-VmvOMK+FjYZXKH9kPUT2L7pmJMPSr5eXptCcoGWK+qo=";
+    sha256 = "sha256-9nFEI4gignIJaBFW9GDuSJJqeWli6YcKs/uYEL89VsE=";
   };
 
   nativeBuildInputs = [

From 2bd3163e83beb417107125ecdf9290d008f77948 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 18:53:01 +0000
Subject: [PATCH 49/51] steam-rom-manager: 2.5.29 -> 2.5.30

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

diff --git a/pkgs/by-name/st/steam-rom-manager/package.nix b/pkgs/by-name/st/steam-rom-manager/package.nix
index 4f89fdd94827..52ac6e6e5c27 100644
--- a/pkgs/by-name/st/steam-rom-manager/package.nix
+++ b/pkgs/by-name/st/steam-rom-manager/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "steam-rom-manager";
-  version = "2.5.29";
+  version = "2.5.30";
 
   src = fetchurl {
     url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage";
-    sha256 = "sha256-6ZJ+MGIgr2osuQuqD6N9NnPiJFNq/HW6ivG8tyXUhvs=";
+    sha256 = "sha256-2prpPNgB8EYrswYc98RRrQtHc/s9asbtACRCDyyGQqg=";
   };
 
   extraInstallCommands =

From 20193847cc1b8be0fb0e2fe900fe813752be8c29 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Sun, 5 Oct 2025 21:06:28 +0200
Subject: [PATCH 50/51] python3Packages.ducc0: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix
index 2f432a5b456e..34c9442bf4ae 100644
--- a/pkgs/development/python-modules/ducc0/default.nix
+++ b/pkgs/development/python-modules/ducc0/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "ducc0";
-  version = "0.38.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mtr";
     repo = "ducc";
     tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-Be7lw9i1uEOY3w/Efnn7sZ4Xg5DenQuih6uReCmOI1I=";
+    hash = "sha256-VF4m0/kna1HEccK5ljFuNwXSYoak9TeFMyhBmUgupf0=";
   };
 
   postPatch = ''

From 89ec0816f9a4aaaebaee81fba5957924c5a3530c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 19:42:36 +0000
Subject: [PATCH 51/51] nfpm: 2.43.1 -> 2.43.2

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

diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index d175301d73f1..ef67992ae0a5 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.43.1";
+  version = "2.43.2";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "nfpm";
     rev = "v${version}";
-    hash = "sha256-00PsRRY8HlfvkLoim1iKjsYH0ab2Bn0DeyEv44iCw5s=";
+    hash = "sha256-RHYGVSR/hMekaNoIxBP2zw3RZi/SSj4RlSMJNvgbigw=";
   };
 
-  vendorHash = "sha256-AEnBrMv5e5JxuX9tNKf/Ee/vC4gN536zMLoVucaWdrI=";
+  vendorHash = "sha256-7OhiaB0PpwvFj+yLyoN0+/qpF+p/c/Vw+7Tn2XVYYjg=";
 
   ldflags = [
     "-s"