Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit 194c2aaf9c - Show all commits

View file

@ -27,9 +27,11 @@ 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 pep8 yapf flake8
# autopep8 (broken) # autopep8 (broken)
# pylint (broken) # pylint (broken)
ipython ipython
@ -146,7 +148,7 @@ in {
# Virtualization # Virtualization
virtmanager virtmanager
qemu (pkgs.lib.hiPrio qemu)
# virtualbox # virtualbox
vagrant vagrant
rkt rkt