Merge pull request #237929 from DChalcraft/manticore

manticoresearch: 5.0.3 -> 6.0.4

1 files changed, 30 insertions, 17 deletions

diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix
index 2611798248a6e..442ebe751b2dd 100644
--- a/pkgs/servers/search/manticoresearch/default.nix
+++ b/pkgs/servers/search/manticoresearch/default.nix
@@ -1,16 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl
-, bison, cmake, flex, pkg-config
-, boost, icu, libstemmer, mariadb-connector-c, re2
+{ lib
+, stdenv
+, fetchFromGitHub
+, bison
+, cmake
+, flex
+, pkg-config
+, boost
+, icu
+, libstemmer
+, mariadb-connector-c
+, re2
+, nlohmann_json
 }:
+
 let
-  columnar = stdenv.mkDerivation rec {
+  columnar = stdenv.mkDerivation (finalAttrs: {
     pname = "columnar";
-    version = "c16-s5"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake
+    version = "c18-s6"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake
     src = fetchFromGitHub {
       owner = "manticoresoftware";
       repo = "columnar";
-      rev = version;
-      sha256 = "sha256-iHB82FeA0rq9eRuDzY+AT/MiaRIGETsnkNPCqKRXgq8=";
+      rev = finalAttrs.version;
+      hash = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c=";
     };
     nativeBuildInputs = [ cmake ];
     cmakeFlags = [ "-DAPI_ONLY=ON" ];
@@ -20,17 +31,17 @@ let
       license = lib.licenses.asl20;
       platforms = lib.platforms.all;
     };
-  };
+  });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "manticoresearch";
-  version = "5.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "manticoresoftware";
     repo = "manticoresearch";
-    rev = version;
-    sha256 = "sha256-samZYwDYgI9jQ7jcoMlpxulSFwmqyt5bkxG+WZ9eXuk=";
+    rev = finalAttrs.version;
+    hash = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c=";
   };
 
   nativeBuildInputs = [
@@ -46,6 +57,7 @@ stdenv.mkDerivation rec {
     icu.dev
     libstemmer
     mariadb-connector-c
+    nlohmann_json
     re2
   ];
 
@@ -54,6 +66,7 @@ stdenv.mkDerivation rec {
 
     # supply our own packages rather than letting manticore download dependencies during build
     sed -i 's/^with_get/with_menu/' CMakeLists.txt
+    sed -i 's/include(GetNLJSON)/find_package(nlohmann_json)/' CMakeLists.txt
   '';
 
   cmakeFlags = [
@@ -63,12 +76,12 @@ stdenv.mkDerivation rec {
     "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Easy to use open source fast database for search";
     homepage = "https://manticoresearch.com";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     mainProgram = "searchd";
-    maintainers = with maintainers; [ jdelStrother ];
-    platforms = platforms.all;
+    maintainers = [ lib.maintainers.jdelStrother ];
+    platforms = lib.platforms.all;
   };
-}
+})