diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-20 00:18:32 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-20 00:18:46 +0200 |
| commit | 8aa50beb1f1821ed8b1f054a81a82ee903c86560 (patch) | |
| tree | 0030e37643e3a61722aaf4e3dd7fd2e187372e98 /pkgs/servers | |
| parent | ef07bd04dca43a3ea5902a62d729cc2cc91999d1 (diff) | |
| download | nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar.gz nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar.bz2 nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar.lz nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar.xz nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.tar.zst nixlib-8aa50beb1f1821ed8b1f054a81a82ee903c86560.zip | |
elasticsearch 1.4.5 -> 1.5.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/es-home.patch | 16 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index be30e12258b2..859f1501bb3c 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.4.5"; + name = "elasticsearch-1.5.2"; src = fetchurl { - url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w"; + url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; + sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg"; }; patches = [ ./es-home.patch ]; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; + maintainers = [ maintainers.offline ]; }; } diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch index b4ecbb5a7097..2f7a7fe79198 100644 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -1,8 +1,7 @@ -diff --git a/bin/elasticsearch b/bin/elasticsearch -index c7c9263..0fcecf6 100755 ---- a/bin/elasticsearch -+++ b/bin/elasticsearch -@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2015-08-05 17:52:05.740819671 +0200 ++++ b/bin/elasticsearch 2015-08-05 17:22:34.664657364 +0200 +@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do done # determine elasticsearch home @@ -14,10 +13,9 @@ index c7c9263..0fcecf6 100755 # make ELASTICSEARCH_HOME absolute ES_HOME=`cd "$ES_HOME"; pwd` -diff --git a/bin/plugin b/bin/plugin -index a8c796a..daf7b99 100755 ---- a/bin/plugin -+++ b/bin/plugin +diff -rupN a/bin/plugin b/bin/plugin +--- a/bin/plugin 2015-08-05 17:57:07.903088815 +0200 ++++ b/bin/plugin 2015-08-05 17:57:38.979808139 +0200 @@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do done |