From 929143c14558140944c3beb392fbb084d8f9bd93 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 28 Feb 2023 21:46:48 +0100 Subject: [PATCH 1/2] opensearch: 2.5.0 -> 2.6.0 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index b8274d894b27..fd7bb04e0c87 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -13,11 +13,11 @@ stdenvNoCC.mkDerivation rec { pname = "opensearch"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; - hash = "sha256-WPD5StVBb/hK+kP/1wkQQBKRQma/uaP+8ULeIFUBL1U="; + hash = "sha256-qJrgWF8JCR4jmnF239gaiRr4Y7Tin0TyYjzxd1Q4Wko"; }; nativeBuildInputs = [ makeWrapper ]; From 5cfd70fd4d6afabb89434c7a2ff0d116b030bbf9 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 28 Feb 2023 21:47:34 +0100 Subject: [PATCH 2/2] opensearch: fix knn ml plugin --- pkgs/servers/search/opensearch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index fd7bb04e0c87..fa860437fb51 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , stdenvNoCC , fetchurl , makeWrapper @@ -35,6 +36,7 @@ stdenvNoCC.mkDerivation rec { wrapProgram $out/bin/opensearch \ --prefix PATH : "${lib.makeBinPath [ util-linux gnugrep coreutils ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/plugins/opensearch-knn/lib/" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}"