libhv: 1.3.2 → 1.3.3 (#350316)

NixOS · Oct 23, 2024 · d084336 · d084336
2 parents d2c0b40 + 87aa8fe
commit d084336
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/pkgs/development/libraries/libhv/default.nix → pkgs/by-name/li/libhv/package.nix b/pkgs/development/libraries/libhv/default.nix → pkgs/by-name/li/libhv/package.nix
@@ -1,29 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  openssl,
+  darwin,
+}:
 
 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;
+  buildInputs = [
+    curl
+    openssl
+  ] ++ 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
@@ -21027,10 +21027,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 { };