Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
2 changed files with 4 additions and 1 deletions
Showing only changes of commit 75a8b3e94f - Show all commits

View file

@ -147,5 +147,8 @@ in {
myPython36 myPython36
busyboxStatic busyboxStatic
# Virtualization
virtmanager
]); ]);
} }

View file

@ -12,7 +12,7 @@ in {
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
virtualisation = { virtualisation = {
libvirtd.enable = false; libvirtd.enable = true;
virtualbox.host.enable = false; virtualbox.host.enable = false;
docker.enable = true; docker.enable = true;
}; };