public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elasticsearch: add missing gnugrep and coreutils to wrapper

Browse Source
This commit is contained in:
Jaka Hudoklin 2019-05-12 16:26:43 +02:00
parent 2c86b2c79c
commit e4d89879f8
No known key found for this signature in database
GPG Key ID: 916062A1C4748647
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/search/elasticsearch/5.x.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }: { stdenv, fetchurl, elk5Version, makeWrapper, jre_headless
, utillinux, gnugrep, coreutils }:
with stdenv.lib; with stdenv.lib;
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/elasticsearch \ wrapProgram $out/bin/elasticsearch \
--prefix ES_CLASSPATH : "$out/lib/*" \ --prefix ES_CLASSPATH : "$out/lib/*" \
--prefix PATH : "${utillinux}/bin" \ --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}" \ --set JAVA_HOME "${jre_headless}" \
--set ES_JVM_OPTIONS "$out/config/jvm.options" --set ES_JVM_OPTIONS "$out/config/jvm.options"

4
pkgs/servers/search/elasticsearch/6.x.nix
View File

@ -4,7 +4,7 @@
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, jre_headless , jre_headless
, utillinux , utillinux, gnugrep, coreutils
, autoPatchelfHook , autoPatchelfHook
, zlib , zlib
}: }:
@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
chmod -x $out/bin/*.* chmod -x $out/bin/*.*
wrapProgram $out/bin/elasticsearch \ wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${utillinux}/bin/" \ --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}" --set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"

4
pkgs/servers/search/elasticsearch/7.x.nix
View File

@ -4,7 +4,7 @@
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, jre_headless , jre_headless
, utillinux , utillinux, gnugrep, coreutils
, autoPatchelfHook , autoPatchelfHook
, zlib , zlib
}: }:
@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
chmod +x $out/bin/* chmod +x $out/bin/*
wrapProgram $out/bin/elasticsearch \ wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${utillinux}/bin/" \ --prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
--set JAVA_HOME "${jre_headless}" --set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"

14
pkgs/top-level/all-packages.nix
View File

@ -2656,14 +2656,22 @@ in
elk6Version = "6.7.2"; elk6Version = "6.7.2";
elk7Version = "7.0.1"; elk7Version = "7.0.1";
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix {
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; utillinux = utillinuxMinimal;
};
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
utillinux = utillinuxMinimal;
};
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
enableUnfree = false; enableUnfree = false;
utillinux = utillinuxMinimal;
};
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
utillinux = utillinuxMinimal;
}; };
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { };
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
enableUnfree = false; enableUnfree = false;
utillinux = utillinuxMinimal;
}; };
elasticsearch = elasticsearch6; elasticsearch = elasticsearch6;
elasticsearch-oss = elasticsearch6-oss; elasticsearch-oss = elasticsearch6-oss;