diff --git a/README.md b/README.md index 5f235a2..c4248b9 100644 --- a/README.md +++ b/README.md @@ -892,15 +892,17 @@ want to test for. We can compose tests in the following Nix expression: ```nix -{ pkgs ? import { inherit system; } +{ nixpkgs ? , system ? builtins.currentSystem , processManagers ? [ "supervisord" "sysvinit" "systemd" "docker" "disnix" "s6-rc" ] , profiles ? [ "privileged" "unprivileged" ] }: let + pkgs = import nixpkgs { inherit system; }; + testService = import ../../nixproc/test-driver/universal.nix { - inherit system; + inherit nixpkgs system; }; in { diff --git a/release.nix b/release.nix index 7b43e8f..3b28bc8 100644 --- a/release.nix +++ b/release.nix @@ -18,7 +18,7 @@ rec { }; services = import ./tests/services { - inherit pkgs system; + inherit nixpkgs system; }; multi-process-images = import ./tests/multi-process-images.nix { diff --git a/tests/services/default.nix b/tests/services/default.nix index 545fd66..ff088bb 100644 --- a/tests/services/default.nix +++ b/tests/services/default.nix @@ -1,12 +1,14 @@ -{ pkgs ? import { inherit system; } +{ nixpkgs ? , system ? builtins.currentSystem , processManagers ? [ "supervisord" "sysvinit" "systemd" "docker" "disnix" "s6-rc" ] , profiles ? [ "privileged" "unprivileged" ] }: let + pkgs = import nixpkgs { inherit system; }; + testService = import ../../nixproc/test-driver/universal.nix { - inherit system; + inherit nixpkgs system; }; in {