diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2021-12-09 13:48:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 13:48:46 +0000 |
| commit | b2ed7c36c15cdcefc57b5c9558c53606a52d14e9 (patch) | |
| tree | 2b0df863e4462ff0fee733d6e0cd798cffb27a02 /nixos | |
| parent | 1161bf5d061819a9357ac1649c5360bfe4475995 (diff) | |
| parent | 6f2ed3cd1e0a8de8ec132c7e1d6d821ce4ab9e2f (diff) | |
Merge pull request #149642 from r-ryantm/auto-update/os-prober
os-prober: 1.78 -> 1.79
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/os-prober.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index a7b955d447215..c1e29b0f68b41 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -53,12 +53,12 @@ let }; # /etc/nixos/configuration.nix for the vm configFile = pkgs.writeText "configuration.nix" '' - {config, pkgs, ...}: ({ + {config, pkgs, lib, ...}: ({ imports = [ ./hardware-configuration.nix <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; - } // pkgs.lib.importJSON ${ + } // lib.importJSON ${ pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig) }) ''; @@ -114,7 +114,7 @@ in { "${configFile}", "/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") ''; |