diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-11-29 17:10:15 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-01 12:47:12 +0100 |
| commit | fbf0efc6a72a831c3dd89598fe8c596e2949929d (patch) | |
| tree | d299212c4d0a82916fac5f49729a7c7cfc570e4d /pkgs/servers/search/elasticsearch | |
| parent | 3b44ccd991be84dcc32e60875c7a49db55fc4159 (diff) | |
| download | nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar.gz nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar.bz2 nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar.lz nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar.xz nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.tar.zst nixpkgs-fbf0efc6a72a831c3dd89598fe8c596e2949929d.zip | |
elk: 6.3.2 -> 6.5.1
Diffstat (limited to 'pkgs/servers/search/elasticsearch')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/plugins.nix | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 5a43a30257e..0cf81a4c2d6 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -19,14 +19,20 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh" - else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4"; + then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp" + else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs"; }; patches = [ ./es-home-6.x.patch ]; postPatch = '' - sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env + substituteInPlace bin/elasticsearch-env --replace \ + "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \ + "ES_CLASSPATH=\"$out/lib/*\"" + + substituteInPlace bin/elasticsearch-cli --replace \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\"" ''; buildInputs = [ makeWrapper jre_headless utillinux ] diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 330a81a422c..4451b010446 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -27,7 +27,7 @@ in { version = "${elk6Version}"; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "1m4z05wixjrq4nlbdjyhvprkrwxjym8aba18scmzfn25fhbjgvkz"; + sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v"; }; meta = with stdenv.lib; { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; @@ -42,7 +42,7 @@ in { version = "${elk6Version}"; src = pkgs.fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; - sha256 = "1i7ksy69132sr84h51lamgq967yz3a3dw0b54nckxpqwad9pcpj0"; + sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1"; }; meta = with stdenv.lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; @@ -54,10 +54,10 @@ in { search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "${elk6Version}-22.3"; + version = "${elk6Version}-23.2"; src = fetchurl rec { url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "1r71h4h9bmxak1mq5gpm19xq5ji1gry1kp3sjmm8azy4ykdqdncx"; + sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb"; }; meta = with stdenv.lib; { homepage = https://github.com/floragunncom/search-guard; |