diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 78bc07a59a37..cd61eae0c862 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -914,7 +914,7 @@ in nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix; nitter = handleTest ./nitter.nix { }; nix-config = handleTest ./nix-config.nix { }; - nix-ld = handleTest ./nix-ld.nix { }; + nix-ld = runTest ./nix-ld.nix; nix-misc = handleTest ./nix/misc.nix { }; nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; }; nix-required-mounts = runTest ./nix-required-mounts; diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix index 9a1f7110eeea..0b89b99a33b5 100644 --- a/nixos/tests/nix-ld.nix +++ b/nixos/tests/nix-ld.nix @@ -1,14 +1,12 @@ +{ ... }: { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: -let - inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; - shared = + name = "nix-ld"; + + nodes.machine = { config, pkgs, ... }: { programs.nix-ld.enable = true; + environment.systemPackages = [ (pkgs.runCommand "patched-hello" { } '' install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello @@ -16,14 +14,9 @@ let '') ]; }; -in -{ - nix-ld = makeTest { - name = "nix-ld"; - nodes.machine = shared; - testScript = '' - start_all() - machine.succeed("hello") - ''; - }; + + testScript = '' + start_all() + machine.succeed("hello") + ''; }