diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/by-name/li/libhv/package.nix similarity index 52% rename from pkgs/development/libraries/libhv/default.nix rename to pkgs/by-name/li/libhv/package.nix index 93524afabe49..4eb104dbce54 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/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 index d763bf23ad75..dcae4d59f5b3 100644 --- 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 { };