0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-11-21 06:01:18 +00:00 committed by GitHub
commit 6ad93ecdbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 387 additions and 210 deletions

View file

@ -288,7 +288,7 @@ let
# builds stuff in the VM, needs more juice
virtualisation.diskSize = 8 * 1024;
virtualisation.cores = 8;
virtualisation.memorySize = 1536;
virtualisation.memorySize = 2048;
# Use a small /dev/vdb as the root disk for the
# installer. This ensures the target disk (/dev/vda) is