nixfmt-rfc-style
There is nothing in this commit except for the changes made by nix-shell -p nixfmt-rfc-style --run "nixfmt ." If this has mucked up your open branches then sorry about that. You can probably nixfmt them to match before merging
This commit is contained in:
@@ -1,29 +1,35 @@
|
||||
let lmx = (import <liminix> {
|
||||
let
|
||||
lmx = (
|
||||
import <liminix> {
|
||||
device = import <liminix/devices/qemu>;
|
||||
liminix-config = ./configuration.nix;
|
||||
});
|
||||
rogue = lmx.pkgs.rogue;
|
||||
img = lmx.outputs.vmroot;
|
||||
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
|
||||
in pkgs.runCommand "check" {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
expect
|
||||
socat
|
||||
min-copy-closure
|
||||
rogue
|
||||
] ;
|
||||
} ''
|
||||
. ${../test-helpers.sh}
|
||||
}
|
||||
);
|
||||
rogue = lmx.pkgs.rogue;
|
||||
img = lmx.outputs.vmroot;
|
||||
pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
|
||||
in
|
||||
pkgs.runCommand "check"
|
||||
{
|
||||
nativeBuildInputs = with pkgs; [
|
||||
expect
|
||||
socat
|
||||
min-copy-closure
|
||||
rogue
|
||||
];
|
||||
}
|
||||
''
|
||||
. ${../test-helpers.sh}
|
||||
|
||||
(
|
||||
mkdir vm
|
||||
${img}/run.sh --lan user,hostfwd=tcp::2022-:22 --background ./vm
|
||||
expect ${./wait-until-ready.expect}
|
||||
export SSH_COMMAND="ssh -o StrictHostKeyChecking=no -p 2022 -i ${./id}"
|
||||
$SSH_COMMAND root@localhost echo ready
|
||||
IN_NIX_BUILD=true min-copy-closure --quiet root@localhost ${rogue}
|
||||
$SSH_COMMAND root@localhost ls -ld ${rogue}
|
||||
IN_NIX_BUILD=true min-copy-closure --root /run root@localhost ${rogue}
|
||||
$SSH_COMMAND root@localhost ls -ld /run/${rogue}
|
||||
) 2>&1 | tee $out
|
||||
''
|
||||
(
|
||||
mkdir vm
|
||||
${img}/run.sh --lan user,hostfwd=tcp::2022-:22 --background ./vm
|
||||
expect ${./wait-until-ready.expect}
|
||||
export SSH_COMMAND="ssh -o StrictHostKeyChecking=no -p 2022 -i ${./id}"
|
||||
$SSH_COMMAND root@localhost echo ready
|
||||
IN_NIX_BUILD=true min-copy-closure --quiet root@localhost ${rogue}
|
||||
$SSH_COMMAND root@localhost ls -ld ${rogue}
|
||||
IN_NIX_BUILD=true min-copy-closure --root /run root@localhost ${rogue}
|
||||
$SSH_COMMAND root@localhost ls -ld /run/${rogue}
|
||||
) 2>&1 | tee $out
|
||||
''
|
||||
|
Reference in New Issue
Block a user