+user@updatability(Bonfire): bump to 1.0.6.beta-4

Author: ju1m

pkgs/by-name/bonfire/deps/evision.nix

@@ -7,6 +7,7 @@
   which,
   python3,
   elixir,
+  fetchFromGitHub,
   enableOpenCVContrib ? true,
   # FixMe(functional/completeness): test whether CUDA actually works. CUDA is not free software.
   cudaSupport ? config.cudaSupport,
@@ -15,29 +16,27 @@
 }:
 finalMixPkgs: previousMixPkgs: {
   evision = previousMixPkgs.evision.overrideAttrs (
-    finalAttrs: previousAttrs: {
+    finalAttrs: previousAttrs:
+    let
+      src = fetchFromGitHub {
+        owner = "cocoa-xu";
+        repo = "evision";
+        rev = "v${finalAttrs.version}";
+        hash = "sha256-3iek3FQBIrauJ2x7Ph9RCkdSH7kePamff+ycjKNBGuM=";
+      };
+    in
+    {
+      inherit src;
       # Explanation: to build, evision.so requires:
       # 1. OPENCV_CONFIGURATION_PRIVATE_HPP, a private CPP header from opencv.src
-      # 2. C_SRC_HEADERS_TXT, a list of CPP headers from python_bindings_generator
+      # 2. C_SRC_HEADERS_TXT, a JSON file listing CPP headers from python_bindings_generator
       postUnpack = previousAttrs.postUnpack or "" + ''
+        cp -av --no-preserve=mode ${src}/py_src $sourceRoot
         cp -at $sourceRoot/c_src/ \
           ${finalAttrs.passthru.opencv.src}/modules/core/include/opencv2/core/utils/configuration.private.hpp \
-          ${finalAttrs.passthru.opencv}/modules/python_bindings_generator/headers${lib.optionalString enableOpenCVContrib "-contrib"}.txt
+          ${finalAttrs.passthru.opencv}/modules/python_bindings_generator/gen_python_config${lib.optionalString enableOpenCVContrib "-contrib"}.json
       '';
 
-      patches = [
-        # Explanation: avoid errors caused by missing flann symbols.
-        # See https://github.com/cocoa-xu/evision/issues/293
-        # Revert [PATCH] commented out `cvflann::flann_distance_t` conversion
-        (fetchpatch2 {
-          name = "commented-out-cvflann-flann_distance_t-conversion
--functions";
-          url = "https://github.com/cocoa-xu/evision/commit/4ae5c62ca591e0a0fadb5dcd90ed5149bddfc7c0.patch";
-          hash = "sha256-+vM6swrqIK9Xz2R8kRSR+BeF7wBvW6x6d0N/+9FnO5E=";
-          revert = true;
-        })
-      ];
-
       # Explanation: skip complex rules of the Makefile to build opencv,
       # and let cmake use the opencv provided by nix.
       postPatch = previousAttrs.postPatch or "" + ''

pkgs/by-name/bonfire/deps/evision/opencv.nix

@@ -2,11 +2,14 @@
   lib,
   fetchFromGitHub,
   fetchpatch2,
+  jq,
   python3,
   python3Packages,
   enableContrib ? true,
   enableCuda ? false,
   apply_patch_py,
+  sysprof,
+  libsysprof-capture,
   ...
 }:
 let
@@ -24,59 +27,67 @@ in
 }).overrideAttrs
   (
     finalAttrs: previousAttrs: {
-      # Explanation: nixpkgs's opencv-4.12.0 is not (yet) supported by evision-0.2.14
-      # and more specifically, gen2.py's flags where changed substantialy in opencv-4.12.0:
-      # https://github.com/opencv/opencv/pull/27325
-      #
-      # ToDo(maintenance/update): once evision supports opencv-4.12.0
-      # this version may be able to match nixpkgs' version.
-      version = "4.11.0";
+      # Explanation: match evision-0.2.17's `OPENCV_VER`
+      version = "4.13.0";
 
       src = fetchFromGitHub {
         owner = "opencv";
         repo = "opencv";
         tag = finalAttrs.version;
-        hash = "sha256-oiU4CwoMfuUbpDtujJVTShMCzc5GsnIaprC4DzkSzEM=";
+        hash = "sha256-h9gpSf+xf/OafQSCYq3JYBt/ShnxafSG7WbxesTjM/A=";
       };
-      patches = [
-        # ToDo(maintenance/update): remove this patch on opencv-4.12.0
-        #
-        # Explanation: frontporting opencv-4.11.0 to nixos-25.11
-        # stumbles on the new ffmpeg-8 in nixos-25.11.
-        # Issue: https://github.com/opencv/opencv/issues/27688
-        (fetchpatch2 {
-          name = "FFmpeg 8.0 support";
-          url = "https://github.com/opencv/opencv/pull/27691.patch";
-          hash = "sha256-wRL2mLxclO5NpWg1rBKso/8oTO13I5XJ6pEW+Y3PsPc=";
-        })
+      /*
+        patches = [
+          # ToDo(maintenance/update): remove this patch on opencv-4.12.0
+          #
+          # Explanation: frontporting opencv-4.11.0 to nixos-25.11
+          # stumbles on the new ffmpeg-8 in nixos-25.11.
+          # Issue: https://github.com/opencv/opencv/issues/27688
+          (fetchpatch2 {
+            name = "FFmpeg 8.0 support";
+            url = "https://github.com/opencv/opencv/pull/27691.patch";
+            hash = "sha256-wRL2mLxclO5NpWg1rBKso/8oTO13I5XJ6pEW+Y3PsPc=";
+          })
 
-        # ToDo(maintenance/update): remove this patch on opencv-4.12.0
-        #
-        # Explanation: frontporting opencv-4.11.0 to nixos-25.11
-        # stumbles on the new cmake-4 in nixos-25.11,
-        # which deprecated too old cmake_minimum_required() in CMakeLists.txt
-        # that BUILD_JASPER=ON + WITH_ADE=ON still expects.
-        (fetchpatch2 {
-          name = "Fix configuring with CMake version 4";
-          url = "https://github.com/opencv/opencv/pull/27192.patch";
-          hash = "sha256-1yzOU9xR5LmdxzczM4sXuDyZ/DCLJApAQMUQE2mmAlg=";
-        })
-      ];
+          # ToDo(maintenance/update): remove this patch on opencv-4.12.0
+          #
+          # Explanation: frontporting opencv-4.11.0 to nixos-25.11
+          # stumbles on the new cmake-4 in nixos-25.11,
+          # which deprecated too old cmake_minimum_required() in CMakeLists.txt
+          # that BUILD_JASPER=ON + WITH_ADE=ON still expects.
+          (fetchpatch2 {
+            name = "Fix configuring with CMake version 4";
+            url = "https://github.com/opencv/opencv/pull/27192.patch";
+            hash = "sha256-1yzOU9xR5LmdxzczM4sXuDyZ/DCLJApAQMUQE2mmAlg=";
+          })
+        ];
+      */
 
-      # Explanation: nixos-25.11#opencv4's contribSrc's version
+      # Explanation: nixos-26.05#opencv4's contribSrc's version
       # is not using finalAttrs.version
       # so override postUnpack with the correct one.
       opencvContribSrc = fetchFromGitHub {
         owner = "opencv";
         repo = "opencv_contrib";
         tag = finalAttrs.version;
-        hash = "sha256-YNd96qFJ8SHBgDEEsoNps888myGZdELbbuYCae9pW3M=";
+        hash = "sha256-8YRCq1H9afb1a0pVevH0x61SMW4dTpLAno/P9A6bOIg=";
       };
       postUnpack = ''
-        cp --no-preserve=mode -r "${finalAttrs.opencvContribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
+        cp --no-preserve=mode -r "${finalAttrs.opencvContribSrc}/modules" "$sourceRoot/opencv_contrib"
+        # Required for apply_patch to find `opencv_contrib`,
+        # eg. for `patch_ocr_tesseract_run_with_components`
+        mkdir $sourceRoot/opencv_contrib-${finalAttrs.version}
+        ln -s ../opencv_contrib $sourceRoot/opencv_contrib-${finalAttrs.version}/modules
       '';
 
-      nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ python3 ];
+      nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
+        jq
+        python3
+      ];
+      buildInputs = previousAttrs.buildInputs or [ ] ++ [
+        sysprof
+        libsysprof-capture
+      ];
 
       # Explanation(compatibility): evision has an unusual way to patch opencv:
       # a Python script.
@@ -190,18 +201,22 @@ in
       # > from the python module in the OpenCV repo so that they output header files
       # > that can be used in Elixir bindings
       #
-      # For that evision needs a headers.txt generated for Python
+      # For that evision needs a gen_python_config.json generated for Python
       # listing the .hpp files to consider.
       # Unfortunately those files are absolute path in $NIX_BUILD_TOP,
-      # they need to be fixed to point to $out, and installed there.
+      # they need to be fixed to point to somewhere in $out.
+      # Note that $out/include/ cannot be used reliably
+      # since some headers are not installed at all yet required by evision.
       postInstall = previousAttrs.postInstall or "" + ''
-        OPENCV_HEADERS_TXT=$NIX_BUILD_TOP/$sourceRoot/build/modules/python_bindings_generator/headers.txt
+        pushd "$NIX_BUILD_TOP/$sourceRoot"
+        find . \( -name "*.hpp" -or -name "*.h" \) \
+             -exec sh -xc 'install -Dm644 -t$out/source/''${1%/*} $1' -- {} \;
+        OPENCV_HEADERS="build/modules/python_bindings_generator/gen_python_config.json"
         mkdir -p $out/modules/python_bindings_generator/
-        while IFS= read -r header; do
-          h=$(realpath --relative-to "$NIX_BUILD_TOP" "$header")
-          install -Dm644 "$header" "$out/$h"
-          echo "$out/$h"
-        done <"$OPENCV_HEADERS_TXT" >$out/modules/python_bindings_generator/headers${lib.optionalString enableContrib "-contrib"}.txt
+        jq '.headers |= map(sub("^'"$NIX_BUILD_TOP"'"; "'$out'"))' \
+          <"$OPENCV_HEADERS" \
+          >$out/modules/python_bindings_generator/gen_python_config${lib.optionalString enableContrib "-contrib"}.json
+        popd
       '';
     }
   )

pkgs/by-name/bonfire/deps/text/4.patch

@@ -0,0 +1,54 @@
+From 10bad143bed89fd55d7a2c3cdfa977f59b7cfe1e Mon Sep 17 00:00:00 2001
+From: Julien Moutinho <julm@sourcephile.fr>
+Date: Thu, 9 Jul 2026 00:13:05 +0200
+Subject: [PATCH] Fix compatibility with Erlang/OTP 28
+
+Erlang/OTP 28 no longer allows regexes to be defined in the module body and interpolated into an attribute.
+
+Closes: https://github.com/kipcole9/text/issues/3
+---
+ lib/pii.ex | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/lib/pii.ex b/lib/pii.ex
+index 029159f..9363fe9 100644
+--- a/lib/pii.ex
++++ b/lib/pii.ex
+@@ -29,7 +29,7 @@ defmodule Text.PII do
+ 
+   """
+ 
+-  @patterns [
++  defp patterns do [
+     email: ~r/\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/,
+     url: ~r{\bhttps?://[^\s<>"']+},
+     ssn: ~r/\b\d{3}-\d{2}-\d{4}\b/,
+@@ -43,14 +43,13 @@ defmodule Text.PII do
+     # Always re-validated by Luhn before being reported.
+     credit_card: ~r/\b(?:\d[ \-]?){12,18}\d\b/
+   ]
+-
+-  @types Keyword.keys(@patterns)
++  end
+ 
+   @doc """
+   Returns the list of detector type atoms supported by this module.
+   """
+   @spec types() :: [atom()]
+-  def types, do: @types
++  def types, do: Keyword.keys(patterns())
+ 
+   @doc """
+   Detects PII matches in the text.
+@@ -85,9 +84,9 @@ defmodule Text.PII do
+           %{type: atom(), value: String.t(), start: non_neg_integer(), length: pos_integer()}
+         ]
+   def detect(text, options \\ []) when is_binary(text) do
+-    requested = Keyword.get(options, :types, @types)
++    requested = Keyword.get(options, :types, types())
+ 
+-    @patterns
++    patterns()
+     |> Enum.filter(fn {type, _} -> type in requested end)
+     |> Enum.flat_map(fn {type, regex} ->
+       Regex.scan(regex, text, return: :index)