From 23284e113cd3cccb1677a29a472a099a474eda28 Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Sat, 18 Oct 2025 12:10:24 +0200
Subject: [PATCH] gnu: python-datrie: Update to 0.8.3, unbundle libdatrie.

* gnu/packages/python-xyz.scm (python-datrie): Update to 0.8.3.
[source]: Switch to git-fetch, unbundle libdatrie.
[build-system]: Switch to pyproject-build-system.
[arguments]<#:phases>: Add phase 'inject-libdatrie.
[native-inputs]: Add python-setuptools.  Remove python-pytest-runner.
[inputs]: Add libdatrie.

Change-Id: I90cd92129b75b76485122c9fffa359a0b8bfd8fb
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/python-xyz.scm | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b78a3cc8f01833e32552a2d4a81f2a623d3be2c1..0f07a04b94efe2f569b00e78ab2a5d9e46ba2cc9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15478,27 +15478,35 @@ of the structure, dynamics, and functions of complex networks.")
 (define-public python-datrie
   (package
     (name "python-datrie")
-    (version "0.8.2")
+    (version "0.8.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "datrie" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/kmike/datrie")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0pbn32flkrpjiwfcknmj6398qa81ba783kbcvwan3kym73v0hnsj"))))
-    (build-system python-build-system)
+        (base32 "1jfyhzfjgin370l6chd0cjg521ql3y53db194n94ff6cdbdbg7cg"))))
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'ensure-no-mtimes-pre-1980 'inject-libdatrie
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((headers (search-input-directory inputs
+                                                      "include/datrie"))
+                     (base (dirname (dirname headers))))
+                (symlink headers "libdatrie/datrie")
+                (setenv "LDFLAGS" (string-append "-L" base "/lib")))))
           (add-before 'build 'relax-gcc-14-strictness
             (lambda _
               (setenv "CFLAGS"
-                      (string-append "-g -O2"
-                                     " -Wno-error=incompatible-pointer-types")))))))
+                      "-g -O2 -Wno-error=incompatible-pointer-types"))))))
     (native-inputs
-     (list python-cython python-hypothesis python-pytest
-           python-pytest-runner))
+     (list python-cython python-hypothesis python-pytest python-setuptools))
+    (inputs (list libdatrie))
     (home-page "https://github.com/kmike/datrie")
     (synopsis "Fast, efficiently stored trie for Python")
     (description