diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-07-02 11:05:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-07-02 11:05:56 +0200 |
| commit | 36888aa839276fb1fa3d1c41ff5d882435f487c0 (patch) | |
| tree | 30b6253a3a7cf49546642716b57f533d558c10df | |
| parent | 6f9359a504ae930346156b2428b47d48d950aea3 (diff) | |
| parent | cd0c2b23749bc4084e7ff5f3643a581aa193f84a (diff) | |
Merge #179882: thrift: fix expired certs in tests
| -rw-r--r-- | pkgs/development/libraries/thrift/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f54288b5a3faa..cd127b4b0e71d 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , boost , zlib , libevent @@ -60,6 +61,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 = [ |