Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -836,7 +836,7 @@ in
        options = {

          device = mkOption {
-            type = types.string;
+            type = types.str;
            example = "wlp6s0";
            description = "The name of the underlying hardware WLAN device as assigned by <literal>udev</literal>.";
          };
@@ -852,7 +852,7 @@ in
          };

          meshID = mkOption {
-            type = types.nullOr types.string;
+            type = types.nullOr types.str;
            default = null;
            description = "MeshID of interface with type <literal>mesh</literal>.";
          };