From b2fb95a6cfa9689c2d432be6d6ba96fc17951377 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Fri, 3 Feb 2017 16:58:22 -0500
Subject: [PATCH 1/2] neovim-remote: move from python-packages to
 /neovim/neovim-remote.

---
 .../editors/neovim/neovim-remote.nix            | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 pkgs/top-level/python-packages.nix              | 17 -----------------
 3 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/applications/editors/neovim/neovim-remote.nix

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
new file mode 100644
index 000000000000..2ee269156bb4
--- /dev/null
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "neovim-remote-${version}";
+  version = "v1.4.0";
+  disabled = !pythonPackages.isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "mhinz";
+    repo = "neovim-remote";
+    rev = version;
+    sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.neovim ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f8fb7a8b023..28ec46192232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15385,6 +15385,8 @@ with pkgs;
 
   neovim-pygui = pythonPackages.neovim_gui;
 
+  neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
+
   vis = callPackage ../applications/editors/vis {
     inherit (lua52Packages) lpeg;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcab34122ec..2bdd0b91974e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29771,23 +29771,6 @@ EOF
     '';
   };
 
-  neovim-remote = buildPythonPackage rec {
-    name = "neovim-remote-${version}";
-    version = "v1.4.0";
-    disabled = !isPy3k;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "mhinz";
-      repo = "neovim-remote";
-      rev = version;
-      sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz";
-    };
-
-    propagatedBuildInputs = [
-      self.neovim
-    ];
-  };
-
   ghp-import = buildPythonPackage rec {
     version = "0.4.1";
     name = "ghp-import-${version}";

From ee4f732633363cbe238683f836ca6e42049200f8 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Fri, 10 Feb 2017 11:43:42 -0500
Subject: [PATCH 2/2] neovim-remote: add meta section.

Also add myself to maintainers; it's time to admit I'm not leaving
anytime soon ;)
---
 lib/maintainers.nix                                |  1 +
 pkgs/applications/editors/neovim/neovim-remote.nix | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4672dc59d431..705327782017 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -138,6 +138,7 @@
   dtzWill = "Will Dietz <nix@wdtz.org>";
   e-user = "Alexander Kahl <nixos@sodosopa.io>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
+  edanaher = "Evan Danaher <nixos@edanaher.net>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 2ee269156bb4..487d9c842b8c 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
+with stdenv.lib;
+
 pythonPackages.buildPythonPackage rec {
   name = "neovim-remote-${version}";
   version = "v1.4.0";
@@ -13,4 +15,12 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ pythonPackages.neovim ];
+
+  meta = {
+    description = "A tool that helps controlling nvim processes from a terminal";
+    homepage = https://github.com/mhinz/neovim-remote/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ edanaher ];
+    platforms = platforms.unix;
+  };
 }