From 4898e0921580fd3b53c6882ae6da1ef294d56aab Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 9 Dec 2018 01:09:57 +0200
Subject: [PATCH] pythonPackages.neovim-0.3.0 -> pythonPackages.pynvim-0.3.1

---
 pkgs/applications/editors/neovim/neovim-remote.nix          | 2 +-
 pkgs/applications/editors/neovim/wrapper.nix                | 4 ++--
 .../python-modules/{neovim => pynvim}/default.nix           | 6 +++---
 pkgs/top-level/python-packages.nix                          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{neovim => pynvim}/default.nix (86%)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 8e99005bbf6..c1b459638c9 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ neovim psutil ];
+  propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
 
   meta = {
     description = "A tool that helps controlling nvim processes from a terminal";
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index bd4304560fd..5e57fe4d141 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -43,13 +43,13 @@ let
 
   pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins;
   pythonEnv = pythonPackages.python.withPackages(ps:
-        (if withPyGUI then [ ps.neovim_gui ] else [ ps.neovim ])
+        (if withPyGUI then [ ps.neovim_gui ] else [ ps.pynvim ])
         ++ (extraPythonPackagesFun ps)
         ++ (concatMap (f: f ps) pluginPythonPackages));
 
   pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
   python3Env = python3Packages.python.withPackages (ps:
-        [ ps.neovim ]
+        [ ps.pynvim ]
         ++ (extraPython3PackagesFun ps)
         ++ (concatMap (f: f ps) pluginPython3Packages));
 
diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
similarity index 86%
rename from pkgs/development/python-modules/neovim/default.nix
rename to pkgs/development/python-modules/pynvim/default.nix
index 20479093a47..3811e5082c0 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "neovim";
-  version = "0.3.0";
+  pname = "pynvim";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18x7gi1idsch11hijvy0mm2mk4f42rapz9niax4rnak14x2klqq2";
+    sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37c1a0c9c67..71c33965cd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4627,7 +4627,7 @@ in {
 
   trollius = callPackage ../development/python-modules/trollius {};
 
-  neovim = callPackage ../development/python-modules/neovim {};
+  pynvim = callPackage ../development/python-modules/pynvim {};
 
   neovim_gui = callPackage ../development/python-modules/neovim_gui { };