borgbackup: migrate to clan.nixosTests module

clanServices/borgbackup/flake-module.nix

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

clanServices/borgbackup/tests/vm/default.nix

@@ -1,24 +1,14 @@
 {
+  module,
   pkgs,
-  nixosLib,
-  clan-core,
   ...
 }:
-nixosLib.runTest (
+{
-  { ... }:
-  {
-    imports = [
-      clan-core.modules.nixosVmTest.clanTest
-    ];
-
-    hostPkgs = pkgs;
-
   name = "borgbackup";
 
   clan = {
     directory = ./.;
     test.useContainers = true;
-      modules."@clan/borgbackup" = ../../default.nix;
     inventory = {
 
       machines.clientone = { };
@@ -45,7 +35,12 @@ nixosLib.runTest (
     };
 
     clientone =
-        { config, pkgs, ... }:
+      {
+        config,
+        pkgs,
+        clan-core,
+        ...
+      }:
       let
         dependencies = [
           clan-core
@@ -114,5 +109,4 @@ nixosLib.runTest (
     clientone.succeed(f"NAME='serverone::borg@serverone:.::{backup_id}' borgbackup-restore >&2")
     assert clientone.succeed("cat /var/test-backups/somefile").strip() == "testing", "restore failed"
   '';
-  }
+}
-)