From 7927333d481829ecc1b9e55c0d0cada7aee481f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jul 2022 15:06:27 +0200 Subject: [PATCH 1/2] python310Packages.urllib3: add optional-dependencies secure back --- pkgs/development/python-modules/urllib3/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index dbcf05c9c52a..790b497bb8f0 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -2,14 +2,18 @@ , brotli , brotlicffi , buildPythonPackage -, python-dateutil +, certifi +, cryptography , fetchPypi +, idna , isPyPy , mock +, pyopenssl , pysocks , pytest-freezegun , pytest-timeout , pytestCheckHook +, python-dateutil , tornado , trustme }: @@ -61,9 +65,8 @@ buildPythonPackage rec { passthru.optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; - # we are removing secure dependencies as they are no longer relevant with py3: - # https://urllib3.readthedocs.io/en/stable/reference/contrib/pyopenssl.html - # secure = [ certifi cryptography idna pyopenssl ]; + # Use carefully since pyopenssl is not supported aarch64-darwin + secure = [ certifi cryptography idna pyopenssl ]; socks = [ pysocks ]; }; From ef2e27ebe2f60f4063018ab515bf8b3be384f739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jul 2022 15:06:15 +0200 Subject: [PATCH 2/2] python310Packages.selenium: fix dependencies --- pkgs/development/python-modules/selenium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index bafff76be579..a1db98deeb75 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -35,7 +35,8 @@ buildPythonPackage rec { trio trio-websocket urllib3 - ] ++ urllib3.optional-dependencies.socks; + ] ++ urllib3.optional-dependencies.secure + ++ urllib3.optional-dependencies.socks; checkInputs = [ pytestCheckHook