From 2c821a977e988cbec52560f9fb73d216bfc5b83f Mon Sep 17 00:00:00 2001
From: Dominic Chalcraft <dominic@audioboom.com>
Date: Thu, 15 Jun 2023 13:18:19 +0100
Subject: [PATCH 1/2] manticoresearch: 5.0.3 -> 6.0.4

---
 pkgs/servers/search/manticoresearch/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix
index 2611798248a6..e1bbcd3538ce 100644
--- a/pkgs/servers/search/manticoresearch/default.nix
+++ b/pkgs/servers/search/manticoresearch/default.nix
@@ -1,16 +1,17 @@
 { lib, stdenv, fetchFromGitHub, fetchurl
 , bison, cmake, flex, pkg-config
 , boost, icu, libstemmer, mariadb-connector-c, re2
+, nlohmann_json
 }:
 let
   columnar = stdenv.mkDerivation rec {
     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=";
+      sha256 = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c=";
     };
     nativeBuildInputs = [ cmake ];
     cmakeFlags = [ "-DAPI_ONLY=ON" ];
@@ -24,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "manticoresearch";
-  version = "5.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "manticoresoftware";
     repo = "manticoresearch";
     rev = version;
-    sha256 = "sha256-samZYwDYgI9jQ7jcoMlpxulSFwmqyt5bkxG+WZ9eXuk=";
+    sha256 = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c=";
   };
 
   nativeBuildInputs = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
     icu.dev
     libstemmer
     mariadb-connector-c
+    nlohmann_json
     re2
   ];
 
@@ -54,6 +56,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 = [

From 2670961a5485a9f73f43165e6e8a2496c932dfec Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 29 Jul 2023 12:56:23 +0200
Subject: [PATCH 2/2] mantiscoresearch: use `finalAttrs` pattern

---
 .../search/manticoresearch/default.nix        | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix
index e1bbcd3538ce..442ebe751b2d 100644
--- a/pkgs/servers/search/manticoresearch/default.nix
+++ b/pkgs/servers/search/manticoresearch/default.nix
@@ -1,17 +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 = "c18-s6"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake
     src = fetchFromGitHub {
       owner = "manticoresoftware";
       repo = "columnar";
-      rev = version;
-      sha256 = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c=";
+      rev = finalAttrs.version;
+      hash = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c=";
     };
     nativeBuildInputs = [ cmake ];
     cmakeFlags = [ "-DAPI_ONLY=ON" ];
@@ -21,17 +31,17 @@ let
       license = lib.licenses.asl20;
       platforms = lib.platforms.all;
     };
-  };
+  });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "manticoresearch";
   version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "manticoresoftware";
     repo = "manticoresearch";
-    rev = version;
-    sha256 = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c=";
+    rev = finalAttrs.version;
+    hash = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c=";
   };
 
   nativeBuildInputs = [
@@ -66,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;
   };
-}
+})