From e279676f480c0bce3ea9baea90cf926f07071de1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Jan 2020 15:01:21 +0100 Subject: [PATCH] pythonPackages.pyopenssl: fix build, fixes #76879 --- .../python-modules/pyopenssl/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4e643257a0c6..8d5f6291c26d 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -10,6 +10,7 @@ , flaky , glibcLocales , six +, fetchpatch }: with stdenv.lib; @@ -80,6 +81,27 @@ buildPythonPackage rec { runHook postCheck ''; + patches = [ + # 4 patches for 2020 bug + # https://github.com/pyca/pyopenssl/pull/828 + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch; + sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch; + sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch; + sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch; + sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2"; + }) + ]; + # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin;