diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 1c778c65aad1..4e37062c3896 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2024.03.11.00"; + version = "2024.11.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "wangle"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fDtJ+9bZj+siKlMglYMkLO/+jldUmsS5V3Umk1gNdlo="; + hash = "sha256-4mqE9GgJP2f7QAykwdhMFoReE9wmPKOXqSHJ2MHP2G0="; }; nativeBuildInputs = [ @@ -61,30 +61,40 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; + env.GTEST_FILTER = + "-" + + lib.concatStringsSep ":" ( + [ + # these depend on example pem files from the folly source tree (?) + "SSLContextManagerTest.TestSingleClientCAFileSet" + "SSLContextManagerTest.TestMultipleClientCAsSet" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # flaky + "BroadcastPoolTest.ThreadLocalPool" + "Bootstrap.UDPClientServerTest" + ] + ); + __darwinAllowLocalNetworking = true; doCheck = true; - preCheck = - let - disabledTests = - [ - # these depend on example pem files from the folly source tree (?) - "SSLContextManagerTest.TestSingleClientCAFileSet" - "SSLContextManagerTest.TestMultipleClientCAsSet" + checkPhase = '' + runHook preCheck - # https://github.com/facebook/wangle/issues/206 - "SSLContextManagerTest.TestSessionContextCertRemoval" + ctest -j $NIX_BUILD_CORES --output-on-failure ${ + # Deterministic glibc abort 🫠 + lib.optionalString stdenv.hostPlatform.isLinux ( + lib.escapeShellArgs [ + "--exclude-regex" + "^(BootstrapTest|BroadcastPoolTest)$" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # flaky - "BroadcastPoolTest.ThreadLocalPool" - "Bootstrap.UDPClientServerTest" - ]; - in - '' - export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" - ''; + ) + } + + runHook postCheck + ''; meta = { description = "Open-source C++ networking library";