From 05f8f9ac35f987b5aa0d656af91c4e4d42b35e7c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 22 Mar 2021 14:20:08 +0100 Subject: [PATCH] logstash: Use jdk11_headless --- pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd86483198f..97781149901 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5823,13 +5823,23 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; - logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; logstash = logstash6;