From 842cc081aec77bf146c0301fc3084436edf28280 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 21 Oct 2024 23:18:36 +0400
Subject: [PATCH 1/3] =?UTF-8?q?libhv:=201.3.2=20=E2=86=92=201.3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libhv/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix
index 93524afabe49..d2a7d02d848a 100644
--- a/pkgs/development/libraries/libhv/default.nix
+++ b/pkgs/development/libraries/libhv/default.nix
@@ -1,26 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libhv";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "ithewei";
     repo = "libhv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk=";
+    hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU=";
   };
 
-  patches = [
-    # Fix build failure on gcc-13:
-    #   https://github.com/ithewei/libhv/pull/490
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch";
-      hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;

From ab48d62f62f6b966c7ae64211676148b633d14f8 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 21 Oct 2024 23:19:56 +0400
Subject: [PATCH 2/3] libhv: format

---
 pkgs/development/libraries/libhv/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix
index d2a7d02d848a..1e8082e86b90 100644
--- a/pkgs/development/libraries/libhv/default.nix
+++ b/pkgs/development/libraries/libhv/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  openssl,
+  Security,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libhv";
@@ -13,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = [
+    curl
+    openssl
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
 
   cmakeFlags = [
     "-DENABLE_UDS=ON"

From 87aa8fee46527e3b7f987ab8f0b7f86d7c30b885 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 21 Oct 2024 23:22:15 +0400
Subject: [PATCH 3/3] libhv: migrate to by-name

---
 .../libhv/default.nix => by-name/li/libhv/package.nix}        | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{development/libraries/libhv/default.nix => by-name/li/libhv/package.nix} (89%)

diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/by-name/li/libhv/package.nix
similarity index 89%
rename from pkgs/development/libraries/libhv/default.nix
rename to pkgs/by-name/li/libhv/package.nix
index 1e8082e86b90..4eb104dbce54 100644
--- a/pkgs/development/libraries/libhv/default.nix
+++ b/pkgs/by-name/li/libhv/package.nix
@@ -5,7 +5,7 @@
   cmake,
   curl,
   openssl,
-  Security,
+  darwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     openssl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;
 
   cmakeFlags = [
     "-DENABLE_UDS=ON"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a9536c70ec..a1bc0d05cef7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21012,10 +21012,6 @@ with pkgs;
 
   libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { };
 
-  libhv = callPackage ../development/libraries/libhv {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   libhwy = callPackage ../development/libraries/libhwy { };
 
   libHX = callPackage ../development/libraries/libHX { };