diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-09-25 11:10:10 +0200 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-09-25 11:10:10 +0200 |
commit | 5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d (patch) | |
tree | d0048b286773f27a47435067dc660283b011ba4d /pkgs/servers | |
parent | 4086bd92a54593f5137b07fba4f910a7a2ab63c6 (diff) | |
parent | cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8 (diff) | |
download | nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar.gz nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar.bz2 nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar.lz nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar.xz nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.tar.zst nixlib-5d6500fee8d49dc65b62ca0bf6b4570d0700ce2d.zip |
Merge pull request #10028 from itkovian/elasticsearch-1.7.2
elasticsearch: 1.5.2 -> 1.7.2
Diffstat (limited to 'pkgs/servers')
-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 859f1501bb3c..16f010302902 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 2f7a7fe79198..2f2018fd69fa 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 |