diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix new file mode 100644 index 000000000000..6f028341e97d --- /dev/null +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography +, pyasn1 +, idna +, pytest +, pretend +, flaky +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyOpenSSL"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; + }; + + outputs = [ "out" "dev" ]; + + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + # https://github.com/pyca/pyopenssl/issues/692 + sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py + ''; + + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8" + py.test + runHook postCheck + ''; + + # 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; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna ]; + + checkInputs = [ pytest pretend flaky glibcLocales ]; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c697f3449d4a..5c6ba0b0b829 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14644,39 +14644,7 @@ in { doCheck = false; }; - pyopenssl = buildPythonPackage rec { - pname = "pyOpenSSL"; - name = "${pname}-${version}"; - version = "17.2.0"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; - }; - - outputs = [ "out" "dev" ]; - - preCheck = '' - sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py - # https://github.com/pyca/pyopenssl/issues/692 - sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py - ''; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test - runHook postCheck - ''; - - # 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; - - buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales self.pretend self.flaky ]; - propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; - }; - + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; pyquery = buildPythonPackage rec { name = "pyquery-${version}";