diff --git a/nix/tests/container-test/default.nix b/nix/tests/container-test/default.nix index 4e5f590..a70902d 100644 --- a/nix/tests/container-test/default.nix +++ b/nix/tests/container-test/default.nix @@ -54,7 +54,7 @@ let machine.copy_from_host("${image.tarball}", "/image") machine.succeed("mkdir -p /test") machine.copy_from_host("${image.tester}", "/test/Dockerfile") - machine.copy_from_host("${nix-installer-static}", "/test/nix-installer") + machine.copy_from_host("${lix-installer-static}", "/test/lix-installer") machine.copy_from_host("${binaryTarball.${system}}", "/test/binary-tarball") machine.succeed("${containerTool} import /image default") machine.succeed("${containerTool} build -t test /test") diff --git a/nix/tests/container-test/default/Dockerfile b/nix/tests/container-test/default/Dockerfile index cf661d6..dcd2127 100644 --- a/nix/tests/container-test/default/Dockerfile +++ b/nix/tests/container-test/default/Dockerfile @@ -3,7 +3,7 @@ COPY lix-installer /lix-installer RUN chmod +x /lix-installer COPY binary-tarball /binary-tarball RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz -RUN /nix-installer/bin/lix-installer install linux --logger pretty --log-directive lix_installer=debug --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --no-confirm -vvv +RUN /lix-installer/bin/lix-installer install linux --logger pretty --log-directive lix_installer=debug --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --no-confirm -vvv ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin" RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }' -RUN /nix/lix-installer uninstall --no-confirm \ No newline at end of file +RUN /nix/nix-installer uninstall --no-confirm diff --git a/nix/tests/vm-test/default.nix b/nix/tests/vm-test/default.nix index 5afe444..10e410b 100644 --- a/nix/tests/vm-test/default.nix +++ b/nix/tests/vm-test/default.nix @@ -515,7 +515,7 @@ let uninstallScript = test.uninstall; preuninstallScript = test.preuninstall or "echo \"Not Applicable\""; uninstallCheckScript = test.uninstallCheck; - installer = nix-installer-static; + installer = lix-installer-static; binaryTarball = binaryTarball.${system}; } '' @@ -573,7 +573,7 @@ let fi echo "Copying installer..." - scp -P 20022 $ssh_opts $installer/bin/nix-installer vagrant@localhost:nix-installer + scp -P 20022 $ssh_opts $installer/bin/lix-installer vagrant@localhost:nix-installer echo "Copying nix tarball..." scp -P 20022 $ssh_opts $binaryTarball/nix-*.tar.xz vagrant@localhost:nix.tar.xz