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 1 additions and 1 deletions
Showing only changes of commit de18ab5720 - Show all commits

View file

@ -22,5 +22,6 @@ in {
home.packages = [] home.packages = []
++ (with pkgs; [ ++ (with pkgs; [
iperf3
]); ]);
} }

View file

@ -3,7 +3,6 @@
{ {
disabledModules = [ disabledModules = [
"system/boot/initrd-network.nix" "system/boot/initrd-network.nix"
]; ];
imports = [ imports = [