re-isearch: 2.20220925.4.0a-unstable-2025-03-16 -> 2.20220925.4.0a-unstable-2025-05-15 (#430702)

pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch

···
-# fixes "undefined reference to `IDB::JsonHitTable(RESULT const&)" build failure
-
----
- src/idb.cxx | 26 --------------------------
- 1 file changed, 26 deletions(-)
-
-diff --git a/src/idb.cxx b/src/idb.cxx
-index 2469c06..753a9fb 100644
---- a/src/idb.cxx
-+++ b/src/idb.cxx
-@@ -5486,37 +5486,11 @@ STRING IDB::XMLHitTable(const RESULT& Result)
- }
- #endif
-
--#if 0
- STRING IDB::JsonHitTable(const RESULT& Result)
- {
--#if 1
-   message_log (LOG_FATAL, "JsonHitTable is not yet implemented");
-   return NulString;
--#else
--/*
--<folders>
--    <folder id="123" private="0" archived="0" order="1">Shopping</folder>
--</folders>
--
--is JSON
--
--{
--    "folders": {
--        "folder":{
--        "@": {
--            "id": "123",
--            "private": "0",
--            "archived": "0",
--            "order": "1"
--            },
--        "#": "Shopping"
--        }
--    }
--}
--*/
- }
--#endif
--#endif
-
-
- PIRSET IDB::SearchSmart(QUERY *Query, const STRING& DefaultField)
---
-2.47.2

pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch

···
+From 9fc97ea817762e2575954cd31aa735b2cfec7a5e Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[e-mail]>
+Date: Sun, 3 Aug 2025 19:08:30 +0200
+Subject: [PATCH] build/Makefile: Fix recursive make & parallelism
+
+- Recursively calling make should be done by using the special `MAKE` variable, which will preserve parallelism across calls
+- Don't hardcode parallelism in recursive make calls, inherit user-supplied ones instead
+---
+ build/Makefile | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 6633ebd..807bfd9 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -2,36 +2,36 @@ UNAME := $(shell uname)
+ 
+ all:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5  -f Makefile.MacOS-OMP $(MFLAGS)  
++	$(MAKE) -f Makefile.MacOS-OMP $(MFLAGS)
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS)
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS)
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS)
++	$(MAKE) -f Makefile.solaris $(MFLAGS)
+ endif
+ 
+ install:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5  -f Makefile.MacOS-OMP $(MFLAGS) install
++	$(MAKE) -f Makefile.MacOS-OMP $(MFLAGS) install
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS) install
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS) install
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS) install
++	$(MAKE) -f Makefile.solaris $(MFLAGS) install
+ endif
+ 
+ 
+ plugins:
+ ifeq ($(UNAME), Darwin)
+-	make -j 5 -f Makefile.MacOS $(MFLAGS) plugins
++	$(MAKE) -f Makefile.MacOS $(MFLAGS) plugins
+ endif
+ ifeq ($(UNAME), Linux)
+-	make -j 3  -f Makefile.ubuntu $(MFLAGS) plugins
++	$(MAKE) -f Makefile.ubuntu $(MFLAGS) plugins
+ endif
+ ifeq ($(UNAME), Solaris)
+-	make  -f Makefile.solaris $(MFLAGS) plugins
++	$(MAKE) -f Makefile.solaris $(MFLAGS) plugins
+ endif
+ 
+ 
+-- 
+2.50.1
+

pkgs/by-name/re/re-isearch/package.nix

···
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-03-16";
+  version = "2.20220925.4.0a-unstable-2025-05-15";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873";
-    hash = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM=";
+    rev = "35e939fd60948f112b668b06d2b8b75f2c7425d3";
+    hash = "sha256-r7KUwx2SrfnpSknGSpzw33Qwp63htoKknrnmdOgA/9Y=";
   };
 
-  # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11
-  patches = [ ./0001-fix-JsonHitTable-undefined-reference.patch ];
+  patches = [
+    # https://github.com/re-Isearch/re-Isearch/pull/12
+    ./1001-Fix-resurcive-make-parallelism.patch
+  ];
 
   postPatch = ''
     # Fix gcc-13 build due to missing <cstdint> include.
+    # https://github.com/re-Isearch/re-Isearch/pull/13
     sed -e '1i #include <cstdint>' -i src/mmap.cxx
 
-    # g++: error: unrecognized command-line option '-msse2'
-    # gcc: error: unrecognized command-line option '-m64'
+    # These flags are not supported on all architectures
+    # https://github.com/re-Isearch/re-Isearch/issues/14
     substituteInPlace build/Makefile.ubuntu \
       --replace-fail "-msse2" "" \
       --replace-fail "-m64" ""
···
   ];
 
   makeFlags = [
-    "CC=g++"
-    "cc=gcc"
-    "LD=g++"
+    "CC=${stdenv.cc.targetPrefix}c++"
+    "cc=${stdenv.cc.targetPrefix}cc"
+    "LD=${stdenv.cc.targetPrefix}c++"
   ];
 
   preBuild = ''
     cd build
-    make clean # clean up pre-built objects in the source
     makeFlagsArray+=(
-      EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include"
+      EXTRA_INC="-I${lib.getDev db}/include -I${lib.getDev file}/include"
       LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib"
     )
   '';
+
+  # Handwritten Makefiles, doesn't properly ensure that libraries are built before they're used in linking
+  # ld: cannot find -libUtils: No such file or directory
+  # ld: cannot find -libLocal: No such file or directory
+  enableParallelBuilding = false;
 
   installPhase = ''
     runHook preInstall