BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kibana7: 7.5.1 -> 7.11.1; drop enableUnfree

Browse source
This commit is contained in:
Andrew Childs 2021-02-26 19:32:09 +09:00 committed by Robert Hensing
parent ce98cdc02d
commit 06f7b8b2ce
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/tools/misc/kibana/7.x.nix
View file

@ -4,32 +4,27 @@
, stdenv
, makeWrapper
, fetchurl
, nodejs-10_x
, nodejs-14_x
, coreutils
, which
}:
with lib;
let
nodejs = nodejs-10_x;
nodejs = nodejs-14_x;
inherit (builtins) elemAt;
info = splitString "-" stdenv.hostPlatform.system;
arch = elemAt info 0;
plat = elemAt info 1;
shas =
if enableUnfree
then {
x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo=";
x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc=";
}
else {
x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ=";
x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk=";
{
x86_64-linux = "19p9s4sir982bb1zcldrbphhwfs9i11p0q28vgc421iqg10kjlf1";
x86_64-darwin = "0qq557ngwwakifidyrccga4cadj9k9pzhjwy4msmbcgf5pb86qyc";
aarch64-linux = "183cp1h8d3n7xfcpcys4hf36palczxa409afyp62kzyzckngy0j8";
};
in
stdenv.mkDerivation rec {
pname = "kibana${optionalString (!enableUnfree) "-oss"}";
in stdenv.mkDerivation rec {
pname = "kibana";
version = elk7Version;
src = fetchurl {
@ -58,7 +53,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Visualize logs and time-stamped data";
homepage = "http://www.elasticsearch.org/overview/kibana";
license = if enableUnfree then licenses.elastic else licenses.asl20;
license = licenses.elastic;
maintainers = with maintainers; [ offline basvandijk ];
platforms = with platforms; unix;
};

1
pkgs/top-level/aliases.nix
View file

@ -377,6 +377,7 @@ mapAliases ({
json_glib = json-glib; # added 2018-02-25
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
kodiGBM = kodi-gbm;
kodiPlain = kodi;
kodiPlainWayland = kodi-wayland;

3
pkgs/top-level/all-packages.nix
View file

@ -6699,9 +6699,6 @@ with pkgs;
enableUnfree = false;
};
kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { };
kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix {
enableUnfree = false;
};
kibana = kibana6;
kibana-oss = kibana6-oss;