From 31c7a1b61466e9323973a487288e9b98fbb4d746 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 18 Dec 2022 15:20:45 -0800 Subject: [PATCH] python310Packages.trustme: remove aarch64-darwin workarounds These are no longer necessary now that pyopenssl is no longer broken on aarch64-darwin. --- .../python-modules/trustme/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index fb145ac9a99a..649e2de1c179 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -21,10 +20,9 @@ buildPythonPackage rec { }; checkInputs = [ - service-identity - pytestCheckHook - ] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyopenssl + pytestCheckHook + service-identity ]; propagatedBuildInputs = [ @@ -34,17 +32,6 @@ buildPythonPackage rec { futures ]; - # aarch64-darwin forbids W+X memory, but this tests depends on it: - # * https://github.com/pyca/pyopenssl/issues/873 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "test_pyopenssl_end_to_end" - ]; - - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace "tests/test_trustme.py" \ - --replace "import OpenSSL.SSL" "" - ''; - # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true;