diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:11 +0200 |
commit | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch) | |
tree | 4c7212dd0f5244a3f09b8dcd5abca15737cffedf /nixos/modules | |
parent | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff) | |
parent | 4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff) | |
download | nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2 nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/logging/logstash.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/search/kibana.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 9b707e9deb58..4943e8d7db3a 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -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."; }; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index c096af731ad4..75871a9df949 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -150,7 +150,7 @@ in { description = "Kibana package to use"; default = pkgs.kibana; defaultText = "pkgs.kibana"; - example = "pkgs.kibana5"; + example = "pkgs.kibana"; type = types.package; }; |