From cc9c34ff0d3db14f9801c6496eb4aa8b28a503a3 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 11 May 2025 01:52:00 +0200
Subject: [PATCH] llhttp: 9.2.1 -> 9.3.0

---
 pkgs/by-name/ll/llhttp/package.nix   | 20 ++++++++++++--------
 pkgs/by-name/op/opendht/package.nix  | 10 ----------
 pkgs/by-name/re/restinio/package.nix |  4 ++--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ll/llhttp/package.nix b/pkgs/by-name/ll/llhttp/package.nix
index 2b2e55df913b..e1e34082491f 100644
--- a/pkgs/by-name/ll/llhttp/package.nix
+++ b/pkgs/by-name/ll/llhttp/package.nix
@@ -3,19 +3,20 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  nix-update-script,
   testers,
   python3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "llhttp";
-  version = "9.2.1";
+  version = "9.3.0";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "llhttp";
-    rev = "release/v${finalAttrs.version}";
-    hash = "sha256-cnEp7Ds32bqu3jeUU/rqJOr/VW3KNmJU4pmNNaTpXRs=";
+    tag = "release/v${finalAttrs.version}";
+    hash = "sha256-VL58h8sdJIpzMiWNqTvfp8oITjb0b3X/F8ygaE9cH94=";
   };
 
   outputs = [
@@ -28,9 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DBUILD_STATIC_LIBS=ON"
+    "-DBUILD_SHARED_LIBS=ON"
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=release/v(.+)" ];
+  };
   passthru.tests = {
     inherit (python3.pkgs) aiohttp;
 
@@ -40,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Port of http_parser to llparse";
     homepage = "https://llhttp.org/";
     changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+    platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix
index eb6b2b8c5168..1cdbd0f17f89 100644
--- a/pkgs/by-name/op/opendht/package.nix
+++ b/pkgs/by-name/op/opendht/package.nix
@@ -15,7 +15,6 @@
   llhttp,
   openssl,
   fmt,
-  fetchpatch2,
   nix-update-script,
   enableProxyServerAndClient ? false,
   enablePushNotifications ? false,
@@ -32,15 +31,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-WNN4aCZiJuz9CgEKIzFmy50HBj0ZL/d1uU7L518lPhk=";
   };
 
-  patches = lib.optionals enableProxyServerAndClient [
-    # Remove this patch when switching to using shared llhttp
-    (fetchpatch2 {
-      url = "https://github.com/savoirfairelinux/opendht/commit/2bc46e9657c94adcce2479807a0a04c2f783bd4e.patch?full_index=1";
-      hash = "sha256-znft836nPx8uvfHm0fQE9h+l5G006Im6IJOrsmElx6w=";
-      revert = true;
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix
index 486fc3c9287c..e8df6bb5d625 100644
--- a/pkgs/by-name/re/restinio/package.nix
+++ b/pkgs/by-name/re/restinio/package.nix
@@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     [
       expected-lite
       fmt
-      llhttp
       openssl
       pcre2
       zlib
@@ -64,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     catch2_3
+    llhttp
   ];
 
   cmakeDir = "../dev";
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DRESTINIO_ASIO_SOURCE=${if with_boost_asio then "boost" else "standalone"}"
     "-DRESTINIO_DEP_EXPECTED_LITE=find"
     "-DRESTINIO_DEP_FMT=find"
-    "-DRESTINIO_DEP_LLHTTP=find"
+    "-DRESTINIO_DEP_LLHTTP=system"
     "-DRESTINIO_DEP_CATCH2=find"
   ];