diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2017-09-20 21:56:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-20 21:56:26 +0000 |
commit | 29c1888a57242ef83c65cd7810545c2b2efb8fdf (patch) | |
tree | fceb5f27533501d73c4cee907d8017daa5821c34 /pkgs | |
parent | 94a5de61af16d23a2020b7978638f1ed6f93f031 (diff) | |
parent | ea8e7ed1e32b40fc90173e35d5b8afe747d84e38 (diff) | |
download | nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar.gz nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar.bz2 nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar.lz nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar.xz nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.tar.zst nixlib-29c1888a57242ef83c65cd7810545c2b2efb8fdf.zip |
Merge pull request #29560 from LumiGuide/elk-5.6.1
elk: 5.5.2 -> 5.6.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/kibana/5.x.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/logging/beats/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/5.x.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/5.x.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 69a19987020d..735f85f74569 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb"; - "i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp"; - "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl"; + "x86_64-linux" = "02dhhp16pmkrpi2dfrca9qzz1q7jrxhaw6l3cfflgxx77hz0hlnw"; + "i686-linux" = "1h1zr342dq7nngvzpf9pn9mvwsi7aksa3qjyqpcc4yvbmmyrlk0m"; + "x86_64-darwin" = "0van8cnir6s520crc20bf2clbkf822c3ylpk7iiq7da8hwvsypp9"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index 2b555978edc3..e3333fa5caac 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy"; + sha256 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 781f505f4690..cfa471f217ee 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08"; + sha256 = "0pvi6akicg0i3bz3lbc6k9rznxw7d25flg9wbs2dyxv8i2rrqvq0"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index d796b3952f68..4ecc0be783eb 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "04nrw7ikcjp02cmwvaa1swj0b66l91n9d8qbdicsa023js4mp14m"; + sha256 = "11qg8i0svsccr1wd0yj0ivfzpza2hd68221g38v88shvj0bb737f"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef2e23e71b8c..f3f9020ff650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1838,7 +1838,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.5.2"; + elk5Version = "5.6.1"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; |