tests: Fix container and VM tests

The `nix-installer-static` package is now named `lix-installer-static`.
However, the uninstall binary is still called `nix-installer`

Change-Id: I60fd2ab84867beaa8cf527e88c953298ec703881

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")

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 nix_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
+RUN /nix/nix-installer uninstall --no-confirm

nix/tests/vm-test/default.nix

@@ -4,7 +4,7 @@
 let
   nix-installer-install = ''
     NIX_PATH=$(readlink -f nix.tar.xz)
-    RUST_BACKTRACE="full" ./nix-installer install --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive nix_installer=info
+    RUST_BACKTRACE="full" ./nix-installer install --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive lix_installer=info
   '';
   nix-installer-install-quiet = ''
     NIX_PATH=$(readlink -f nix.tar.xz)
@@ -135,7 +135,7 @@ let
     install-no-start-daemon = {
       install = ''
         NIX_PATH=$(readlink -f nix.tar.xz)
-        RUST_BACKTRACE="full" ./nix-installer install linux --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive nix_installer=info --no-start-daemon
+        RUST_BACKTRACE="full" ./nix-installer install linux --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive lix_installer=info --no-start-daemon
       '';
       check = ''
         set -ex
@@ -162,7 +162,7 @@ let
     install-daemonless = {
       install = ''
         NIX_PATH=$(readlink -f nix.tar.xz)
-        RUST_BACKTRACE="full" ./nix-installer install linux --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive nix_installer=info --init none
+        RUST_BACKTRACE="full" ./nix-installer install linux --nix-package-url "file://$NIX_PATH" --no-confirm --logger pretty --log-directive lix_installer=info --init none
       '';
       check = ''
         set -ex
@@ -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

src/action/mod.rs

@@ -68,7 +68,7 @@ impl MyAction {
 #[async_trait::async_trait]
 #[typetag::serde(name = "my_action")]
 impl Action for MyAction {
-    fn action_tag() -> nix_installer::action::ActionTag {
+    fn action_tag() -> lix_installer::action::ActionTag {
         "my_action".into()
     }
     fn tracing_synopsis(&self) -> String {

src/lib.rs

@@ -42,9 +42,9 @@ use lix_installer::{InstallPlan, planner::Planner};
 
 # async fn chosen_planner_install() -> color_eyre::Result<()> {
 #[cfg(target_os = "linux")]
-let planner = nix_installer::planner::steam_deck::SteamDeck::default().await?;
+let planner = lix_installer::planner::steam_deck::SteamDeck::default().await?;
 #[cfg(target_os = "macos")]
-let planner = nix_installer::planner::macos::Macos::default().await?;
+let planner = lix_installer::planner::macos::Macos::default().await?;
 
 // Or call `crate::planner::BuiltinPlanner::default()`
 // Match on the result to customize.

tests/fixtures/linux/linux.json

@@ -416,6 +416,7 @@
       "ssl_cert_file": null,
       "extra_conf": [],
       "force": false,
+      "enable_flakes": true
     },
     "init": {
       "init": "Systemd",

tests/fixtures/linux/steam-deck.json

@@ -400,6 +400,7 @@
       "ssl_cert_file": null,
       "extra_conf": [],
       "force": false,
+      "enable_flakes": true
     }
   },
   "diagnostic_data": {

tests/fixtures/macos/macos.json

@@ -427,6 +427,7 @@
       "ssl_cert_file": null,
       "extra_conf": [],
       "force": false,
+      "enable_flakes": true
     },
     "encrypt": null,
     "case_sensitive": false,

upload-to-lix.xsh

@@ -103,7 +103,7 @@ if args.make_default:
         aws s3 @(aws_args) cp @(folder)/lix-installer-@(in_filename) @(default_path)/lix-installer-@(out_filename) --acl public-read
 
     printerr(f"\n>> Updating base install script...")
-    aws s3 @(aws_args) cp nix-installer.sh @(default_path) --acl public-read
+    aws s3 @(aws_args) cp lix-installer.sh @(default_path) --acl public-read
 
 # Make sure all of our lines are out.
 sys.stderr.flush()