dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #9357 from offlinehacker/pkgs/elasticsearch/update/1.5.2

Browse Source 
elasticsearch 1.4.5 -> 1.5.2
This commit is contained in:
Arseniy Seroka 2015-08-20 16:04:00 +03:00
commit 6df52b6c96
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ];
};
}

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

@ -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

32
pkgs/servers/search/elasticsearch/plugins.nix
View File

@ -24,10 +24,10 @@ in {
elasticsearch_river_jdbc = esPlugin rec {
name = "elasticsearch-river-jdbc-${version}";
pluginName = "elasticsearch-river-jdbc";
version = "1.3.0.4";
version = "1.5.0.5";
src = fetchurl {
url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip";
sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk";
sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp";
};
meta = {
homepage = "https://github.com/jprante/elasticsearch-river-jdbc";
@ -53,11 +53,11 @@ in {
elasticsearch_http_basic = stdenv.mkDerivation rec {
name = "elasticsearch-http-basic-${version}";
version = "1.3.2";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar";
sha256 = "1qq8z0233mzz699zbzjwmx7ghn8k0djgyc5ixr8i5xchfrsrymn2";
url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar";
sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb";
};
phases = ["installPhase"];
@ -75,11 +75,11 @@ in {
name = pname + "-" + version;
pname = "elasticsearch-river-twitter";
pluginName = "elasticsearch/" + pname + "/" + version;
version = "2.3.0";
version = "2.5.0";
src = fetchurl {
url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip";
sha256 = "1lxxh1r61r15mzqyl0li37kcnn3vvpklnbfyys0kd6a1l82f0qvj";
sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4";
};
meta = {
@ -94,10 +94,10 @@ in {
elasticsearch_kopf = esPlugin rec {
name = "elasticsearch-kopf-${version}";
pluginName = "elasticsearch-kopf";
version = "1.4.7";
version = "1.5.7";
src = fetchurl {
url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip";
sha256 = "17r9mmfjnraswij1glmglljga4i4mfiraivxmai6giwmm2grwlz3";
sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1";
};
meta = {
homepage = https://github.com/lmenezes/elasticsearch-kopf;
@ -106,4 +106,18 @@ in {
};
};
search_guard = esPlugin rec {
name = "elastic-search-guard-${version}";
pluginName = "search-guard";
version = "0.5";
src = fetchurl {
url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip";
sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl";
};
meta = {
homepage = https://github.com/floragunncom/search-guard;
description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch";
license = licenses.asl20;
};
};
}