forked from lix-project/lix-installer
Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
Artemis Tosini | 9705a12ec0 | ||
Artemis Tosini | 85bbfe3d7c | ||
Artemis Tosini | f6ee8eeda8 | ||
Artemis Tosini | cc9f65a03a |
|
@ -54,7 +54,7 @@ let
|
||||||
machine.copy_from_host("${image.tarball}", "/image")
|
machine.copy_from_host("${image.tarball}", "/image")
|
||||||
machine.succeed("mkdir -p /test")
|
machine.succeed("mkdir -p /test")
|
||||||
machine.copy_from_host("${image.tester}", "/test/Dockerfile")
|
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.copy_from_host("${binaryTarball.${system}}", "/test/binary-tarball")
|
||||||
machine.succeed("${containerTool} import /image default")
|
machine.succeed("${containerTool} import /image default")
|
||||||
machine.succeed("${containerTool} build -t test /test")
|
machine.succeed("${containerTool} build -t test /test")
|
||||||
|
|
|
@ -3,7 +3,7 @@ COPY lix-installer /lix-installer
|
||||||
RUN chmod +x /lix-installer
|
RUN chmod +x /lix-installer
|
||||||
COPY binary-tarball /binary-tarball
|
COPY binary-tarball /binary-tarball
|
||||||
RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz
|
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"
|
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-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
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
let
|
let
|
||||||
nix-installer-install = ''
|
nix-installer-install = ''
|
||||||
NIX_PATH=$(readlink -f nix.tar.xz)
|
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-installer-install-quiet = ''
|
||||||
NIX_PATH=$(readlink -f nix.tar.xz)
|
NIX_PATH=$(readlink -f nix.tar.xz)
|
||||||
|
@ -135,7 +135,7 @@ let
|
||||||
install-no-start-daemon = {
|
install-no-start-daemon = {
|
||||||
install = ''
|
install = ''
|
||||||
NIX_PATH=$(readlink -f nix.tar.xz)
|
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 = ''
|
check = ''
|
||||||
set -ex
|
set -ex
|
||||||
|
@ -162,7 +162,7 @@ let
|
||||||
install-daemonless = {
|
install-daemonless = {
|
||||||
install = ''
|
install = ''
|
||||||
NIX_PATH=$(readlink -f nix.tar.xz)
|
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 = ''
|
check = ''
|
||||||
set -ex
|
set -ex
|
||||||
|
@ -515,7 +515,7 @@ let
|
||||||
uninstallScript = test.uninstall;
|
uninstallScript = test.uninstall;
|
||||||
preuninstallScript = test.preuninstall or "echo \"Not Applicable\"";
|
preuninstallScript = test.preuninstall or "echo \"Not Applicable\"";
|
||||||
uninstallCheckScript = test.uninstallCheck;
|
uninstallCheckScript = test.uninstallCheck;
|
||||||
installer = nix-installer-static;
|
installer = lix-installer-static;
|
||||||
binaryTarball = binaryTarball.${system};
|
binaryTarball = binaryTarball.${system};
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
@ -573,7 +573,7 @@ let
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Copying installer..."
|
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..."
|
echo "Copying nix tarball..."
|
||||||
scp -P 20022 $ssh_opts $binaryTarball/nix-*.tar.xz vagrant@localhost:nix.tar.xz
|
scp -P 20022 $ssh_opts $binaryTarball/nix-*.tar.xz vagrant@localhost:nix.tar.xz
|
||||||
|
|
|
@ -68,7 +68,7 @@ impl MyAction {
|
||||||
#[async_trait::async_trait]
|
#[async_trait::async_trait]
|
||||||
#[typetag::serde(name = "my_action")]
|
#[typetag::serde(name = "my_action")]
|
||||||
impl Action for MyAction {
|
impl Action for MyAction {
|
||||||
fn action_tag() -> nix_installer::action::ActionTag {
|
fn action_tag() -> lix_installer::action::ActionTag {
|
||||||
"my_action".into()
|
"my_action".into()
|
||||||
}
|
}
|
||||||
fn tracing_synopsis(&self) -> String {
|
fn tracing_synopsis(&self) -> String {
|
||||||
|
|
|
@ -42,9 +42,9 @@ use lix_installer::{InstallPlan, planner::Planner};
|
||||||
|
|
||||||
# async fn chosen_planner_install() -> color_eyre::Result<()> {
|
# async fn chosen_planner_install() -> color_eyre::Result<()> {
|
||||||
#[cfg(target_os = "linux")]
|
#[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")]
|
#[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()`
|
// Or call `crate::planner::BuiltinPlanner::default()`
|
||||||
// Match on the result to customize.
|
// Match on the result to customize.
|
||||||
|
|
1
tests/fixtures/linux/linux.json
vendored
1
tests/fixtures/linux/linux.json
vendored
|
@ -416,6 +416,7 @@
|
||||||
"ssl_cert_file": null,
|
"ssl_cert_file": null,
|
||||||
"extra_conf": [],
|
"extra_conf": [],
|
||||||
"force": false,
|
"force": false,
|
||||||
|
"enable_flakes": true
|
||||||
},
|
},
|
||||||
"init": {
|
"init": {
|
||||||
"init": "Systemd",
|
"init": "Systemd",
|
||||||
|
|
1
tests/fixtures/linux/steam-deck.json
vendored
1
tests/fixtures/linux/steam-deck.json
vendored
|
@ -400,6 +400,7 @@
|
||||||
"ssl_cert_file": null,
|
"ssl_cert_file": null,
|
||||||
"extra_conf": [],
|
"extra_conf": [],
|
||||||
"force": false,
|
"force": false,
|
||||||
|
"enable_flakes": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"diagnostic_data": {
|
"diagnostic_data": {
|
||||||
|
|
1
tests/fixtures/macos/macos.json
vendored
1
tests/fixtures/macos/macos.json
vendored
|
@ -427,6 +427,7 @@
|
||||||
"ssl_cert_file": null,
|
"ssl_cert_file": null,
|
||||||
"extra_conf": [],
|
"extra_conf": [],
|
||||||
"force": false,
|
"force": false,
|
||||||
|
"enable_flakes": true
|
||||||
},
|
},
|
||||||
"encrypt": null,
|
"encrypt": null,
|
||||||
"case_sensitive": false,
|
"case_sensitive": false,
|
||||||
|
|
|
@ -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
|
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...")
|
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.
|
# Make sure all of our lines are out.
|
||||||
sys.stderr.flush()
|
sys.stderr.flush()
|
||||||
|
|
Loading…
Reference in a new issue