diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
| commit | 09e494f4c296b29755fb8639e3f751f6aa706a45 (patch) | |
| tree | 1f1ff77e46b78c8d91808fef8405361366867dd4 /nixos/tests | |
| parent | 6b8044795e4b7ff99b96259a4a6b09eb9380703d (diff) | |
| parent | b2181bc967053310657128d687e44ec683e7604b (diff) | |
| download | nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.gz nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.bz2 nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.lz nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.xz nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.zst nixlib-09e494f4c296b29755fb8639e3f751f6aa706a45.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/installer.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1ff3dc76f4b6..0748a74ee176 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -76,8 +76,8 @@ let def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") - then ''flags += " -m 1024"'' - else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' + then ''flags += " -m 1500"'' + else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"'' } return flags @@ -288,7 +288,7 @@ let # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; virtualisation.cores = 8; - virtualisation.memorySize = 2048; + virtualisation.memorySize = 3096; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is |