From 8fff8b7127e1be38215c1af0ac1c6995f40135bc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 19 Mar 2021 17:16:35 -0400 Subject: [PATCH 1/2] python2Packages.urllib3: re-enable Was disabled for no explained reason. Fixes: dced68b7 ('python3Packages.urllib3: enable tests (#114282)') --- pkgs/development/python-modules/urllib3/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index fa323fb960b..c8d98fe9307 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -21,7 +21,6 @@ buildPythonPackage rec { pname = "urllib3"; version = "1.26.3"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 2fd38834a82a0b78681d1b9f9005d85ec0b243f1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 19 Mar 2021 17:21:20 -0400 Subject: [PATCH 2/2] python3Packages.urllib3: remove obsolete SSL dependencies Same as: 'https://github.com/gentoo/gentoo/pull/19383' Remove certifi as it is not referenced https://github.com/urllib3/urllib3/commit/90ee766d9153e2f0def7ba903895d51a86c13b5f --- pkgs/development/python-modules/urllib3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index c8d98fe9307..7ee5eefb5e1 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -2,11 +2,11 @@ , stdenv , brotli , buildPythonPackage -, certifi , cryptography , dateutil , fetchPypi , idna +, isPy27 , mock , pyopenssl , pysocks @@ -29,11 +29,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli - certifi + pysocks + ] ++ lib.optionals isPy27 [ cryptography idna pyopenssl - pysocks ]; checkInputs = [