From d338fc15832eb30964cbb322a1d3d0df43809b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 19 Mar 2019 22:01:54 +0100 Subject: [PATCH] python.pkgs.msrest: fix build on python2 --- pkgs/development/python-modules/msrest/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index bb7f8a9c62d..e44d65e5cbe 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast +, isPy3k , requests , requests_oauthlib , isodate , certifi +, enum34 +, typing , aiohttp , aiodns , pytest , httpretty +, mock +, futures , trio }: @@ -28,12 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_oauthlib isodate certifi - # optional - aiohttp aiodns - ]; + ] ++ lib.optionals (!isPy3k) [ enum34 typing ] + ++ lib.optionals isPy3k [ aiohttp aiodns ]; checkInputs = [ pytest httpretty ] - ++ lib.optional (pythonAtLeast "3.5") trio; + ++ lib.optionals (!isPy3k) [ mock futures ] + ++ lib.optional isPy3k trio; # Deselected tests require network access checkPhase = ''