From a95caee27ff290a377e220acc643ba5081a7010c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Jul 2022 11:05:56 +0200 Subject: [PATCH] Merge #179882: thrift: fix expired certs in tests (cherry picked from commit 36888aa839276fb1fa3d1c41ff5d882435f487c0) --- pkgs/development/libraries/thrift/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f85e56578bbe..468c26ed345a 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config , bison, flex +, fetchpatch , static ? stdenv.hostPlatform.isStatic }: @@ -26,6 +27,11 @@ stdenv.mkDerivation rec { # ToStringTest.cpp is failing from some reason due to locale issue, this # doesn't disable all UnitTests as in Darwin. ./disable-failing-test.patch + (fetchpatch { + name = "tests-expired-certs.diff"; # https://github.com/apache/thrift/pull/2629 + url = "https://github.com/apache/thrift/commit/54765854873e19b8ba50a0ec8080dd92d8323851.diff"; + sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA="; + }) ]; cmakeFlags = [