diff options
| author | Andy Georges <ageorges@zorspro-2.local> | 2015-09-15 01:52:44 +0200 |
|---|---|---|
| committer | Andy Georges <ageorges@zorspro-2.local> | 2015-09-24 00:18:29 +0200 |
| commit | cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8 (patch) | |
| tree | bcaa02edf72900e03b194efac6148382759175dd /pkgs/servers/search | |
| parent | a6f6c0eeeb45ad122022366724e396955f0f775b (diff) | |
| download | nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar.gz nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar.bz2 nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar.lz nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar.xz nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.tar.zst nixpkgs-cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8.zip | |
elasticsearch: 1.5.2 -> 1.7.2
Diffstat (limited to 'pkgs/servers/search')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/es-home.patch | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 859f1501bb3..16f01030290 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.5.2"; + name = "elasticsearch-1.7.2"; src = fetchurl { url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg"; + sha256 = "1lix4asvx1lbc227gzsrws3xqbcbqaal7v10w60kch0c4xg970bg"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch index 2f7a7fe7919..2f2018fd69f 100644 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -28,9 +28,10 @@ diff -rupN a/bin/plugin b/bin/plugin # make ELASTICSEARCH_HOME absolute ES_HOME=`cd "$ES_HOME"; pwd` -@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do - shift - done - --exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args -+exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args +@@ -105,4 +105,4 @@ + + export HOSTNAME=`hostname -s` + +-eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/*"\" org.elasticsearch.plugins.PluginManager $args +\ No newline at end of file ++eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args |