elasticsearch7: 7.5.1 -> 7.11.1; drop enableUnfree
This commit is contained in:
parent
499807e106
commit
6c2478f462
|
@ -1,5 +1,4 @@
|
|||
{ elk7Version
|
||||
, enableUnfree ? true
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
@ -18,19 +17,15 @@ let
|
|||
arch = elemAt info 0;
|
||||
plat = elemAt info 1;
|
||||
shas =
|
||||
if enableUnfree
|
||||
then {
|
||||
x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4=";
|
||||
x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24=";
|
||||
}
|
||||
else {
|
||||
x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ=";
|
||||
x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo=";
|
||||
{
|
||||
x86_64-linux = "1ld7656b37l67vi4pyv0il865b168niqnbd4hzbvdnwrm35prp10";
|
||||
x86_64-darwin = "11b180y11xw5q01l7aw6lyn15lp9ks8xmakjg1j7gp3z6c90hpn3";
|
||||
aarch64-linux = "0s4ph79x17f90jk31wjwk259dk9dmhnmnkxdcn77m191wvf6m3wy";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elasticsearch";
|
||||
version = elk7Version;
|
||||
pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz";
|
||||
|
@ -49,9 +44,13 @@ stdenv.mkDerivation (rec {
|
|||
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre_headless util-linux ]
|
||||
++ optional enableUnfree zlib;
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [ jre_headless util-linux zlib ];
|
||||
|
||||
runtimeDependencies = [ zlib ];
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
@ -69,22 +68,19 @@ stdenv.mkDerivation (rec {
|
|||
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
|
||||
'';
|
||||
|
||||
passthru = { inherit enableUnfree; };
|
||||
|
||||
meta = {
|
||||
description = "Open Source, Distributed, RESTful Search Engine";
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ apeschar basvandijk ];
|
||||
};
|
||||
} // optionalAttrs enableUnfree {
|
||||
dontPatchELF = true;
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
runtimeDependencies = [ zlib ];
|
||||
postFixup = ''
|
||||
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
for exe in $(find $out/modules/x-pack-ml/platform/${plat}-${arch}/bin -executable -type f); do
|
||||
echo "patching $exe..."
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
|
||||
done
|
||||
'';
|
||||
})
|
||||
|
||||
passthru = { enableUnfree = true; };
|
||||
|
||||
meta = {
|
||||
description = "Open Source, Distributed, RESTful Search Engine";
|
||||
license = licenses.elastic;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ apeschar basvandijk ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -213,6 +213,7 @@ mapAliases ({
|
|||
ec2_ami_tools = ec2-ami-tools; # added 2021-10-08
|
||||
ec2_api_tools = ec2-api-tools; # added 2021-10-08
|
||||
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
|
||||
elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
|
||||
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
|
||||
|
|
|
@ -4878,11 +4878,6 @@ with pkgs;
|
|||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
|
||||
enableUnfree = false;
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch = elasticsearch6;
|
||||
elasticsearch-oss = elasticsearch6-oss;
|
||||
|
||||
|
@ -4895,7 +4890,7 @@ with pkgs;
|
|||
elasticsearch = elasticsearch6-oss;
|
||||
};
|
||||
elasticsearch7Plugins = elasticsearchPlugins.override {
|
||||
elasticsearch = elasticsearch7-oss;
|
||||
elasticsearch = elasticsearch7;
|
||||
};
|
||||
|
||||
elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator {
|
||||
|
|
Loading…
Reference in a new issue