diff --git a/pkgs/development/python2-modules/mock/default.nix b/pkgs/development/python2-modules/mock/default.nix deleted file mode 100644 index d65fede054b5..000000000000 --- a/pkgs/development/python2-modules/mock/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, - funcsigs, - six, - pbr, - unittestCheckHook, -}: - -buildPythonPackage rec { - pname = "mock"; - version = "3.0.5"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; - }; - - propagatedBuildInputs = [ - six - pbr - ] - ++ lib.optionals isPy27 [ funcsigs ]; - - # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. - # Mock upstream has a decoration to disable the failing test and make - # everything pass, but it is not yet released. The commit: - # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 - #doCheck = !(python.isPyPy && python.isPy27); - doCheck = false; # Infinite recursion pytest - - nativeCheckInputs = [ - unittestCheckHook - ]; - - meta = { - description = "Mock objects for Python"; - homepage = "http://python-mock.sourceforge.net/"; - license = lib.licenses.bsd2; - }; - -} diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix index 2ccdf3ca4189..e0b6b001cb3e 100644 --- a/pkgs/development/python2-modules/pip/default.nix +++ b/pkgs/development/python2-modules/pip/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, bootstrapped-pip, fetchFromGitHub, - mock, scripttest, virtualenv, pretend, @@ -29,7 +28,6 @@ buildPythonPackage rec { pipInstallFlags = [ "--ignore-installed" ]; nativeCheckInputs = [ - mock scripttest virtualenv pretend diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 0f8b544c1959..41ba19d8799e 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -33,7 +33,7 @@ with super; markupsafe = disabled super.markupsafe; - mock = callPackage ../development/python2-modules/mock { }; + mock = disabled super.mock; more-itertools = callPackage ../development/python2-modules/more-itertools { };