diff options
Diffstat (limited to 'pkgs/servers/search')
-rw-r--r-- | pkgs/servers/search/elasticsearch/7.x.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/plugins.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/search/manticoresearch/default.nix | 115 | ||||
-rw-r--r-- | pkgs/servers/search/meilisearch/default.nix | 3 |
4 files changed, 16 insertions, 130 deletions
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 9efa621e5b4bb..f439b0ae43046 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -18,10 +18,10 @@ let plat = elemAt info 1; hashes = { - x86_64-linux = "sha512-eiAT5Dx/w56GoxpzPMdMWH7yu6DAE/lc6HT5i0iKT48Ob7JUoe7dXAsOIQrtmgGV9zWPqWU8iQ4jRBP/kxkIBw=="; - x86_64-darwin = "sha512-5vSefA9Z4mCz49Q+Vzdck1KXbE9REYAF46kSf0G1n5XlHqFYzTGOmUEObZhGTqH4RDLJBdEqhLj2iyzjWQX5RA=="; - aarch64-linux = "sha512-8nkPSbecOBJGu/h0MZGUUq+Tqk/YqmvJwfkDHn7V2cZJ9bq4Z8KKfRYC4ihdP0pfePgJrAV0SwKtZ9aGELtnfQ=="; - aarch64-darwin = "sha512-dbZrYGULuC3FF/SllPpAgW077Lkr87NJ8+gyTMayl8i8rOvAjnZhiR/U7eA6CZ/qVsFQkpGATdAzRXF8NlZBcg=="; + x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw=="; + x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw=="; + aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA=="; + aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig=="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index c23b5ad7a2bd2..58e74b746ee9c 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,7 +38,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-D08CVW/qHpZZaKnploM4aCJ4bunvPjVmieDYr1d6jQA=" + if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-cpgr2zPCpsLrmshWJWoGNcGl0X+bO/K4A9bMqLv8+H8=" + if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -87,7 +87,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-UmykO+hZDvlFhEbf7zL2bdw4j6NhByRBu9eH3F6/EtM=" + if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -103,7 +103,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-Y/AbLfHSdocX0NQbnKm63gTWgwzssb4kpSwRqLozD9w=" + if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -119,7 +119,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-QIYD7cGpJQg+csv/tekN6GFtdnuhYU6VyAXk7nY/uWs=" + if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -135,7 +135,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.10" then "sha256-L8lS+EPYuhNNTnP3ImeZsBQ5a5DAncs3qBFDWGWISRI=" + if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -151,7 +151,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.10" then "sha256-eXstbxlyS8WzW8u5YiMFXGpILCcEWrIb/IxXVzAGFLU=" + if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -167,13 +167,13 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.17.10" then "${esVersion}-53.7.0" + if esVersion == "7.17.16" then "${esVersion}-53.8.0" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.17.10" then + if esVersion == "7.17.16" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - hash = "sha256-FIF4O8z0U2giXVA2cNEdCDbpuJDJhaxHBOmv2fACucw="; + hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI="; } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = with lib; { diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix deleted file mode 100644 index d7fe93a214b13..0000000000000 --- a/pkgs/servers/search/manticoresearch/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -, cmake -, flex -, pkg-config -, boost -, icu -, libstemmer -, mariadb-connector-c -, re2 -, nlohmann_json -, testers -, manticoresearch -}: - -let - columnar = stdenv.mkDerivation (finalAttrs: { - pname = "columnar"; - version = "c21-s10"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's cmake/GetColumnar.cmake - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "columnar"; - rev = finalAttrs.version; - hash = "sha256-TGFGFfoyHnPSr2U/9dpqFLUN3Dt2jDQrTF/xxDY4pdE="; - }; - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DAPI_ONLY=ON" ]; - meta = { - description = "A column-oriented storage and secondary indexing library"; - homepage = "https://github.com/manticoresoftware/columnar/"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; - }); - uni-algo = stdenv.mkDerivation (finalAttrs: { - pname = "uni-algo"; - version = "0.7.2"; - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "uni-algo"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+V9w4UJ+3KsyZUYht6OEzms60mBHd8FewVc7f21Z9ww="; - }; - nativeBuildInputs = [ cmake ]; - meta = { - description = "Unicode Algorithms Implementation for C/C++"; - homepage = "https://github.com/manticoresoftware/uni-algo"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "manticoresearch"; - version = "6.2.0"; - - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "manticoresearch"; - rev = finalAttrs.version; - hash = "sha256-KmBIQa5C71Y/1oa3XiPfmb941QDU2rWo7Bl5QlAo+yA="; - }; - - nativeBuildInputs = [ - bison - cmake - flex - pkg-config - ]; - - buildInputs = [ - boost - columnar - icu.dev - libstemmer - mariadb-connector-c - nlohmann_json - uni-algo - re2 - ]; - - postPatch = '' - sed -i 's/set ( Boost_USE_STATIC_LIBS ON )/set ( Boost_USE_STATIC_LIBS OFF )/' src/CMakeLists.txt - - # supply our own packages rather than letting manticore download dependencies during build - sed -i 's/^with_get/with_menu/' CMakeLists.txt - sed -i 's/get_dep \( nlohmann_json .* \)/find_package(nlohmann_json)/' CMakeLists.txt - sed -i 's/get_dep \( uni-algo .* \)/find_package(uni-algo)/' CMakeLists.txt - ''; - - cmakeFlags = [ - "-DWITH_GALERA=0" - "-DWITH_MYSQL=1" - "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" - "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" - ]; - - passthru.tests.version = testers.testVersion { - inherit (finalAttrs) version; - package = manticoresearch; - command = "searchd --version"; - }; - - meta = { - description = "Easy to use open source fast database for search"; - homepage = "https://manticoresearch.com"; - changelog = "https://github.com/manticoresoftware/manticoresearch/releases/tag/${finalAttrs.version}"; - license = lib.licenses.gpl2; - mainProgram = "searchd"; - maintainers = [ lib.maintainers.jdelStrother ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index b1965bff52bfb..262a5e9e63e07 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchFromGitHub , Security +, SystemConfiguration , nixosTests , nix-update-script }: @@ -40,7 +41,7 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ - Security + Security SystemConfiguration ]; passthru = { |