diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/nghttp3/default.nix | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nghttp3/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/nghttp3/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 76de14079deb..849a464b1c0d 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -1,31 +1,33 @@ { lib, stdenv, fetchFromGitHub , cmake -, cunit, ncurses +, CoreServices , curlHTTP3 }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-B/5r0mRpOEi5DQ7OUAAcDmAm1nnak6qNz4qjDrzWlDc="; + hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk="; + fetchSubmodules = true; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cunit ncurses ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; cmakeFlags = [ - "-DENABLE_STATIC_LIB=OFF" + (lib.cmakeBool "ENABLE_STATIC_LIB" false) ]; doCheck = true; - enableParallelBuilding = true; passthru.tests = { inherit curlHTTP3; |