diff --git a/lib/clanTest/flake-module.nix b/lib/clanTest/flake-module.nix index 174cd8f56..39449b047 100644 --- a/lib/clanTest/flake-module.nix +++ b/lib/clanTest/flake-module.nix @@ -99,10 +99,18 @@ in machine: flip mapAttrsToList machine.clan.core.vars.generators (_name: generator: generator.runtimeInputs); + generatorScripts = + machine: + flip mapAttrsToList machine.clan.core.vars.generators (_name: generator: generator.finalScript); + generatorRuntimeInputs = unique ( flatten (flip mapAttrsToList config.nodes (_machineName: machine: inputsForMachine machine)) ); + allGeneratorScripts = unique ( + flatten (flip mapAttrsToList config.nodes (_machineName: machine: generatorScripts machine)) + ); + vars-check = hostPkgs.runCommand "update-vars-check-${testName}" { @@ -114,16 +122,19 @@ in hostPkgs.bubblewrap ]; closureInfo = hostPkgs.closureInfo { - rootPaths = generatorRuntimeInputs ++ [ - hostPkgs.bash - hostPkgs.coreutils - hostPkgs.jq.dev - hostPkgs.stdenv - hostPkgs.stdenvNoCC - hostPkgs.shellcheck-minimal - hostPkgs.age - hostPkgs.sops - ]; + rootPaths = + generatorRuntimeInputs + ++ allGeneratorScripts + ++ [ + hostPkgs.bash + hostPkgs.coreutils + hostPkgs.jq.dev + hostPkgs.stdenv + hostPkgs.stdenvNoCC + hostPkgs.shellcheck-minimal + hostPkgs.age + hostPkgs.sops + ]; }; } ''