From e645389834c01696748af90847f2e71be7b781b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Sun, 29 May 2016 23:31:47 +0200
Subject: [PATCH] Neovim: use Python 3.5 again (#15781)

neovim: use Python 3.5 again
---
 pkgs/top-level/all-packages.nix    |  1 -
 pkgs/top-level/python-packages.nix | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d00ca1353a2..809ab4a54f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14457,7 +14457,6 @@ in
 
   neovim = callPackage ../applications/editors/neovim {
     inherit (lua52Packages) lpeg luaMessagePack luabitop;
-    python3Packages = python34Packages;
   };
 
   neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66f17e89308..361bb598b23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26350,13 +26350,21 @@ in modules // {
     version = "0.1.8";
     name = "neovim-${version}";
 
-    disabled = isPy35;
-
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/neovim/${name}.tar.gz";
       sha256 = "06g84f0l208jrc1iqa4vk9kgwr77z1ya8cq39cygpq88yjj28whi";
     };
 
+    buildInputs = with self; [ nose ];
+
+    checkPhase = ''
+      nosetests
+    '';
+
+    # Tests require pkgs.neovim,
+    # which we cannot add because of circular dependency.
+    doCheck = false;
+
     propagatedBuildInputs = with self; [ msgpack ]
       ++ optional (!isPyPy) greenlet
       ++ optional (!isPy34) trollius;