Merge branch 'staging-next' into staging

pkgs/development/tools/misc/kibana/5.x.nix

@@ -1,45 +0,0 @@
-{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }:
-
-with stdenv.lib;
-let
-  inherit (builtins) elemAt;
-  archOverrides = {
-    i686 = "x86";
-  };
-  info = splitString "-" stdenv.hostPlatform.system;
-  arch = (elemAt info 0);
-  elasticArch = archOverrides.${arch} or arch;
-  plat = elemAt info 1;
-  shas = {
-    x86_64-linux  = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
-    i686-linux    = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
-    x86_64-darwin = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
-  };
-in stdenv.mkDerivation rec {
-  pname = "kibana";
-  version = elk5Version;
-
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz";
-    sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/libexec/kibana $out/bin
-    mv * $out/libexec/kibana/
-    rm -r $out/libexec/kibana/node
-    makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
-    sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
-  '';
-
-  meta = {
-    description = "Visualize logs and time-stamped data";
-    homepage = http://www.elasticsearch.org/overview/kibana;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
-  };
-}