diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix deleted file mode 100644 index cd81975ee445..000000000000 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, lib, stdenv -, makeWrapper -, fetchurl -, nodejs-10_x -, coreutils -, which -}: - -with lib; -let - nodejs = nodejs-10_x; - inherit (builtins) elemAt; - info = splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; - shas = - if enableUnfree - then { - x86_64-linux = "1a501lavxhckb3l93sbrbqyshicwkk6p89frry4x8p037xcfpy0x"; - x86_64-darwin = "0zm45af30shhcg3mdhcma6rms1hyrx62rm5jzwnz9kxv4d30skbw"; - } - else { - x86_64-linux = "0wfdipf21apyily7mvlqgyc7m5jpr96zgrryzwa854z3xb2vw8zg"; - x86_64-darwin = "1nklfx4yz6hsxlljvnvwjy7pncv9mzngl84710xad5jlyras3sdj"; - }; - -in stdenv.mkDerivation rec { - pname = "kibana${optionalString (!enableUnfree) "-oss"}"; - version = elk6Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - patches = [ - # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. - # The test succeeds with this newer version so lets just - # disable the version check. - ./disable-nodejs-version-check.patch - ]; - - nativeBuildInputs = [ 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 : "${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 = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix deleted file mode 100644 index 5c107b20f4a4..000000000000 --- a/pkgs/development/web/nodejs/v10.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl icu; - python = python2; - }; -in - buildNodejs { - inherit enableNpm; - version = "10.24.1"; - sha256 = "032801kg24j04xmf09m0vxzlcz86sv21s24lv9l4cfv08k1c4byp"; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1fc44abf1ab8..7dfa2c64b476 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -936,6 +936,7 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 + nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6062c597b0e2..9c1719b83b73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7472,13 +7472,8 @@ with pkgs; kfctl = callPackage ../applications/networking/cluster/kfctl { }; - kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { - enableUnfree = false; - }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; - kibana = kibana6; - kibana-oss = kibana6-oss; + kibana = kibana7; kibi = callPackage ../applications/editors/kibi { }; @@ -7858,14 +7853,6 @@ with pkgs; nodejs-slim = nodejs-slim-16_x; - - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - icu = icu67; - }; - nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { - enableNpm = false; - icu = icu67; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false;