Merge master into staging-next

2021-04-21 12:06:23 +00:00
parent 43d3569e0f 1f1a77bdb7
commit 9b3e698b14
64 changed files with 1505 additions and 459 deletions
@@ -263,6 +263,7 @@ in
  nat.standalone = handleTest ./nat.nix { withFirewall = false; };
  ncdns = handleTest ./ncdns.nix {};
  ndppd = handleTest ./ndppd.nix {};
+  nebula = handleTest ./nebula.nix {};
  neo4j = handleTest ./neo4j.nix {};
  netdata = handleTest ./netdata.nix {};
  networking.networkd = handleTest ./networking.nix { networkd = true; };