diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-08-16 19:37:11 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-08-16 19:37:11 +0200 |
| commit | 86797b2008511751bfb4e9abf085d8bdea1d547f (patch) | |
| tree | fc3b05e823892f3a59d9c88df9d3612e3e4e07d9 /pkgs/servers/search | |
| parent | 1dcd19866c8608e7fc1f54cc3d84542f19c65503 (diff) | |
| parent | ec1e6d834ae803f02a353914843e096c2091d233 (diff) | |
| download | nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar.gz nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar.bz2 nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar.lz nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar.xz nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.tar.zst nixlib-86797b2008511751bfb4e9abf085d8bdea1d547f.zip | |
Merge branch 'staging-next' into staging
Conflicts: - pkgs/development/libraries/qt-6/default.nix Merge a5b92645f1e6762e4b53f48652cb766184d84e77 and 0597d865ef4f763f3fed54702b29ce328d28e2b4
Diffstat (limited to 'pkgs/servers/search')
| -rw-r--r-- | pkgs/servers/search/opensearch/default.nix | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 8e4514eb0bc2..d32d77f0ae49 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -1,27 +1,30 @@ -{ lib -, stdenv -, stdenvNoCC +{ coreutils , fetchurl -, makeWrapper -, jre_headless , gnugrep -, coreutils -, autoPatchelfHook -, zlib +, jre_headless +, lib +, makeBinaryWrapper , nixosTests +, stdenv +, stdenvNoCC }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; - hash = "sha256-64vWis+YQfjOw8eaYi1nggq/Q2ErqqcEuISXPGROypc="; + url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; + hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre_headless ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + jre_headless + ]; installPhase = '' runHook preInstall @@ -48,12 +51,12 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ shyim ]; + platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ shyim ]; }; -} +}) |