summary refs log tree commit diff
path: root/pkgs/servers/search
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2015-01-08 19:21:56 +0100
committerRickard Nilsson <rickynils@gmail.com>2015-01-09 00:04:59 +0100
commit0dedcdf29da1df38b56ffc327745f14d125d14df (patch)
treed6a20c4159cee99c31c87d143e9e264683fc5f86 /pkgs/servers/search
parent520cc3518a67760bc92f81ce3f1f2769eba16ecf (diff)
downloadnixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar.gz
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar.bz2
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar.lz
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar.xz
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.tar.zst
nixlib-0dedcdf29da1df38b56ffc327745f14d125d14df.zip
elasticsearch: Update from 1.3.4 to 1.4.2
Diffstat (limited to 'pkgs/servers/search')
-rw-r--r--pkgs/servers/search/elasticsearch/default.nix4
-rw-r--r--pkgs/servers/search/elasticsearch/es-home.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 29ffee2f73a3..a90b52923c2b 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.3.4";
+  name = "elasticsearch-1.4.2";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "0c6klwag17npmr1f0zv4syn0d9ir3zm595x3vb42ni4b72f65bqq";
+    sha256 = "0g5mffzx15y8sj0gsn6kd5l1v15hg2vm4j7r071dmxs5jw26rp9i";
   };
 
   patches = [ ./es-home.patch ];
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index 9b96149e5ad8..b4ecbb5a7097 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -34,5 +34,5 @@ index a8c796a..daf7b99 100755
    shift
  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 -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_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