From 97927ff28e5a270445fd110d209e3ee06283d068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 19:58:38 +0100 Subject: [PATCH 1/2] pythonPackages.google-auth: add extra requirement pyopenssl --- pkgs/development/python-modules/google-auth/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index d583de9c074b..cf456317f8cb 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -13,6 +13,7 @@ , responses , rsa , six +, pyopenssl }: buildPythonPackage rec { @@ -24,7 +25,13 @@ buildPythonPackage rec { sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; }; - propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ]; + propagatedBuildInputs = [ + cachetools + pyasn1-modules + rsa + six + pyopenssl + ]; checkInputs = [ flask From 4b9c3d465fe61f624d7c851f2a2ec1bcbd535b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 20:01:17 +0100 Subject: [PATCH 2/2] pythonPackages.cachetools: dropped support for Python 2.7 --- pkgs/development/python-modules/cachetools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 120fd5df124b..a160c5ea94c5 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy27 , fetchFromGitHub , pytestCheckHook }: @@ -8,6 +9,8 @@ buildPythonPackage rec { pname = "cachetools"; version = "4.2.1"; + disabled = isPy27; + src = fetchFromGitHub { owner = "tkem"; repo = pname;