nixosTests.os-prober: fix infinite recursion
This commit is contained in:
parent
4f984654ee
commit
6f2ed3cd1e
|
@ -53,12 +53,12 @@ let
|
||||||
};
|
};
|
||||||
# /etc/nixos/configuration.nix for the vm
|
# /etc/nixos/configuration.nix for the vm
|
||||||
configFile = pkgs.writeText "configuration.nix" ''
|
configFile = pkgs.writeText "configuration.nix" ''
|
||||||
{config, pkgs, ...}: ({
|
{config, pkgs, lib, ...}: ({
|
||||||
imports =
|
imports =
|
||||||
[ ./hardware-configuration.nix
|
[ ./hardware-configuration.nix
|
||||||
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
||||||
];
|
];
|
||||||
} // pkgs.lib.importJSON ${
|
} // lib.importJSON ${
|
||||||
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
|
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
|
||||||
})
|
})
|
||||||
'';
|
'';
|
||||||
|
@ -114,7 +114,7 @@ in {
|
||||||
"${configFile}",
|
"${configFile}",
|
||||||
"/etc/nixos/configuration.nix",
|
"/etc/nixos/configuration.nix",
|
||||||
)
|
)
|
||||||
machine.succeed("nixos-rebuild boot >&2")
|
machine.succeed("nixos-rebuild boot --show-trace >&2")
|
||||||
|
|
||||||
machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
|
machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue