From 18f1127f0582b65e2e4bba16f0917ee3fb7501ba Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 6 Mar 2017 20:33:23 +0000
Subject: [PATCH 1/2] typed-ast: init at 1.0.1

---
 .../python-modules/typed-ast/default.nix         | 16 ++++++++++++++++
 pkgs/top-level/python-packages.nix               |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/python-modules/typed-ast/default.nix

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
new file mode 100644
index 000000000000..8d36d3c3a61f
--- /dev/null
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -0,0 +1,16 @@
+{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }:
+buildPythonPackage rec {
+  name = "typed-ast-${version}";
+  version = "1.0.1";
+  src = fetchzip {
+    url = "mirror://pypi/t/typed-ast/${name}.zip";
+    sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154";
+  };
+  # Only works with Python 3.3 and newer;
+  disabled = !isPy3k && !(pythonOlder "3.3");
+  meta = {
+    homepage = "https://pypi.python.org/pypi/typed-ast";
+    description = "a fork of Python 2 and 3 ast modules with type comment support";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa5909b6498c..0cd4752cc1ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32038,6 +32038,8 @@ EOF
     };
   };
 
+  typed-ast = callPackage ../development/python-modules/typed-ast { };
+
   stripe = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "stripe";

From 1a8a1941867a10be826ec5039d0d7e1dcb2a06b4 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 6 Mar 2017 20:34:04 +0000
Subject: [PATCH 2/2] mypy-lang: 0.4.5 -> 0.501 and rename to mypy

---
 .../development/tools/{mypy-lang => mypy}/default.nix | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/development/tools/{mypy-lang => mypy}/default.nix (62%)

diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy/default.nix
similarity index 62%
rename from pkgs/development/tools/mypy-lang/default.nix
rename to pkgs/development/tools/mypy/default.nix
index 6831c7f2b56c..eb6e50840a5b 100644
--- a/pkgs/development/tools/mypy-lang/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchurl, python35Packages }:
-
 python35Packages.buildPythonApplication rec {
-  name = "mypy-lang-${version}";
-  version = "0.4.5";
+  name = "mypy-${version}";
+  version = "0.501";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchurl {
-    url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";
-    sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f";
+    url = "mirror://pypi/m/mypy/${name}.tar.gz";
+    sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h";
   };
 
-  propagatedBuildInputs = with python35Packages; [ lxml ];
+  propagatedBuildInputs = with python35Packages; [ lxml typed-ast ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78fd1a78662c..a3cf74d50144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,7 +6909,7 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy-lang = callPackage ../development/tools/mypy-lang { };
+  mypy = callPackage ../development/tools/mypy { };
 
 
   ### DEVELOPMENT / LIBRARIES