git.iko.soy/typeable/nixpkgs
on master help sign in
elk7: 7.5.1 -> 7.10.2

Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com>

commitf9321de0f3dc6d97bf68c10ac4d5263162c25ed8 authorhappysalada <raphael@megzari.com> dateMon 30 Aug 2021, 12:47 (5 years ago) parent8b2cecc
6 files changed+28−25
compare with master
unifiedsplit
pkgs/development/tools/misc/kibana/7.x.nix+4−4 pkgs/misc/logging/beats/7.x.nix+1−1 pkgs/servers/search/elasticsearch/7.x.nix+4−4 pkgs/servers/search/elasticsearch/plugins.nix+12−10 pkgs/tools/misc/logstash/7.x.nix+4−3 pkgs/top-level/all-packages.nix+3−3
pkgs/development/tools/misc/kibana/7.x.nix+4−4
@@ -19,12 +19,12 @@ let
1919 shas =
2020 if enableUnfree
2121 then {
22− x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja";
23− x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v";
22+ x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo=";
23+ x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc=";
2424 }
2525 else {
26− x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj";
27− x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1";
26+ x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ=";
27+ x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk=";
2828 };
2929
3030in
pkgs/misc/logging/beats/7.x.nix+1−1
@@ -8,7 +8,7 @@ let beat = package: extraArgs: buildGoPackage (rec {
88 owner = "elastic";
99 repo = "beats";
1010 rev = "v${version}";
11− sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb";
11+ sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA=";
1212 };
1313
1414 goPackagePath = "github.com/elastic/beats";
pkgs/servers/search/elasticsearch/7.x.nix+4−4
@@ -20,12 +20,12 @@ let
2020 shas =
2121 if enableUnfree
2222 then {
23− x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp";
24− x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q";
23+ x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4=";
24+ x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24=";
2525 }
2626 else {
27− x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3";
28− x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh";
27+ x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ=";
28+ x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo=";
2929 };
3030in
3131stdenv.mkDerivation (rec {
pkgs/servers/search/elasticsearch/plugins.nix+12−10
@@ -37,7 +37,7 @@ in
3737 src = fetchurl {
3838 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
3939 sha256 =
40− if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6"
40+ if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E="
4141 else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv"
4242 else throw "unsupported version ${version} for plugin ${pluginName}";
4343 };
@@ -54,7 +54,7 @@ in
5454 src = fetchurl {
5555 url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
5656 sha256 =
57− if version == "7.5.1" then "0js8b9a9ma797448m3sy92qxbwziix8gkcka7hf17dqrb9k29v61"
57+ if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8="
5858 else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53"
5959 else throw "unsupported version ${version} for plugin ${pluginName}";
6060 };
@@ -71,7 +71,7 @@ in
7171 src = fetchurl {
7272 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
7373 sha256 =
74− if version == "7.5.1" then "0znmbdf99bli4kvyb3vxr5x48yb6n64nl38gpa63iqsv3nlbi0hp"
74+ if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y="
7575 else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37"
7676 else throw "unsupported version ${version} for plugin ${pluginName}";
7777 };
@@ -88,7 +88,7 @@ in
8888 src = fetchurl {
8989 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
9090 sha256 =
91− if version == "7.5.1" then "09wl2bpng4xx384xns960rymnm64b5zn2cb1sp25n85pd0isp4p2"
91+ if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s="
9292 else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im"
9393 else throw "unsupported version ${version} for plugin ${pluginName}";
9494 };
@@ -105,7 +105,7 @@ in
105105 src = fetchurl {
106106 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
107107 sha256 =
108− if version == "7.5.1" then "0hhwxkjlkw1yv5sp6pdn5k1y8bdv4mnmb6nby1z4367mig6rm8v9"
108+ if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc="
109109 else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll"
110110 else throw "unsupported version ${version} for plugin ${pluginName}";
111111 };
@@ -122,7 +122,7 @@ in
122122 src = fetchurl {
123123 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
124124 sha256 =
125− if version == "7.5.1" then "1j1rgbha5lh0a02h55zqc5qn0mvvi16l2m5r8lmaswp97px056v9"
125+ if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE="
126126 else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x"
127127 else throw "unsupported version ${version} for plugin ${pluginName}";
128128 };
@@ -139,7 +139,7 @@ in
139139 src = fetchurl {
140140 url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
141141 sha256 =
142− if version == "7.5.1" then "15g438zpxrcmsgddwmk3sccy92ha90cyq9c61kcw1q84wfi0a7jl"
142+ if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g="
143143 else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk"
144144 else throw "unsupported version ${version} for plugin ${pluginName}";
145145 };
@@ -158,13 +158,15 @@ in
158158 pluginName = "search-guard";
159159 version =
160160 # https://docs.search-guard.com/latest/search-guard-versions
161− if esVersion == "7.5.1" then "${esVersion}-38.0.0"
161+ if esVersion == "7.10.2" then "7.10.1-49.3.0"
162162 else if esVersion == "6.8.3" then "${esVersion}-25.5"
163163 else throw "unsupported version ${esVersion} for plugin ${pluginName}";
164164 src = fetchurl {
165− url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
165+ url =
166+ if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"
167+ else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
166168 sha256 =
167− if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh"
169+ if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4="
168170 else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb"
169171 else throw "unsupported version ${version} for plugin ${pluginName}";
170172 };
pkgs/tools/misc/logstash/7.x.nix+4−3
@@ -11,15 +11,16 @@
1111with lib;
1212
1313let this = stdenv.mkDerivation rec {
14− version = elk7Version;
14+ # FIXME 7.10 is not available on the mirror
15+ version = "7.9.3";
1516 name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
1617
1718 src = fetchurl {
1819 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
1920 sha256 =
2021 if enableUnfree
21− then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj"
22− else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb";
22+ then "sha256-YM17/LqsMLH15YZp+0pqbEUzmAcCUpIwWT7o+MJN1QE="
23+ else "sha256-5HEs/2bi8m64P0R8aHGgyFJCqiFxs1aBF59Wzg9STCM=";
2324 };
2425
2526 dontBuild = true;
pkgs/top-level/all-packages.nix+3−3
@@ -4618,7 +4618,7 @@ with pkgs;
46184618 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
46194619 # When updating make sure to update all plugins or they will break!
46204620 elk6Version = "6.8.3";
4621− elk7Version = "7.5.1";
4621+ elk7Version = "7.10.2";
46224622
46234623 elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
46244624 util-linux = util-linuxMinimal;
@@ -4631,12 +4631,12 @@ with pkgs;
46314631 };
46324632 elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
46334633 util-linux = util-linuxMinimal;
4634− jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
4634+ jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
46354635 };
46364636 elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
46374637 enableUnfree = false;
46384638 util-linux = util-linuxMinimal;
4639− jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
4639+ jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
46404640 };
46414641 elasticsearch = elasticsearch6;
46424642 elasticsearch-oss = elasticsearch6-oss;