Merge remote-tracking branch 'origin/staging' into cross-nixos

2018-03-01 14:56:58 -05:00
parent a486cb1af6 810dd0f984
commit 95579af5ec
300 changed files with 2355 additions and 1653 deletions
@@ -650,7 +650,11 @@ let
  unitFiles = map (name: {
    target = "systemd/network/${name}";
    source = "${cfg.units.${name}.unit}/${name}";
-  }) (attrNames cfg.units);
+  }) (attrNames cfg.units) ++
+  (map (entry: {
+    target = "systemd/network/${entry}";
+    source = "${config.systemd.package}/lib/systemd/network/${entry}";
+  }) (attrNames (builtins.readDir "${config.systemd.package}/lib/systemd/network")));
 in

 {