packages: migrate to clan.nixosTests module

clanServices/packages/flake-module.nix

@@ -1,18 +1,19 @@
-{ lib, self, ... }:
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
 {
   clan.modules = {
-    packages = lib.modules.importApply ./default.nix { };
+    packages = module;
   };
 
   perSystem =
-    { pkgs, ... }:
+    { ... }:
     {
-      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+      clan.nixosTests.packages = {
-        packages = import ./tests/vm/default.nix {
+        imports = [ ./tests/vm/default.nix ];
-          inherit pkgs;
+
-          clan-core = self;
+        clan.modules."@clan/packages" = module;
-          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
-        };
       };
     };
 

clanServices/packages/tests/vm/default.nix

@@ -1,24 +1,12 @@
 {
-  pkgs,
+  module,
-  nixosLib,
-  clan-core,
   ...
 }:
-
+{
-nixosLib.runTest (
-  { ... }:
-  {
-    imports = [
-      clan-core.modules.nixosVmTest.clanTest
-    ];
-
-    hostPkgs = pkgs;
-
   name = "packages";
 
   clan = {
     directory = ./.;
-      modules."@clan/packages" = ../../default.nix;
     inventory = {
       machines.server = { };
 
@@ -37,5 +25,4 @@ nixosLib.runTest (
     start_all()
     server.succeed("cbonsai")
   '';
-  }
+}
-)