diff --git a/clanServices/localsend/flake-module.nix b/clanServices/localsend/flake-module.nix index 71cd5752d..330a9e9ed 100644 --- a/clanServices/localsend/flake-module.nix +++ b/clanServices/localsend/flake-module.nix @@ -1,18 +1,19 @@ -{ lib, self, ... }: +{ lib, ... }: +let + module = lib.modules.importApply ./default.nix { }; +in { clan.modules = { - localsend = lib.modules.importApply ./default.nix { }; + localsend = module; }; perSystem = - { pkgs, ... }: + { ... }: { - checks = lib.optionalAttrs (pkgs.stdenv.isLinux) { - localsend = import ./tests/vm/default.nix { - inherit pkgs; - clan-core = self; - nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { }; - }; + clan.nixosTests.localsend = { + imports = [ ./tests/vm/default.nix ]; + + clan.modules."@clan/localsend" = module; }; }; } diff --git a/clanServices/localsend/tests/vm/default.nix b/clanServices/localsend/tests/vm/default.nix index f9de82499..466e436ec 100644 --- a/clanServices/localsend/tests/vm/default.nix +++ b/clanServices/localsend/tests/vm/default.nix @@ -1,51 +1,38 @@ { - pkgs, - nixosLib, - clan-core, + module, ... }: +{ + name = "localsend"; -nixosLib.runTest ( - { ... }: - { - imports = [ - clan-core.modules.nixosVmTest.clanTest - ]; + clan = { + directory = ./.; + inventory = { + machines.server = { }; - hostPkgs = pkgs; - - name = "localsend"; - - clan = { - directory = ./.; - modules."@clan/localsend" = ../../default.nix; - inventory = { - machines.server = { }; - - instances = { - localsend-test = { - module.name = "@clan/localsend"; - roles.default.machines."server".settings = { - displayName = "Test Instance"; - ipv4Addr = "192.168.56.2/24"; - }; + instances = { + localsend-test = { + module.name = "@clan/localsend"; + roles.default.machines."server".settings = { + displayName = "Test Instance"; + ipv4Addr = "192.168.56.2/24"; }; }; }; }; + }; - nodes = { - server = { }; - }; + nodes = { + server = { }; + }; - testScript = '' - start_all() + testScript = '' + start_all() - # Check that the localsend wrapper script is available - server.succeed("command -v localsend") + # Check that the localsend wrapper script is available + server.succeed("command -v localsend") - # Verify the 09-zerotier network is configured with the specified IP address - server.succeed("grep -q 'Address=192.168.56.2/24' /etc/systemd/network/09-zerotier.network") - ''; - } -) + # Verify the 09-zerotier network is configured with the specified IP address + server.succeed("grep -q 'Address=192.168.56.2/24' /etc/systemd/network/09-zerotier.network") + ''; +}