From 46ff1c385f04cdadb371a3698533aff093097521 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sun, 25 Sep 2016 14:40:15 -0500 Subject: [PATCH] kibana: 4.5.2 -> 4.6.0 (#18277) Includes supporting binary src for x86_64-linux, x86_64-darwin, and i686-linux which were previously unsupported and failed grossly before. --- .../development/tools/misc/kibana/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 3aeacd457dd0..d851741405ff 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,14 +1,23 @@ { stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: with stdenv.lib; - -stdenv.mkDerivation rec { +let + inherit (builtins) elemAt; + info = splitString "-" stdenv.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; + "i686-linux" = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf"; + "x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9"; + }; +in stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { - url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz"; - sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4"; + url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.system}"; }; buildInputs = [ makeWrapper ];