diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-25 17:04:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-25 17:04:07 +0200 |
commit | 7d04961c959c8bd89a90aee993b90166ae5a211f (patch) | |
tree | c8b5e9702437da7eb49d24d3cef4a0456de68a7f /pkgs/servers/search/elasticsearch/es-classpath-2.x.patch | |
parent | 5e3c1c2e327c1109f2bb9d615a0d0358fbb296f6 (diff) | |
parent | 551fec44673ea023c303335e762f880d3c28646e (diff) | |
download | nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar.gz nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar.bz2 nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar.lz nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar.xz nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.tar.zst nixlib-7d04961c959c8bd89a90aee993b90166ae5a211f.zip |
Merge pull request #44389 from Mic92/es6
elasticsearch: use 6.x as default version, remove unsupported releases
Diffstat (limited to 'pkgs/servers/search/elasticsearch/es-classpath-2.x.patch')
-rw-r--r-- | pkgs/servers/search/elasticsearch/es-classpath-2.x.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch deleted file mode 100644 index 46a3f0be71b7..000000000000 --- a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 -@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` - # If an include wasn't specified in the environment, then search for one... - if [ "x$ES_INCLUDE" = "x" ]; then - # Locations (in order) to use when searching for an include file. -- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ -- /usr/local/share/elasticsearch/elasticsearch.in.sh \ -- /opt/elasticsearch/elasticsearch.in.sh \ -- ~/.elasticsearch.in.sh \ -- "$ES_HOME/bin/elasticsearch.in.sh" \ -- "`dirname "$0"`"/elasticsearch.in.sh; do -+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do - if [ -r "$include" ]; then - . "$include" - break -diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh ---- a/bin/elasticsearch.in.sh 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 -@@ -1,17 +1,5 @@ - #!/bin/sh - --# check in case a user was using this mechanism --if [ "x$ES_CLASSPATH" != "x" ]; then -- cat >&2 << EOF --Error: Don't modify the classpath with ES_CLASSPATH. Best is to add --additional elements via the plugin mechanism, or if code must really be --added to the main classpath, add jars to lib/ (unsupported). --EOF -- exit 1 --fi -- --ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" -- - if [ "x$ES_MIN_MEM" = "x" ]; then - ES_MIN_MEM=256m - fi |