chore(treewide): clean up tests layout, fix package buckets, add missing maintainers

74k1 · 74k1 · commit 36bf11ca3976 · 2026-06-18T22:06:12.000+02:00
diff --git a/flake.nix b/flake.nix
@@ -36,7 +36,7 @@
           ./modules/flake/checks.nix
         ];
 
-        debug = true;
+        debug = false;
 
         perSystem =
           {
diff --git a/modules/flake/checks.nix b/modules/flake/checks.nix
@@ -160,12 +160,7 @@
     in
     {
       checks = lib.optionalAttrs enabled (
-        nixosChecks
-        // homeManagerChecks
-        // lib.optionalAttrs (nixosChecks ? module-nixos-services-grimmory-setup) {
-          # Backwards-compatible name from the old ad-hoc Grimmory VM check.
-          grimmory-nixos = nixosChecks.module-nixos-services-grimmory-setup;
-        }
+        nixosChecks // homeManagerChecks
       );
     };
 }
diff --git a/modules/home-manager/programs/waterfox/default.nix b/modules/home-manager/programs/waterfox/default.nix
@@ -15,6 +15,8 @@ let
   mkFirefoxModule = import "${inputs.home-manager}/modules/programs/firefox/mkFirefoxModule.nix";
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   imports = [
     (mkFirefoxModule {
       inherit modulePath;
diff --git a/modules/nixos/services/brscan-skey/default.nix b/modules/nixos/services/brscan-skey/default.nix
@@ -29,6 +29,8 @@ let
   '';
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   options.services.brscan-skey = {
     enable = mkEnableOption "Brother scan-key-tool daemon";
 
diff --git a/modules/nixos/services/fourget/default.nix b/modules/nixos/services/fourget/default.nix
@@ -181,6 +181,8 @@ let
       "${pkgs.path}/nixos/modules/services/web-servers/nginx/vhost-options.nix";
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   options.services.fourget = {
     enable = mkEnableOption "4get";
 
diff --git a/modules/nixos/services/grimmory/default.nix b/modules/nixos/services/grimmory/default.nix
@@ -98,6 +98,8 @@ let
   '';
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   options.services.grimmory = {
     enable = mkEnableOption "Grimmory, a self-hosted digital library";
 
diff --git a/modules/nixos/services/mc-gate/default.nix b/modules/nixos/services/mc-gate/default.nix
@@ -17,6 +17,8 @@ let
   '';
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   options.services.mc-gate = {
     enable = lib.mkEnableOption "Gate Service";
     config = lib.mkOption {
diff --git a/modules/nixos/services/multi-scrobbler/default.nix b/modules/nixos/services/multi-scrobbler/default.nix
@@ -223,6 +223,8 @@ let
   '';
 in
 {
+  meta.maintainers = [ "74k1" ];
+
   options.services.multi-scrobbler = {
     enable = lib.mkEnableOption "multi-scrobbler service";
 
diff --git a/modules/tests/README.md b/modules/tests/README.md
@@ -2,17 +2,19 @@
 
 Tests are discovered recursively from:
 
-- `modules/tests/nixos/<module-path>/<test>.nix`
+- `modules/tests/nixos/<category>/<module-path>/<test>.nix`
 - `modules/tests/home-manager/<module-path>/<test>.nix`
 
-The `<module-path>` mirrors the exported module key, for example
-`modules/tests/nixos/services/grimmory/setup.nix` tests
+For NixOS, `<category>` is either `services` (for `services.*` module tests)
+or `pkgs` (for package-level integration tests that don't correspond to a
+module). The `<module-path>` mirrors the exported module key, for example
+`modules/tests/nixos/services/grimmory/basic.nix` tests
 `nixosModules."services/grimmory"`.
 
 Generated check names use the path:
 
 ```sh
-nix build .#checks.x86_64-linux.module-nixos-services-grimmory-setup
+nix build .#checks.x86_64-linux.module-nixos-services-grimmory-basic
 nix build .#checks.x86_64-linux.module-home-manager-programs-waterfox-basic
 ```
 
diff --git a/modules/tests/nixos/pkgs/waterfox/basic.nix b/modules/tests/nixos/pkgs/waterfox/basic.nix
diff --git a/modules/tests/nixos/services/grimmory/basic.nix b/modules/tests/nixos/services/grimmory/basic.nix
diff --git a/pkgs/br/brimcap/default.nix b/pkgs/br/brimcap/default.nix
diff --git a/pkgs/fo/fogpanther/default.nix b/pkgs/fo/fogpanther/default.nix
@@ -187,5 +187,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "fogpanther";
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = [ "74k1" ];
   };
 })
diff --git a/pkgs/fo/fourget/default.nix b/pkgs/fo/fourget/default.nix
@@ -31,5 +31,6 @@ stdenvNoCC.mkDerivation {
     license = licenses.agpl3Plus;
     mainProgram = "index.php";
     platforms = platforms.unix;
+    maintainers = [ "74k1" ];
   };
 }
diff --git a/pkgs/go/godap/default.nix b/pkgs/go/godap/default.nix
@@ -14,4 +14,11 @@ buildGoModule rec {
     hash = "sha256-mvzVOuFZABGE7DH3AkhOXvsvSZzgpW0aJUdXW6N6hf0=";
   };
   vendorHash = "sha256-NiNhKbf5bU1SQXFTZCp8/yNPc89ss8go6M2867ziqq4=";
+
+  meta = with lib; {
+    description = "A lightweight LDAP directory server";
+    homepage = "https://github.com/Macmod/godap";
+    license = licenses.mit;
+    maintainers = [ "74k1" ];
+  };
 }
diff --git a/pkgs/id/idahelper/default.nix b/pkgs/id/idahelper/default.nix
@@ -30,5 +30,6 @@ python3Packages.buildPythonPackage rec {
     description = "Standard library for IDA Pro plugins";
     homepage = "https://github.com/yoavst/idahelper";
     license = licenses.mit;
+    maintainers = [ "74k1" ];
   };
 }
diff --git a/pkgs/ke/keeper-sh/default.nix b/pkgs/ke/keeper-sh/default.nix
diff --git a/pkgs/ke/keeper-sh/update.sh b/pkgs/ke/keeper-sh/update.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 root="${UPDATE_NIXPKGS_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}"
-package_file="$root/pkgs/pl/keeper-sh/default.nix"
+package_file="$root/pkgs/ke/keeper-sh/default.nix"
 api="https://api.github.com/repos/ridafkih/keeper.sh/releases/latest"
 
 release="$(curl -fsSL "$api")"
diff --git a/pkgs/lo/logria/default.nix b/pkgs/lo/logria/default.nix
diff --git a/pkgs/mt/mtkclient/default.nix b/pkgs/mt/mtkclient/default.nix
@@ -57,5 +57,6 @@ python3.pkgs.buildPythonPackage rec {
     description = "MTK reverse engineering and flash tool";
     homepage = "https://github.com/bkerler/mtkclient";
     license = lib.licenses.gpl3Only;
+    maintainers = [ "74k1" ];
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`./modules/flake/checks.nix`
`37`	`37`	`];`
`38`	`38`
`39`		`- debug = true;`
	`39`	`+ debug = false;`
`40`	`40`
`41`	`41`	`perSystem =`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -160,12 +160,7 @@`
`160`	`160`	`in`
`161`	`161`	`{`
`162`	`162`	`checks = lib.optionalAttrs enabled (`
`163`		`- nixosChecks`
`164`		`- // homeManagerChecks`
`165`		`- // lib.optionalAttrs (nixosChecks ? module-nixos-services-grimmory-setup) {`
`166`		`- # Backwards-compatible name from the old ad-hoc Grimmory VM check.`
`167`		`- grimmory-nixos = nixosChecks.module-nixos-services-grimmory-setup;`
`168`		`- }`
	`163`	`+ nixosChecks // homeManagerChecks`
`169`	`164`	`);`
`170`	`165`	`};`
`171`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ let`
`15`	`15`	`mkFirefoxModule = import "${inputs.home-manager}/modules/programs/firefox/mkFirefoxModule.nix";`
`16`	`16`	`in`
`17`	`17`	`{`
	`18`	`+ meta.maintainers = [ "74k1" ];`
	`19`	`+`
`18`	`20`	`imports = [`
`19`	`21`	`(mkFirefoxModule {`
`20`	`22`	`inherit modulePath;`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ let`
`29`	`29`	`'';`
`30`	`30`	`in`
`31`	`31`	`{`
	`32`	`+ meta.maintainers = [ "74k1" ];`
	`33`	`+`
`32`	`34`	`options.services.brscan-skey = {`
`33`	`35`	`enable = mkEnableOption "Brother scan-key-tool daemon";`
`34`	`36`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,8 @@ let`
`181`	`181`	`"${pkgs.path}/nixos/modules/services/web-servers/nginx/vhost-options.nix";`
`182`	`182`	`in`
`183`	`183`	`{`
	`184`	`+ meta.maintainers = [ "74k1" ];`
	`185`	`+`
`184`	`186`	`options.services.fourget = {`
`185`	`187`	`enable = mkEnableOption "4get";`
`186`	`188`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ let`
`98`	`98`	`'';`
`99`	`99`	`in`
`100`	`100`	`{`
	`101`	`+ meta.maintainers = [ "74k1" ];`
	`102`	`+`
`101`	`103`	`options.services.grimmory = {`
`102`	`104`	`enable = mkEnableOption "Grimmory, a self-hosted digital library";`
`103`	`105`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ let`
`17`	`17`	`'';`
`18`	`18`	`in`
`19`	`19`	`{`
	`20`	`+ meta.maintainers = [ "74k1" ];`
	`21`	`+`
`20`	`22`	`options.services.mc-gate = {`
`21`	`23`	`enable = lib.mkEnableOption "Gate Service";`
`22`	`24`	`config = lib.mkOption {`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ let`
`223`	`223`	`'';`
`224`	`224`	`in`
`225`	`225`	`{`
	`226`	`+ meta.maintainers = [ "74k1" ];`
	`227`	`+`
`226`	`228`	`options.services.multi-scrobbler = {`
`227`	`229`	`enable = lib.mkEnableOption "multi-scrobbler service";`
`228`	`230`