From 6da918656a32fe24f7527323be61939a621902b3 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 15:43:53 +0000 Subject: [PATCH] wangle: format with `nixfmt-rfc-style` (cherry picked from commit 6d542aedaf25d86a78a3ab58b9a574a972b8f785) (cherry picked from commit 16aa5008561cb3bdcb1fa82cf296ac76530ca277) --- pkgs/development/libraries/wangle/default.nix | 78 +++++++++++-------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index c1209e0ee800..c4ce19bd426e 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, libevent -, double-conversion -, glog -, gflags -, openssl -, fizz -, folly -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libevent, + double-conversion, + glog, + gflags, + openssl, + fizz, + folly, + gtest, }: stdenv.mkDerivation (finalAttrs: { @@ -27,12 +28,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeDir = "../wangle"; - cmakeFlags = [ - "-Wno-dev" - (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation - ]; + cmakeFlags = + [ + "-Wno-dev" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; buildInputs = [ double-conversion @@ -48,22 +51,26 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; - preCheck = let - disabledTests = [ - # these depend on example pem files from the folly source tree (?) - "SSLContextManagerTest.TestSingleClientCAFileSet" - "SSLContextManagerTest.TestMultipleClientCAsSet" + preCheck = + let + disabledTests = + [ + # these depend on example pem files from the folly source tree (?) + "SSLContextManagerTest.TestSingleClientCAFileSet" + "SSLContextManagerTest.TestMultipleClientCAsSet" - # https://github.com/facebook/wangle/issues/206 - "SSLContextManagerTest.TestSessionContextCertRemoval" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # flaky - "BroadcastPoolTest.ThreadLocalPool" - "Bootstrap.UDPClientServerTest" - ]; - in '' - export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" - ''; + # https://github.com/facebook/wangle/issues/206 + "SSLContextManagerTest.TestSessionContextCertRemoval" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # flaky + "BroadcastPoolTest.ThreadLocalPool" + "Bootstrap.UDPClientServerTest" + ]; + in + '' + export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" + ''; meta = with lib; { description = "Open-source C++ networking library"; @@ -75,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/facebook/wangle"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pierreis kylesferrazza ]; + maintainers = with maintainers; [ + pierreis + kylesferrazza + ]; }; })