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

elasticsearch: Update from 1.3.4 to 1.4.2

Browse Source
This commit is contained in:
Rickard Nilsson 2015-01-08 19:21:56 +01:00
parent 520cc3518a
commit 0dedcdf29d
2 changed files with 4 additions and 4 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; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elasticsearch-1.3.4"; name = "elasticsearch-1.4.2";
src = fetchurl { src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
sha256 = "0c6klwag17npmr1f0zv4syn0d9ir3zm595x3vb42ni4b72f65bqq"; sha256 = "0g5mffzx15y8sj0gsn6kd5l1v15hg2vm4j7r071dmxs5jw26rp9i";
}; };
patches = [ ./es-home.patch ]; patches = [ ./es-home.patch ];

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

@ -34,5 +34,5 @@ index a8c796a..daf7b99 100755
shift shift
done done
-exec $JAVA $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_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
+exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/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