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

(cherry picked from commit 005a118ceba6e1a1acc1b6262680b6bbc0d3bcab)
---
 maintainers/maintainer-list.nix |   1 -
 maintainers/team-list.nix       | 194 ++++++++++++++++----------------
 2 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9bb4c14d7e0a..9aaae44349d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27718,4 +27718,3 @@
   };
   # keep-sorted end
 }
-# Keep the list alphabetically sorted.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index fdb9994e887c..4e04e3da174a 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,28 +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
-    ];
-    scope = "Maintainers of the .NET build tools and packages";
-    shortName = "dotnet";
-  };
-
   deepin = {
     members = [ rewine ];
     scope = "Maintain deepin desktop environment and related packages.";
@@ -369,6 +357,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  dotnet = {
+    members = [
+      mdarocha
+      corngood
+      ggg
+      raphaelr
+      jamiemagee
+      anpin
+    ];
+    scope = "Maintainers of the .NET build tools and packages";
+    shortName = "dotnet";
+  };
+
   emacs = {
     members = [
       AndersonTorres
@@ -495,21 +496,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
@@ -533,6 +519,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
@@ -698,6 +688,17 @@ with lib.maintainers;
     shortName = "Kodi";
   };
 
+  kubernetes = {
+    members = [
+      johanot
+      offline
+      saschagrunert
+      srhb
+    ];
+    scope = "Maintain the Kubernetes package and module";
+    shortName = "Kubernetes";
+  };
+
   libretro = {
     members = [
       aanderse
@@ -735,6 +736,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
@@ -758,6 +772,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 = [
@@ -768,13 +789,6 @@ with lib.maintainers;
     shortName = "Lumiguide employees";
   };
 
-  lua = {
-    githubTeams = [ "lua" ];
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
-    enableFeatureFreezePing = true;
-  };
-
   lumina = {
     members = [ romildo ];
     githubTeams = [ "lumina" ];
@@ -836,19 +850,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
@@ -861,31 +862,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 = {
@@ -934,6 +921,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).";
@@ -1153,12 +1154,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 ];
@@ -1166,6 +1161,12 @@ with lib.maintainers;
     shortName = "Serokell employees";
   };
 
+  sphinx = {
+    members = [ ];
+    scope = "Maintain Sphinx related packages.";
+    shortName = "Sphinx";
+  };
+
   stdenv = {
     members = [
       artturin
@@ -1276,4 +1277,5 @@ with lib.maintainers;
     shortName = "Zig";
     enableFeatureFreezePing = true;
   };
+  # keep-sorted end
 }

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

(cherry picked from commit 4d055c69f7248602fff1075f9d15c69d9fddaa80)
---
 nixos/tests/all-tests.nix | 308 +++++++++++++++++++-------------------
 1 file changed, 155 insertions(+), 153 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a7e6f9cf9036..c39028519e87 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -167,10 +167,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;
@@ -202,9 +210,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;
@@ -213,7 +221,6 @@ in
   atop = import ./atop.nix { inherit pkgs runTest; };
   atticd = runTest ./atticd.nix;
   atuin = runTest ./atuin.nix;
-  ax25 = handleTest ./ax25.nix { };
   audiobookshelf = runTest ./audiobookshelf.nix;
   auth-mysql = runTest ./auth-mysql.nix;
   authelia = runTest ./authelia.nix;
@@ -227,6 +234,7 @@ in
     imports = [ ./avahi.nix ];
     _module.args.networkd = true;
   };
+  ax25 = handleTest ./ax25.nix { };
   ayatana-indicators = runTest ./ayatana-indicators.nix;
   babeld = runTest ./babeld.nix;
   bazarr = runTest ./bazarr.nix;
@@ -255,9 +263,9 @@ in
   blockbook-frontend = handleTest ./blockbook-frontend.nix { };
   blocky = handleTest ./blocky.nix { };
   boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { };
-  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   boot-stage1 = handleTest ./boot-stage1.nix { };
   boot-stage2 = handleTest ./boot-stage2.nix { };
+  bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   borgbackup = handleTest ./borgbackup.nix { };
   borgmatic = handleTest ./borgmatic.nix { };
   botamusique = runTest ./botamusique.nix;
@@ -277,11 +285,11 @@ in
   cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };
   cage = handleTest ./cage.nix { };
   cagebreak = handleTest ./cagebreak.nix { };
-  calibre-web = runTest ./calibre-web.nix;
   calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
+  calibre-web = runTest ./calibre-web.nix;
   canaille = handleTest ./canaille.nix { };
-  castopod = handleTest ./castopod.nix { };
   cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
+  castopod = handleTest ./castopod.nix { };
   centrifugo = runTest ./centrifugo.nix;
   ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { };
   ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix { };
@@ -351,31 +359,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 = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };
   cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { };
+  croc = handleTest ./croc.nix { };
+  cross-seed = runTest ./cross-seed.nix;
   cryptpad = runTest ./cryptpad.nix;
   cups-pdf = runTest ./cups-pdf.nix;
   curl-impersonate = handleTest ./curl-impersonate.nix { };
   custom-ca = handleTest ./custom-ca.nix { };
-  croc = handleTest ./croc.nix { };
-  cross-seed = runTest ./cross-seed.nix;
   cyrus-imap = runTest ./cyrus-imap.nix;
-  darling-dmg = runTest ./darling-dmg.nix;
   dae = handleTest ./dae.nix { };
+  darling-dmg = runTest ./darling-dmg.nix;
   davis = runTest ./davis.nix;
   db-rest = handleTest ./db-rest.nix { };
   dconf = handleTest ./dconf.nix { };
@@ -394,34 +402,32 @@ 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 = handleTestOn [ "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 = handleTest ./documize.nix { };
   documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
+  documize = handleTest ./documize.nix { };
   doh-proxy-rust = handleTest ./doh-proxy-rust.nix { };
   dokuwiki = runTest ./dokuwiki.nix;
   dolibarr = runTest ./dolibarr.nix;
   domination = handleTest ./domination.nix { };
   dovecot = handleTest ./dovecot.nix { };
+  draupnir = runTest ./matrix/draupnir.nix;
   drawterm = discoverTests (import ./drawterm.nix);
   drbd = handleTest ./drbd.nix { };
-  draupnir = runTest ./matrix/draupnir.nix;
-  druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drbd-driver = handleTest ./drbd-driver.nix { };
+  druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   dublin-traceroute = handleTest ./dublin-traceroute.nix { };
-  earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { };
   early-mount-options = handleTest ./early-mount-options.nix { };
+  earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.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 = handleTest ./ecryptfs.nix { };
-  fscrypt = handleTest ./fscrypt.nix { };
-  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
   eintopf = runTest ./eintopf.nix;
   ejabberd = handleTest ./xmpp/ejabberd.nix { };
   elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
@@ -445,13 +451,6 @@ in
   eris-server = handleTest ./eris-server.nix { };
   esphome = handleTest ./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 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix { };
   etcd-cluster = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix { };
   etebase-server = handleTest ./etebase-server.nix { };
@@ -461,6 +460,7 @@ in
   fakeroute = handleTest ./fakeroute.nix { };
   fancontrol = runTest ./fancontrol.nix;
   fanout = handleTest ./fanout.nix { };
+  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
   fcitx5 = handleTest ./fcitx5 { };
   fedimintd = runTest ./fedimintd.nix;
   fenics = handleTest ./fenics.nix { };
@@ -496,8 +496,8 @@ in
   firejail = handleTest ./firejail.nix { };
   firewall = handleTest ./firewall.nix { nftables = false; };
   firewall-nftables = handleTest ./firewall.nix { nftables = true; };
-  fish = runTest ./fish.nix;
   firezone = handleTest ./firezone/firezone.nix { };
+  fish = runTest ./fish.nix;
   flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };
   flaresolverr = handleTest ./flaresolverr.nix { };
   flood = handleTest ./flood.nix { };
@@ -527,9 +527,8 @@ in
   frr = handleTest ./frr.nix { };
   fsck = handleTest ./fsck.nix { };
   fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; };
+  fscrypt = handleTest ./fscrypt.nix { };
   ft2-clone = handleTest ./ft2-clone.nix { };
-  legit = handleTest ./legit.nix { };
-  mimir = handleTest ./mimir.nix { };
   gancio = handleTest ./gancio.nix { };
   garage_1 = import ./garage {
     inherit runTest;
@@ -562,10 +561,10 @@ in
   gnome-xorg = handleTest ./gnome-xorg.nix { };
   gns3-server = handleTest ./gns3-server.nix { };
   gnupg = handleTest ./gnupg.nix { };
-  goatcounter = handleTest ./goatcounter.nix { };
   go-camo = handleTest ./go-camo.nix { };
   go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
+  goatcounter = handleTest ./goatcounter.nix { };
   gobgpd = handleTest ./gobgpd.nix { };
   gocd-agent = handleTest ./gocd-agent.nix { };
   gocd-server = handleTest ./gocd-server.nix { };
@@ -594,41 +593,26 @@ 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 = handleTest ./haste-server.nix { };
+  hadoop_3_3 = import ./hadoop {
+    inherit handleTestOn;
+    package = pkgs.hadoop_3_3;
+  };
   haproxy = runTest ./haproxy.nix;
   hardened = handleTest ./hardened.nix { };
   harmonia = runTest ./harmonia.nix;
+  haste-server = handleTest ./haste-server.nix { };
+  hbase2 = handleTest ./hbase.nix { package = pkgs.hbase2; };
+  hbase3 = handleTest ./hbase.nix { package = pkgs.hbase3; };
+  hbase_2_4 = handleTest ./hbase.nix { package = pkgs.hbase_2_4; };
+  hbase_2_5 = handleTest ./hbase.nix { package = pkgs.hbase_2_5; };
   headscale = handleTest ./headscale.nix { };
   healthchecks = handleTest ./web-apps/healthchecks.nix { };
-  hbase2 = handleTest ./hbase.nix { package = pkgs.hbase2; };
-  hbase_2_5 = handleTest ./hbase.nix { package = pkgs.hbase_2_5; };
-  hbase_2_4 = handleTest ./hbase.nix { package = pkgs.hbase_2_4; };
-  hbase3 = handleTest ./hbase.nix { package = pkgs.hbase3; };
   hedgedoc = handleTest ./hedgedoc.nix { };
   herbstluftwm = handleTest ./herbstluftwm.nix { };
-  homebox = handleTest ./homebox.nix { };
-  homer = handleTest ./homer { };
-  homepage-dashboard = runTest ./homepage-dashboard.nix;
-  honk = runTest ./honk.nix;
-  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
-  invidious = handleTest ./invidious.nix { };
-  iosched = handleTest ./iosched.nix { };
-  isolate = handleTest ./isolate.nix { };
-  livebook-service = handleTest ./livebook-service.nix { };
-  pyload = handleTest ./pyload.nix { };
-  oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
-  odoo = handleTest ./odoo.nix { };
-  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
-  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
-  oncall = runTest ./web-apps/oncall.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.
@@ -640,14 +624,20 @@ in
   hledger-web = handleTest ./hledger-web.nix { };
   hockeypuck = handleTest ./hockeypuck.nix { };
   home-assistant = runTest ./home-assistant.nix;
+  homebox = handleTest ./homebox.nix { };
+  homepage-dashboard = runTest ./homepage-dashboard.nix;
+  homer = handleTest ./homer { };
+  honk = runTest ./honk.nix;
   hostname = handleTest ./hostname.nix { };
   hound = handleTest ./hound.nix { };
   hub = runTest ./git/hub.nix;
   hydra = runTest ./hydra;
+  i18n = runTest ./i18n.nix;
   i3wm = handleTest ./i3wm.nix { };
   icingaweb2 = runTest ./icingaweb2.nix;
   ifm = handleTest ./ifm.nix { };
   iftop = handleTest ./iftop.nix { };
+  image-contents = handleTest ./image-contents.nix { };
   immich = handleTest ./web-apps/immich.nix { };
   immich-public-proxy = handleTest ./web-apps/immich-public-proxy.nix { };
   incron = handleTest ./incron.nix { };
@@ -660,22 +650,26 @@ in
   incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
   influxdb = handleTest ./influxdb.nix { };
   influxdb2 = handleTest ./influxdb2.nix { };
+  initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix { };
   initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn { };
   initrd-network-ssh = handleTest ./initrd-network-ssh { };
-  initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix { };
-  initrdNetwork = handleTest ./initrd-network.nix { };
   initrd-secrets = handleTest ./initrd-secrets.nix { };
   initrd-secrets-changing = handleTest ./initrd-secrets-changing.nix { };
+  initrdNetwork = handleTest ./initrd-network.nix { };
   input-remapper = handleTest ./input-remapper.nix { };
   inspircd = handleTest ./inspircd.nix { };
+  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
   installer = handleTest ./installer.nix { };
   installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
   intune = handleTest ./intune.nix { };
+  invidious = handleTest ./invidious.nix { };
   invoiceplane = runTest ./invoiceplane.nix;
   iodine = handleTest ./iodine.nix { };
+  iosched = handleTest ./iosched.nix { };
   ipv6 = handleTest ./ipv6.nix { };
   iscsi-multipath-root = handleTest ./iscsi-multipath-root.nix { };
   iscsi-root = handleTest ./iscsi-root.nix { };
+  isolate = handleTest ./isolate.nix { };
   isso = handleTest ./isso.nix { };
   jackett = handleTest ./jackett.nix { };
   jellyfin = handleTest ./jellyfin.nix { };
@@ -723,6 +717,7 @@ in
   latestKernel.login = handleTest ./login.nix { latestKernel = true; };
   lavalink = runTest ./lavalink.nix;
   leaps = handleTest ./leaps.nix { };
+  legit = handleTest ./legit.nix { };
   lemmy = handleTest ./lemmy.nix { };
   libinput = handleTest ./libinput.nix { };
   librenms = runTest ./librenms.nix;
@@ -738,12 +733,13 @@ in
   lidarr = handleTest ./lidarr.nix { };
   lightdm = handleTest ./lightdm.nix { };
   lighttpd = runTest ./lighttpd.nix;
-  livekit = runTest ./networking/livekit.nix;
   limesurvey = handleTest ./limesurvey.nix { };
   limine = import ./limine { inherit runTest; };
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
   litellm = runTest ./litellm.nix;
   litestream = handleTest ./litestream.nix { };
+  livebook-service = handleTest ./livebook-service.nix { };
+  livekit = runTest ./networking/livekit.nix;
   lk-jwt-service = runTest ./matrix/lk-jwt-service.nix;
   lldap = handleTest ./lldap.nix { };
   localsend = handleTest ./localsend.nix { };
@@ -751,11 +747,6 @@ in
   login = handleTest ./login.nix { };
   logrotate = runTest ./logrotate.nix;
   loki = handleTest ./loki.nix { };
-  luks = handleTest ./luks.nix { };
-  lvm2 = handleTest ./lvm2 { };
-  lxc = handleTest ./lxc { };
-  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
-  lxd-image-server = handleTest ./lxd-image-server.nix { };
   #logstash = handleTest ./logstash.nix {};
   lomiri = discoverTests (import ./lomiri.nix);
   lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
@@ -764,11 +755,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 = handleTest ./luks.nix { };
+  lvm2 = handleTest ./lvm2 { };
+  lxc = handleTest ./lxc { };
+  lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; });
+  lxd-image-server = handleTest ./lxd-image-server.nix { };
   lxqt = handleTest ./lxqt.nix { };
   ly = handleTest ./ly.nix { };
   maddy = discoverTests (import ./maddy { inherit handleTest; });
@@ -777,16 +773,14 @@ in
   magnetico = handleTest ./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 = handleTest ./marytts.nix { };
   mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
-  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   mate = handleTest ./mate.nix { };
   mate-wayland = handleTest ./mate-wayland.nix { };
-  matter-server = handleTest ./matter-server.nix { };
   matomo = runTest ./matomo.nix;
   matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix;
   matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
@@ -794,9 +788,10 @@ in
   matrix-continuwuity = runTest ./matrix/continuwuity.nix;
   matrix-synapse = handleTest ./matrix/synapse.nix { };
   matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix { };
+  matter-server = handleTest ./matter-server.nix { };
+  mattermost = handleTest ./mattermost { };
   mautrix-meta-postgres = handleTest ./matrix/mautrix-meta-postgres.nix { };
   mautrix-meta-sqlite = handleTest ./matrix/mautrix-meta-sqlite.nix { };
-  mattermost = handleTest ./mattermost { };
   mealie = handleTest ./mealie.nix { };
   mediamtx = handleTest ./mediamtx.nix { };
   mediatomb = handleTest ./mediatomb.nix { };
@@ -806,6 +801,7 @@ in
   merecat = handleTest ./merecat.nix { };
   metabase = handleTest ./metabase.nix { };
   mihomo = handleTest ./mihomo.nix { };
+  mimir = handleTest ./mimir.nix { };
   mindustry = handleTest ./mindustry.nix { };
   minecraft = handleTest ./minecraft.nix { };
   minecraft-server = handleTest ./minecraft-server.nix { };
@@ -823,7 +819,6 @@ in
   mollysocket = handleTest ./mollysocket.nix { };
   monado = handleTest ./monado.nix { };
   monetdb = handleTest ./monetdb.nix { };
-  monica = runTest ./web-apps/monica.nix;
   mongodb = runTest ./mongodb.nix;
   mongodb-ce = runTest (
     { config, ... }:
@@ -832,24 +827,25 @@ in
       defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
     }
   );
+  monica = runTest ./web-apps/monica.nix;
   moodle = runTest ./moodle.nix;
   moonraker = handleTest ./moonraker.nix { };
+  moosefs = handleTest ./moosefs.nix { };
   mopidy = handleTest ./mopidy.nix { };
   morph-browser = runTest ./morph-browser.nix;
   morty = handleTest ./morty.nix { };
   mosquitto = runTest ./mosquitto.nix;
-  moosefs = handleTest ./moosefs.nix { };
   movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = handleTest ./mtp.nix { };
   multipass = handleTest ./multipass.nix { };
   mumble = runTest ./mumble.nix;
+  munin = handleTest ./munin.nix { };
   # Fails on aarch64-linux at the PDF creation step - need to debug this on an
   # aarch64 machine..
   musescore = handleTestOn [ "x86_64-linux" ] ./musescore.nix { };
   music-assistant = runTest ./music-assistant.nix;
-  munin = handleTest ./munin.nix { };
   mutableUsers = handleTest ./mutable-users.nix { };
   mycelium = handleTest ./mycelium { };
   mympd = handleTest ./mympd.nix { };
@@ -861,7 +857,6 @@ in
   nagios = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix { };
   nar-serve = handleTest ./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;
@@ -870,6 +865,7 @@ in
     withFirewall = false;
     nftables = true;
   };
+  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   nats = handleTest ./nats.nix { };
   navidrome = handleTest ./navidrome.nix { };
   nbd = handleTest ./nbd.nix { };
@@ -880,19 +876,17 @@ in
     defaults.services.ncps.cache.dataPath = "/path/to/ncps";
   };
   ndppd = handleTest ./ndppd.nix { };
-  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nebula = handleTest ./nebula.nix { };
-  netbird = handleTest ./netbird.nix { };
-  nimdow = handleTest ./nimdow.nix { };
   neo4j = handleTest ./neo4j.nix { };
-  netdata = handleTest ./netdata.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 { };
+  netbird = handleTest ./netbird.nix { };
+  netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix { };
   netbox_3_7 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_3_7; };
   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-upgrade = handleTest ./web-apps/netbox-upgrade.nix { };
+  netdata = handleTest ./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 = handleTest ./networking-proxy.nix { };
   nextcloud = handleTest ./nextcloud { };
@@ -922,14 +916,16 @@ 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 = handleTest ./nimdow.nix { };
   nitter = handleTest ./nitter.nix { };
+  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nix-config = handleTest ./nix-config.nix { };
   nix-ld = runTest ./nix-ld.nix;
   nix-misc = handleTest ./nix/misc.nix { };
-  nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
   nix-required-mounts = runTest ./nix-required-mounts;
   nix-serve = runTest ./nix-serve.nix;
   nix-serve-ssh = handleTest ./nix-serve-ssh.nix { };
+  nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };
   nixops = handleTest ./nixops/default.nix { };
   nixos-generate-config = handleTest ./nixos-generate-config.nix { };
   nixos-rebuild-install-bootloader = handleTestOn [
@@ -974,9 +970,15 @@ in
   nvmetcfg = handleTest ./nvmetcfg.nix { };
   nzbget = handleTest ./nzbget.nix { };
   nzbhydra2 = handleTest ./nzbhydra2.nix { };
-  ocis = handleTest ./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 = handleTest ./ocis.nix { };
+  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
+  octoprint = handleTest ./octoprint.nix { };
+  oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
+  odoo = handleTest ./odoo.nix { };
+  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
+  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
   oh-my-zsh = handleTest ./oh-my-zsh.nix { };
   olivetin = runTest ./olivetin.nix;
   ollama = runTest ./ollama.nix;
@@ -984,37 +986,34 @@ in
   ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
   ombi = handleTest ./ombi.nix { };
   omnom = runTest ./omnom.nix;
+  oncall = runTest ./web-apps/oncall.nix;
+  open-web-calendar = handleTest ./web-apps/open-web-calendar.nix { };
+  open-webui = runTest ./open-webui.nix;
   openarena = handleTest ./openarena.nix { };
   openbao = runTest ./openbao.nix;
   openldap = handleTest ./openldap.nix { };
-  opensearch = discoverTests (import ./opensearch.nix);
   openresty-lua = handleTest ./openresty-lua.nix { };
+  opensearch = discoverTests (import ./opensearch.nix);
   opensmtpd = handleTest ./opensmtpd.nix { };
   opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix { };
   opensnitch = handleTest ./opensnitch.nix { };
   openssh = handleTest ./openssh.nix { };
-  octoprint = handleTest ./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 = handleTest ./opentabletdriver.nix { };
   opentelemetry-collector = handleTest ./opentelemetry-collector.nix { };
-  open-web-calendar = handleTest ./web-apps/open-web-calendar.nix { };
-  ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
-  orthanc = runTest ./orthanc.nix;
-  owncast = handleTest ./owncast.nix { };
-  outline = handleTest ./outline.nix { };
-  i18n = runTest ./i18n.nix;
-  image-contents = handleTest ./image-contents.nix { };
   openvscode-server = handleTest ./openvscode-server.nix { };
-  open-webui = runTest ./open-webui.nix;
   openvswitch = runTest ./openvswitch.nix;
   orangefs = handleTest ./orangefs.nix { };
+  orthanc = runTest ./orthanc.nix;
   os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { };
   osquery = handleTestOn [ "x86_64-linux" ] ./osquery.nix { };
   osrm-backend = handleTest ./osrm-backend.nix { };
+  outline = handleTest ./outline.nix { };
   overlayfs = handleTest ./overlayfs.nix { };
+  owncast = handleTest ./owncast.nix { };
   pacemaker = handleTest ./pacemaker.nix { };
   packagekit = handleTest ./packagekit.nix { };
   pam-file-contents = handleTest ./pam/pam-file-contents.nix { };
@@ -1022,15 +1021,15 @@ in
   pam-u2f = handleTest ./pam/pam-u2f.nix { };
   pam-ussh = handleTest ./pam/pam-ussh.nix { };
   pam-zfs-key = handleTest ./pam/zfs-key.nix { };
-  paretosecurity = runTest ./paretosecurity.nix;
-  pass-secret-service = handleTest ./pass-secret-service.nix { };
-  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pantalaimon = handleTest ./matrix/pantalaimon.nix { };
   pantheon = handleTest ./pantheon.nix { };
   pantheon-wayland = handleTest ./pantheon-wayland.nix { };
   paperless = handleTest ./paperless.nix { };
+  paretosecurity = runTest ./paretosecurity.nix;
   parsedmarc = handleTest ./parsedmarc { };
+  pass-secret-service = handleTest ./pass-secret-service.nix { };
   password-option-override-ordering = handleTest ./password-option-override-ordering.nix { };
+  patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
   pdns-recursor = runTest ./pdns-recursor.nix;
   pds = handleTest ./pds.nix { };
   peerflix = handleTest ./peerflix.nix { };
@@ -1041,8 +1040,8 @@ in
   pgbackrest = import ./pgbackrest { inherit runTest; };
   pgbouncer = handleTest ./pgbouncer.nix { };
   pghero = runTest ./pghero.nix;
-  pgweb = runTest ./pgweb.nix;
   pgmanage = handleTest ./pgmanage.nix { };
+  pgweb = runTest ./pgweb.nix;
   phosh = handleTest ./phosh.nix { };
   photonvision = handleTest ./photonvision.nix { };
   photoprism = handleTest ./photoprism.nix { };
@@ -1070,11 +1069,12 @@ in
   pict-rs = handleTest ./pict-rs.nix { };
   pingvin-share = handleTest ./pingvin-share.nix { };
   pinnwand = runTest ./pinnwand.nix;
+  pixelfed = import ./web-apps/pixelfed { inherit runTestOn; };
   plantuml-server = handleTest ./plantuml-server.nix { };
   plasma-bigscreen = handleTest ./plasma-bigscreen.nix { };
   plasma5 = handleTest ./plasma5.nix { };
-  plasma6 = handleTest ./plasma6.nix { };
   plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix { };
+  plasma6 = handleTest ./plasma6.nix { };
   plausible = handleTest ./plausible.nix { };
   playwright-python = handleTest ./playwright-python.nix { };
   please = handleTest ./please.nix { };
@@ -1095,39 +1095,39 @@ in
   postfix-raise-smtpd-tls-security-level =
     handleTest ./postfix-raise-smtpd-tls-security-level.nix
       { };
-  postfixadmin = handleTest ./postfixadmin.nix { };
   postfix-tlspol = runTest ./postfix-tlspol.nix;
+  postfixadmin = handleTest ./postfixadmin.nix { };
   postgres-websockets = runTest ./postgres-websockets.nix;
   postgresql = handleTest ./postgresql { };
   postgrest = runTest ./postgrest.nix;
+  power-profiles-daemon = handleTest ./power-profiles-daemon.nix { };
   powerdns = handleTest ./powerdns.nix { };
   powerdns-admin = handleTest ./powerdns-admin.nix { };
-  power-profiles-daemon = handleTest ./power-profiles-daemon.nix { };
   pppd = handleTest ./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;
+  };
   private-gpt = handleTest ./private-gpt.nix { };
   privatebin = runTest ./privatebin.nix;
   privoxy = handleTest ./privoxy.nix { };
@@ -1135,19 +1135,20 @@ in
   prometheus-exporters = handleTest ./prometheus-exporters.nix { };
   prosody = handleTest ./xmpp/prosody.nix { };
   prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { };
-  proxy = handleTest ./proxy.nix { };
   prowlarr = handleTest ./prowlarr.nix { };
+  proxy = handleTest ./proxy.nix { };
   pt2-clone = handleTest ./pt2-clone.nix { };
-  pykms = handleTest ./pykms.nix { };
   public-inbox = handleTest ./public-inbox.nix { };
   pufferpanel = handleTest ./pufferpanel.nix { };
   pulseaudio = discoverTests (import ./pulseaudio.nix);
+  pykms = handleTest ./pykms.nix { };
+  pyload = handleTest ./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 = handleTest ./qownnotes.nix { };
@@ -1164,8 +1165,8 @@ in
   rasdaemon = handleTest ./rasdaemon.nix { };
   rathole = runTest ./rathole.nix;
   readarr = handleTest ./readarr.nix { };
-  realm = handleTest ./realm.nix { };
   readeck = runTest ./readeck.nix;
+  realm = handleTest ./realm.nix { };
   rebuilderd = runTest ./rebuilderd.nix;
   redis = handleTest ./redis.nix { };
   redlib = handleTest ./redlib.nix { };
@@ -1174,16 +1175,16 @@ in
   replace-dependencies = handleTest ./replace-dependencies { };
   reposilite = runTest ./reposilite.nix;
   restartByActivationScript = handleTest ./restart-by-activation-script.nix { };
-  restic-rest-server = handleTest ./restic-rest-server.nix { };
   restic = handleTest ./restic.nix { };
+  restic-rest-server = handleTest ./restic-rest-server.nix { };
   retroarch = handleTest ./retroarch.nix { };
   rke2 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./rke2 { };
   rkvm = handleTest ./rkvm { };
   rmfakecloud = runTest ./rmfakecloud.nix;
   robustirc-bridge = handleTest ./robustirc-bridge.nix { };
+  rosenpass = handleTest ./rosenpass.nix { };
   roundcube = handleTest ./roundcube.nix { };
   routinator = handleTest ./routinator.nix { };
-  rosenpass = handleTest ./rosenpass.nix { };
   rshim = handleTest ./rshim.nix { };
   rspamd = handleTest ./rspamd.nix { };
   rspamd-trainer = handleTest ./rspamd-trainer.nix { };
@@ -1216,12 +1217,12 @@ in
   send = runTest ./send.nix;
   service-runner = handleTest ./service-runner.nix { };
   servo = runTest ./servo.nix;
-  shadps4 = runTest ./shadps4.nix;
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = handleTest ./sfxr-qt.nix { };
   sgt-puzzles = handleTest ./sgt-puzzles.nix { };
   shadow = handleTest ./shadow.nix { };
   shadowsocks = handleTest ./shadowsocks { };
+  shadps4 = runTest ./shadps4.nix;
   shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };
   shiori = handleTest ./shiori.nix { };
   signal-desktop = runTest ./signal-desktop.nix;
@@ -1230,11 +1231,11 @@ in
   sing-box = handleTest ./sing-box.nix { };
   slimserver = handleTest ./slimserver.nix { };
   slurm = handleTest ./slurm.nix { };
-  snmpd = handleTest ./snmpd.nix { };
   smokeping = handleTest ./smokeping.nix { };
   snapcast = runTest ./snapcast.nix;
   snapper = handleTest ./snapper.nix { };
   snipe-it = runTest ./web-apps/snipe-it.nix;
+  snmpd = handleTest ./snmpd.nix { };
   soapui = handleTest ./soapui.nix { };
   soft-serve = handleTest ./soft-serve.nix { };
   sogo = handleTest ./sogo.nix { };
@@ -1248,14 +1249,15 @@ in
   spiped = runTest ./spiped.nix;
   sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix { };
   squid = handleTest ./squid.nix { };
-  sslh = handleTest ./sslh.nix { };
   ssh-agent-auth = handleTest ./ssh-agent-auth.nix { };
   ssh-audit = handleTest ./ssh-audit.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 = handleTest ./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 { };
@@ -1285,10 +1287,10 @@ in
   sx = handleTest ./sx.nix { };
   sympa = handleTest ./sympa.nix { };
   syncthing = handleTest ./syncthing.nix { };
-  syncthing-no-settings = handleTest ./syncthing-no-settings.nix { };
+  syncthing-folders = runTest ./syncthing-folders.nix;
   syncthing-init = handleTest ./syncthing-init.nix { };
   syncthing-many-devices = handleTest ./syncthing-many-devices.nix { };
-  syncthing-folders = runTest ./syncthing-folders.nix;
+  syncthing-no-settings = handleTest ./syncthing-no-settings.nix { };
   syncthing-relay = handleTest ./syncthing-relay.nix { };
   sysinit-reactivation = runTest ./sysinit-reactivation.nix;
   systemd = handleTest ./systemd.nix { };
@@ -1298,37 +1300,39 @@ in
   systemd-bpf = handleTest ./systemd-bpf.nix { };
   systemd-confinement = handleTest ./systemd-confinement { };
   systemd-coredump = handleTest ./systemd-coredump.nix { };
-  systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix { };
   systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix { };
+  systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix { };
   systemd-escaping = handleTest ./systemd-escaping.nix { };
+  systemd-homed = handleTest ./systemd-homed.nix { };
   systemd-initrd-bridge = handleTest ./systemd-initrd-bridge.nix { };
   systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix { };
   systemd-initrd-credentials = handleTest ./systemd-initrd-credentials.nix { };
-  systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix { };
-  systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix { };
   systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {
     systemdStage1 = true;
   };
+  systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix { };
+  systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix { };
   systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix { };
   systemd-initrd-luks-tpm2 = handleTest ./systemd-initrd-luks-tpm2.nix { };
   systemd-initrd-luks-unl0kr = handleTest ./systemd-initrd-luks-unl0kr.nix { };
   systemd-initrd-modprobe = handleTest ./systemd-initrd-modprobe.nix { };
-  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
-  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
-  systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix { };
-  systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix { };
   systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix { };
-  systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix { };
   systemd-initrd-networkd-openvpn = handleTestOn [
     "x86_64-linux"
     "i686-linux"
   ] ./initrd-network-openvpn { systemdStage1 = true; };
+  systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix { };
+  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
+  systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
+  systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix { };
+  systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix { };
   systemd-initrd-vlan = handleTest ./systemd-initrd-vlan.nix { };
   systemd-journal = handleTest ./systemd-journal.nix { };
   systemd-journal-gateway = handleTest ./systemd-journal-gateway.nix { };
   systemd-journal-upload = handleTest ./systemd-journal-upload.nix { };
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = handleTest ./systemd-machinectl.nix { };
+  systemd-misc = handleTest ./systemd-misc.nix { };
   systemd-networkd = handleTest ./systemd-networkd.nix { };
   systemd-networkd-bridge = handleTest ./systemd-networkd-bridge.nix { };
   systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix { };
@@ -1346,36 +1350,33 @@ in
   systemd-portabled = handleTest ./systemd-portabled.nix { };
   systemd-repart = handleTest ./systemd-repart.nix { };
   systemd-resolved = handleTest ./systemd-resolved.nix { };
-  systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix;
   systemd-shutdown = handleTest ./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 = handleTest ./systemd-timesyncd.nix { };
   systemd-timesyncd-nscd-dnssec = handleTest ./systemd-timesyncd-nscd-dnssec.nix { };
   systemd-user-linger = handleTest ./systemd-user-linger.nix { };
   systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix { };
-  systemd-misc = handleTest ./systemd-misc.nix { };
   systemd-userdbd = handleTest ./systemd-userdbd.nix { };
-  systemd-homed = handleTest ./systemd-homed.nix { };
   systemtap = handleTest ./systemtap.nix { };
-  startx = import ./startx.nix { inherit pkgs runTest; };
   taler = handleTest ./taler { };
   tandoor-recipes = handleTest ./tandoor-recipes.nix { };
   tandoor-recipes-script-name = handleTest ./tandoor-recipes-script-name.nix { };
   tang = handleTest ./tang.nix { };
-  taskserver = handleTest ./taskserver.nix { };
   taskchampion-sync-server = handleTest ./taskchampion-sync-server.nix { };
+  taskserver = handleTest ./taskserver.nix { };
   tayga = handleTest ./tayga.nix { };
   technitium-dns-server = handleTest ./technitium-dns-server.nix { };
   teeworlds = handleTest ./teeworlds.nix { };
   telegraf = runTest ./telegraf.nix;
   teleport = handleTest ./teleport.nix { };
   teleports = runTest ./teleports.nix;
-  thelounge = handleTest ./thelounge.nix { };
   terminal-emulators = handleTest ./terminal-emulators.nix { };
   thanos = handleTest ./thanos.nix { };
+  thelounge = handleTest ./thelounge.nix { };
   tiddlywiki = handleTest ./tiddlywiki.nix { };
   tigervnc = handleTest ./tigervnc.nix { };
   tika = runTest ./tika.nix;
@@ -1385,25 +1386,24 @@ in
   tinydns = handleTest ./tinydns.nix { };
   tinyproxy = handleTest ./tinyproxy.nix { };
   tinywl = handleTest ./tinywl.nix { };
+  tlsrpt = runTest ./tlsrpt.nix;
   tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
   tomcat = handleTest ./tomcat.nix { };
   tor = handleTest ./tor.nix { };
-  tlsrpt = runTest ./tlsrpt.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 = handleTest ./trafficserver.nix { };
   transfer-sh = handleTest ./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 = handleTest ./trezord.nix { };
   trickster = handleTest ./trickster.nix { };
   trilium-server = handleTestOn [ "x86_64-linux" ] ./trilium-server.nix { };
   tsm-client-gui = handleTest ./tsm-client-gui.nix { };
-  ttyd = handleTest ./web-servers/ttyd.nix { };
   tt-rss = handleTest ./web-apps/tt-rss.nix { };
-  txredisapi = handleTest ./txredisapi.nix { };
+  ttyd = handleTest ./web-servers/ttyd.nix { };
   tuned = runTest ./tuned.nix;
   tuptime = handleTest ./tuptime.nix { };
   turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { };
@@ -1411,6 +1411,7 @@ in
   tusd = runTest ./tusd/default.nix;
   tuxguitar = runTest ./tuxguitar.nix;
   twingate = runTest ./twingate.nix;
+  txredisapi = handleTest ./txredisapi.nix { };
   typesense = handleTest ./typesense.nix { };
   tzupdate = runTest ./tzupdate.nix;
   ucarp = handleTest ./ucarp.nix { };
@@ -1419,23 +1420,23 @@ in
   umurmur = handleTest ./umurmur.nix { };
   unbound = handleTest ./unbound.nix { };
   unifi = runTest ./unifi.nix;
-  unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = handleTest ./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 = handleTest ./uptermd.nix { };
   uptime-kuma = handleTest ./uptime-kuma.nix { };
   urn-timer = handleTest ./urn-timer.nix { };
   usbguard = handleTest ./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 = handleTest ./user-activation-scripts.nix { };
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
   user-home-mode = handleTest ./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 = handleTest ./ustreamer.nix { };
   uwsgi = handleTest ./uwsgi.nix { };
   v2ray = handleTest ./v2ray.nix { };
@@ -1471,18 +1472,18 @@ in
   watchdogd = handleTest ./watchdogd.nix { };
   webhook = runTest ./webhook.nix;
   weblate = handleTest ./web-apps/weblate.nix { };
+  wg-access-server = handleTest ./wg-access-server.nix { };
   whisparr = handleTest ./whisparr.nix { };
   whoami = runTest ./whoami.nix;
   whoogle-search = handleTest ./whoogle-search.nix { };
   wiki-js = runTest ./wiki-js.nix;
   wine = handleTest ./wine.nix { };
   wireguard = handleTest ./wireguard { };
-  wg-access-server = handleTest ./wg-access-server.nix { };
   without-nix = handleTest ./without-nix.nix { };
   wmderland = handleTest ./wmderland.nix { };
+  wordpress = runTest ./wordpress.nix;
   workout-tracker = handleTest ./workout-tracker.nix { };
   wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };
-  wordpress = runTest ./wordpress.nix;
   wrappers = handleTest ./wrappers.nix { };
   writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; };
   wstunnel = runTest ./wstunnel.nix;
@@ -1524,4 +1525,5 @@ in
   zsh-history = runTest ./zsh-history.nix;
   zwave-js = runTest ./zwave-js.nix;
   zwave-js-ui = runTest ./zwave-js-ui.nix;
+  # keep-sorted end
 }