Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5f26f3803b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 310989baefae
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on May 12, 2019

  1. elasticsearch: add missing gnugrep and coreutils to wrapper

    @offlinehacker
    offlinehacker committed May 12, 2019
    Copy the full SHA
    e4d8987 View commit details

Commits on May 13, 2019

  1. Merge pull request #61375 from xtruder/pkgs/elasticsearch/missing_deps 

    elasticsearch: add missing gnugrep and coreutils to wrapper
    @offlinehacker
    offlinehacker authored May 13, 2019
    Copy the full SHA
    310989b View commit details
Showing with 18 additions and 9 deletions.
  1. +3 −2 pkgs/servers/search/elasticsearch/5.x.nix
  2. +2 −2 pkgs/servers/search/elasticsearch/6.x.nix
  3. +2 −2 pkgs/servers/search/elasticsearch/7.x.nix
  4. +11 −3 pkgs/top-level/all-packages.nix
5 changes: 3 additions & 2 deletions pkgs/servers/search/elasticsearch/5.x.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }:
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless
, utillinux, gnugrep, coreutils }:

with stdenv.lib;

@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/elasticsearch \
--prefix ES_CLASSPATH : "$out/lib/*" \
--prefix PATH : "${utillinux}/bin" \
--prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}" \
--set ES_JVM_OPTIONS "$out/config/jvm.options"
4 changes: 2 additions & 2 deletions pkgs/servers/search/elasticsearch/6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux
, utillinux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
chmod -x $out/bin/*.*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${utillinux}/bin/" \
--prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
4 changes: 2 additions & 2 deletions pkgs/servers/search/elasticsearch/7.x.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux
, utillinux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
chmod +x $out/bin/*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${utillinux}/bin/" \
--prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
14 changes: 11 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2658,14 +2658,22 @@ in
elk6Version = "6.7.2";
elk7Version = "7.0.1";

elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { };
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix {
utillinux = utillinuxMinimal;
};
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
utillinux = utillinuxMinimal;
};
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
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 {
enableUnfree = false;
utillinux = utillinuxMinimal;
};
elasticsearch = elasticsearch6;
elasticsearch-oss = elasticsearch6-oss;