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
@@ -156,7 +156,7 @@ in {
      };

      unmanaged = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
        default = [];
        description = ''
          List of interfaces that will not be managed by NetworkManager.