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

Merge pull request #10028 from itkovian/elasticsearch-1.7.2

Browse Source 
elasticsearch: 1.5.2 -> 1.7.2
This commit is contained in:
Jaka Hudoklin 2015-09-25 11:10:10 +02:00
commit 5d6500fee8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/search/elasticsearch/default.nix
View File

@ -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 ];

13
pkgs/servers/search/elasticsearch/es-home.patch
View File

@ -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