From 127c299efcedb7e2b4e8d7240fbcf718e05eed5c Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:27:19 -0500
Subject: [PATCH 1/4] vim-plugins: add vim-highlightedyank

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1b6369d87d91..2ed082f04649 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -281,6 +281,17 @@ rec {
     sourceRoot = ".";
   };
 
+  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-highlightedyank-2017-01-04";
+    src = fetchgit {
+      url = "git://github.com/machakann/vim-highlightedyank";
+      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
+      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+    };
+    dependencies = [];
+
+  };
+
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "alchemist.vim-2017-01-02";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4be4c0a97228..2abf59efb664 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -75,6 +75,7 @@
 "github:lokaltog/vim-easymotion"
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
+"github:machakann/vim-highlightedyank"
 "github:mhinz/vim-startify"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"

From b017334b46c7addf83c9935af4f98cdc56d14534 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:28:48 -0500
Subject: [PATCH 2/4] vim-plugins: add vim-scala

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 2ed082f04649..85a28e8f3eef 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -552,6 +552,17 @@ rec {
 
   };
 
+  vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-scala-2016-08-02";
+    src = fetchgit {
+      url = "git://github.com/derekwyatt/vim-scala";
+      rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7";
+      sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp";
+    };
+    dependencies = [];
+
+  };
+
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jade-2016-10-31";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2abf59efb664..82df05dc04a6 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -36,6 +36,7 @@
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
 "github:derekelkins/agda-vim"
+"github:derekwyatt/vim-scala"
 "github:digitaltoad/vim-jade"
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"

From 20db0d793f72c0bdd0868208d58866f9cd9f0b58 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:29:33 -0500
Subject: [PATCH 3/4] vim-plugins: add neco-vim

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 85a28e8f3eef..dae7bf059a80 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -596,6 +596,17 @@ rec {
 
   };
 
+  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-vim-2017-01-16";
+    src = fetchgit {
+      url = "git://github.com/shougo/neco-vim";
+      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
+      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
+    };
+    dependencies = [];
+
+  };
+
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 82df05dc04a6..b65831d8c658 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -92,6 +92,7 @@
 "github:rust-lang/rust.vim"
 "github:sbdchd/neoformat"
 "github:sheerun/vim-polyglot"
+"github:shougo/neco-vim"
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"

From cdb59104f139aafaa2c8fa3f9085c4eee556c0be Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:42:39 -0500
Subject: [PATCH 4/4] neovim-remote: init at v1.4.0

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 477914e3836b..57679082c540 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29806,6 +29806,23 @@ 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}";