Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

elk: 5.4.2 -> 5.5.2

Release notes:

* https://www.elastic.co/guide/en/elasticsearch/reference/5.5/release-notes-5.5.2.html
* https://www.elastic.co/guide/en/logstash/5.5/logstash-5-5-2.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.5.2.html

+9 -8
+1
nixos/release.nix
··· 239 tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); 240 tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; 241 tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; 242 tests.ferm = callTest tests/ferm.nix {}; 243 tests.firefox = callTest tests/firefox.nix {}; 244 tests.firewall = callTest tests/firewall.nix {};
··· 239 tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); 240 tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; 241 tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; 242 + tests.elk = callTest tests/elk.nix {}; 243 tests.ferm = callTest tests/ferm.nix {}; 244 tests.firefox = callTest tests/firefox.nix {}; 245 tests.firewall = callTest tests/firewall.nix {};
+3 -3
pkgs/development/tools/misc/kibana/5.x.nix
··· 11 elasticArch = archOverrides."${arch}" or arch; 12 plat = elemAt info 1; 13 shas = { 14 - "x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y"; 15 - "i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9"; 16 - "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl"; 17 }; 18 in stdenv.mkDerivation rec { 19 name = "kibana-${version}";
··· 11 elasticArch = archOverrides."${arch}" or arch; 12 plat = elemAt info 1; 13 shas = { 14 + "x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb"; 15 + "i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp"; 16 + "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl"; 17 }; 18 in stdenv.mkDerivation rec { 19 name = "kibana-${version}";
+1 -1
pkgs/misc/logging/beats/default.nix
··· 8 owner = "elastic"; 9 repo = "beats"; 10 rev = "v${version}"; 11 - sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32"; 12 }; 13 14 goPackagePath = "github.com/elastic/beats";
··· 8 owner = "elastic"; 9 repo = "beats"; 10 rev = "v${version}"; 11 + sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy"; 12 }; 13 14 goPackagePath = "github.com/elastic/beats";
+1 -1
pkgs/servers/search/elasticsearch/5.x.nix
··· 8 9 src = fetchurl { 10 url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; 11 - sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; 12 }; 13 14 patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
··· 8 9 src = fetchurl { 10 url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; 11 + sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08"; 12 }; 13 14 patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
+2 -2
pkgs/tools/misc/logstash/5.x.nix
··· 6 7 src = fetchurl { 8 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; 9 - sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs"; 10 }; 11 12 dontBuild = true; ··· 20 21 installPhase = '' 22 mkdir -p $out 23 - cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out 24 25 wrapProgram $out/bin/logstash \ 26 --set JAVA_HOME "${jre}"
··· 6 7 src = fetchurl { 8 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; 9 + sha256 = "04nrw7ikcjp02cmwvaa1swj0b66l91n9d8qbdicsa023js4mp14m"; 10 }; 11 12 dontBuild = true; ··· 20 21 installPhase = '' 22 mkdir -p $out 23 + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out 24 25 wrapProgram $out/bin/logstash \ 26 --set JAVA_HOME "${jre}"
+1 -1
pkgs/top-level/all-packages.nix
··· 1806 evemu = callPackage ../tools/system/evemu { }; 1807 1808 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. 1809 - elk5Version = "5.4.2"; 1810 1811 elasticsearch = callPackage ../servers/search/elasticsearch { }; 1812 elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
··· 1806 evemu = callPackage ../tools/system/evemu { }; 1807 1808 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. 1809 + elk5Version = "5.5.2"; 1810 1811 elasticsearch = callPackage ../servers/search/elasticsearch { }; 1812 elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };