Merge branch 'staging' of https://gitlab.com/steveeJ/infra into staging

This commit is contained in:
steveej 2019-01-12 10:51:32 +01:00
commit e9464dfbe7
3 changed files with 16 additions and 1 deletions

View file

@ -26,6 +26,8 @@ in {
gnutls = true; gnutls = true;
}; };
android_sdk.accept_license = true;
packageOverrides = pkgs: with pkgs; { packageOverrides = pkgs: with pkgs; {
myPython36 = python36Full.withPackages (ps: with ps; [ myPython36 = python36Full.withPackages (ps: with ps; [
pylint pep8 yapf flake8 pylint pep8 yapf flake8
@ -145,5 +147,8 @@ in {
myPython36 myPython36
busyboxStatic busyboxStatic
# Virtualization
virtmanager
]); ]);
} }

View file

@ -0,0 +1,10 @@
{
channelsNixosStable = {
ref = "nixos-18.09";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb";
};
}

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;
}; };