diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:45 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 16:55:45 +0200 |
commit | 8563088e69b9414db34b455d455758f515faefb3 (patch) | |
tree | a8bfd7bc0e60b3a53d75fa6579cb2caadede6222 /nixos | |
parent | a70aea12ca35ac10468fb241f5f957de8c83431f (diff) | |
parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
download | nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar.gz nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar.bz2 nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar.lz nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar.xz nixpkgs-8563088e69b9414db34b455d455758f515faefb3.tar.zst nixpkgs-8563088e69b9414db34b455d455758f515faefb3.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/Makefile | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 18 | ||||
-rw-r--r-- | nixos/modules/services/logging/logstash.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/search/kibana.nix | 2 | ||||
-rw-r--r-- | nixos/tests/ceph.nix | 2 | ||||
-rw-r--r-- | nixos/tests/elk.nix | 6 |
6 files changed, 18 insertions, 14 deletions
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile index 9ff599a0090..b86a7600575 100644 --- a/nixos/doc/manual/Makefile +++ b/nixos/doc/manual/Makefile @@ -24,7 +24,7 @@ fix-misc-xml: clean: rm -f manual-combined.xml generated -generated: ./options-to-docbook.xsl +generated: nix-build ../../release.nix \ --attr manualGeneratedSources.x86_64-linux \ --out-link ./generated diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index ff1bd628ad2..ee6ef883068 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -63,10 +63,10 @@ like games. <itemizedlist> <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para> - <listitem><para><link linkend="opt-services.gnome3.core-os-services.enable"><literal>services.gnome3.core-os-services.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.core-shell.enable"><literal>services.gnome3.core-shell.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.core-utilities.enable"><literal>services.gnome3.core-utilities.enable</literal></link></para></listitem> - <listitem><para><link linkend="opt-services.gnome3.games.enable"><literal>services.gnome3.games.enable</literal></link></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem> + <listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem> </itemizedlist> With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. @@ -428,6 +428,16 @@ any updates from upstream and depends on outdated Python2-based modules. </para> </listitem> + <listitem> + <para> + Old unsupported versions (<literal>logstash5</literal>, + <literal>kibana5</literal>, + <literal>filebeat5</literal>, + <literal>heartbeat5</literal>, + <literal>metricbeat5</literal>, + <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 9b707e9deb5..4943e8d7db3 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 c096af731ad..75871a9df94 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; }; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix index 0706b68075c..57120ff978f 100644 --- a/nixos/tests/ceph.nix +++ b/nixos/tests/ceph.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({pkgs, lib, ...}: { name = "All-in-one-basic-ceph-cluster"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lejonet ]; + maintainers = [ johanot lejonet ]; }; nodes = { diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index e423f295a08..b33d98b85d6 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -178,12 +178,6 @@ let ''; }; in mapAttrs mkElkTest { - ELK-5 = { - elasticsearch = pkgs.elasticsearch5; - logstash = pkgs.logstash5; - kibana = pkgs.kibana5; - journalbeat = pkgs.journalbeat5; - }; ELK-6 = if enableUnfree then { |