Merge branch 'master' into staging-next

2019-09-06 16:55:11 +02:00
parent cdf426488b 4a1189e0ab
commit f9237f3152
36 changed files with 235 additions and 441 deletions
@@ -53,7 +53,7 @@ in
        type = types.package;
        default = pkgs.logstash;
        defaultText = "pkgs.logstash";
-        example = literalExample "pkgs.logstash5";
+        example = literalExample "pkgs.logstash";
        description = "Logstash package to use.";
      };