diff options
author | adisbladis <adisbladis@gmail.com> | 2019-09-06 14:52:20 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-09-07 12:43:40 +0100 |
commit | 3ab433df342c4196a8210fa631ceece9096a445b (patch) | |
tree | 628d2aa82a90bd6ec88aac9b8f2a4018be4f6537 | |
parent | 4149a662a7864c24c705dcd2b0bbd7ad95950d3d (diff) |
elastic6: 6.7.2 -> 6.8.3
-rw-r--r-- | pkgs/development/tools/misc/kibana/6.x.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/logging/beats/6.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/6.x.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
5 files changed, 11 insertions, 15 deletions
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 635be9e08768..f7da3521aa1e 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - x86_64-linux = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; - x86_64-darwin = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; + "x86_64-linux" = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3"; + "x86_64-darwin" = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106"; } else { - x86_64-linux = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; - x86_64-darwin = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; + "x86_64-linux" = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf"; + "x86_64-darwin" = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2f7e38692eb1..fe1f655246ef 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq"; + sha256 = "0jkiz5dfdi9zsji04ipcmcj7pml9294v455y7s2c22k24gyzbaw8"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index fffc84b2d281..04e81fe150a9 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh" - else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6"; + then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42" + else "0s04xz3j4psyhawvy503sp2nl5s0gswmpd9wfvwnavgcrr23wk39"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index be26aee03b98..c926d220b05d 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p" - else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj"; + then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053" + else "0spxgqsyh72n0l0xh6rljp0lbqz46xmr02sqz25ybycr4qkxdhgk"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 120ffd7504bb..800d7d271954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1066,11 +1066,7 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 @@ -2873,7 +2869,7 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk6Version = "6.7.2"; + elk6Version = "6.8.3"; elk7Version = "7.0.1"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { |