diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix similarity index 80% rename from pkgs/development/tools/mypy/default.nix rename to pkgs/development/python-modules/mypy/default.nix index d021f994e49..5ce05b7938f 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }: +{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mypy"; version = "0.600"; @@ -12,6 +12,8 @@ buildPythonApplication rec { sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw"; }; + disabled = !isPy3k; + propagatedBuildInputs = [ lxml typed-ast psutil ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f729c0942f..2791e379e8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8492,7 +8492,7 @@ with pkgs; grabserial = callPackage ../development/tools/grabserial { }; - mypy = python3Packages.callPackage ../development/tools/mypy { }; + mypy = python3Packages.mypy; ### DEVELOPMENT / LIBRARIES diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 739c40b2d63..27195dc6869 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8088,6 +8088,8 @@ in { mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mypy = callPackage ../development/python-modules/mypy { }; + mwclient = buildPythonPackage rec { version = "0.8.3"; pname = "mwclient";