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
@@ -734,6 +734,7 @@
  ./services/networking/nar-serve.nix
  ./services/networking/nat.nix
  ./services/networking/ndppd.nix
+  ./services/networking/nebula.nix
  ./services/networking/networkmanager.nix
  ./services/networking/nextdns.nix
  ./services/networking/nftables.nix