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
@@ -33,7 +33,7 @@ in

      patterns = mkOption {
        default = {};
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;

        example = literalExample ''
          {
@@ -50,7 +50,7 @@ in
      };
      styles = mkOption {
        default = {};
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;

        example = literalExample ''
          {