Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00
parent e4316b8c17 d4fc2b4d99
commit 8e19ac8d7c
139 changed files with 2778 additions and 1524 deletions
@@ -33,7 +33,7 @@ in
    };

    security.pki.certificates = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
      default = [];
      example = singleton ''
        NixOS.org