Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-26 13:06:43 +02:00
parent fea23020fe 2273849a85
commit 7077a270bf
177 changed files with 4107 additions and 1641 deletions
@@ -288,6 +288,7 @@ in
    };

    extraConfig = mkOption {
+      type = types.lines;
      default = "";
      example =
        ''
@@ -164,6 +164,7 @@ in


    extraConfig = mkOption {
+      type = types.lines;
      default = "";
      example =
        ''
@@ -212,6 +212,7 @@ in
          example = "[ \"en_GB\" \"de_DE\" ];";
    };
    extraConfig = mkOption {
+      type = types.lines;
      default = "";
      example =
        ''