diff --git a/release.nix b/release.nix index bc7b0fa..87def61 100644 --- a/release.nix +++ b/release.nix @@ -10,6 +10,6 @@ let in { tests = import ./tests { - inherit pkgs system nix-processmgmt processManagers profiles; + inherit nixpkgs system nix-processmgmt processManagers profiles; }; } diff --git a/tests/default.nix b/tests/default.nix index f960c05..3dd3aa8 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import { inherit system; } +{ nixpkgs ? , system ? builtins.currentSystem , processManagers ? [ "supervisord" "sysvinit" "systemd" "docker" "disnix" "s6-rc" ] , profiles ? [ "privileged" "unprivileged" ] @@ -6,8 +6,10 @@ }: let + pkgs = import nixpkgs { inherit system; }; + testService = import "${nix-processmgmt}/nixproc/test-driver/universal.nix" { - inherit system; + inherit nixpkgs system; }; in { diff --git a/tests/docker/default.nix b/tests/docker/default.nix index e68dd08..f0446d5 100644 --- a/tests/docker/default.nix +++ b/tests/docker/default.nix @@ -19,7 +19,8 @@ testService { ) ''; - inherit processManagers; + # It is useless to run Docker in Docker + processManagers = builtins.filter (processManager: processManager != "docker") processManagers; # There's an experimental rootless feature for Docker, but a hassle to setup. As a result, we disable unprivileged mode profiles = builtins.filter (profile: profile == "privileged") profiles;