JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61255 from basvandijk/elk-old-upgrades

Browse Source 
elk5: 5.6.9 -> 5.6.16 & elk6: 6.7.1 -> 6.7.2
This commit is contained in:
Bas van Dijk 2019-05-10 23:48:21 +02:00 committed by GitHub
commit cc3d0f4acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/kibana/5.x.nix
View File

@ -11,9 +11,9 @@ let
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j";
"i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx";
"x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k";
"x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
"i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
"x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";

8
pkgs/development/tools/misc/kibana/6.x.nix
View File

@ -19,12 +19,12 @@ let
shas =
if enableUnfree
then {
"x86_64-linux" = "039ll00kvrp881cyybb04z90cw68j7p5cspgdxh0bky9lyi9qpwb";
"x86_64-darwin" = "0qrakrihcjwn9dic77b0k9ja3zf6nbz534v76xid9gv20md5dds3";
"x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn";
"x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c";
}
else {
"x86_64-linux" = "1v1fbmfkbnlx043z3yx02gaqqy63bj2ymvcby66n4qq0vlpahvwx";
"x86_64-darwin" = "1y4q7a2b9arln94d6sj547qkv3258jlgcz9b342fh6khlbpfjb8c";
"x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk";
"x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk";
};
in stdenv.mkDerivation rec {

2
pkgs/misc/logging/beats/5.x.nix
View File

@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin";
sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b";
};
goPackagePath = "github.com/elastic/beats";

2
pkgs/misc/logging/beats/6.x.nix
View File

@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5";
sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq";
};
goPackagePath = "github.com/elastic/beats";

2
pkgs/servers/search/elasticsearch/5.x.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4";
sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb";
};
patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];

4
pkgs/servers/search/elasticsearch/6.x.nix
View File

@ -19,8 +19,8 @@ stdenv.mkDerivation (rec {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
sha256 =
if enableUnfree
then "1qh6iz3qhw8zcvxfss5w3h89zarwvk6dp5bbbag7c30kh94gkqvv"
else "13v8qpslanfn5w81qvbg0aqh510yfbl3x59kisvdkz9ifhjbcavi";
then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh"
else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6";
};
patches = [ ./es-home-6.x.patch ];

11
pkgs/servers/search/elasticsearch/plugins.nix
View File

@ -24,7 +24,7 @@ in {
elasticsearch_analysis_lemmagen = esPlugin rec {
name = "elasticsearch-analysis-lemmagen-${version}";
pluginName = "elasticsearch-analysis-lemmagen";
version = "${elk6Version}";
version = "6.7.1"; # elk6Version;
src = fetchurl {
url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip";
sha256 = "0mf8lpf40bjpzfj9lkhrg7c3xinzvg7aby3vd6h92g9i676xs8ri";
@ -33,6 +33,9 @@ in {
homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter";
license = licenses.asl20;
# TODO: remove the following when there's a release compatible with elasticsearch-6.7.2.
# See: https://github.com/vhyza/elasticsearch-analysis-lemmagen/issues/14
broken = true;
};
};
@ -42,7 +45,7 @@ in {
version = "${elk6Version}";
src = pkgs.fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip";
sha256 = "05z4vmi29fzfqzid7fdh6h6pjwgd1dz1mhhjgjz9plpvpzymjiln";
sha256 = "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523";
};
meta = with stdenv.lib; {
homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2;
@ -54,10 +57,10 @@ in {
search_guard = esPlugin rec {
name = "elastic-search-guard-${version}";
pluginName = "search-guard";
version = "${elk6Version}-24.3";
version = "${elk6Version}-25.1";
src = fetchurl rec {
url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip";
sha256 = "17gif45fbi4vj9qrzv075fkr7d2sp0naa5bjjj9gvfgqyl2flj7g";
sha256 = "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda";
};
meta = with stdenv.lib; {
homepage = https://github.com/floragunncom/search-guard;

2
pkgs/tools/misc/logstash/5.x.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 = "0qcq4c4nysdscbjrikhw653xwbi4dwscynjzyndsp8l21vl81x7p";
sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
};
dontBuild = true;

4
pkgs/tools/misc/logstash/6.x.nix
View File

@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 =
if enableUnfree
then "18j2n6gnhfjmb6skhhrzs0d1zwa1aj9jv37rqvg4w3fimnm8p0sh"
else "181x8y6izrh587a6d1qipgj8wk71v4fggypkzjkns4my00nki42y";
then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p"
else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj";
};
dontBuild = true;

4
pkgs/top-level/all-packages.nix
View File

@ -2648,8 +2648,8 @@ in
evemu = callPackage ../tools/system/evemu { };
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
elk5Version = "5.6.9";
elk6Version = "6.7.1";
elk5Version = "5.6.16";
elk6Version = "6.7.2";
elk7Version = "7.0.1";
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };