From 84a76adc8180c6a5d6d0db649712a5b1dbb41038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 8 Sep 2025 21:24:45 +0200
Subject: [PATCH 01/46] nextcloud31Packages.apps.recognize: add hooks

---
 pkgs/servers/nextcloud/packages/apps/recognize.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 2159c1132dd3..502d592af4c4 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -91,6 +91,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = lib.optionalString useLibTensorflow ''
+    runHook preBuild
+
     cd recognize
 
     # Install tfjs dependency
@@ -102,14 +104,20 @@ stdenv.mkDerivation rec {
     # Test tfjs returns exit code 0
     node src/test_libtensorflow.js
     cd ..
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))"
     if [ -d "$approot" ]; then
       mv "$approot/" $out
       chmod -R a-w $out
     fi
+
+    runHook postInstall
   '';
 
   meta = with lib; {

From 3325f3ad9fa0d4643e3cfd41227adab4b65cbf12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 8 Sep 2025 21:25:22 +0200
Subject: [PATCH 02/46] nextcloud31Packages.apps.recognize: delete temporary
 build artifacts to remove build time only dependencies from closure

---
 pkgs/servers/nextcloud/packages/apps/recognize.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 502d592af4c4..c0deead18dd4 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
     export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include"
     cd node_modules/@tensorflow/tfjs-node
     node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}
+    rm -r ./build-tmp-napi-v*/
     cd -
 
     # Test tfjs returns exit code 0

From b3cc172e19b42fa6861aa06d6e8c99ff78ebce45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Sep 2025 18:16:19 -0700
Subject: [PATCH 03/46] spotdl: 4.2.11 -> 4.4.2

Diff: https://github.com/spotDL/spotify-downloader/compare/v4.2.11...v4.4.2

Changelog: https://github.com/spotDL/spotify-downloader/releases/tag/v4.4.2
---
 pkgs/by-name/sp/spotdl/package.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix
index c57a2f03fdbf..faff6ff7b5e8 100644
--- a/pkgs/by-name/sp/spotdl/package.nix
+++ b/pkgs/by-name/sp/spotdl/package.nix
@@ -1,28 +1,29 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   ffmpeg,
+  writableTmpDirAsHomeHook,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "spotdl";
-  version = "4.2.11";
+  version = "4.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     tag = "v${version}";
-    hash = "sha256-9PlqnpUlV5b8g+lctGjVL1Xgf25SS5xqkDaa1bSlxpk=";
+    hash = "sha256-guQ8fIA20wtCkB5CkU7zg/INE+g8/fvQfIs5TNteQGo=";
   };
 
-  build-system = with python3.pkgs; [ poetry-core ];
+  build-system = with python3Packages; [ hatchling ];
 
   pythonRelaxDeps = true;
 
   dependencies =
-    with python3.pkgs;
+    with python3Packages;
     [
       beautifulsoup4
       fastapi
@@ -45,18 +46,15 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ python-slugify.optional-dependencies.unidecode;
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     pyfakefs
     pytest-mock
     pytest-subprocess
     pytest-vcr
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
   disabledTestPaths = [
     # Tests require networking
     "tests/test_init.py"
@@ -91,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Download your Spotify playlists and songs along with album art and metadata";
     homepage = "https://github.com/spotDL/spotify-downloader";
-    changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}";
+    changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
     mainProgram = "spotdl";

From e85c602520abffcff75abf73ed45323d201f51a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Wed, 10 Sep 2025 10:33:37 +0200
Subject: [PATCH 04/46] deno: 2.4.5 -> 2.5.0

---
 pkgs/by-name/de/deno/librusty_v8.nix | 10 +++++-----
 pkgs/by-name/de/deno/package.nix     | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix
index d44e299628a3..7fe9f1aba734 100644
--- a/pkgs/by-name/de/deno/librusty_v8.nix
+++ b/pkgs/by-name/de/deno/librusty_v8.nix
@@ -2,11 +2,11 @@
 { fetchLibrustyV8 }:
 
 fetchLibrustyV8 {
-  version = "137.2.1";
+  version = "140.0.0";
   shas = {
-    x86_64-linux = "sha256-1mV+UjvJsIyLFpBGVDrGxr/rqUgKzRRFwgnMyYTb/pM=";
-    aarch64-linux = "sha256-Rp7chA+GjsozCkMQrDnOoi4VhVJdrFZd1BuLfcRhGjw=";
-    x86_64-darwin = "sha256-tDMk+F6D/h4osYlzT2qAhqfHYUSDk3nL4RxEKjhBhD0=";
-    aarch64-darwin = "sha256-1eBUjKFalb/CIPfHYP8SvqIaxRep8vU6u9QFShOMUsQ=";
+    x86_64-linux = "sha256-wQHvnrOPEp/rs+YV3NFcfq+Xg+XouxYOD8zev+bjJHw=";
+    aarch64-linux = "sha256-RR5h2TIxwMEDtML12Ko1FxEcPNUFZ+YXMrX+ur0Njm8=";
+    x86_64-darwin = "sha256-+MCp9CQvZw0OnEmKWMNYQTCPs+ueSCqAHsJn/BX/QGI=";
+    aarch64-darwin = "sha256-l7AtIA92PDY6zsr1bjcTSPlW2tzRvOfyzNskp0Fm0Io=";
   };
 }
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index d474bd602660..6f269129ec25 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.4.5";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-kzY/ZT5Ld6oQnl8vHBaMfdAgZljTcWCFafIbuRS21ro=";
+    hash = "sha256-N5TDKQKgmVCUevjJKIXJYje3bIBPXKLX53kQP7DdSUA=";
   };
 
-  cargoHash = "sha256-A1LABL99mXson3gw8CaDbMH4afzyGMcaK0A8+aeK7T0=";
+  cargoHash = "sha256-oGkM9kvPM3HU8SGj7Hpe6xcy5dzjGxEyKjck68CpeBA=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.
@@ -187,6 +187,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=watcher"
     "--skip=node_unit_tests::_fs_watch_test"
     "--skip=js_unit_tests::fs_events_test"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959
+    "--skip=tests::test_userspace_resolver"
   ];
 
   __darwinAllowLocalNetworking = true;

From 6713f41eeefe6774974bf740830d8b4d640ba4d4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Sep 2025 19:48:19 +0200
Subject: [PATCH 05/46] python313Packages.construct-classes: 0.1.2 -> 0.2.2

Changelog: https://github.com/matejcik/construct-classes/blob/v0.2.2/CHANGELOG.rst
---
 .../construct-classes/default.nix              | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index a89f8f030a0e..189729fb9bd7 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -1,28 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  poetry-core,
   construct,
+  fetchFromGitHub,
   pytestCheckHook,
+  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "construct-classes";
-  version = "0.1.2";
-  format = "pyproject";
+  version = "0.2.2";
+  pyproject = true;
 
-  # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "matejcik";
     repo = "construct-classes";
-    rev = "v${version}";
-    hash = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo=";
+    tag = "v${version}";
+    hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ uv-build ];
 
-  propagatedBuildInputs = [ construct ];
+  dependencies = [ construct ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -31,6 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Parse your binary data into dataclasses";
     homepage = "https://github.com/matejcik/construct-classes";
+    changelog = "https://github.com/matejcik/construct-classes/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ prusnak ];
   };

From 3995c1531f69e7a327810472b28c57c4180dec82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Sep 2025 17:40:09 +0000
Subject: [PATCH 06/46] postgresqlPackages.pgmq: 1.6.1 -> 1.7.0

---
 pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index 827239f0ae60..03eb8bbed8b6 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgmq";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "tembo-io";
     repo = "pgmq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ddlExWqAJXijLl9skEkZu5ZH9X+cTreT38pZ3izt8j0=";
+    hash = "sha256-CnXweDsLO2yE+z1tPADqz54Q1rswsKoUVYbdiZFEbPs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pgmq-extension";

From 0e3b6286a7dbefb2d0195dcbd1e1c64fc6e2686b Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Fri, 12 Sep 2025 14:43:06 +0200
Subject: [PATCH 07/46] fish: 4.0.2 -> 4.0.6

Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.0.6
Diff: https://github.com/fish-shell/fish-shell/compare/4.0.2...4.0.6
---
 pkgs/by-name/fi/fish/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 949abee00fa2..8fcd76fcd12b 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -152,13 +152,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.0.2";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4=";
+    hash = "sha256-qkPKpZvTVDEV7A/xX2bYgTf+o24mswRDr5UBXOsV5jQ=";
   };
 
   env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg=";
+    hash = "sha256-myDme0aHEJPUDIcIN3j6i93oPrQ0Li4rIdepBp/C/R4=";
   };
 
   patches = [

From 6d521ceac9fe37078822cca71c75770b9cf78ac7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 12 Sep 2025 16:21:43 +0200
Subject: [PATCH 08/46] nixos/test-driver: Add machine.get_console_log()

---
 .../src/test_driver/machine/__init__.py       |  16 +++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/nixos-test-driver/console-log.nix | 117 ++++++++++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 nixos/tests/nixos-test-driver/console-log.nix

diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index 8115a5967a2d..6f0985479803 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -241,6 +241,8 @@ class Machine:
     # Store last serial console lines for use
     # of wait_for_console_text
     last_lines: Queue = Queue()
+    # Store all console output for full log retrieval
+    full_console_log: list[str]
     callbacks: list[Callable]
 
     def __repr__(self) -> str:
@@ -263,6 +265,7 @@ class Machine:
         self.start_command = start_command
         self.callbacks = callbacks if callbacks is not None else []
         self.logger = logger
+        self.full_console_log = []
 
         # set up directories
         self.shared_dir = self.tmp_dir / "shared-xchg"
@@ -996,6 +999,8 @@ class Machine:
         Wait until the supplied regular expressions match a line of the
         serial console output.
         This method is useful when OCR is not possible or inaccurate.
+
+        When this method returns, the console output that includes the match has already become part of get_console_log().
         """
         # Buffer the console output, this is needed
         # to match multiline regexes.
@@ -1020,6 +1025,13 @@ class Machine:
                 while not console_matches(False):
                     pass
 
+    def get_console_log(self) -> str:
+        """
+        Get the full console output from the machine since boot.
+        Returns all serial console output as a single string.
+        """
+        return "\n".join(self.full_console_log)
+
     def send_key(
         self, key: str, delay: float | None = 0.01, log: bool | None = True
     ) -> None:
@@ -1086,6 +1098,8 @@ class Machine:
         # Store last serial console lines for use
         # of wait_for_console_text
         self.last_lines: Queue = Queue()
+        # Re-initialize (if this is not the first start)
+        self.full_console_log: list[str] = []
 
         def process_serial_output() -> None:
             assert self.process
@@ -1093,6 +1107,8 @@ class Machine:
             for _line in self.process.stdout:
                 # Ignore undecodable bytes that may occur in boot menus
                 line = _line.decode(errors="ignore").replace("\r", "").rstrip()
+                self.full_console_log.append(line)
+                # Put on queue after adding to full_console_log to guarantee ordering
                 self.last_lines.put(line)
                 self.log_serial(line)
 
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 46fa3160cb69..92f917ca51ef 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -162,6 +162,7 @@ in
     lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix { };
     node-name = runTest ./nixos-test-driver/node-name.nix;
     busybox = runTest ./nixos-test-driver/busybox.nix;
+    console-log = runTest ./nixos-test-driver/console-log.nix;
     driver-timeout =
       pkgs.runCommand "ensure-timeout-induced-failure"
         {
diff --git a/nixos/tests/nixos-test-driver/console-log.nix b/nixos/tests/nixos-test-driver/console-log.nix
new file mode 100644
index 000000000000..5fc8a5e8ae78
--- /dev/null
+++ b/nixos/tests/nixos-test-driver/console-log.nix
@@ -0,0 +1,117 @@
+# Run with: nix-build -A nixosTests.nixos-test-driver.console-log
+{
+  name = "nixos-test-driver.console-log";
+
+  nodes = {
+    machine = {
+      # Configure the machine to print some distinctive messages to console
+      boot.kernelParams = [ "console=ttyS0,115200n8" ];
+
+      # TODO: add a system service that logs to /dev/console, and test that
+      #       blocked on https://github.com/NixOS/nixpkgs/issues/442382
+    };
+  };
+
+  testScript = ''
+    # Start the machine and wait for it to boot
+    machine.start()
+    machine.wait_for_unit("multi-user.target")
+
+    with subtest("get_console_log returns console output"):
+      # Get the console log
+      console_log = machine.get_console_log()
+      # Verify it's a non-empty string
+      assert isinstance(console_log, str), f"Expected string, got {type(console_log)}"
+      assert len(console_log) > 0, "Console log should not be empty"
+
+      print(f"Console log length: {len(console_log)} characters")
+      print("Console log preview (first 500 chars):")
+      print(console_log[:500])
+
+    with subtest("console log contains boot messages"):
+      # Check for typical boot messages
+      assert "systemd" in console_log, "Console log should contain systemd messages"
+
+      # Test direct stderr capture
+      machine.succeed("echo 'DIRECT_TEST_MESSAGE_12345' >&2")
+      import time
+      time.sleep(1)
+
+      updated_log = machine.get_console_log()
+      assert "DIRECT_TEST_MESSAGE_12345" in updated_log, "Console log should capture stderr messages"
+      print("Successfully captured stderr message in console log")
+
+    with subtest("console log captures command output"):
+      # Execute a command that prints to console via kernel messages
+      machine.succeed("echo 'KERNEL_TEST_MESSAGE_12345' > /dev/kmsg")
+
+      # Wait a moment for the message to be captured
+      import time
+      time.sleep(2)
+
+      # Get updated console log
+      updated_log = machine.get_console_log()
+      if "KERNEL_TEST_MESSAGE_12345" in updated_log:
+        print("Successfully captured kernel message in console log")
+      else:
+        print("Kernel message not found in console log - this may be expected depending on log level")
+
+    with subtest("console log persists across multiple calls"):
+      # Get console log twice and verify they're consistent
+      log1 = machine.get_console_log()
+      log2 = machine.get_console_log()
+
+      # Both logs should contain the same content (log2 might have additional content)
+      assert "systemd" in log1, "First log should contain systemd messages"
+      assert "systemd" in log2, "Second log should contain systemd messages"
+      assert len(log2) >= len(log1), "Second log should be at least as long as first log"
+      assert "KERNEL_TEST_MESSAGE_12345" in log2, "Second log should contain our kernel test message"
+
+    with subtest("console log contains kernel messages"):
+      # Look for typical kernel boot messages
+      kernel_indicators = ["Linux version", "Command line:", "Kernel command line"]
+      kernel_found = any(indicator in console_log for indicator in kernel_indicators)
+      assert kernel_found, f"Console log should contain kernel messages. Indicators checked: {kernel_indicators}"
+
+    with subtest("console log is cleared on machine restart"):
+      # Get the current console log and verify it contains our test messages
+      pre_shutdown_log = machine.get_console_log()
+      assert "KERNEL_TEST_MESSAGE_12345" in pre_shutdown_log, "Pre-shutdown log should contain our kernel test message"
+      assert "DIRECT_TEST_MESSAGE_12345" in pre_shutdown_log, "Pre-shutdown log should contain our stderr test message"
+      pre_shutdown_length = len(pre_shutdown_log)
+      print(f"Pre-shutdown console log length: {pre_shutdown_length} characters")
+
+      # Shutdown the machine
+      machine.shutdown()
+
+      # Start the machine again
+      machine.start()
+      machine.wait_for_unit("multi-user.target")
+
+      # Get the console log after restart
+      post_restart_log = machine.get_console_log()
+      post_restart_length = len(post_restart_log)
+      print(f"Post-restart console log length: {post_restart_length} characters")
+
+      # Verify the old messages are gone (log should be fresh)
+      assert "KERNEL_TEST_MESSAGE_12345" not in post_restart_log, "Post-restart log should not contain old kernel test message"
+      assert "DIRECT_TEST_MESSAGE_12345" not in post_restart_log, "Post-restart log should not contain old stderr test message"
+
+      # Verify we still have boot messages (log should contain new boot sequence)
+      assert "systemd" in post_restart_log, "Post-restart log should contain systemd messages from new boot"
+      kernel_found_restart = any(indicator in post_restart_log for indicator in kernel_indicators)
+      assert kernel_found_restart, "Post-restart log should contain kernel messages from new boot"
+
+      # Add a new test message to verify the log is working after restart
+      machine.succeed("echo 'POST_RESTART_TEST_MESSAGE_67890' > /dev/kmsg")
+      import time
+      time.sleep(1)
+
+      final_log = machine.get_console_log()
+      assert "POST_RESTART_TEST_MESSAGE_67890" in final_log, "Should capture new messages after restart"
+
+      print("Console log successfully cleared on restart and is functional again")
+
+    print("All console log tests passed successfully!")
+  '';
+}

From 43f8717d3604885bc7665be4120fccba33b82f8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 18:11:49 +0000
Subject: [PATCH 09/46] windsurf: 1.12.4 -> 1.12.5

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index ef29301d1547..e0bbac798ad8 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.12.4",
+    "version": "1.12.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-arm64-1.12.4.zip",
-    "sha256": "b45050d9a38ca88b4768985f7007d2c222931d5e113c35bd2eeab9611873b6c8"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-arm64-1.12.5.zip",
+    "sha256": "5b114d4dfea8ccc63a0bfbbbc07c0883a4638e0edaaca60fed3aefd0cdf9747f"
   },
   "x86_64-darwin": {
-    "version": "1.12.4",
+    "version": "1.12.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-x64-1.12.4.zip",
-    "sha256": "007207ae3fc620da956874c6d7162cd1d0728a0501b4227197f9d1a659b2e2b4"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-x64-1.12.5.zip",
+    "sha256": "21b27ec4ed2e3b5e721b44251f56b6784b917b82dc58ed63e90e83b90830e63a"
   },
   "x86_64-linux": {
-    "version": "1.12.4",
+    "version": "1.12.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-linux-x64-1.12.4.tar.gz",
-    "sha256": "bda6a3bd74524c3e70a7e1a53b63fda7f7ed1840707e4a1b0a7ead5f3b2c48a2"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-linux-x64-1.12.5.tar.gz",
+    "sha256": "a73bb9f23f8a9acb36d0d858b5c3c247f8ab2c66a8030852cea539c0ae8c4876"
   }
 }

From bd1da437f641cc2fd34d1cd2b68d088c4d3a4adb Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 31 Jul 2025 13:29:18 +0200
Subject: [PATCH 10/46] haskell.compiler.ghc910: 9.10.2 -> 9.10.3

https://www.haskell.org/ghc/blog/20250910-ghc-9.10.3-released.html

(partially cherry picked from commit ed65db9c51f0556a2b7a5072226428ff1188d6f5)
---
 pkgs/development/compilers/ghc/9.10.3.nix |  4 +++
 pkgs/top-level/haskell-packages.nix       | 33 ++++++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/9.10.3.nix

diff --git a/pkgs/development/compilers/ghc/9.10.3.nix b/pkgs/development/compilers/ghc/9.10.3.nix
new file mode 100644
index 000000000000..aac558f47417
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.10.3.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.10.3";
+  sha256 = "d266864b9e0b7b741abe8c9d6a790d7c01c21cf43a1419839119255878ebc59a";
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d9da08cfeb1b..aeb5cef6c9b5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,11 +175,31 @@ in
         buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
         llvmPackages = pkgs.llvmPackages_15;
       };
-      ghc910 = compiler.ghc9102;
+      ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
+        bootPkgs =
+          if stdenv.buildPlatform.isDarwin then
+            # it seems like the GHC 9.6.* bindists are built with a different
+            # toolchain than we are using (which I'm guessing from the fact
+            # that 9.6.4 bindists pass linker flags our ld doesn't support).
+            # With both 9.6.3 and 9.6.4 binary it is impossible to link against
+            # the clock package (probably a hsc2hs problem).
+            bb.packages.ghc963
+          else
+            bb.packages.ghc963Binary;
+        inherit (buildPackages.python3Packages) sphinx;
+        # Need to use apple's patched xattr until
+        # https://github.com/xattr/xattr/issues/44 and
+        # https://github.com/xattr/xattr/issues/55 are solved.
+        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
+        # 2023-01-15: Support range >= 11 && < 16
+        buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
+        llvmPackages = pkgs.llvmPackages_15;
+      };
+      ghc910 = compiler.ghc9103;
       ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
         bootPkgs =
           # No suitable bindist packaged yet
-          bb.packages.ghc9102;
+          bb.packages.ghc9103;
         inherit (buildPackages.python3Packages) sphinx;
         # Need to use apple's patched xattr until
         # https://github.com/xattr/xattr/issues/44 and
@@ -192,7 +212,7 @@ in
       ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
         bootPkgs =
           # No suitable bindist packaged yet
-          bb.packages.ghc9102;
+          bb.packages.ghc9103;
         inherit (buildPackages.python3Packages) sphinx;
         # Need to use apple's patched xattr until
         # https://github.com/xattr/xattr/issues/44 and
@@ -305,7 +325,12 @@ in
         ghc = bh.compiler.ghc9102;
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
       };
-      ghc910 = packages.ghc9102;
+      ghc9103 = callPackage ../development/haskell-modules {
+        buildHaskellPackages = bh.packages.ghc9103;
+        ghc = bh.compiler.ghc9103;
+        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
+      };
+      ghc910 = packages.ghc9103;
       ghc9121 = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc9121;
         ghc = bh.compiler.ghc9121;

From 135515d1617db94321d1c940875e70c6fe638025 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 20:40:37 +0000
Subject: [PATCH 11/46] proton-pass: 1.32.5 -> 1.32.6

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

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index dcd7ebfd3c48..2e3d7faf7bd6 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.32.5";
+  version = "1.32.6";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-nf24oCLeJ0FoWPCB1NKFEDfzLkRWvvgzMFItFw4dikY=";
+    hash = "sha256-xtptEi/H15fEABrlPE854uSWagr2kt2/h33SuegVab8=";
   };
 
   dontConfigure = true;

From 976e2f2da41b5bb1498e0b574216c01c10485344 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 20:45:41 +0000
Subject: [PATCH 12/46] isle-portable: 0-unstable-2025-08-21 ->
 0-unstable-2025-09-12

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

diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index 449bade34ce2..4e954f7018bf 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
 stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   name = "isle-portable";
-  version = "0-unstable-2025-08-21";
+  version = "0-unstable-2025-09-12";
 
   src = fetchFromGitHub {
     owner = "isledecomp";
     repo = "isle-portable";
-    rev = "ef2eaf04bf09c8827139ad4c06cea24ea8ab6942";
-    hash = "sha256-rOF8DZck3TVvfP4Ho4hvlAZmhAhbGD+Q91yk/pvXv3o=";
+    rev = "ec3c770c61a717e8da1006beeda384533e235f8c";
+    hash = "sha256-XzPHthUYSDj9gleq0Tnhe79xIU2X57ZqMzND53q8+sI=";
     fetchSubmodules = true;
   };
 

From 53ac426853c55871994f144232ba77aba73a5971 Mon Sep 17 00:00:00 2001
From: Jeppe Fihl-Pearson <jeppe@tenzer.dk>
Date: Fri, 12 Sep 2025 22:11:02 +0100
Subject: [PATCH 13/46] maintainers: add Tenzer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 347b35e84e6d..27c8dc4cc4cc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25393,6 +25393,12 @@
     matrix = "@tensor5:matrix.org";
     name = "Nicola Squartini";
   };
+  Tenzer = {
+    email = "nixpkgs@tenzer.dk";
+    github = "Tenzer";
+    githubId = 68696;
+    name = "Jeppe Fihl-Pearson";
+  };
   teohz = {
     email = "gitstuff@teohz.com";
     github = "teohz";

From e957f47b547794d3d9d08833dd9df613b607eb64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 00:24:14 +0000
Subject: [PATCH 14/46] python3Packages.model-checker: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index bb54c00ca92f..d642f8b19e1c 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-RnEkYdQP2VGYNpcQuwJoC1QenppJj+lFtHiPIUNfRnY=";
+    hash = "sha256-WCep7ibi1iN8v8508ZkEPjW9zqK7mUaiGuWv2wnoiRI=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From be975034fd42887d414789b958f7919ee89e9923 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 00:42:17 +0000
Subject: [PATCH 15/46] cloud-hypervisor: 47.0 -> 48.0

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

diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 0f023704788a..8557b1659f40 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloud-hypervisor";
-  version = "47.0";
+  version = "48.0";
 
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = "cloud-hypervisor";
     rev = "v${version}";
-    hash = "sha256-NzvK6gKu7pWwTqLaeDKyYedIjzRa85k9PGUGfeA2Y4c=";
+    hash = "sha256-cfS3sO1GQIxF9UlzKP9iE/UuJwGVIkNBN7GDF/ltn4Q=";
   };
 
-  cargoHash = "sha256-s3lBlYbE9xoLov8JWeX89A7J00tCISoCDHHBoEcILus=";
+  cargoHash = "sha256-QvW1loljt9KzY0h2pG7n9NCkJJOYr/VxftsyqATm9DA=";
 
   separateDebugInfo = true;
 

From 8e58578ddcd7a57029ff5b01285f3e7c2156207a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 00:57:38 +0000
Subject: [PATCH 16/46] ocm: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index 65c859754244..b73ac4ffeb7f 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "ocm";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
     rev = "v${version}";
-    sha256 = "sha256-fN7nrWxF4eFaEd5iNpVJWoK23S76jjh20834b/MVlPo=";
+    sha256 = "sha256-v+BWmdTDJm1oElP/XV59pHm7NlsFj2sDTymtT0xpXKY=";
   };
 
-  vendorHash = "sha256-q/Se4jq1a25QX9TzVkPbOi7AeT2hossCX4dh9gMqCx0=";
+  vendorHash = "sha256-GOdRYVnFPS1ovFmU+9MEnwTNg1sa9/25AjzbcbBJrQ0=";
 
   # Strip the final binary.
   ldflags = [

From 608df331d8fc173a8006c32dcb33af9b03125203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 22 Jul 2025 15:56:03 +0200
Subject: [PATCH 17/46] nixos/mailman: add package option

---
 nixos/modules/services/mail/mailman.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 0cebc8254627..9ab7f09d7b1c 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.mailman;
 
   inherit
-    (pkgs.mailmanPackages.buildEnvs {
+    (cfg.packageSet.buildEnvs {
       withHyperkitty = cfg.hyperkitty.enable;
       withLDAP = cfg.ldap.enable;
     })
@@ -117,6 +117,10 @@ in
         description = "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix).";
       };
 
+      packageSet = lib.mkPackageOption pkgs "mailmanPackages" { } // {
+        type = lib.types.attrs;
+      };
+
       ldap = {
         enable = lib.mkEnableOption "LDAP auth";
         serverUri = lib.mkOption {
@@ -348,7 +352,7 @@ in
       mailman.layout = "fhs";
 
       "paths.fhs" = {
-        bin_dir = "${pkgs.mailmanPackages.mailman}/bin";
+        bin_dir = "${cfg.packageSet.mailman}/bin";
         var_dir = "/var/lib/mailman";
         queue_dir = "$var_dir/queue";
         template_dir = "$var_dir/templates";

From fe356bac64b99e2cb5d049ef952556cd2f9385e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 01:32:09 +0000
Subject: [PATCH 18/46] bearer: 1.50.1 -> 1.51.0

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

diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix
index dc6cd3e4ed11..1582fd7ec7ab 100644
--- a/pkgs/by-name/be/bearer/package.nix
+++ b/pkgs/by-name/be/bearer/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "bearer";
-  version = "1.50.1";
+  version = "1.51.0";
 
   src = fetchFromGitHub {
     owner = "bearer";
     repo = "bearer";
     tag = "v${version}";
-    hash = "sha256-cUfuTYk3ckijSZbniHaZuprlv9rKNIxzILEdTGdvVQ0=";
+    hash = "sha256-aqyINnOVzWVnQ0F2aRxlMIM+CwYwnfnclavlgBV/UCo=";
   };
 
-  vendorHash = "sha256-+2iiMb2+/a3GCUMVA9boJJxuFgB3NmxpTePyMEA46jw=";
+  vendorHash = "sha256-MBcJlMIYSqzJaxuS0YEoeXiVsD2AQj4aAXhN/P/E2MU=";
 
   subPackages = [ "cmd/bearer" ];
 

From 0e2653af30a9edd0417ca7fc5498a213ca3a6812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 02:15:40 +0000
Subject: [PATCH 19/46] ttop: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix
index bccbbe484190..5ca4733fbc76 100644
--- a/pkgs/by-name/tt/ttop/package.nix
+++ b/pkgs/by-name/tt/ttop/package.nix
@@ -7,13 +7,13 @@
 
 buildNimPackage (finalAttrs: {
   pname = "ttop";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "inv2004";
     repo = "ttop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bBwSeB4azLjDTsfi9NFxoVphwUhHGFeJ/AYicYgk0as=";
+    hash = "sha256-JdUoVP/R3epkx53kMdIflDEuFuJRzCxQY1BgsyVItqM=";
   };
 
   lockFile = ./lock.json;

From 6ad8b0d46e0267682cb9301eb626d7c08ffc7039 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 03:25:10 +0000
Subject: [PATCH 20/46] python3Packages.llama-index-readers-weather: 0.4.0 ->
 0.4.1

---
 .../python-modules/llama-index-readers-weather/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
index 16d821e901c8..32183a5b415d 100644
--- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-weather";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_weather";
     inherit version;
-    hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98=";
+    hash = "sha256-fprFX75y50RzJA4SlMfgAeXOO88QbY9UT17Y8oIwdUk=";
   };
 
   build-system = [ hatchling ];

From c3183717de0c604bdbe0b04a04c4087366d45847 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 13 Sep 2025 09:46:21 +0200
Subject: [PATCH 21/46] zls: 0.14.0 -> 0.15.0

Changelog: https://zigtools.org/zls/releases/0.15.0/
Diff: https://github.com/zigtools/zls/compare/0.14.0...0.15.0

removed tracy from `deps_0_15.nix` as instructed here:
https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13
---
 pkgs/development/tools/zls/deps_0_15.nix | 8 +-------
 pkgs/top-level/all-packages.nix          | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/zls/deps_0_15.nix b/pkgs/development/tools/zls/deps_0_15.nix
index 2292e4212b6c..5e3f28ccc47a 100644
--- a/pkgs/development/tools/zls/deps_0_15.nix
+++ b/pkgs/development/tools/zls/deps_0_15.nix
@@ -1,4 +1,5 @@
 # generated by zon2nix (https://github.com/nix-community/zon2nix)
+# manually removed tracy as instructed here: https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13
 
 { linkFarm, fetchzip }:
 
@@ -10,13 +11,6 @@ linkFarm "zig-packages" [
       hash = "sha256-y7Ck5XZNnHxmPPWlDAqZZ2g3n67txj5/Zq04AhuW5+M=";
     };
   }
-  {
-    name = "N-V-__8AAMeOlQEipHjcyu0TCftdAi9AQe7EXUDJOoVe0k-t";
-    path = fetchzip {
-      url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.11.1.tar.gz";
-      hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
-    };
-  }
   {
     name = "known_folders-0.0.0-Fy-PJkfRAAAVdptXWXBspIIC7EkVgLgWozU5zIk5Zgcy";
     path = fetchzip {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e07466348a9..9f3a8660fef3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9192,6 +9192,7 @@ with pkgs;
     zig_0_15
     ;
 
+  # If this is updated, the default zls version should also be updated to match the default zig version.
   zig = zig_0_15;
 
   zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;
@@ -9202,7 +9203,7 @@ with pkgs;
     ;
 
   # This should be kept updated to ensure the default zls version matches the default zig version.
-  zls = zls_0_14;
+  zls = zls_0_15;
 
   libzint = zint-qt.override { withGUI = false; };
 

From 58a1fc2a07c41f2c5953fad6143f13aff191aa66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 13 Sep 2025 10:51:10 +0200
Subject: [PATCH 22/46] criticality-score: fix build by pinning back to go 1.24

https://hydra.nixos.org/build/307080674/nixlog/1/tail
---
 pkgs/by-name/cr/criticality-score/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix
index 3a85bcfd4f85..9d1409248466 100644
--- a/pkgs/by-name/cr/criticality-score/package.nix
+++ b/pkgs/by-name/cr/criticality-score/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "criticality-score";
   version = "2.0.4";
 

From 895f937c0962e2826eb850404fb4cbd5c128f540 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 09:03:48 +0000
Subject: [PATCH 23/46] oelint-adv: 8.2.0 -> 8.2.1

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

diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 16714558cdf2..b11b57f0ba79 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oelint-adv";
-  version = "8.2.0";
+  version = "8.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
     tag = version;
-    hash = "sha256-K1MUf9QDDBuIuVovyXYkHPK4eoth4wdFnzjuFpZFBLc=";
+    hash = "sha256-JMQqh3bNyG1m001D9v8Gt870bioqduDfpaQFwE5INRQ=";
   };
 
   postPatch = ''

From 1c42d46a95dba90f21b5206ccc5d45cda254f061 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 13 Sep 2025 13:06:08 +0300
Subject: [PATCH 24/46] kdePackages: Frameworks 6.17.0 -> 6.18.0

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

diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 4ebf185b40a5..83acf6a73c42 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/attica-6.17.0.tar.xz",
-    "hash": "sha256-L6tKLTLpj2JGW4G9puQW/3+pnWqklMSyYfh3J1j2txo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/attica-6.18.0.tar.xz",
+    "hash": "sha256-6ysr4zzINRLHevJVn8r3/FitGRq7gs9AsXsunoQA4zY="
   },
   "baloo": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/baloo-6.17.0.tar.xz",
-    "hash": "sha256-IarD6V6gld8Cm74L1WY6o5ioiU6cMep/q7XNC5hIVEo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/baloo-6.18.0.tar.xz",
+    "hash": "sha256-aAsB7Xx4m37w7o8U+v+vLovfh6VqJusqb5WkcuVjCQM="
   },
   "bluez-qt": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/bluez-qt-6.17.0.tar.xz",
-    "hash": "sha256-c25rDDFYl8XqhEVE/u71L9HplI7E/yTyxSxf1xig5l0="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/bluez-qt-6.18.0.tar.xz",
+    "hash": "sha256-k0CEkHWnqj/p8h4tK4OJYsCuhO36FqS0zxf0AiMFzrM="
   },
   "breeze-icons": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/breeze-icons-6.17.0.tar.xz",
-    "hash": "sha256-T/x1iG6aFKKgLaSHFgC4wLWkB1a46Zy+z7UVaW2Tw7g="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/breeze-icons-6.18.0.tar.xz",
+    "hash": "sha256-R5bE7mBZp3etjZVKRYToH99QR6lKeYj8N0BSxCe8C2A="
   },
   "extra-cmake-modules": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/extra-cmake-modules-6.17.0.tar.xz",
-    "hash": "sha256-3+yxfQI49N4d00hbkqZgYTfUqcZ7nkzkBAf+DyrsCkA="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/extra-cmake-modules-6.18.0.tar.xz",
+    "hash": "sha256-stIiLP5azlAsYL2Kd6ebwCMPSM7oMmXIncwmGLlg4pM="
   },
   "frameworkintegration": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/frameworkintegration-6.17.0.tar.xz",
-    "hash": "sha256-nZ4BH6ydmWfZTEPtKiE9hRJjgF4dtdrQjYEv4/DmrRI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/frameworkintegration-6.18.0.tar.xz",
+    "hash": "sha256-zFM2+O0Z2gYfdm1IVNdunNQkrECCy0TftOfPE2rqtFQ="
   },
   "kapidox": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kapidox-6.17.0.tar.xz",
-    "hash": "sha256-p6PCwgnPX4EK9IJko2HlJtuskfF5wsAgj6AtxBb58NI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kapidox-6.18.0.tar.xz",
+    "hash": "sha256-2184y3MtbUutE0jiz3iS6MepAYurAMha3WMVB/S4Z38="
   },
   "karchive": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/karchive-6.17.0.tar.xz",
-    "hash": "sha256-YGR8JGRqQ/Z96vN+ICRt+dN5+j91E/6FNqHfozCGW0A="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/karchive-6.18.0.tar.xz",
+    "hash": "sha256-+iT3A6p5nk/1ucwuSmKHRZEuv8yfDGu22SEG/54C4m8="
   },
   "kauth": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kauth-6.17.0.tar.xz",
-    "hash": "sha256-pWPMqqYVwfHb30tFrR2ic55A/ZSQvFkGr9WrXa41+TI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kauth-6.18.0.tar.xz",
+    "hash": "sha256-jG/uaUguej389+rMqctqGR7F0bCeClOeH31ddtCEA+k="
   },
   "kbookmarks": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kbookmarks-6.17.0.tar.xz",
-    "hash": "sha256-BBuWZ9PUhRsOb6Yqn8ESqZOKSHtMpSDu3eG1NWNiF/I="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kbookmarks-6.18.0.tar.xz",
+    "hash": "sha256-QahF/9nv+42ULQTXb8OliwvyPT/TauuiHImrnrD8T4U="
   },
   "kcalendarcore": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcalendarcore-6.17.0.tar.xz",
-    "hash": "sha256-SgZ1xiEcrxg6BnGUskCT3GMBWhpZvge4ZM9F96zRjhM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcalendarcore-6.18.0.tar.xz",
+    "hash": "sha256-TSMwrzXVbFnuafCPOEW6vumJbQABK8z7sUO9xXG8WOc="
   },
   "kcmutils": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcmutils-6.17.0.tar.xz",
-    "hash": "sha256-j2XvD09PMlrW4qMMsUJCIg+BGrHgMUFv0/qlRKxoPoo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcmutils-6.18.0.tar.xz",
+    "hash": "sha256-YRTB7I63NzRhmpnklW3ORJgorzNsLNkdGb/rA+IhUo8="
   },
   "kcodecs": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcodecs-6.17.0.tar.xz",
-    "hash": "sha256-B7HG9sMJFWKamTRvn9WoVK/jZykZEfthAAkyd39+mPI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcodecs-6.18.0.tar.xz",
+    "hash": "sha256-JH7amt5QJpkGLHuqynu5NpGjCPICwWWVRlKHXr53dCY="
   },
   "kcolorscheme": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcolorscheme-6.17.0.tar.xz",
-    "hash": "sha256-yL1F6ySPw42Bbk6w/ZSdkJwJo6WpCEjvbUBAw1lz97Q="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcolorscheme-6.18.0.tar.xz",
+    "hash": "sha256-FOmedMxjZkCsjXBfKHjXLQN5//Zx51wPE4MCSJiY1lE="
   },
   "kcompletion": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcompletion-6.17.0.tar.xz",
-    "hash": "sha256-8i5Mb6zsgSveSrjVagWziiQ92TYsjetPE2fvsbbmRmM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcompletion-6.18.0.tar.xz",
+    "hash": "sha256-bQaIH/Ls5MKd9cPL43AMteNCUGRoamZ+hPBvKlcyocU="
   },
   "kconfig": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kconfig-6.17.0.tar.xz",
-    "hash": "sha256-BnQ1skyp989WqM5bEIQ4oVYHsm3FKQWuB9wYfH4pSd4="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kconfig-6.18.0.tar.xz",
+    "hash": "sha256-UXy/Z0ffkonW/Ohgpz1J5ZNUaFM0rkaOzVPxBn2dYYs="
   },
   "kconfigwidgets": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kconfigwidgets-6.17.0.tar.xz",
-    "hash": "sha256-C8U2bTjcvhKuoyqoTnfpwnjTxjru1vUJr1KEijCkHiE="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kconfigwidgets-6.18.0.tar.xz",
+    "hash": "sha256-qlp75ieKGXM/d+akNfhMPnGSayjxrDdmMTd4iQ1kCBM="
   },
   "kcontacts": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcontacts-6.17.0.tar.xz",
-    "hash": "sha256-GY2yW9x+f+4Rdm7/7ROtRDj2ohG+ihahzR6BXj688ho="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcontacts-6.18.0.tar.xz",
+    "hash": "sha256-pTLEfDwsgYKyrp54P/UhMRiWJRwqHdvjZLNJH5TBALY="
   },
   "kcoreaddons": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcoreaddons-6.17.0.tar.xz",
-    "hash": "sha256-AwPW0ennbPnsBqQazRpSCIpA3zooBel+HDJ7r2B4Qqo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcoreaddons-6.18.0.tar.xz",
+    "hash": "sha256-4dA8/H1FmH7DHzEQT0cygSmA4AOL6rIiYz2hEI629C8="
   },
   "kcrash": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kcrash-6.17.0.tar.xz",
-    "hash": "sha256-UvS93GQuaOlvjxizS7qAO4+fk8uM9eHRqrzP08UoXhM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kcrash-6.18.0.tar.xz",
+    "hash": "sha256-pmKTghsVH1dfz7WYSFeHSeJIxbqi8mKshnJdD2SzJOA="
   },
   "kdav": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdav-6.17.0.tar.xz",
-    "hash": "sha256-jYo7A8XFP1iiZgtYm4lzHRgro7xiLHbge/5sv1Cmk8c="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdav-6.18.0.tar.xz",
+    "hash": "sha256-w/BI18qfCUZHu2h/HqIYugC/OrOwej0au8KdrWd8VSY="
   },
   "kdbusaddons": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdbusaddons-6.17.0.tar.xz",
-    "hash": "sha256-V9ZAv6EcFmC13NPBxx1gWkBULRZX4E2b+Ge3Yb/ncvQ="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdbusaddons-6.18.0.tar.xz",
+    "hash": "sha256-3Olc0Ubhi0AMTfMeqMm7uo+RnjKaUtwaGWNRhKyF5Jo="
   },
   "kdeclarative": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdeclarative-6.17.0.tar.xz",
-    "hash": "sha256-tTY9/HNU0foe1J1xdaAzSo72boK7OJukuv/m93jy4ro="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdeclarative-6.18.0.tar.xz",
+    "hash": "sha256-3EKnTGQoHmeY0HzZ7VMm9vPYIkfy4p58qYVaNss6Hmw="
   },
   "kded": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kded-6.17.0.tar.xz",
-    "hash": "sha256-T18EudvPOgukKBVBnZabAaZiQCTRSZTVQKlzpjcc8nc="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kded-6.18.0.tar.xz",
+    "hash": "sha256-yQ4+5r+ZHzIKxCiywSavv+ETCnTu5nJAWBBYgwcuWII="
   },
   "kdesu": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdesu-6.17.0.tar.xz",
-    "hash": "sha256-ZmiZrVRre9AC4/wWlwMviSDOcmHfLvUZ6B1KrpGXESM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdesu-6.18.0.tar.xz",
+    "hash": "sha256-MgOwRxE88IvKOYHt5lfkW0F6fNDyh5u0+ekBrU5ZRhY="
   },
   "kdnssd": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdnssd-6.17.0.tar.xz",
-    "hash": "sha256-bhaBoBpM0JZQuk3hu61OwD0/ZFL8B/9PdOJLJAQPPgo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdnssd-6.18.0.tar.xz",
+    "hash": "sha256-xI8ogdlmTA7hK3CRxWy7HpWafpYM8tUsbIfm/KrxPH8="
   },
   "kdoctools": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kdoctools-6.17.0.tar.xz",
-    "hash": "sha256-J7DssCMieDcQPj+mrePeCqTV9W9PbJeplv5u50vonS8="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kdoctools-6.18.0.tar.xz",
+    "hash": "sha256-5z3bLfsbBh4C03hh71jC1Y2vGBfhzlQ3N/96vyhLyYQ="
   },
   "kfilemetadata": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kfilemetadata-6.17.0.tar.xz",
-    "hash": "sha256-K7mpmEarD3NjbsNPuiRJCKEjWR9/dFi6uRuM+yOSMEQ="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kfilemetadata-6.18.0.tar.xz",
+    "hash": "sha256-BcSwlViFtG/tbcI5mHYP2uWVmalgFZ7ET3eddJigiDQ="
   },
   "kglobalaccel": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kglobalaccel-6.17.0.tar.xz",
-    "hash": "sha256-/D1AVVQmORRbPkUGgmR0XGEfw+zw0BROqjUyA4+pcfE="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kglobalaccel-6.18.0.tar.xz",
+    "hash": "sha256-y5p7DukzZWIHlY+ylb8U+/vIKNXZaPYB/SitaHf9tDg="
   },
   "kguiaddons": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kguiaddons-6.17.0.tar.xz",
-    "hash": "sha256-XQfbyOJKsQd951t4MKHzYt/zcQ+wQdYbjaAsV3BWq2s="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kguiaddons-6.18.0.tar.xz",
+    "hash": "sha256-LiuHKALRsnsYVRL/qYlZBueqNDjL8TeEbM/4IWu+xGY="
   },
   "kholidays": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kholidays-6.17.0.tar.xz",
-    "hash": "sha256-W459+Ie/eQ7d1lM5EO76mwCnfyZ1Jg2nHza5XLdk+rI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kholidays-6.18.0.tar.xz",
+    "hash": "sha256-SdyJLZjuSTppbdcw9aDhYktGyn10aih38FcAer6fIVE="
   },
   "ki18n": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/ki18n-6.17.0.tar.xz",
-    "hash": "sha256-UPhn2UjBWq2Rw8V/4vZGLNvziB+rb9mbhbFWFvBzmD4="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/ki18n-6.18.0.tar.xz",
+    "hash": "sha256-0Mv780J8A2jaoj+faLPLWwOtN7aCBZFJGz6ooKKL6mE="
   },
   "kiconthemes": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kiconthemes-6.17.0.tar.xz",
-    "hash": "sha256-XPCyBijTAER3cMSrAO2yJezIVWF5KSPsAIP5vJ4LQkc="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kiconthemes-6.18.0.tar.xz",
+    "hash": "sha256-uXFGCUn6/Jjnrik/NWNcL9YQGm/Eay9PzmS7IUQOzgQ="
   },
   "kidletime": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kidletime-6.17.0.tar.xz",
-    "hash": "sha256-H2fSZ0nenwn0qw3Esj5T7LhNkhsdUtYSgi/cU8NMOzc="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kidletime-6.18.0.tar.xz",
+    "hash": "sha256-RK/IhUOyPFGetfVefFEgzNbU6y6qpb7iTj+15KaV2rc="
   },
   "kimageformats": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kimageformats-6.17.0.tar.xz",
-    "hash": "sha256-GAtnD3ZrrnQDQOWv0gROoIJC6pNUWbuVvIAxPQYgZqg="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kimageformats-6.18.0.tar.xz",
+    "hash": "sha256-nTc+9TYqqNcVQc7CiVQVyVypFGJtyw3WsM7vSR3LrkY="
   },
   "kio": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kio-6.17.0.tar.xz",
-    "hash": "sha256-0A1JUhmPjp/0QzWzQHFGFeASSFftvWfElktQ4MkT1i0="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kio-6.18.0.tar.xz",
+    "hash": "sha256-qXrOwUB+HwDKdOY5ZOdgiCjUQxv+CuvpAQwpa7Y4e9o="
   },
   "kirigami": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kirigami-6.17.0.tar.xz",
-    "hash": "sha256-C3+3GaIx/+t/zETIupA+rRO0NYxBnV8LFVUtP8hO11s="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kirigami-6.18.0.tar.xz",
+    "hash": "sha256-4FdL9fUwp82Y4DQkmGgfQ3S+/xCOdCYgY7EF4cl3+GY="
   },
   "kitemmodels": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kitemmodels-6.17.0.tar.xz",
-    "hash": "sha256-uQBEF7XpuzMJQ0q5CBmIlZD2v6MtSmU4jQUt9DLAsWY="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kitemmodels-6.18.0.tar.xz",
+    "hash": "sha256-iHZTsVca0K/UuDatJFGkKwdlfQ7t4aJijpxpECziPeE="
   },
   "kitemviews": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kitemviews-6.17.0.tar.xz",
-    "hash": "sha256-MdHI/2Syju8hbmOkQ6zNxiHFP1HsI+ahN9nghil0L9E="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kitemviews-6.18.0.tar.xz",
+    "hash": "sha256-90wD4uw2cjjsOVsfJDiHiZnCvj4ptBtr1KPM0ERA4po="
   },
   "kjobwidgets": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kjobwidgets-6.17.0.tar.xz",
-    "hash": "sha256-DcVt4ZvON2m3jDTasTmViAFxgPKY3oQZ7aGQmkIRtiQ="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kjobwidgets-6.18.0.tar.xz",
+    "hash": "sha256-5zn/JUxPo0wN4Aqi2d7uE4E12ZzQtG712yU8GMArzpg="
   },
   "knewstuff": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/knewstuff-6.17.0.tar.xz",
-    "hash": "sha256-EFnLfNubqBcN6CoIxoM0kAB6FSpG5L2+JDBO7dwmPWY="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/knewstuff-6.18.0.tar.xz",
+    "hash": "sha256-fnIXNav34vb4wPQjJPiFvK0RFMMXrHm/q8cF+4AY26U="
   },
   "knotifications": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/knotifications-6.17.0.tar.xz",
-    "hash": "sha256-t4AcVGk15ggqctTH3QOHQHtqGQWriN6b3a82mo7KQUE="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/knotifications-6.18.0.tar.xz",
+    "hash": "sha256-WTywDJ4EAYR3uhRgMfbUb0B5xjfGpGYwVmcS2EK586g="
   },
   "knotifyconfig": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/knotifyconfig-6.17.0.tar.xz",
-    "hash": "sha256-5aCPeHL/uDb7/pcm64bBBOMK/FWZYTjZZXMfV5SYEmM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/knotifyconfig-6.18.0.tar.xz",
+    "hash": "sha256-moF/tOGDO+AUNwutxr2/Rk8aoE4FQBb8O8r9BToZrag="
   },
   "kpackage": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kpackage-6.17.0.tar.xz",
-    "hash": "sha256-eNIxoiM5SSLQKVfheReiCN4OmCJPIfwQ5TislxvbQqQ="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kpackage-6.18.0.tar.xz",
+    "hash": "sha256-G8LkO/IjncIOg2twh3Yx4QMFf7FKlGcpDHb6Rf8Chw4="
   },
   "kparts": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kparts-6.17.0.tar.xz",
-    "hash": "sha256-HmTUJs5HUBqP8brIwjZvDNFT5s1NRA6CfrABXZ44w+k="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kparts-6.18.0.tar.xz",
+    "hash": "sha256-hG5SLmr/KiGQZKUum67v37y+px2tsYELnFjLnEGCFgQ="
   },
   "kpeople": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kpeople-6.17.0.tar.xz",
-    "hash": "sha256-3Q7EubrtQKL5YM5JA73HkHP1UZaTkzFOOql8dfcw978="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kpeople-6.18.0.tar.xz",
+    "hash": "sha256-Cbop7+thLu9OVIFPH5Hi0HyJQubPLCMXbZ8wbWhUTSs="
   },
   "kplotting": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kplotting-6.17.0.tar.xz",
-    "hash": "sha256-ZlSWW2PQhXwxwhgX5WkxaEwy3d8DXoMWnKbqfWuaJkM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kplotting-6.18.0.tar.xz",
+    "hash": "sha256-yf25n9HHX1iOLxXvhDM/6t8yeoeMJDJOREk9A+WT68k="
   },
   "kpty": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kpty-6.17.0.tar.xz",
-    "hash": "sha256-lqcWh6jeC+zDSoFXVy0kQLqNS5dv1dCBMzHf2GuSqrs="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kpty-6.18.0.tar.xz",
+    "hash": "sha256-P4AGOPzA2+oIEJMKHy3s+muJS7AHMv+GRhgsff0qx20="
   },
   "kquickcharts": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kquickcharts-6.17.0.tar.xz",
-    "hash": "sha256-HiBqloTYgs4sFH5DY5LcPvbNp55Lwt31qgOY0uLdxaQ="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kquickcharts-6.18.0.tar.xz",
+    "hash": "sha256-lB6tN40C4FgbcGY5x89HQzmBj2zUjZGGRngvcbx/dMs="
   },
   "krunner": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/krunner-6.17.0.tar.xz",
-    "hash": "sha256-nUpcDHSwz6njXDHediYz3ewEOcUPpEvIW+woraAQaRI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/krunner-6.18.0.tar.xz",
+    "hash": "sha256-aaILTlVNh2PvSlKXjkYFa1mO+47FhKx75b8GyjGNtRw="
   },
   "kservice": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kservice-6.17.0.tar.xz",
-    "hash": "sha256-sBRpfqO6NZ9GpunPlQ17vXqc8J6Vs2cYw2tmBalCSu4="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kservice-6.18.0.tar.xz",
+    "hash": "sha256-0IrKdNzFTaKd0re8QE7Z5uxoisx3g5tLj7w3K16jULg="
   },
   "kstatusnotifieritem": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kstatusnotifieritem-6.17.0.tar.xz",
-    "hash": "sha256-Z4qb/IcAZtVBO7z6CaVrgrCv/SvCIs5XAdAqixKe3ZE="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kstatusnotifieritem-6.18.0.tar.xz",
+    "hash": "sha256-14qiDhhY9wBHjuzttJcUFg1eBLSg0Xe8pDVaoaD31zA="
   },
   "ksvg": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/ksvg-6.17.0.tar.xz",
-    "hash": "sha256-Nyjalmky8g8ZClRaf0Lt6i+b2+bXJ6W8G1V+9RVbf5Q="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/ksvg-6.18.0.tar.xz",
+    "hash": "sha256-DqsrpTKQa2Eq/uL7+oAqiNf0Vw1MMilyy23r0yAHXBA="
   },
   "ktexteditor": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/ktexteditor-6.17.0.tar.xz",
-    "hash": "sha256-mQTAxckzo2jW9JLZ4RbMziAQVNWgKbiw/gdZ/4frjKM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/ktexteditor-6.18.0.tar.xz",
+    "hash": "sha256-T4q7BDagxspQH3vjkZdXVssH+OQD06/n7C8C0Sv3tRY="
   },
   "ktexttemplate": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/ktexttemplate-6.17.0.tar.xz",
-    "hash": "sha256-FddZQdFerDzRJDBmsTow1sFFHKYwsMKbNiS+NK1z6XI="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/ktexttemplate-6.18.0.tar.xz",
+    "hash": "sha256-y7ZQXDWo7cDm/vt9JP3oJ17v3Jc1QHKXrOAqfEDzfgY="
   },
   "ktextwidgets": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/ktextwidgets-6.17.0.tar.xz",
-    "hash": "sha256-M9RuzdA/9oWC2lzvJRkhqMbnpdt62b/QQyywBxKsKeM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/ktextwidgets-6.18.0.tar.xz",
+    "hash": "sha256-mvsTaAbouVw0IR4drmbkzxTXqsKrJE1SZMqsToI9jt8="
   },
   "kunitconversion": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kunitconversion-6.17.0.tar.xz",
-    "hash": "sha256-8mJaS6JbMyn7lzAkkHO800m3o0Y2IUjH+peYnvx+XMo="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kunitconversion-6.18.0.tar.xz",
+    "hash": "sha256-I6Sl2ZRmb52ypaPCUQOPLvHZeEEZUJJXAvt5BgztMcg="
   },
   "kuserfeedback": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kuserfeedback-6.17.0.tar.xz",
-    "hash": "sha256-DxtTYf+m//Euw9/Xo+SxsqpuutxK/MA6nTHC1JvsfK8="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kuserfeedback-6.18.0.tar.xz",
+    "hash": "sha256-tiOrUaW2krGzhdlAy0wArgENzdjCotbiMVn/gVuPHlI="
   },
   "kwallet": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kwallet-6.17.0.tar.xz",
-    "hash": "sha256-RMr2kfR7okby77E/nI9xI8fmdF1CgVYCKLgVjMi5PX0="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kwallet-6.18.0.tar.xz",
+    "hash": "sha256-yGMOGygLmu5E8zZzAvzjgTcKYRVX8ZQZCLkobjiR0WM="
   },
   "kwidgetsaddons": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kwidgetsaddons-6.17.0.tar.xz",
-    "hash": "sha256-3LMzh5U80EKdQpfWKLSHLno6lwzOXqhLRGZ32LdIfqE="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kwidgetsaddons-6.18.0.tar.xz",
+    "hash": "sha256-DC+wB0T/2ey3Ux7lp5wdtLQGdT8lBWUSLzrdk88gCvs="
   },
   "kwindowsystem": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kwindowsystem-6.17.0.tar.xz",
-    "hash": "sha256-JZq+9YsJrRqAIrXLlIMamPPltcx8ZfegtAvmQ2F1b2M="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kwindowsystem-6.18.0.tar.xz",
+    "hash": "sha256-oKBGA5oRuuus2W2DbldluYFCb2DSzqn/mpm6jb5WF44="
   },
   "kxmlgui": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/kxmlgui-6.17.0.tar.xz",
-    "hash": "sha256-oYBxacosOGqNPiXLKwZlVOSWY6bj9jLxoZaO9UdkMOM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/kxmlgui-6.18.0.tar.xz",
+    "hash": "sha256-bV4kDINWaEGawDZmb6TJnjR5eVxpiBAHY/gQyog1xAE="
   },
   "modemmanager-qt": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/modemmanager-qt-6.17.0.tar.xz",
-    "hash": "sha256-tB/h3ZoOFGrbTYCY1WnWsRKR9AyQ33DfuqatFlThjXY="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/modemmanager-qt-6.18.0.tar.xz",
+    "hash": "sha256-yMDBxtbIFe+hG44xu7P16AFHidfgur+hV0KAvmeR0BM="
   },
   "networkmanager-qt": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/networkmanager-qt-6.17.0.tar.xz",
-    "hash": "sha256-2Dvq6Gf7fWaYhvUTiT+O7Fi116JLQp2J3FxsCLej9OA="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/networkmanager-qt-6.18.0.tar.xz",
+    "hash": "sha256-SSg2p0oDukP6z1LoJ0KPiI8T1uK7g3SBmGlwcoCgMQw="
   },
   "prison": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/prison-6.17.0.tar.xz",
-    "hash": "sha256-VULdBzPga+rm+M+L8n/5gfNCBf6YEl2RC+LFP/9HAHw="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/prison-6.18.0.tar.xz",
+    "hash": "sha256-OKTxVLObTS5LhtFvhIRgOdJ71wyybs1Ii1kfYS3UFB4="
   },
   "purpose": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/purpose-6.17.0.tar.xz",
-    "hash": "sha256-aJVl1esJmeHM2S6PhB/IJBqwJInKbDOfSNVBtbqTdko="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/purpose-6.18.0.tar.xz",
+    "hash": "sha256-pCjk9JVlgkCJngLxW3qSMOPDMGlyO0Phc0wh+hojuCU="
   },
   "qqc2-desktop-style": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/qqc2-desktop-style-6.17.0.tar.xz",
-    "hash": "sha256-YxvYnVyCp/k+omvCB50d+Bwy518XfTNGqcsQqc10d5c="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/qqc2-desktop-style-6.18.0.tar.xz",
+    "hash": "sha256-kaYOD++ilKM38lGcd/8kBbhu/5nz6g6Pw+NCZe9GcPI="
   },
   "solid": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/solid-6.17.0.tar.xz",
-    "hash": "sha256-F/BRDvE0tm5kfuIXtkhwUy11fHIcgV8gxJVnuXnJxyU="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/solid-6.18.0.tar.xz",
+    "hash": "sha256-d2jB2n7jSp43z7a1tyfmkMgBNMpCS1Ji5APkjM+BLd8="
   },
   "sonnet": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/sonnet-6.17.0.tar.xz",
-    "hash": "sha256-Sv726cpy7bbCKAC0rPtFDfcSHlB3yFITrKX1arn0Fgs="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/sonnet-6.18.0.tar.xz",
+    "hash": "sha256-LZTJV6PF8iMmU614KykeK5We6m3Kg8wJyuYhvJg0qyU="
   },
   "syndication": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/syndication-6.17.0.tar.xz",
-    "hash": "sha256-1acUsJ72pQtn9V1Y+Mbu+hu6VSUn3tEUWEi1RmMw6pM="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/syndication-6.18.0.tar.xz",
+    "hash": "sha256-oC92+KlCKF+KZCM/sJ9k0o9R7vnpb0td19E9TIOTO5Q="
   },
   "syntax-highlighting": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/syntax-highlighting-6.17.0.tar.xz",
-    "hash": "sha256-PRa+wPvrhTvmhMNfR1UNWYFNsfS3B+x3uGLzZQ81P8w="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/syntax-highlighting-6.18.0.tar.xz",
+    "hash": "sha256-i+gFciGpgsjR/kL5VFT6yWEOtRl1ImxmUmiSk80zW/0="
   },
   "threadweaver": {
-    "version": "6.17.0",
-    "url": "mirror://kde/stable/frameworks/6.17/threadweaver-6.17.0.tar.xz",
-    "hash": "sha256-dx/4nBwBKj6iuu1YyAPs1+iwuJKOOuvBHAffXM8FT0Q="
+    "version": "6.18.0",
+    "url": "mirror://kde/stable/frameworks/6.18/threadweaver-6.18.0.tar.xz",
+    "hash": "sha256-puf0yQubkwTvZ6D/+t13ZVdXxl977gDDWziu/IaeMng="
   }
 }
\ No newline at end of file

From 7ca8298b9ade6909696d65aae4fbdc45717a7af7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 13 Sep 2025 12:27:03 +0200
Subject: [PATCH 25/46] systemd: use finalAttrs.version

I recently deployed systemd 257.9 to a bunch of machines as mitigation
for #440073. This caused some confusion in the aftermath since we had
257.9 deployed (via an override for `systemd.package` to not rebuild the
world), but `systemctl --version` still reported 257.8.

This patch fixes that problem by using the final version everywhere
instead of the version from the let-binding.

I decided to remove the let-binding entirely to avoid re-introducing the
wrong usage again.
---
 pkgs/os-specific/linux/systemd/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 32a963e12cd0..6b87c7b481be 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -195,8 +195,6 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
 
-  version = "257.8";
-
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
   # command:
@@ -207,14 +205,15 @@ let
   kbd' = if withPam then kbd else kbd.override { withVlock = false; };
 in
 stdenv.mkDerivation (finalAttrs: {
-  inherit pname version;
+  inherit pname;
+  version = "257.8";
 
   # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
   # This has proven to be less error-prone than the previous systemd fork.
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY=";
   };
 
@@ -456,7 +455,7 @@ stdenv.mkDerivation (finalAttrs: {
     #   https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
     (lib.mesonOption "time-epoch" releaseTimestamp)
 
-    (lib.mesonOption "version-tag" version)
+    (lib.mesonOption "version-tag" finalAttrs.version)
     (lib.mesonOption "mode" "release")
     (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
     (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
@@ -491,7 +490,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "sbat-distro-summary" "NixOS")
     (lib.mesonOption "sbat-distro-url" "https://nixos.org/")
     (lib.mesonOption "sbat-distro-pkgname" pname)
-    (lib.mesonOption "sbat-distro-version" version)
+    (lib.mesonOption "sbat-distro-version" finalAttrs.version)
 
     # Users
     (lib.mesonOption "system-uid-max" "999")

From e7c273983294f979d91f1ea99d4be38fb3d3c0f9 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sat, 13 Sep 2025 12:32:23 +0200
Subject: [PATCH 26/46] fish: disable test that fails on x86_64-darwin

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

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 8fcd76fcd12b..fdcfe931b81c 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
     rm tests/pexpects/job_summary.py
     rm tests/pexpects/signals.py
     rm tests/pexpects/fg.py
+    rm tests/checks/fish_exit.fish
   ''
   + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) ''
     # This test seems to consistently fail on aarch64 and darwin

From 46ec39a51424b0051a9eb870165157147e08efe0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 10:44:58 +0000
Subject: [PATCH 27/46] fleet: 4.72.1 -> 4.73.1

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

diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index a3930bc16962..3ce76eb64f00 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.72.1";
+  version = "4.73.1";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-vVBYXn++ZhbgPMDlslTQx+Z1vcOaIMBKtq7Ffmjo6YQ=";
+    hash = "sha256-/nND13va4S30/5GCzuIL3ZNeOFS07oOmgvxU5d56dm8=";
   };
-  vendorHash = "sha256-DT7hkTpB6yE08SwxsQcqepvJIwQZWvwkqcf2cbQtBRA=";
+  vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4=";
 
   subPackages = [
     "cmd/fleet"

From 86e2b8873f4be091ac0c6623f370b9e7cc27e69b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 10:54:05 +0000
Subject: [PATCH 28/46] python3Packages.thermopro-ble: 0.13.1 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix
index 8e6f8fa45df6..3d53e0c096fd 100644
--- a/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/pkgs/development/python-modules/thermopro-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "thermopro-ble";
-  version = "0.13.1";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "bluetooth-devices";
     repo = "thermopro-ble";
     tag = "v${version}";
-    hash = "sha256-FgobrgMA+YbmI5VxdzCgYipSLGRK6+uIOTMy9P4Aeos=";
+    hash = "sha256-AlMwpDUFNz98KZRLi9TVqZ9sPXdLcVCvvVa0PXlv4q4=";
   };
 
   build-system = [ poetry-core ];

From e9c80d92512b9d7bcadfb9d2866066b3a93f6c2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 10:57:28 +0000
Subject: [PATCH 29/46] watcher: 0.13.6 -> 0.13.8

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

diff --git a/pkgs/by-name/wa/watcher/package.nix b/pkgs/by-name/wa/watcher/package.nix
index 8f53e767e215..419b49a9776f 100644
--- a/pkgs/by-name/wa/watcher/package.nix
+++ b/pkgs/by-name/wa/watcher/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "watcher";
-  version = "0.13.6";
+  version = "0.13.8";
 
   src = fetchFromGitHub {
     owner = "e-dant";
     repo = "watcher";
     tag = version;
-    hash = "sha256-mcnItyXjU4ylNvM6QLlmUDybhwdxi7D6e3z8saZubMY=";
+    hash = "sha256-sQel+W9J8ExWkSEYd6Wjw2M9VgTIax+8zadI982fH4U=";
   };
 
   nativeBuildInputs = [

From 1281d304fd6c8c1c46898623471c699dc3154fba Mon Sep 17 00:00:00 2001
From: Yo'av Moshe <nixpkgs@yoavmoshe.com>
Date: Fri, 10 Jan 2025 21:17:24 +0100
Subject: [PATCH 30/46] clapboard: add new maintainer

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

diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index b9865237e6b9..5523b7b2439f 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec {
     description = "Wayland clipboard manager that will make you clap";
     homepage = "https://github.com/bjesus/clapboard";
     license = licenses.mit;
-    maintainers = with maintainers; [ dit7ya ];
+    maintainers = with maintainers; [
+      dit7ya
+      bjesus
+    ];
     platforms = platforms.linux;
     mainProgram = "clapboard";
   };

From 586de32ddc246630afb27dc9855ddc4430e1dbf8 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 13 Sep 2025 14:12:32 +0200
Subject: [PATCH 31/46] ente-desktop: bump to electron_37

This matches the upstream, we just forgot to update it

https://github.com/ente-io/ente/blob/photosd-v1.7.14/desktop/package.json#L51
---
 pkgs/by-name/en/ente-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index 3d0eef9ea368..06e57581f319 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   nodejs,
-  electron_35,
+  electron_37,
   yarnConfigHook,
   copyDesktopItems,
   vips,
@@ -15,7 +15,7 @@
   imagemagick,
 }:
 let
-  electron = electron_35;
+  electron = electron_37;
 in
 
 stdenv.mkDerivation (finalAttrs: {

From 005a118ceba6e1a1acc1b6262680b6bbc0d3bcab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 13 Sep 2025 14:17:32 +0200
Subject: [PATCH 32/46] maintainers/team-list: keep-sorted

---
 maintainers/maintainer-list.nix |   1 -
 maintainers/team-list.nix       | 216 ++++++++++++++++----------------
 2 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 565dd0b5eb88..fe3429f2c2d7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29003,4 +29003,3 @@
   };
   # keep-sorted end
 }
-# Keep the list alphabetically sorted.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index efa4fc1c05d7..71d2b62c55cd 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -31,6 +31,7 @@
 { lib }:
 with lib.maintainers;
 {
+  # keep-sorted start case=no numeric=no block=yes newline_separated=yes
   acme = {
     members = [
       aanderse
@@ -258,6 +259,15 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  cosmopolitan = {
+    members = [
+      bbjubjub
+      tomberek
+    ];
+    scope = "Maintain the Cosmopolitan LibC and related programs.";
+    shortName = "Cosmopolitan";
+  };
+
   cuda = {
     members = [
       connorbaker
@@ -293,29 +303,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  cosmopolitan = {
-    members = [
-      bbjubjub
-      tomberek
-    ];
-    scope = "Maintain the Cosmopolitan LibC and related programs.";
-    shortName = "Cosmopolitan";
-  };
-
-  dotnet = {
-    members = [
-      mdarocha
-      corngood
-      ggg
-      raphaelr
-      jamiemagee
-      anpin
-      meenzen
-    ];
-    scope = "Maintainers of the .NET build tools and packages";
-    shortName = "dotnet";
-  };
-
   deepin = {
     members = [ wineee ];
     scope = "Maintain deepin desktop environment and related packages.";
@@ -370,6 +357,20 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  dotnet = {
+    members = [
+      mdarocha
+      corngood
+      ggg
+      raphaelr
+      jamiemagee
+      anpin
+      meenzen
+    ];
+    scope = "Maintainers of the .NET build tools and packages";
+    shortName = "dotnet";
+  };
+
   emacs = {
     members = [
       AndersonTorres
@@ -497,21 +498,6 @@ with lib.maintainers;
     shortName = "gitlab";
   };
 
-  golang = {
-    members = [
-      kalbasit
-      katexochen
-      mic92
-      zowoq
-      qbit
-      mfrw
-    ];
-    githubTeams = [ "golang" ];
-    scope = "Maintain Golang compilers.";
-    shortName = "Go";
-    enableFeatureFreezePing = true;
-  };
-
   gnome = {
     members = [
       bobby285271
@@ -535,6 +521,21 @@ with lib.maintainers;
     shortName = "GNOME Circle";
   };
 
+  golang = {
+    members = [
+      kalbasit
+      katexochen
+      mic92
+      zowoq
+      qbit
+      mfrw
+    ];
+    githubTeams = [ "golang" ];
+    scope = "Maintain Golang compilers.";
+    shortName = "Go";
+    enableFeatureFreezePing = true;
+  };
+
   graalvm-ce = {
     members = [
       bandresen
@@ -672,17 +673,6 @@ with lib.maintainers;
     shortName = "K3s";
   };
 
-  kubernetes = {
-    members = [
-      johanot
-      offline
-      saschagrunert
-      srhb
-    ];
-    scope = "Maintain the Kubernetes package and module";
-    shortName = "Kubernetes";
-  };
-
   kodi = {
     members = [
       aanderse
@@ -697,6 +687,17 @@ with lib.maintainers;
     shortName = "Kodi";
   };
 
+  kubernetes = {
+    members = [
+      johanot
+      offline
+      saschagrunert
+      srhb
+    ];
+    scope = "Maintain the Kubernetes package and module";
+    shortName = "Kubernetes";
+  };
+
   libretro = {
     members = [
       aanderse
@@ -734,6 +735,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lix = {
+    members = [
+      raitobezarius
+      qyriad
+      _9999years
+      lf-
+      alois31
+    ];
+    scope = "Maintain the Lix package manager inside of Nixpkgs.";
+    shortName = "Lix ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   llvm = {
     members = [
       dtzWill
@@ -772,6 +786,13 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lua = {
+    githubTeams = [ "lua" ];
+    scope = "Maintain the lua ecosystem.";
+    shortName = "lua";
+    enableFeatureFreezePing = true;
+  };
+
   lumiguide = {
     # Verify additions by approval of an already existing member of the team.
     members = [
@@ -782,13 +803,6 @@ with lib.maintainers;
     shortName = "Lumiguide employees";
   };
 
-  lua = {
-    githubTeams = [ "lua" ];
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
-    enableFeatureFreezePing = true;
-  };
-
   lumina = {
     members = [ romildo ];
     githubTeams = [ "lumina" ];
@@ -849,19 +863,6 @@ with lib.maintainers;
     shortName = "Matrix";
   };
 
-  minimal-bootstrap = {
-    members = [
-      alejandrosame
-      artturin
-      emilytrau
-      ericson2314
-      jk
-      siraben
-    ];
-    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
-    shortName = "Minimal Bootstrap";
-  };
-
   mercury = {
     members = [
       _9999years
@@ -874,31 +875,17 @@ with lib.maintainers;
     shortName = "Mercury Employees";
   };
 
-  # same as https://github.com/orgs/NixOS/teams/nix-team
-  nix = {
+  minimal-bootstrap = {
     members = [
-      eelco
-      mic92
-      tomberek
-      roberth
+      alejandrosame
+      artturin
+      emilytrau
       ericson2314
+      jk
+      siraben
     ];
-    scope = "Maintain the Nix package manager.";
-    shortName = "Nix/nix-cli ecosystem";
-    enableFeatureFreezePing = true;
-  };
-
-  lix = {
-    members = [
-      raitobezarius
-      qyriad
-      _9999years
-      lf-
-      alois31
-    ];
-    scope = "Maintain the Lix package manager inside of Nixpkgs.";
-    shortName = "Lix ecosystem";
-    enableFeatureFreezePing = true;
+    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
+    shortName = "Minimal Bootstrap";
   };
 
   module-system = {
@@ -949,6 +936,20 @@ with lib.maintainers;
     shortName = "NGI";
   };
 
+  # same as https://github.com/orgs/NixOS/teams/nix-team
+  nix = {
+    members = [
+      eelco
+      mic92
+      tomberek
+      roberth
+      ericson2314
+    ];
+    scope = "Maintain the Nix package manager.";
+    shortName = "Nix/nix-cli ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   nixos-rebuild = {
     members = [ thiagokokada ];
     scope = "Maintain nixos-rebuild(-ng).";
@@ -1166,12 +1167,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  sphinx = {
-    members = [ ];
-    scope = "Maintain Sphinx related packages.";
-    shortName = "Sphinx";
-  };
-
   serokell = {
     # Verify additions by approval of an already existing member of the team.
     members = [ balsoft ];
@@ -1179,6 +1174,12 @@ with lib.maintainers;
     shortName = "Serokell employees";
   };
 
+  sphinx = {
+    members = [ ];
+    scope = "Maintain Sphinx related packages.";
+    shortName = "Sphinx";
+  };
+
   stdenv = {
     members = [
       artturin
@@ -1262,6 +1263,16 @@ with lib.maintainers;
     shortName = "Uzinfocom Open Source";
   };
 
+  wdz = {
+    members = [
+      n0emis
+      johannwagner
+      yuka
+    ];
+    scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
+    shortName = "WDZ GmbH";
+  };
+
   windows = {
     members = [
       RossSmyth
@@ -1273,16 +1284,6 @@ with lib.maintainers;
     shortName = "Windows";
   };
 
-  wdz = {
-    members = [
-      n0emis
-      johannwagner
-      yuka
-    ];
-    scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
-    shortName = "WDZ GmbH";
-  };
-
   xen = {
     members = [
       hehongbo
@@ -1316,4 +1317,5 @@ with lib.maintainers;
     shortName = "Zig";
     enableFeatureFreezePing = true;
   };
+  # keep-sorted end
 }

From 4d055c69f7248602fff1075f9d15c69d9fddaa80 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 13 Sep 2025 14:18:39 +0200
Subject: [PATCH 33/46] nixos/all-tests: keep-sorted

---
 nixos/tests/all-tests.nix | 346 +++++++++++++++++++-------------------
 1 file changed, 174 insertions(+), 172 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 46fa3160cb69..d8b4e1087500 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -179,10 +179,18 @@ in
 
   # NixOS vm tests and non-vm unit tests
 
+  # keep-sorted start case=no numeric=no block=yes
   _3proxy = runTest ./3proxy.nix;
   aaaaxy = runTest ./aaaaxy.nix;
   acme = import ./acme/default.nix { inherit runTest; };
   acme-dns = runTest ./acme-dns.nix;
+  activation = pkgs.callPackage ../modules/system/activation/test.nix { };
+  activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
+  activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
+  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
+  activation-nix-channel = runTest ./activation/nix-channel.nix;
+  activation-perlless = runTest ./activation/perlless.nix;
+  activation-var = runTest ./activation/var.nix;
   actual = runTest ./actual.nix;
   adguardhome = runTest ./adguardhome.nix;
   aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix;
@@ -216,9 +224,9 @@ in
   anuko-time-tracker = runTest ./anuko-time-tracker.nix;
   apcupsd = runTest ./apcupsd.nix;
   apfs = runTest ./apfs.nix;
+  apparmor = runTest ./apparmor;
   appliance-repart-image = runTest ./appliance-repart-image.nix;
   appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix;
-  apparmor = runTest ./apparmor;
   archi = runTest ./archi.nix;
   aria2 = runTest ./aria2.nix;
   armagetronad = runTest ./armagetronad.nix;
@@ -227,9 +235,8 @@ in
   atop = import ./atop.nix { inherit pkgs runTest; };
   atticd = runTest ./atticd.nix;
   atuin = runTest ./atuin.nix;
-  ax25 = runTest ./ax25.nix;
-  audit = runTest ./audit.nix;
   audiobookshelf = runTest ./audiobookshelf.nix;
+  audit = runTest ./audit.nix;
   auth-mysql = runTest ./auth-mysql.nix;
   authelia = runTest ./authelia.nix;
   auto-cpufreq = runTest ./auto-cpufreq.nix;
@@ -242,6 +249,7 @@ in
     imports = [ ./avahi.nix ];
     _module.args.networkd = true;
   };
+  ax25 = runTest ./ax25.nix;
   ayatana-indicators = runTest ./ayatana-indicators.nix;
   babeld = runTest ./babeld.nix;
   bazarr = runTest ./bazarr.nix;
@@ -280,9 +288,9 @@ in
   bluesky-pds = runTest ./bluesky-pds.nix;
   bookstack = runTest ./bookstack.nix;
   boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { };
-  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   boot-stage1 = runTest ./boot-stage1.nix;
   boot-stage2 = runTest ./boot-stage2.nix;
+  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   borgbackup = runTest ./borgbackup.nix;
   borgmatic = runTest ./borgmatic.nix;
   botamusique = runTest ./botamusique.nix;
@@ -303,14 +311,14 @@ in
   cadvisor = runTestOn [ "x86_64-linux" ] ./cadvisor.nix;
   cage = runTest ./cage.nix;
   cagebreak = runTest ./cagebreak.nix;
-  calibre-web = runTest ./calibre-web.nix;
   calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
+  calibre-web = runTest ./calibre-web.nix;
   canaille = runTest ./canaille.nix;
-  castopod = runTest ./castopod.nix;
   cassandra = runTest {
     imports = [ ./cassandra.nix ];
     _module.args.getPackage = pkgs: pkgs.cassandra;
   };
+  castopod = runTest ./castopod.nix;
   centrifugo = runTest ./centrifugo.nix;
   ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix;
   ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix;
@@ -394,31 +402,31 @@ in
     _module.args.enableAutologin = true;
     _module.args.enableXWayland = true;
   };
-  cosmic-noxwayland = runTest {
-    imports = [ ./cosmic.nix ];
-    _module.args.testName = "cosmic-noxwayland";
-    _module.args.enableAutologin = false;
-    _module.args.enableXWayland = false;
-  };
   cosmic-autologin-noxwayland = runTest {
     imports = [ ./cosmic.nix ];
     _module.args.testName = "cosmic-autologin-noxwayland";
     _module.args.enableAutologin = true;
     _module.args.enableXWayland = false;
   };
+  cosmic-noxwayland = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic-noxwayland";
+    _module.args.enableAutologin = false;
+    _module.args.enableXWayland = false;
+  };
   coturn = runTest ./coturn.nix;
   couchdb = runTest ./couchdb.nix;
   crabfit = runTest ./crabfit.nix;
   cri-o = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix;
+  croc = runTest ./croc.nix;
+  cross-seed = runTest ./cross-seed.nix;
   cryptpad = runTest ./cryptpad.nix;
   cups-pdf = runTest ./cups-pdf.nix;
   curl-impersonate = runTest ./curl-impersonate.nix;
   custom-ca = import ./custom-ca.nix { inherit pkgs runTest; };
-  croc = runTest ./croc.nix;
-  cross-seed = runTest ./cross-seed.nix;
   cyrus-imap = runTest ./cyrus-imap.nix;
-  darling-dmg = runTest ./darling-dmg.nix;
   dae = runTest ./dae.nix;
+  darling-dmg = runTest ./darling-dmg.nix;
   davis = runTest ./davis.nix;
   db-rest = runTest ./db-rest.nix;
   dconf = runTest ./dconf.nix;
@@ -426,6 +434,7 @@ in
   deconz = runTest ./deconz.nix;
   deluge = runTest ./deluge.nix;
   dendrite = runTest ./matrix/dendrite.nix;
+  dep-scan = runTest ./dep-scan.nix;
   dependency-track = runTest ./dependency-track.nix;
   devpi-server = runTest ./devpi-server.nix;
   dex-oidc = runTest ./dex-oidc.nix;
@@ -443,38 +452,35 @@ in
   dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
   doas = runTest ./doas.nix;
   docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;
-  docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;
   docker-registry = runTest ./docker-registry.nix;
+  docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;
   docker-tools = runTestOn [ "x86_64-linux" ] ./docker-tools.nix;
-  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-cross = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix;
+  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;
   docling-serve = runTest ./docling-serve.nix;
-  documize = runTest ./documize.nix;
   documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
+  documize = runTest ./documize.nix;
   doh-proxy-rust = runTest ./doh-proxy-rust.nix;
   dokuwiki = runTest ./dokuwiki.nix;
   dolibarr = runTest ./dolibarr.nix;
   domination = runTest ./domination.nix;
   dovecot = runTest ./dovecot.nix;
-  drawterm = discoverTests (import ./drawterm.nix);
   draupnir = runTest ./matrix/draupnir.nix;
+  drawterm = discoverTests (import ./drawterm.nix);
   drbd = runTest ./drbd.nix;
+  drbd-driver = runTest ./drbd-driver.nix;
   druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drupal = runTest ./drupal.nix;
-  drbd-driver = runTest ./drbd-driver.nix;
   dublin-traceroute = runTest ./dublin-traceroute.nix;
   dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix;
-  earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
   early-mount-options = runTest ./early-mount-options.nix;
+  earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix;
+  easytier = runTest ./easytier.nix;
   ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
   ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
   echoip = runTest ./echoip.nix;
   ecryptfs = runTest ./ecryptfs.nix;
-  fscrypt = runTest ./fscrypt.nix;
-  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
-  lauti = runTest ./lauti.nix;
-  easytier = runTest ./easytier.nix;
   ejabberd = runTest ./xmpp/ejabberd.nix;
   elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
   emacs-daemon = runTest ./emacs-daemon.nix;
@@ -496,30 +502,23 @@ in
   ergochat = runTest ./ergochat.nix;
   esphome = runTest ./esphome.nix;
   etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
-  activation = pkgs.callPackage ../modules/system/activation/test.nix { };
-  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
-  activation-var = runTest ./activation/var.nix;
-  activation-nix-channel = runTest ./activation/nix-channel.nix;
-  activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
-  activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
-  activation-perlless = runTest ./activation/perlless.nix;
   etcd = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix;
   etcd-cluster = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix;
   etebase-server = runTest ./etebase-server.nix;
   etesync-dav = runTest ./etesync-dav.nix;
-  dep-scan = runTest ./dep-scan.nix;
   evcc = runTest ./evcc.nix;
   fail2ban = runTest ./fail2ban.nix;
   fakeroute = runTest ./fakeroute.nix;
   fancontrol = runTest ./fancontrol.nix;
   fanout = runTest ./fanout.nix;
+  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
   fcitx5 = runTest ./fcitx5;
   fedimintd = runTest ./fedimintd.nix;
   ferm = runTest ./ferm.nix;
   ferretdb = import ./ferretdb.nix { inherit pkgs runTest; };
   fider = runTest ./fider.nix;
-  filesender = runTest ./filesender.nix;
   filebrowser = runTest ./filebrowser.nix;
+  filesender = runTest ./filesender.nix;
   filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;
   firefly-iii = runTest ./firefly-iii.nix;
   firefly-iii-data-importer = runTest ./firefly-iii-data-importer.nix;
@@ -554,8 +553,8 @@ in
     imports = [ ./firewall.nix ];
     _module.args.nftables = true;
   };
-  fish = runTest ./fish.nix;
   firezone = runTest ./firezone/firezone.nix;
+  fish = runTest ./fish.nix;
   flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix;
   flaresolverr = runTest ./flaresolverr.nix;
   flood = runTest ./flood.nix;
@@ -587,9 +586,8 @@ in
     imports = [ ./fsck.nix ];
     _module.args.systemdStage1 = true;
   };
+  fscrypt = runTest ./fscrypt.nix;
   ft2-clone = runTest ./ft2-clone.nix;
-  legit = runTest ./legit.nix;
-  mimir = runTest ./mimir.nix;
   galene = discoverTests (import ./galene.nix { inherit runTest; });
   gancio = runTest ./gancio.nix;
   garage_1 = import ./garage {
@@ -601,11 +599,11 @@ in
     package = pkgs.garage_2;
   };
   gatus = runTest ./gatus.nix;
-  getaddrinfo = runTest ./getaddrinfo.nix;
   gemstash = import ./gemstash.nix { inherit pkgs runTest; };
   geoclue2 = runTest ./geoclue2.nix;
   geoserver = runTest ./geoserver.nix;
   gerrit = runTest ./gerrit.nix;
+  getaddrinfo = runTest ./getaddrinfo.nix;
   geth = runTest ./geth.nix;
   ghostunnel = runTest ./ghostunnel.nix;
   ghostunnel-modular = runTest ./ghostunnel-modular.nix;
@@ -625,10 +623,10 @@ in
   gnome-xorg = runTest ./gnome-xorg.nix;
   gns3-server = runTest ./gns3-server.nix;
   gnupg = runTest ./gnupg.nix;
-  goatcounter = runTest ./goatcounter.nix;
   go-camo = runTest ./go-camo.nix;
   go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
+  goatcounter = runTest ./goatcounter.nix;
   gobgpd = runTest ./gobgpd.nix;
   gocd-agent = runTest ./gocd-agent.nix;
   gocd-server = runTest ./gocd-server.nix;
@@ -657,61 +655,38 @@ in
     inherit handleTestOn;
     package = pkgs.hadoop;
   };
-  hadoop_3_3 = import ./hadoop {
-    inherit handleTestOn;
-    package = pkgs.hadoop_3_3;
-  };
   hadoop2 = import ./hadoop {
     inherit handleTestOn;
     package = pkgs.hadoop2;
   };
-  haste-server = runTest ./haste-server.nix;
+  hadoop_3_3 = import ./hadoop {
+    inherit handleTestOn;
+    package = pkgs.hadoop_3_3;
+  };
   haproxy = runTest ./haproxy.nix;
   hardened = runTest ./hardened.nix;
   harmonia = runTest ./harmonia.nix;
-  headscale = runTest ./headscale.nix;
-  healthchecks = runTest ./web-apps/healthchecks.nix;
+  haste-server = runTest ./haste-server.nix;
   hbase2 = runTest {
     imports = [ ./hbase.nix ];
     _module.args.getPackage = pkgs: pkgs.hbase2;
   };
-  hbase_2_5 = runTest {
-    imports = [ ./hbase.nix ];
-    _module.args.getPackage = pkgs: pkgs.hbase_2_5;
-  };
-  hbase_2_4 = runTest {
-    imports = [ ./hbase.nix ];
-    _module.args.getPackage = pkgs: pkgs.hbase_2_4;
-  };
   hbase3 = runTest {
     imports = [ ./hbase.nix ];
     _module.args.getPackage = pkgs: pkgs.hbase3;
   };
+  hbase_2_4 = runTest {
+    imports = [ ./hbase.nix ];
+    _module.args.getPackage = pkgs: pkgs.hbase_2_4;
+  };
+  hbase_2_5 = runTest {
+    imports = [ ./hbase.nix ];
+    _module.args.getPackage = pkgs: pkgs.hbase_2_5;
+  };
+  headscale = runTest ./headscale.nix;
+  healthchecks = runTest ./web-apps/healthchecks.nix;
   hedgedoc = runTest ./hedgedoc.nix;
   herbstluftwm = runTest ./herbstluftwm.nix;
-  homebox = runTest ./homebox.nix;
-  homer = handleTest ./homer { };
-  homepage-dashboard = runTest ./homepage-dashboard.nix;
-  honk = runTest ./honk.nix;
-  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
-  invidious = runTest ./invidious.nix;
-  iosched = runTest ./iosched.nix;
-  isolate = runTest ./isolate.nix;
-  livebook-service = runTest ./livebook-service.nix;
-  pyload = runTest ./pyload.nix;
-  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
-  odoo = runTest ./odoo.nix;
-  odoo17 = runTest {
-    imports = [ ./odoo.nix ];
-    _module.args.package = pkgs.odoo17;
-  };
-  odoo16 = runTest {
-    imports = [ ./odoo.nix ];
-    _module.args.package = pkgs.odoo16;
-  };
-  oku = runTest ./oku.nix;
-  oncall = runTest ./web-apps/oncall.nix;
-  overseerr = runTest ./overseerr.nix;
   # 9pnet_virtio used to mount /nix partition doesn't support
   # hibernation. This test happens to work on x86_64-linux but
   # not on other platforms.
@@ -723,19 +698,25 @@ in
   hledger-web = runTest ./hledger-web.nix;
   hockeypuck = runTest ./hockeypuck.nix;
   home-assistant = runTest ./home-assistant.nix;
+  homebox = runTest ./homebox.nix;
   homebridge = runTest ./homebridge.nix;
+  homepage-dashboard = runTest ./homepage-dashboard.nix;
+  homer = handleTest ./homer { };
+  honk = runTest ./honk.nix;
   hostname = handleTest ./hostname.nix { };
   hound = runTest ./hound.nix;
   hub = runTest ./git/hub.nix;
   hydra = runTest ./hydra;
+  i18n = runTest ./i18n.nix;
   i3wm = runTest ./i3wm.nix;
   icingaweb2 = runTest ./icingaweb2.nix;
   ifm = runTest ./ifm.nix;
   ifstate = import ./ifstate { inherit runTest; };
   iftop = runTest ./iftop.nix;
+  image-contents = handleTest ./image-contents.nix { };
   immich = runTest ./web-apps/immich.nix;
-  immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
   immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix;
+  immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
   incron = runTest ./incron.nix;
   incus = pkgs.recurseIntoAttrs (
     handleTest ./incus {
@@ -754,14 +735,18 @@ in
   initrdNetwork = runTest ./initrd-network.nix;
   input-remapper = runTest ./input-remapper.nix;
   inspircd = runTest ./inspircd.nix;
+  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
   installer = handleTest ./installer.nix { };
   installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
   intune = runTest ./intune.nix;
+  invidious = runTest ./invidious.nix;
   invoiceplane = runTest ./invoiceplane.nix;
   iodine = runTest ./iodine.nix;
+  iosched = runTest ./iosched.nix;
   ipv6 = runTest ./ipv6.nix;
   iscsi-multipath-root = runTest ./iscsi-multipath-root.nix;
   iscsi-root = runTest ./iscsi-root.nix;
+  isolate = runTest ./isolate.nix;
   isso = runTest ./isso.nix;
   jackett = runTest ./jackett.nix;
   jellyfin = runTest ./jellyfin.nix;
@@ -808,21 +793,23 @@ in
   ladybird = runTest ./ladybird.nix;
   languagetool = runTest ./languagetool.nix;
   lanraragi = runTest ./lanraragi.nix;
+  lasuite-docs = runTest ./web-apps/lasuite-docs.nix;
+  lasuite-meet = runTest ./web-apps/lasuite-meet.nix;
   latestKernel.login = runTest {
     imports = [ ./login.nix ];
     _module.args.latestKernel = true;
   };
-  lasuite-docs = runTest ./web-apps/lasuite-docs.nix;
-  lasuite-meet = runTest ./web-apps/lasuite-meet.nix;
+  lauti = runTest ./lauti.nix;
   lavalink = runTest ./lavalink.nix;
   leaps = runTest ./leaps.nix;
+  legit = runTest ./legit.nix;
   lemmy = runTest ./lemmy.nix;
-  libinput = runTest ./libinput.nix;
   lemurs = runTest ./lemurs/lemurs.nix;
   lemurs-wayland = runTest ./lemurs/lemurs-wayland.nix;
   lemurs-wayland-script = runTest ./lemurs/lemurs-wayland-script.nix;
   lemurs-xorg = runTest ./lemurs/lemurs-xorg.nix;
   lemurs-xorg-script = runTest ./lemurs/lemurs-xorg-script.nix;
+  libinput = runTest ./libinput.nix;
   librenms = runTest ./librenms.nix;
   libresprite = runTest ./libresprite.nix;
   libreswan = runTest ./libreswan.nix;
@@ -836,12 +823,13 @@ in
   lidarr = runTest ./lidarr.nix;
   lightdm = runTest ./lightdm.nix;
   lighttpd = runTest ./lighttpd.nix;
-  livekit = runTest ./networking/livekit.nix;
   limesurvey = runTest ./limesurvey.nix;
   limine = import ./limine { inherit runTest; };
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
   litellm = runTest ./litellm.nix;
   litestream = runTest ./litestream.nix;
+  livebook-service = runTest ./livebook-service.nix;
+  livekit = runTest ./networking/livekit.nix;
   lk-jwt-service = runTest ./matrix/lk-jwt-service.nix;
   llama-swap = runTest ./web-servers/llama-swap.nix;
   lldap = runTest ./lldap.nix;
@@ -850,11 +838,6 @@ in
   login = runTest ./login.nix;
   logrotate = runTest ./logrotate.nix;
   loki = runTest ./loki.nix;
-  luks = runTest ./luks.nix;
-  lvm2 = handleTest ./lvm2 { };
-  lxc = handleTest ./lxc { };
-  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
-  lxd-image-server = runTest ./lxd-image-server.nix;
   #logstash = handleTest ./logstash.nix {};
   lomiri = discoverTests (import ./lomiri.nix);
   lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
@@ -863,11 +846,16 @@ in
   lomiri-clock-app = runTest ./lomiri-clock-app.nix;
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
+  lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix);
   lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
   lomiri-music-app = runTest ./lomiri-music-app.nix;
-  lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix);
   lomiri-system-settings = runTest ./lomiri-system-settings.nix;
   lorri = handleTest ./lorri/default.nix { };
+  luks = runTest ./luks.nix;
+  lvm2 = handleTest ./lvm2 { };
+  lxc = handleTest ./lxc { };
+  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
+  lxd-image-server = runTest ./lxd-image-server.nix;
   lxqt = runTest ./lxqt.nix;
   ly = runTest ./ly.nix;
   maddy = discoverTests (import ./maddy { inherit handleTest; });
@@ -876,16 +864,14 @@ in
   magnetico = runTest ./magnetico.nix;
   mailcatcher = runTest ./mailcatcher.nix;
   mailhog = runTest ./mailhog.nix;
-  mailpit = runTest ./mailpit.nix;
   mailman = runTest ./mailman.nix;
+  mailpit = runTest ./mailpit.nix;
   man = runTest ./man.nix;
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
   marytts = runTest ./marytts.nix;
   mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
-  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   mate = runTest ./mate.nix;
   mate-wayland = runTest ./mate-wayland.nix;
-  matter-server = runTest ./matter-server.nix;
   matomo = runTest ./matomo.nix;
   matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix;
   matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
@@ -894,8 +880,9 @@ in
   matrix-synapse = runTest ./matrix/synapse.nix;
   matrix-synapse-workers = runTest ./matrix/synapse-workers.nix;
   matrix-tuwunel = runTest ./matrix/tuwunel.nix;
-  mautrix-discord = runTest ./matrix/mautrix-discord.nix;
+  matter-server = runTest ./matter-server.nix;
   mattermost = handleTest ./mattermost { };
+  mautrix-discord = runTest ./matrix/mautrix-discord.nix;
   mautrix-meta-postgres = runTest ./matrix/mautrix-meta-postgres.nix;
   mautrix-meta-sqlite = runTest ./matrix/mautrix-meta-sqlite.nix;
   mealie = runTest ./mealie.nix;
@@ -907,6 +894,7 @@ in
   merecat = runTest ./merecat.nix;
   metabase = runTest ./metabase.nix;
   mihomo = runTest ./mihomo.nix;
+  mimir = runTest ./mimir.nix;
   mindustry = runTest ./mindustry.nix;
   minecraft-server = runTest ./minecraft-server.nix;
   minidlna = runTest ./minidlna.nix;
@@ -920,15 +908,14 @@ in
   mjolnir = runTest ./matrix/mjolnir.nix;
   mobilizon = runTest ./mobilizon.nix;
   mod_perl = runTest ./mod_perl.nix;
+  modular-service-etc = runTest ./modular-service-etc/test.nix;
   modularService = pkgs.callPackage ../modules/system/service/systemd/test.nix {
     inherit evalSystem;
   };
-  modular-service-etc = runTest ./modular-service-etc/test.nix;
   molly-brown = runTest ./molly-brown.nix;
   mollysocket = runTest ./mollysocket.nix;
   monado = runTest ./monado.nix;
   monetdb = runTest ./monetdb.nix;
-  monica = runTest ./web-apps/monica.nix;
   mongodb = runTest ./mongodb.nix;
   mongodb-ce = runTest (
     { config, ... }:
@@ -937,24 +924,25 @@ in
       defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
     }
   );
+  monica = runTest ./web-apps/monica.nix;
   moodle = runTest ./moodle.nix;
   moonraker = runTest ./moonraker.nix;
+  moosefs = runTest ./moosefs.nix;
   mopidy = runTest ./mopidy.nix;
   morph-browser = runTest ./morph-browser.nix;
   morty = runTest ./morty.nix;
   mosquitto = runTest ./mosquitto.nix;
-  moosefs = runTest ./moosefs.nix;
   movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = runTest ./mtp.nix;
   multipass = runTest ./multipass.nix;
   mumble = runTest ./mumble.nix;
+  munin = runTest ./munin.nix;
   # Fails on aarch64-linux at the PDF creation step - need to debug this on an
   # aarch64 machine..
   musescore = runTestOn [ "x86_64-linux" ] ./musescore.nix;
   music-assistant = runTest ./music-assistant.nix;
-  munin = runTest ./munin.nix;
   mutableUsers = runTest ./mutable-users.nix;
   mycelium = runTest ./mycelium;
   mympd = runTest ./mympd.nix;
@@ -966,7 +954,6 @@ in
   nagios = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix;
   nar-serve = runTest ./nar-serve.nix;
   nat.firewall = handleTest ./nat.nix { withFirewall = true; };
-  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   nat.nftables.firewall = handleTest ./nat.nix {
     withFirewall = true;
     nftables = true;
@@ -975,6 +962,7 @@ in
     withFirewall = false;
     nftables = true;
   };
+  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   nats = runTest ./nats.nix;
   navidrome = runTest ./navidrome.nix;
   nbd = runTest ./nbd.nix;
@@ -988,16 +976,14 @@ in
   nebula = runTest ./nebula.nix;
   neo4j = runTest ./neo4j.nix;
   netbird = runTest ./netbird.nix;
-  netdata = runTest ./netdata.nix;
-  nimdow = runTest ./nimdow.nix;
-  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
-  networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
-  networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
-  networking.networkmanager = handleTest ./networking/networkmanager.nix { };
+  netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix;
   netbox_4_1 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_1; };
   netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; };
   netbox_4_3 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_3; };
-  netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix;
+  netdata = runTest ./netdata.nix;
+  networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
+  networking.networkmanager = handleTest ./networking/networkmanager.nix { };
+  networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   networkingProxy = runTest ./networking-proxy.nix;
   nextcloud = handleTest ./nextcloud { };
@@ -1027,19 +1013,21 @@ in
   nginx-unix-socket = runTest ./nginx-unix-socket.nix;
   nginx-variants = import ./nginx-variants.nix { inherit pkgs runTest; };
   nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix;
+  nimdow = runTest ./nimdow.nix;
   nipap = runTest ./web-apps/nipap.nix;
   nitter = runTest ./nitter.nix;
+  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nix-config = runTest ./nix-config.nix;
   nix-ld = runTest ./nix-ld.nix;
   nix-misc = handleTest ./nix/misc.nix { };
-  nix-upgrade = handleTest ./nix/upgrade.nix {
-    inherit (pkgs) nixVersions;
-    inherit system;
-  };
   nix-required-mounts = runTest ./nix-required-mounts;
   nix-serve = runTest ./nix-serve.nix;
   nix-serve-ssh = runTest ./nix-serve-ssh.nix;
   nix-store-veritysetup = runTest ./nix-store-veritysetup.nix;
+  nix-upgrade = handleTest ./nix/upgrade.nix {
+    inherit (pkgs) nixVersions;
+    inherit system;
+  };
   nixops = handleTest ./nixops/default.nix { };
   nixos-generate-config = runTest ./nixos-generate-config.nix;
   nixos-rebuild-install-bootloader = handleTestOn [
@@ -1087,16 +1075,32 @@ in
   nyxt = runTest ./nyxt.nix;
   nzbget = runTest ./nzbget.nix;
   nzbhydra2 = runTest ./nzbhydra2.nix;
-  ocis = runTest ./ocis.nix;
-  oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
   obs-studio = runTest ./obs-studio.nix;
+  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
+  ocis = runTest ./ocis.nix;
+  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
+  octoprint = runTest ./octoprint.nix;
+  oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
+  odoo = runTest ./odoo.nix;
+  odoo16 = runTest {
+    imports = [ ./odoo.nix ];
+    _module.args.package = pkgs.odoo16;
+  };
+  odoo17 = runTest {
+    imports = [ ./odoo.nix ];
+    _module.args.package = pkgs.odoo17;
+  };
   oh-my-zsh = runTest ./oh-my-zsh.nix;
+  oku = runTest ./oku.nix;
   olivetin = runTest ./olivetin.nix;
   ollama = runTest ./ollama.nix;
   ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;
   ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
   ombi = runTest ./ombi.nix;
   omnom = runTest ./omnom;
+  oncall = runTest ./web-apps/oncall.nix;
+  open-web-calendar = runTest ./web-apps/open-web-calendar.nix;
+  open-webui = runTest ./open-webui.nix;
   openarena = runTest ./openarena.nix;
   openbao = runTest ./openbao.nix;
   opencloud = runTest ./opencloud.nix;
@@ -1107,30 +1111,25 @@ in
   opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix { };
   opensnitch = runTest ./opensnitch.nix;
   openssh = runTest ./openssh.nix;
-  octoprint = runTest ./octoprint.nix;
   openstack-image-metadata =
     (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).metadata or { };
   openstack-image-userdata =
     (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).userdata or { };
   opentabletdriver = runTest ./opentabletdriver.nix;
   opentelemetry-collector = runTest ./opentelemetry-collector.nix;
-  open-web-calendar = runTest ./web-apps/open-web-calendar.nix;
-  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
-  orthanc = runTest ./orthanc.nix;
-  owi = runTest ./owi.nix;
-  owncast = runTest ./owncast.nix;
-  outline = runTest ./outline.nix;
-  i18n = runTest ./i18n.nix;
-  image-contents = handleTest ./image-contents.nix { };
   openvscode-server = runTest ./openvscode-server.nix;
-  open-webui = runTest ./open-webui.nix;
   openvswitch = runTest ./openvswitch.nix;
   optee = handleTestOn [ "aarch64-linux" ] ./optee.nix { };
   orangefs = runTest ./orangefs.nix;
+  orthanc = runTest ./orthanc.nix;
   os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { };
   osquery = handleTestOn [ "x86_64-linux" ] ./osquery.nix { };
   osrm-backend = runTest ./osrm-backend.nix;
+  outline = runTest ./outline.nix;
   overlayfs = runTest ./overlayfs.nix;
+  overseerr = runTest ./overseerr.nix;
+  owi = runTest ./owi.nix;
+  owncast = runTest ./owncast.nix;
   oxidized = handleTest ./oxidized.nix { };
   pacemaker = runTest ./pacemaker.nix;
   packagekit = runTest ./packagekit.nix;
@@ -1141,15 +1140,15 @@ in
   pam-u2f = runTest ./pam/pam-u2f.nix;
   pam-ussh = runTest ./pam/pam-ussh.nix;
   pam-zfs-key = runTest ./pam/zfs-key.nix;
-  paretosecurity = runTest ./paretosecurity.nix;
-  pass-secret-service = runTest ./pass-secret-service.nix;
-  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pantalaimon = runTest ./matrix/pantalaimon.nix;
   pantheon = runTest ./pantheon.nix;
   pantheon-wayland = runTest ./pantheon-wayland.nix;
   paperless = runTest ./paperless.nix;
+  paretosecurity = runTest ./paretosecurity.nix;
   parsedmarc = handleTest ./parsedmarc { };
+  pass-secret-service = runTest ./pass-secret-service.nix;
   password-option-override-ordering = runTest ./password-option-override-ordering.nix;
+  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pdns-recursor = runTest ./pdns-recursor.nix;
   peerflix = runTest ./peerflix.nix;
   peering-manager = runTest ./web-apps/peering-manager.nix;
@@ -1159,8 +1158,8 @@ in
   pgbackrest = import ./pgbackrest { inherit runTest; };
   pgbouncer = runTest ./pgbouncer.nix;
   pghero = runTest ./pghero.nix;
-  pgweb = runTest ./pgweb.nix;
   pgmanage = runTest ./pgmanage.nix;
+  pgweb = runTest ./pgweb.nix;
   phosh = runTest ./phosh.nix;
   photonvision = runTest ./photonvision.nix;
   photoprism = runTest ./photoprism.nix;
@@ -1186,9 +1185,10 @@ in
   };
   phylactery = runTest ./web-apps/phylactery.nix;
   pict-rs = runTest ./pict-rs.nix;
+  pihole-ftl = import ./pihole-ftl { inherit runTest; };
   pingvin-share = runTest ./pingvin-share.nix;
   pinnwand = runTest ./pinnwand.nix;
-  pihole-ftl = import ./pihole-ftl { inherit runTest; };
+  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   plantuml-server = runTest ./plantuml-server.nix;
   plasma6 = runTest ./plasma6.nix;
   plausible = runTest ./plausible.nix;
@@ -1216,53 +1216,54 @@ in
   postgres-websockets = runTest ./postgres-websockets.nix;
   postgresql = handleTest ./postgresql { };
   postgrest = runTest ./postgrest.nix;
+  power-profiles-daemon = runTest ./power-profiles-daemon.nix;
   powerdns = runTest ./powerdns.nix;
   powerdns-admin = handleTest ./powerdns-admin.nix { };
-  power-profiles-daemon = runTest ./power-profiles-daemon.nix;
   pppd = runTest ./pppd.nix;
   predictable-interface-names = handleTest ./predictable-interface-names.nix { };
-  pretalx = runTest ./web-apps/pretalx.nix;
   prefect = runTest ./prefect.nix;
+  pretalx = runTest ./web-apps/pretalx.nix;
   pretix = runTest ./web-apps/pretix.nix;
-  printing-socket = runTest {
-    imports = [ ./printing.nix ];
-    _module.args.socket = true;
-    _module.args.listenTcp = true;
-  };
   printing-service = runTest {
     imports = [ ./printing.nix ];
     _module.args.socket = false;
     _module.args.listenTcp = true;
   };
-  printing-socket-notcp = runTest {
-    imports = [ ./printing.nix ];
-    _module.args.socket = true;
-    _module.args.listenTcp = false;
-  };
   printing-service-notcp = runTest {
     imports = [ ./printing.nix ];
     _module.args.socket = false;
     _module.args.listenTcp = false;
   };
+  printing-socket = runTest {
+    imports = [ ./printing.nix ];
+    _module.args.socket = true;
+    _module.args.listenTcp = true;
+  };
+  printing-socket-notcp = runTest {
+    imports = [ ./printing.nix ];
+    _module.args.socket = true;
+    _module.args.listenTcp = false;
+  };
   privatebin = runTest ./privatebin.nix;
   privoxy = runTest ./privoxy.nix;
   prometheus = import ./prometheus { inherit runTest; };
   prometheus-exporters = handleTest ./prometheus-exporters.nix { };
   prosody = runTest ./xmpp/prosody.nix;
   prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { };
-  proxy = runTest ./proxy.nix;
   prowlarr = runTest ./prowlarr.nix;
+  proxy = runTest ./proxy.nix;
   pt2-clone = runTest ./pt2-clone.nix;
-  pykms = runTest ./pykms.nix;
   public-inbox = runTest ./public-inbox.nix;
   pufferpanel = runTest ./pufferpanel.nix;
   pulseaudio = discoverTests (import ./pulseaudio.nix);
+  pykms = runTest ./pykms.nix;
+  pyload = runTest ./pyload.nix;
   qbittorrent = runTest ./qbittorrent.nix;
   qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { };
-  qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { };
-  qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
   qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix;
+  qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { };
   qemu-vm-store = runTest ./qemu-vm-store.nix;
+  qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
   qgis = handleTest ./qgis.nix { package = pkgs.qgis; };
   qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; };
   qownnotes = runTest ./qownnotes.nix;
@@ -1280,8 +1281,8 @@ in
   rasdaemon = runTest ./rasdaemon.nix;
   rathole = runTest ./rathole.nix;
   readarr = runTest ./readarr.nix;
-  realm = runTest ./realm.nix;
   readeck = runTest ./readeck.nix;
+  realm = runTest ./realm.nix;
   rebuilderd = runTest ./rebuilderd.nix;
   redis = handleTest ./redis.nix { };
   redlib = runTest ./redlib.nix;
@@ -1291,8 +1292,8 @@ in
   replace-dependencies = handleTest ./replace-dependencies { };
   reposilite = runTest ./reposilite.nix;
   restartByActivationScript = runTest ./restart-by-activation-script.nix;
-  restic-rest-server = runTest ./restic-rest-server.nix;
   restic = runTest ./restic.nix;
+  restic-rest-server = runTest ./restic-rest-server.nix;
   retroarch = runTest ./retroarch.nix;
   rke2 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./rke2 { };
   rkvm = handleTest ./rkvm { };
@@ -1332,12 +1333,12 @@ in
   send = runTest ./send.nix;
   service-runner = runTest ./service-runner.nix;
   servo = runTest ./servo.nix;
-  shadps4 = runTest ./shadps4.nix;
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = runTest ./sfxr-qt.nix;
   sgt-puzzles = runTest ./sgt-puzzles.nix;
   shadow = runTest ./shadow.nix;
   shadowsocks = handleTest ./shadowsocks { };
+  shadps4 = runTest ./shadps4.nix;
   sharkey = runTest ./web-apps/sharkey.nix;
   shattered-pixel-dungeon = runTest ./shattered-pixel-dungeon.nix;
   shiori = runTest ./shiori.nix;
@@ -1348,12 +1349,12 @@ in
   slimserver = runTest ./slimserver.nix;
   slipshow = runTest ./slipshow.nix;
   slurm = runTest ./slurm.nix;
-  snmpd = runTest ./snmpd.nix;
   smokeping = runTest ./smokeping.nix;
   snapcast = runTest ./snapcast.nix;
   snapper = runTest ./snapper.nix;
   snipe-it = runTest ./web-apps/snipe-it.nix;
   snips-sh = runTest ./snips-sh.nix;
+  snmpd = runTest ./snmpd.nix;
   soapui = runTest ./soapui.nix;
   soft-serve = runTest ./soft-serve.nix;
   sogo = runTest ./sogo.nix;
@@ -1366,15 +1367,16 @@ in
   spiped = runTest ./spiped.nix;
   sqlite3-to-mysql = runTest ./sqlite3-to-mysql.nix;
   squid = runTest ./squid.nix;
-  sslh = handleTest ./sslh.nix { };
   ssh-agent-auth = runTest ./ssh-agent-auth.nix;
   ssh-audit = runTest ./ssh-audit.nix;
   sshwifty = runTest ./web-apps/sshwifty/default.nix;
+  sslh = handleTest ./sslh.nix { };
   sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { };
   sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
   stalwart-mail = runTest ./stalwart/stalwart-mail.nix;
   stargazer = runTest ./web-servers/stargazer.nix;
   starship = runTest ./starship.nix;
+  startx = import ./startx.nix { inherit pkgs runTest; };
   stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { };
   static-web-server = runTest ./web-servers/static-web-server.nix;
   step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { };
@@ -1397,13 +1399,13 @@ in
   sx = runTest ./sx.nix;
   sympa = runTest ./sympa.nix;
   syncthing = runTest ./syncthing.nix;
-  syncthing-no-settings = runTest ./syncthing-no-settings.nix;
+  syncthing-folders = runTest ./syncthing-folders.nix;
   syncthing-init = runTest ./syncthing-init.nix;
   syncthing-many-devices = runTest ./syncthing-many-devices.nix;
-  syncthing-folders = runTest ./syncthing-folders.nix;
+  syncthing-no-settings = runTest ./syncthing-no-settings.nix;
   syncthing-relay = runTest ./syncthing-relay.nix;
-  sysinit-reactivation = runTest ./sysinit-reactivation.nix;
   sysfs = runTest ./sysfs.nix;
+  sysinit-reactivation = runTest ./sysinit-reactivation.nix;
   systemd = runTest ./systemd.nix;
   systemd-analyze = runTest ./systemd-analyze.nix;
   systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { };
@@ -1411,28 +1413,29 @@ in
   systemd-bpf = runTest ./systemd-bpf.nix;
   systemd-confinement = handleTest ./systemd-confinement { };
   systemd-coredump = runTest ./systemd-coredump.nix;
-  systemd-cryptenroll = runTest ./systemd-cryptenroll.nix;
   systemd-credentials-tpm2 = runTest ./systemd-credentials-tpm2.nix;
+  systemd-cryptenroll = runTest ./systemd-cryptenroll.nix;
   systemd-escaping = runTest ./systemd-escaping.nix;
+  systemd-homed = runTest ./systemd-homed.nix;
   systemd-initrd-bridge = runTest ./systemd-initrd-bridge.nix;
   systemd-initrd-btrfs-raid = runTest ./systemd-initrd-btrfs-raid.nix;
   systemd-initrd-credentials = runTest ./systemd-initrd-credentials.nix;
-  systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix;
-  systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix;
   systemd-initrd-luks-empty-passphrase = runTest {
     imports = [ ./initrd-luks-empty-passphrase.nix ];
     _module.args.systemdStage1 = true;
   };
+  systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix;
+  systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix;
   systemd-initrd-luks-password = runTest ./systemd-initrd-luks-password.nix;
   systemd-initrd-luks-tpm2 = runTest ./systemd-initrd-luks-tpm2.nix;
   systemd-initrd-luks-unl0kr = runTest ./systemd-initrd-luks-unl0kr.nix;
   systemd-initrd-modprobe = runTest ./systemd-initrd-modprobe.nix;
   systemd-initrd-networkd = import ./systemd-initrd-networkd.nix { inherit runTest; };
-  systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix;
   systemd-initrd-networkd-openvpn = handleTestOn [
     "x86_64-linux"
     "i686-linux"
   ] ./initrd-network-openvpn { systemdStage1 = true; };
+  systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix;
   systemd-initrd-shutdown = runTest {
     imports = [ ./systemd-shutdown.nix ];
     _module.args.systemdStage1 = true;
@@ -1446,6 +1449,7 @@ in
   systemd-journal-upload = runTest ./systemd-journal-upload.nix;
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = runTest ./systemd-machinectl.nix;
+  systemd-misc = runTest ./systemd-misc.nix;
   systemd-networkd = runTest ./systemd-networkd.nix;
   systemd-networkd-bridge = runTest ./systemd-networkd-bridge.nix;
   systemd-networkd-dhcpserver = runTest ./systemd-networkd-dhcpserver.nix;
@@ -1462,38 +1466,35 @@ in
   systemd-pstore = runTest ./systemd-pstore.nix;
   systemd-repart = handleTest ./systemd-repart.nix { };
   systemd-resolved = runTest ./systemd-resolved.nix;
-  systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix;
   systemd-shutdown = runTest ./systemd-shutdown.nix;
+  systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix;
   systemd-sysupdate = runTest ./systemd-sysupdate.nix;
-  systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
   systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
+  systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
   systemd-sysusers-password-option-override-ordering = runTest ./systemd-sysusers-password-option-override-ordering.nix;
   systemd-timesyncd = runTest ./systemd-timesyncd.nix;
   systemd-timesyncd-nscd-dnssec = runTest ./systemd-timesyncd-nscd-dnssec.nix;
   systemd-user-linger = runTest ./systemd-user-linger.nix;
   systemd-user-tmpfiles-rules = runTest ./systemd-user-tmpfiles-rules.nix;
-  systemd-misc = runTest ./systemd-misc.nix;
   systemd-userdbd = runTest ./systemd-userdbd.nix;
-  systemd-homed = runTest ./systemd-homed.nix;
   systemtap = handleTest ./systemtap.nix { };
-  startx = import ./startx.nix { inherit pkgs runTest; };
   szurubooru = handleTest ./szurubooru.nix { };
   taler = handleTest ./taler { };
   tandoor-recipes = runTest ./tandoor-recipes.nix;
   tandoor-recipes-script-name = runTest ./tandoor-recipes-script-name.nix;
   tang = runTest ./tang.nix;
-  taskserver = runTest ./taskserver.nix;
   taskchampion-sync-server = runTest ./taskchampion-sync-server.nix;
+  taskserver = runTest ./taskserver.nix;
   tayga = runTest ./tayga.nix;
   technitium-dns-server = runTest ./technitium-dns-server.nix;
   teeworlds = runTest ./teeworlds.nix;
   telegraf = runTest ./telegraf.nix;
   teleport = handleTest ./teleport.nix { };
   teleports = runTest ./teleports.nix;
-  thelounge = handleTest ./thelounge.nix { };
   temporal = runTest ./temporal.nix;
   terminal-emulators = handleTest ./terminal-emulators.nix { };
   thanos = runTest ./thanos.nix;
+  thelounge = handleTest ./thelounge.nix { };
   tiddlywiki = runTest ./tiddlywiki.nix;
   tigervnc = handleTest ./tigervnc.nix { };
   tika = runTest ./tika.nix;
@@ -1508,20 +1509,19 @@ in
   tomcat = runTest ./tomcat.nix;
   tor = runTest ./tor.nix;
   tpm-ek = handleTest ./tpm-ek { };
+  # tracee requires bpf
+  tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
   traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
   trafficserver = runTest ./trafficserver.nix;
   transfer-sh = runTest ./transfer-sh.nix;
   transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; };
   transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; };
-  # tracee requires bpf
-  tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
   trezord = runTest ./trezord.nix;
   trickster = runTest ./trickster.nix;
   trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;
   tsm-client-gui = runTest ./tsm-client-gui.nix;
-  ttyd = runTest ./web-servers/ttyd.nix;
   tt-rss = runTest ./web-apps/tt-rss.nix;
-  txredisapi = runTest ./txredisapi.nix;
+  ttyd = runTest ./web-servers/ttyd.nix;
   tuned = runTest ./tuned.nix;
   tuptime = runTest ./tuptime.nix;
   turbovnc-headless-server = runTest ./turbovnc-headless-server.nix;
@@ -1529,6 +1529,7 @@ in
   tusd = runTest ./tusd/default.nix;
   tuxguitar = runTest ./tuxguitar.nix;
   twingate = runTest ./twingate.nix;
+  txredisapi = runTest ./txredisapi.nix;
   typesense = runTest ./typesense.nix;
   tzupdate = runTest ./tzupdate.nix;
   ucarp = runTest ./ucarp.nix;
@@ -1538,23 +1539,23 @@ in
   umurmur = runTest ./umurmur.nix;
   unbound = runTest ./unbound.nix;
   unifi = runTest ./unifi.nix;
-  unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = runTest ./web-servers/unit-perl.nix;
+  unit-php = runTest ./web-servers/unit-php.nix;
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
   upnp.nftables = handleTest ./upnp.nix { useNftables = true; };
   uptermd = runTest ./uptermd.nix;
   uptime-kuma = runTest ./uptime-kuma.nix;
   urn-timer = runTest ./urn-timer.nix;
   usbguard = runTest ./usbguard.nix;
-  userborn = runTest ./userborn.nix;
-  userborn-mutable-users = runTest ./userborn-mutable-users.nix;
-  userborn-immutable-users = runTest ./userborn-immutable-users.nix;
-  userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
-  userborn-immutable-etc = runTest ./userborn-immutable-etc.nix;
   user-activation-scripts = runTest ./user-activation-scripts.nix;
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
   user-home-mode = runTest ./user-home-mode.nix;
+  userborn = runTest ./userborn.nix;
+  userborn-immutable-etc = runTest ./userborn-immutable-etc.nix;
+  userborn-immutable-users = runTest ./userborn-immutable-users.nix;
+  userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
+  userborn-mutable-users = runTest ./userborn-mutable-users.nix;
   ustreamer = runTest ./ustreamer.nix;
   uwsgi = runTest ./uwsgi.nix;
   v2ray = runTest ./v2ray.nix;
@@ -1591,6 +1592,7 @@ in
   watchdogd = runTest ./watchdogd.nix;
   webhook = runTest ./webhook.nix;
   weblate = runTest ./web-apps/weblate.nix;
+  wg-access-server = runTest ./wg-access-server.nix;
   whisparr = runTest ./whisparr.nix;
   whoami = runTest ./whoami.nix;
   whoogle-search = runTest ./whoogle-search.nix;
@@ -1600,12 +1602,11 @@ in
     inherit pkgs runTest;
     inherit (pkgs) lib;
   };
-  wg-access-server = runTest ./wg-access-server.nix;
   without-nix = runTest ./without-nix.nix;
   wmderland = runTest ./wmderland.nix;
+  wordpress = runTest ./wordpress.nix;
   workout-tracker = runTest ./workout-tracker.nix;
   wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };
-  wordpress = runTest ./wordpress.nix;
   wrappers = runTest ./wrappers.nix;
   writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; };
   wstunnel = runTest ./wstunnel.nix;
@@ -1642,4 +1643,5 @@ in
   zrepl = runTest ./zrepl.nix;
   zwave-js = runTest ./zwave-js.nix;
   zwave-js-ui = runTest ./zwave-js-ui.nix;
+  # keep-sorted end
 }

From 7f1c48cc9c284a5860803d30ac6948cac25ee46c Mon Sep 17 00:00:00 2001
From: Jeppe Fihl-Pearson <jeppe@tenzer.dk>
Date: Fri, 12 Sep 2025 22:11:21 +0100
Subject: [PATCH 34/46] tf: init at 2.11.1

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

diff --git a/pkgs/by-name/tf/tf/package.nix b/pkgs/by-name/tf/tf/package.nix
new file mode 100644
index 000000000000..f59ced6c28a4
--- /dev/null
+++ b/pkgs/by-name/tf/tf/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "tf";
+  version = "2.11.1";
+
+  src = fetchFromGitHub {
+    owner = "dex4er";
+    repo = "tf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EWD6BfOAZR/PucDhJmLStjBNVgXCLW45g8stVhoMyO8=";
+  };
+
+  vendorHash = "sha256-lcgLEj6NELZS0LoakbuektO4epieY7ctl8ya1JnXim8=";
+
+  subPackages = [ "." ];
+
+  preInstallCheck = "make test";
+
+  meta = {
+    description = "Less verbose and more shell friendly Terraform";
+    mainProgram = "tf";
+    homepage = "https://github.com/dex4er/tf";
+    changelog = "https://github.com/dex4er/tf/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Tenzer ];
+  };
+})

From 5bd18455d498055716c2dc832919663a33384335 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 11:41:27 -0500
Subject: [PATCH 35/46] fsuae: maintainers add c4patino

---
 pkgs/by-name/fs/fsuae/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix
index bffc46e4dab3..714520534d48 100644
--- a/pkgs/by-name/fs/fsuae/package.nix
+++ b/pkgs/by-name/fs/fsuae/package.nix
@@ -69,7 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "fs-uae";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      c4patino
+    ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux;
   };
 })

From 857c13bd9a0ad677fa481c83b34a25355a04b237 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 11:41:06 -0500
Subject: [PATCH 36/46] fsuae: add passthru.updateScript for autoupdate

---
 pkgs/by-name/fs/fsuae/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix
index 714520534d48..3430d02313b5 100644
--- a/pkgs/by-name/fs/fsuae/package.nix
+++ b/pkgs/by-name/fs/fsuae/package.nix
@@ -17,6 +17,7 @@
   stdenv,
   zip,
   zlib,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -58,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     strip-nondeterminism --type zip $out/share/fs-uae/fs-uae.dat
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://fs-uae.net";
     description = "Accurate, customizable Amiga Emulator";

From 3418b9d41ad30099552768401cb01f53be40547a Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 11:32:10 -0500
Subject: [PATCH 37/46] fsuae: 3.1.66 -> 3.2.35

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

diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix
index 3430d02313b5..9ff2a17e17f4 100644
--- a/pkgs/by-name/fs/fsuae/package.nix
+++ b/pkgs/by-name/fs/fsuae/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fs-uae";
-  version = "3.1.66";
+  version = "3.2.35";
 
   src = fetchFromGitHub {
     owner = "FrodeSolheim";
     repo = "fs-uae";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys=";
+    hash = "sha256-e+Q+PC6Kpq3OBKsgoRvmu2p9dQfJeRCdFO1agXIGcU8=";
   };
 
   nativeBuildInputs = [

From c421dc7aa3853bb28348c6dce1c1fd1e9475f141 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Sep 2025 13:07:21 +0000
Subject: [PATCH 38/46] sarasa-gothic: 1.0.32 -> 1.0.33

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

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 0d72da67a5de..9514d0a2a102 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.32";
+  version = "1.0.33";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-XgWtuNtBqizk9HHiVyQRuUeCBrra2Hq9jnlvZdPjNTQ=";
+    hash = "sha256-aIZWTrG1NimE6cPzs1drrTfvbHAuObUOjlPgZv3PaSg=";
   };
 
   sourceRoot = ".";

From 88b9a7d3b6640c2ae2befe561a905d13eebc19ab Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 13 Sep 2025 06:10:19 -0700
Subject: [PATCH 39/46] tests.cross.sanity: fix eval

`qt5` is not long for the world.
---
 pkgs/test/cross/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index aeb39b59a2da..35a16c146e67 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -195,7 +195,7 @@ let
     pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
     pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv
     pkgs.pkgsCross.mingwW64.stdenv
-    # Uses the expression that is used by the most cross-compil_ed_ GHCs
+    # Uses the expression that is used by the most cross-compiled GHCs
     pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948
 
   ]
@@ -206,7 +206,7 @@ let
     pkgs.pkgsMusl.pkgsCross.gnu64.hello
 
     # Two web browsers -- exercises almost the entire packageset
-    pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5
+    pkgs.pkgsCross.aarch64-multiplatform.qutebrowser
     pkgs.pkgsCross.aarch64-multiplatform.firefox
 
     # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859

From 8d346e4f495938ac50bf38a75b53b49ea05b5b98 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sat, 13 Sep 2025 15:31:05 +0200
Subject: [PATCH 40/46] =?UTF-8?q?lixPackageSets.lix=5F2=5F93.lix:=20restor?=
 =?UTF-8?q?e=20lowdown=20=E2=89=A5=201.4=20patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was removed accidentally in
5d4210ba4e9e0a5b100c3b84c7e5c8b6e17f5aa0 ("lixPackageSets.lix_2_92:
drop").

Thanks to @magneticflux- for flagging this.

Change-Id: I731fafbe1cb47202110f359536c3023652b61dce
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 pkgs/tools/package-management/lix/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 727ae28b0feb..4573325396dd 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -159,6 +159,15 @@ lib.makeExtensible (
           inherit src;
           hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
         };
+
+        patches = [
+          # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731
+          (fetchpatch2 {
+            name = "lix-lowdown-1.4.0.patch";
+            url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch";
+            hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY=";
+          })
+        ];
       };
     };
 

From b4bd693c817efb677658dbf3930281d621ed400d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Wickstr=C3=B6m?= <oskar@wickstrom.tech>
Date: Fri, 12 Sep 2025 22:50:04 +0200
Subject: [PATCH 41/46] amp-cli: remove 'owickstrom' from maintainers

---
 pkgs/by-name/am/amp-cli/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 997d7c29327e..c5422673c020 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -82,7 +82,6 @@ buildNpmPackage (finalAttrs: {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
       keegancsmith
-      owickstrom
     ];
     mainProgram = "amp";
   };

From ffd53dd5272390748d94c0a58db8ae9afb27db58 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 12 Sep 2025 14:53:41 +0000
Subject: [PATCH 42/46] cloudflare-cli: 4.2.0 -> 5.0.5

Changelog: https://github.com/danielpigott/cloudflare-cli/releases/tag/v5.0.5
Diff: https://github.com/danielpigott/cloudflare-cli/compare/v4.2.0...v5.0.5
---
 pkgs/by-name/cl/cloudflare-cli/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix
index 6e1ad3be90b0..7b5cb9db2dae 100644
--- a/pkgs/by-name/cl/cloudflare-cli/package.nix
+++ b/pkgs/by-name/cl/cloudflare-cli/package.nix
@@ -6,31 +6,38 @@
   yarnConfigHook,
   yarnInstallHook,
   nodejs,
+  makeBinaryWrapper,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cloudflare-cli";
-  version = "4.2.0";
+  version = "5.0.5";
 
   src = fetchFromGitHub {
     owner = "danielpigott";
     repo = "cloudflare-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cT+cMekXhHKfFi+dH1dCA/YNBSyYePJIZBSkDMPZZ14=";
+    hash = "sha256-+QlSKXkGXc72FCQAlfZnBK5tQ1jbpICxR1Xe73RSgbk=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-0SFXgaLQE/MkqC9id7DAiP422tEyTt2gpgpIdXViFBI=";
+    hash = "sha256-pPM2lKjSS6sFj5R+eaXT2mXoCQouq4UleCN1IQilnnw=";
   };
 
   nativeBuildInputs = [
     yarnConfigHook
     yarnInstallHook
     nodejs
+    makeBinaryWrapper
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/cfcli \
+      --chdir $out/lib/node_modules/cloudflare-cli
+  '';
+
   doInstallCheck = true;
   installCheckPhase = ''
     runHook preInstallCheck

From 82f4631e2d9e339a3d741b562fa717a350ebdc84 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 13 Sep 2025 17:25:33 +0200
Subject: [PATCH 43/46] python313Packages.pyexploitdb: 0.2.96 -> 0.2.97

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 153c6d9368ac..8eb6814b4ba3 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.96";
+  version = "0.2.97";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-5STYqx0D6X6h6tJFCCrYVx3oYqlZwvmiuTrVLXsXWLM=";
+    hash = "sha256-w9OrwJjS4KoGc/o8YzYklNQbHliDV7KlayJRM5e6itc=";
   };
 
   build-system = [ setuptools ];

From db76b39ddd561fb0a4f28b62b5fc12d276c3f036 Mon Sep 17 00:00:00 2001
From: detroyejr <detroyejr@outlook.com>
Date: Fri, 12 Sep 2025 13:41:26 -0400
Subject: [PATCH 44/46] python3Packages.backports-asyncio-runner: init at 1.2.0

---
 .../backports-asyncio-runner/default.nix      | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/backports-asyncio-runner/default.nix

diff --git a/pkgs/development/python-modules/backports-asyncio-runner/default.nix b/pkgs/development/python-modules/backports-asyncio-runner/default.nix
new file mode 100644
index 000000000000..d94a22477932
--- /dev/null
+++ b/pkgs/development/python-modules/backports-asyncio-runner/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  pytestCheckHook,
+  fetchFromGitHub,
+  hatchling,
+  hatch-fancy-pypi-readme,
+}:
+
+let
+  pname = "backports-asyncio-runner";
+  version = "1.2.0";
+  src = fetchFromGitHub {
+    owner = "samypr100";
+    repo = "backports.asyncio.runner";
+    tag = "v${version}";
+    hash = "sha256-F8x7MZgu0VItH7kBke7C7+ZBoM6Iyj8xOeQ2t56ff3k=";
+  };
+in
+buildPythonPackage {
+  inherit pname version src;
+  pyproject = true;
+
+  build-system = [
+    hatch-fancy-pypi-readme
+    hatchling
+  ];
+
+  pythonImportsCheck = [ "backports.asyncio.runner" ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # These tests depend on the test.test_asyncio module in cpython which is
+  # removed at build time.
+  disabledTestPaths = [
+    "tests/test_tasks_py38.py"
+    "tests/test_tasks_py39.py"
+    "tests/test_tasks_py310.py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/samypr100/backports.asyncio.runner/releases/tag/${src.tag}";
+    description = "Backport of Python 3.11 asyncio.Runner";
+    homepage = "https://github.com/samypr100/backports.asyncio.runner";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ detroyejr ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 82871be7f8dc..2fac02977710 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1659,6 +1659,12 @@ self: super: with self; {
 
   backoff = callPackage ../development/python-modules/backoff { };
 
+  backports-asyncio-runner =
+    if pythonAtLeast "3.11" then
+      null
+    else
+      callPackage ../development/python-modules/backports-asyncio-runner { };
+
   backports-datetime-fromisoformat =
     callPackage ../development/python-modules/backports-datetime-fromisoformat
       { };

From 56d9cd414d6b888a98b3711e434f2056d43834d6 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 13 Sep 2025 11:32:13 -0400
Subject: [PATCH 45/46] zstd: fix changelog

lib.version (nixpkgs version) creeped in due to wide `lib` scope.

Note: I am working on an automated extinguisher of the pattern, so
leaving the rest of "modernization" out of scope.
---
 pkgs/tools/compression/zstd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index d6a28ece4163..83def1dd150f 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
       property shared by most LZ compression algorithms, such as zlib.
     '';
     homepage = "https://facebook.github.io/zstd/";
-    changelog = "https://github.com/facebook/zstd/blob/v${version}/CHANGELOG";
+    changelog = "https://github.com/facebook/zstd/blob/v${finalAttrs.version}/CHANGELOG";
     license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
     mainProgram = "zstd";
     platforms = platforms.all;

From a45b1f58a30b5c8d4e8676da1087835b7e050f26 Mon Sep 17 00:00:00 2001
From: detroyejr <detroyejr@outlook.com>
Date: Fri, 12 Sep 2025 13:41:42 -0400
Subject: [PATCH 46/46] python3Packages.pytest-asyncio: add
 backports.asyncio.runner to dependencies for python 3.10

---
 pkgs/development/python-modules/pytest-asyncio/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 5ac0fdc37f87..a251f89fc5de 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -3,8 +3,10 @@
   buildPythonPackage,
   callPackage,
   fetchFromGitHub,
+  pythonOlder,
   pytest,
   setuptools-scm,
+  backports-asyncio-runner,
 }:
 
 buildPythonPackage rec {
@@ -27,6 +29,9 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    backports-asyncio-runner
+  ];
 
   postInstall = ''
     mkdir $testout