diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index f19d015e9e30..0d029831ab0d 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -4,7 +4,7 @@ , pyyaml, colorama, docopt , dockerpty, docker, jsonschema, requests , six, texttable, websocket-client, cached-property -, enum34, functools32, paramiko, distro, python-dotenv +, enum34, paramiko, distro, python-dotenv }: buildPythonApplication rec { @@ -25,8 +25,7 @@ buildPythonApplication rec { jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] - ++ lib.optional (pythonOlder "3.4") enum34 - ++ lib.optional (pythonOlder "3.2") functools32; + ++ lib.optional (pythonOlder "3.4") enum34; postPatch = '' # Remove upper bound on requires, see also diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 2cb13c747742..4a659c1e26a5 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub , pytestCheckHook, mock, pytest-cov, coverage -, future, futures ? null, ujson}: +, future, ujson}: buildPythonPackage rec { pname = "python-jsonrpc-server"; @@ -22,8 +22,7 @@ buildPythonPackage rec { pytestCheckHook mock pytest-cov coverage ]; - propagatedBuildInputs = [ future ujson ] - ++ lib.optional (pythonOlder "3.2") futures; + propagatedBuildInputs = [ future ujson ]; meta = with lib; { homepage = "https://github.com/palantir/python-jsonrpc-server";