diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
| commit | 8ba23e138d9714bf309facf0003d69b1f8b86265 (patch) | |
| tree | 9412925f611693a9a3ff880c10392b3763eafecb /nixos/tests/kexec.nix | |
| parent | 040d8929bd4548fd0e2969476eb227f920ae06b8 (diff) | |
| parent | 66754ae952bb2ffd16e793f4be00ffecb9253e28 (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix
Diffstat (limited to 'nixos/tests/kexec.nix')
| -rw-r--r-- | nixos/tests/kexec.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 010f3da49846a..55b71e0999f68 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { maintainers = [ eelco ]; }; - machine = { ... }: + nodes.machine = { ... }: { virtualisation.vlans = [ ]; }; testScript = |