summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-09-18 08:01:53 +0100
committerGitHub <noreply@github.com>2018-09-18 08:01:53 +0100
commitbab28c26f12afb7c868e1c91f67472bba478b2a9 (patch)
tree8f7d212e137ab07447f360d5fa0539d86f203d28
parent8c242f596ef38645180bb0a3c41570ed4bcbb2d1 (diff)
parent676ceb81b783589e38d76615f4617ca838fe772b (diff)
downloadnixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar.gz
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar.bz2
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar.lz
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar.xz
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.tar.zst
nixpkgs-bab28c26f12afb7c868e1c91f67472bba478b2a9.zip
Merge pull request #46788 from teto/mypy630
python3Packages.mypy: 0.620 -> 0.630
-rw-r--r--pkgs/development/python-modules/mypy/default.nix9
-rw-r--r--pkgs/development/python-modules/mypy/extensions.nix25
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 32 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 021f3461e53..2cd2e2484e6 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k
+,mypy_extensions }:
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.620";
+  version = "0.630";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c";
+    sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137";
   };
 
   disabled = !isPy3k;
 
-  propagatedBuildInputs = [ lxml typed-ast psutil ];
+  propagatedBuildInputs = [ lxml typed-ast psutil mypy_extensions ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
new file mode 100644
index 00000000000..8ed3f5ce86c
--- /dev/null
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage, typing, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "mypy_extensions";
+  version = "0.4.1";
+
+  # Tests not included in pip package.
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p";
+  };
+
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [ typing ];
+
+  meta = with stdenv.lib; {
+    description = "Experimental type system extensions for programs checked with the mypy typechecker";
+    homepage    = "http://www.mypy-lang.org";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ martingms lnl7 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4e46ea8889..5936345bf0a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7786,6 +7786,8 @@ in {
 
   mypy = callPackage ../development/python-modules/mypy { };
 
+  mypy_extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
+
   mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
 
   mwclient = buildPythonPackage rec {