diff --git a/nixproc/backends/disnix/test-module/default.nix b/nixproc/backends/disnix/test-module/default.nix index fe14c2a..5bb287d 100644 --- a/nixproc/backends/disnix/test-module/default.nix +++ b/nixproc/backends/disnix/test-module/default.nix @@ -11,6 +11,8 @@ let } // profileSettings.params); in { + inherit (profileSettings) params; + nixosModules = []; systemPackages = [ diff --git a/nixproc/backends/docker/test-module/default.nix b/nixproc/backends/docker/test-module/default.nix index 84c27ac..3c3a5f5 100644 --- a/nixproc/backends/docker/test-module/default.nix +++ b/nixproc/backends/docker/test-module/default.nix @@ -26,6 +26,8 @@ let } // profileSettingsSystem.params); in { + inherit (profileSettingsSystem) params; + nixosModules = []; systemPackages = [ diff --git a/nixproc/backends/s6-rc/test-module/default.nix b/nixproc/backends/s6-rc/test-module/default.nix index 8dba800..ed268cc 100644 --- a/nixproc/backends/s6-rc/test-module/default.nix +++ b/nixproc/backends/s6-rc/test-module/default.nix @@ -15,6 +15,8 @@ let } // profileSettings.params); in { + inherit (profileSettings) params; + nixosModules = []; systemPackages = [ diff --git a/nixproc/backends/supervisord/test-module/default.nix b/nixproc/backends/supervisord/test-module/default.nix index 1b92edd..f32c05a 100644 --- a/nixproc/backends/supervisord/test-module/default.nix +++ b/nixproc/backends/supervisord/test-module/default.nix @@ -15,6 +15,8 @@ let } // profileSettings.params); in { + inherit (profileSettings) params; + nixosModules = []; systemPackages = [ diff --git a/nixproc/backends/systemd/test-module/default.nix b/nixproc/backends/systemd/test-module/default.nix index 3e42634..66a340e 100644 --- a/nixproc/backends/systemd/test-module/default.nix +++ b/nixproc/backends/systemd/test-module/default.nix @@ -14,6 +14,8 @@ let else "SYSTEMD_TARGET_DIR=/etc/systemd-mutable/system"; in { + inherit (profileSettings) params; + nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix; systemPackages = [ diff --git a/nixproc/backends/sysvinit/test-module/default.nix b/nixproc/backends/sysvinit/test-module/default.nix index 4b0e681..b937a95 100644 --- a/nixproc/backends/sysvinit/test-module/default.nix +++ b/nixproc/backends/sysvinit/test-module/default.nix @@ -10,6 +10,8 @@ let } // profileSettings.params); in { + inherit (profileSettings) params; + nixosModules = []; systemPackages = [ diff --git a/nixproc/test-driver/agnostic.nix b/nixproc/test-driver/agnostic.nix index 6ad0f3b..86c5b9f 100644 --- a/nixproc/test-driver/agnostic.nix +++ b/nixproc/test-driver/agnostic.nix @@ -24,7 +24,7 @@ let processesArgs = builtins.intersectAttrs processesFormalArgs ({ inherit pkgs system processManager; - } // profileSettings.params // extraParams); + } // processManagerSettings.params // extraParams); processes = processesFun processesArgs; in @@ -60,14 +60,14 @@ let '' + processManagerSettings.deployProcessManager + processManagerSettings.deploySystem - + pkgs.lib.optionalString (initialTests != null) (initialTests profileSettings.params) + + pkgs.lib.optionalString (initialTests != null) (initialTests processManagerSettings.params) # Execute readiness check for all process instances + pkgs.lib.concatMapStrings (instanceName: let instance = builtins.getAttr instanceName processes; in - readiness ({ inherit instanceName instance; } // profileSettings.params) + readiness ({ inherit instanceName instance; } // processManagerSettings.params) ) (builtins.attrNames processes) # Execute tests for all process instances @@ -75,7 +75,7 @@ let let instance = builtins.getAttr instanceName processes; in - tests ({ inherit instanceName instance; } // profileSettings.params) + tests ({ inherit instanceName instance; } // processManagerSettings.params) ) (builtins.attrNames processes); }; in