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

elasticsearch: Update to 1.0.0

Browse Source 
close #1746
This commit is contained in:
Oliver Charles 2014-02-14 16:24:26 +00:00 committed by Evgeny Egorochkin
parent daa2827b99
commit 5cd0a886fe
2 changed files with 40 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, fetchurl, makeWrapper, jre, utillinux }: { stdenv, fetchurl, makeWrapper, jre, utillinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elasticsearch-0.90.3"; name = "elasticsearch-1.0.0";
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 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s"; sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01";
}; };
patches = [ ./es-home.patch ]; patches = [ ./es-home.patch ];

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

@ -1,59 +1,38 @@
diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch diff --git a/bin/elasticsearch b/bin/elasticsearch
*** elasticsearch-0.90.3/bin/elasticsearch 2013-08-06 15:19:22.000000000 +0200 index c7c9263..0fcecf6 100755
--- elasticsearch-0.90.3-new/bin/elasticsearch 2013-08-27 16:42:00.935880011 +0200 --- a/bin/elasticsearch
*************** +++ b/bin/elasticsearch
*** 62,68 **** @@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do
done done
# determine elasticsearch home # determine elasticsearch home
! ES_HOME=`dirname "$SCRIPT"`/.. -ES_HOME=`dirname "$SCRIPT"`/..
+if [ -z "$ES_HOME" ]; then
# make ELASTICSEARCH_HOME absolute + echo "You must set the ES_HOME var" >&2
ES_HOME=`cd "$ES_HOME"; pwd` + exit 1
--- 62,71 ---- +fi
done
# make ELASTICSEARCH_HOME absolute
# determine elasticsearch home ES_HOME=`cd "$ES_HOME"; pwd`
! if [ -z "$ES_HOME" ]; then diff --git a/bin/plugin b/bin/plugin
! echo "You must set the ES_HOME var" >&2 index a8c796a..daf7b99 100755
! exit 1 --- a/bin/plugin
! fi +++ b/bin/plugin
@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
# make ELASTICSEARCH_HOME absolute done
ES_HOME=`cd "$ES_HOME"; pwd`
diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin # determine elasticsearch home
*** elasticsearch-0.90.3/bin/plugin 2013-08-06 15:19:22.000000000 +0200 -ES_HOME=`dirname "$SCRIPT"`/..
--- elasticsearch-0.90.3-new/bin/plugin 2013-08-27 16:49:01.024160295 +0200 +if [ -z "$ES_HOME" ]; then
*************** + echo "You must set the ES_HOME var" >&2
*** 16,22 **** + exit 1
done +fi
# determine elasticsearch home # make ELASTICSEARCH_HOME absolute
! ES_HOME=`dirname "$SCRIPT"`/.. ES_HOME=`cd "$ES_HOME"; pwd`
@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do
# make ELASTICSEARCH_HOME absolute shift
ES_HOME=`cd "$ES_HOME"; pwd` done
--- 16,25 ----
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
# determine elasticsearch home
! if [ -z "$ES_HOME" ]; then
! echo "You must set the ES_HOME var" >&2
! exit 1
! fi
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
***************
*** 46,50 ****
shift
done
! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
--- 49,53 ----
shift
done
! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args