From 1e25b748fae3cfcb3179665481967eb0e9027fd4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 23 Dec 2018 23:30:11 +0100
Subject: [PATCH 1/8] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 216 ++++++++++++++--------------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ebb8f1868ff..38a2a584262 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-12-10";
+    name = "ale-2018-12-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d";
-      sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp";
+      rev = "73ca1e71918a0b50b7bbcbed91857c3618ad93cc";
+      sha256 = "0q2wmpprr6mva6k7d8280cpf8ia6g7fbzw309fb0291y7241v5j1";
     };
   };
 
@@ -103,12 +103,12 @@
   };
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "awesome-vim-colorschemes-2018-10-30";
+    name = "awesome-vim-colorschemes-2018-12-16";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "21d1c93da95d58bead99f3226f9447f5b035afe1";
-      sha256 = "1niwwyxgq7k7mbi05lnpz12lbmn9mam9x4qvzxcbvxsqqp2zzsj8";
+      rev = "680930f34bf5d4007dbaee66aba2dd688cbb3098";
+      sha256 = "0jk4fm2ivf6r91yra7ddyxfbh2swf315zvmrm5ym605xcsiwv0nw";
     };
   };
 
@@ -143,12 +143,12 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-11-07";
+    name = "caw-vim-2018-12-17";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
-      sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
+      rev = "0060d6fbf53e02a153c5faf6eca1d10c1ed7c489";
+      sha256 = "01pngcf7b04rw2a0bmr8xv191wlnsny2rwg5xzhmargzf68fd6lv";
     };
   };
 
@@ -344,22 +344,22 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-11";
+    name = "denite-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17";
-      sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al";
+      rev = "c21dd10b6d1c4fd3805b130e1a6551daadb8c111";
+      sha256 = "0is51kkzf2vqaxhdfsxaq3vzwjcysriqsigfmv8wl80r6nk1nxlp";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-10-12";
+    name = "deol-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "04a5295ebad2df1a2141b85dc0b78cc51ea86fb4";
-      sha256 = "1v5qip8kzrsq8qmmjrvhm15d9wrn48iz2s62qddcgvc0sdzk1y64";
+      rev = "b052a5aef05bafd2b6dc48e089483eb5839febc6";
+      sha256 = "1y6nx364xg6xh9arvr53kk45j5p5pkhrm1izkqaigwmsnyr2gdjq";
     };
   };
 
@@ -386,12 +386,12 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-03";
+    name = "deoplete-jedi-2018-12-22";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "583ee29a0a0fe6206f3f106b8866ff2b663fde74";
-      sha256 = "0lbiwk6fc1z9i3sx4y62gsl3yr8pzv09s4wwxq1k8cziddbiypig";
+      rev = "d3fac767f7034baa3d61baf4f844c5f1b3470817";
+      sha256 = "0m16h2fwz7i7l7l5833jkc97sapg6p56v60yjwilmrlagq4k4bk8";
       fetchSubmodules = true;
     };
   };
@@ -427,12 +427,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-11";
+    name = "deoplete-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "04159b053ae83933d67225c53c36d98e516fa729";
-      sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115";
+      rev = "48bcbe06757907de62919d27dc75d51dc1deed3a";
+      sha256 = "1f7l8mczp5kl06swwzbdhbjqc9vw9xnyx1pbxla7wly2djjcawh2";
     };
   };
 
@@ -509,12 +509,12 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-11-30";
+    name = "falcon-2018-12-21";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "070f2132266d85059f36496ed277527d5b8f00a1";
-      sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
+      rev = "92489daf912f33c743fb07b170a563aa53a8a0a6";
+      sha256 = "1a3yahjvp98icfv6a6d0z0v70rb9i0580iik2jjbcdmbri5jbnj2";
     };
   };
 
@@ -529,12 +529,12 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-04";
+    name = "ferret-2018-12-20";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "fbef13c37f0083ecbcec131c2a8f62079f3cdacb";
-      sha256 = "1ajrwg5fg3myhazsdfprlj50qlw25jk1viy1cny6mzhbvmb80qln";
+      rev = "b1647292669ddfa13bfd16d2cc3e084b9b01cfbb";
+      sha256 = "1afry4h6ms2h92c0gdcx89z9jb1g2d5wk4swc3xc20x1p32qdql1";
     };
   };
 
@@ -861,12 +861,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-08";
+    name = "ncm2-2018-12-23";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "40d1eb9b52805e0e81bbaac4bb87788007ad19de";
-      sha256 = "1awbzm3vgp31afjlbagxjzzxxgwmy2axhnyhcal7x1rk93cr78iw";
+      rev = "ead80d5e0c8e6079b780a0470c3e893b508fcc5c";
+      sha256 = "082ixcr7v8h349aiyi0rrcp61nxk7g5jp0s1g48rv0mknwkzj9ir";
     };
   };
 
@@ -971,12 +971,12 @@
   };
 
   neoformat = buildVimPluginFrom2Nix {
-    name = "neoformat-2018-09-22";
+    name = "neoformat-2018-12-21";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07";
-      sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw";
+      rev = "fec5be9e3ee10d8311fb78944fdaa8547480f3d9";
+      sha256 = "0wzw59pw22gqd9db6j1yvyz5l2xvrcw3gwjcg03pys9ynwd0vcjs";
     };
   };
 
@@ -991,12 +991,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-15";
+    name = "neomake-2018-12-23";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "b84769baf9f04e1018ca16bb5d22287500c25e43";
-      sha256 = "0wfh0332yczq42pr2fyv5bv3ryf09021n1nsfrgiyrcy00k62r4j";
+      rev = "a7fe130028375e7dbc0d17ba5ee6b4d807245875";
+      sha256 = "14wmpf719w05hy9nhgdkpag5chzyai1x227cmmc3sqgdjy6phfxs";
     };
   };
 
@@ -1081,12 +1081,12 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-12-13";
+    name = "nim-vim-2018-12-16";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
-      rev = "358e2e013056af5ad09b3e2963e3390db8677680";
-      sha256 = "0ygyxcbbf6vqimzi71gdq40xx7kyi03yc73h5lyycnzwqc7wyxm2";
+      rev = "21731384b8f0675e3d666e98dd6625508c30f3af";
+      sha256 = "15l897xyli4wr5adgciizqnpqv80l95ykf2xq5kvc4icgj93gwga";
     };
   };
 
@@ -1111,12 +1111,12 @@
   };
 
   nvim-yarp = buildVimPluginFrom2Nix {
-    name = "nvim-yarp-2018-09-14";
+    name = "nvim-yarp-2018-12-23";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
-      rev = "5443ac06b3989baa9262adec810503e0234c316e";
-      sha256 = "0b6gmsbgzgwidl0rpkwzr2l1qxd9aw5pvj8izflf6gz36r2irszq";
+      rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0";
+      sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v";
     };
   };
 
@@ -1271,12 +1271,12 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-11-30";
+    name = "ranger-vim-2018-12-21";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
-      rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
-      sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
+      rev = "0bd9e8122f79655f58142389c595513b855cf05d";
+      sha256 = "0vpfdn01vy065hpc9ii56dsx35cxpmw2k6cidjdl0czy30vyjy94";
     };
   };
 
@@ -1341,12 +1341,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-11-29";
+    name = "rust-vim-2018-12-23";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
-      sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
+      rev = "c6312525ce948e603aec827fba8842a5dea92a9c";
+      sha256 = "11ki4zfnnizvdpymddxb7l1qmx1090xn5hiwhxifsrlg1c0dn3dp";
     };
   };
 
@@ -1501,12 +1501,12 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-11-01";
+    name = "targets-vim-2018-12-21";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
-      rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
-      sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
+      rev = "55c9c40e47af660677725b68fcfe7e88d9985889";
+      sha256 = "0jywlb5yxkyxn6vrdd3vd7q522llr2jplcl9yf97v89x3kmwpbqy";
     };
   };
 
@@ -1631,12 +1631,12 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-11-25";
+    name = "vim-2018-12-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "f24e259073994b4f76d125332954d26748fcc581";
-      sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
+      rev = "88b2e4086966a36beebd146b67f83e19079142c9";
+      sha256 = "14l1vkja1179b10ikg7i39z4vi5zm1c5call54sa5jb5c68fjbvr";
     };
   };
 
@@ -1841,12 +1841,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-12-10";
+    name = "vim-airline-2018-12-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60";
-      sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr";
+      rev = "72888d87ea57761f21c9f67cd0c0faa5904795eb";
+      sha256 = "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd";
     };
   };
 
@@ -1891,12 +1891,12 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-12-10";
+    name = "vim-autoformat-2018-12-19";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "c203080645936e73b2124040bc963386eeb44f5e";
-      sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9";
+      rev = "4f993fad63f98b844a5bd728c5a963c0da404e1a";
+      sha256 = "12c8yqwwm7n63r3gpl5zc5qd9mq3xdzk4rj4s91ni5x6njirpjzf";
     };
   };
 
@@ -1951,12 +1951,12 @@
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-12-14";
+    name = "vim-codefmt-2018-12-15";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "62c09d51dd5fda2cbd579a3c4f261bbf34a1f655";
-      sha256 = "10bv35xm0qs44sff5nkp3pvvvi1fh339m4a2fcnnz2bbd0nal8dl";
+      rev = "2147649088e977852c168a2173f13e0e04d555ed";
+      sha256 = "17kc9zwj3flj32riqsknwik5b5fr042yr3qn7w9wqk0m2vdid4mv";
     };
   };
 
@@ -2231,12 +2231,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-11-22";
+    name = "vim-fugitive-2018-12-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
-      sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
+      rev = "baee3bbfe87784985a410924a2b3a0008d6b8424";
+      sha256 = "05c99m2ph0iy9fan2l1148f7vs3nii5zbya7hpdiarvs5i35cj53";
     };
   };
 
@@ -2271,12 +2271,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-12-13";
+    name = "vim-gitgutter-2018-12-15";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "5c636b128ed40f3ed926d18adb307e01dfc082f8";
-      sha256 = "014ylh6cmrfw7qp6nrjz0dr4f5v09fmmfi729kpkf97lx79sd37i";
+      rev = "1d422b9f98194e38bc56e54192c9bc66d95c21f1";
+      sha256 = "1xv4brbhpxx23q2wklxxclzj9n1fi34m2rj0syf7ggp9fy7y50dk";
     };
   };
 
@@ -2291,12 +2291,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-12";
+    name = "vim-go-2018-12-21";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27";
-      sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw";
+      rev = "ead0ef3a169e1b990f20cbbbcca8b3bda5056675";
+      sha256 = "1f4v4jilk3hf0xapqq7zm6fx2p8n43baq3j9128ayd0cg5i60352";
     };
   };
 
@@ -2311,12 +2311,12 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-11-08";
+    name = "vim-grepper-2018-12-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
-      sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
+      rev = "9b62e6bdd9de9fe027363bbde68e9e32d937cfa0";
+      sha256 = "15j65qcnyfdkzyyv7504anaic891v5kvnqszcz37y5j15zjs5c02";
     };
   };
 
@@ -2491,22 +2491,22 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-14";
+    name = "vim-javacomplete2-2018-12-21";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "e896e0b249f6115a921cb27aaabdb688374d9f21";
-      sha256 = "0lqhb5kgswvsni456nmskrmn9lrnxwg523x5yaylm8s71w3kv1a6";
+      rev = "fd441fde07fe132f1e278bc61354e02277559d2b";
+      sha256 = "11z9q11xgnmsm6dd4bk19pj585qwmi5qrlbs4ga5vyvbvng1xgl5";
     };
   };
 
   vim-javascript = buildVimPluginFrom2Nix {
-    name = "vim-javascript-2018-08-29";
+    name = "vim-javascript-2018-12-23";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
-      rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28";
-      sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl";
+      rev = "50c135735611946707d04757fdc0cde5537659ae";
+      sha256 = "175w6a5x8wcssd5ix32gmyc4s4v7l4nmhhzvs28n3lwias8cm2q9";
     };
   };
 
@@ -2682,12 +2682,12 @@
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
-    name = "vim-nerdtree-tabs-2018-05-05";
+    name = "vim-nerdtree-tabs-2018-12-21";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
-      rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
-      sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
+      rev = "07d19f0299762669c6f93fbadb8249da6ba9de62";
+      sha256 = "16iqhp5l6xvq0k8bq9ngqfhish1fwggpmvd7ni1fh5dqr00iii9x";
     };
   };
 
@@ -3002,12 +3002,12 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-11-03";
+    name = "vim-scriptease-2018-12-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
-      rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
-      sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
+      rev = "386f19cd92f7b30cd830784ae22ebbe7033564aa";
+      sha256 = "122bnx9j1pdgpkfph48l4zngak1hjlijbksim05iypi7sd0bvix9";
     };
   };
 
@@ -3032,12 +3032,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-11-16";
+    name = "vim-signify-2018-12-20";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
-      sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
+      rev = "ea6db3c7df7671584df0a37a2436a919332d0b7c";
+      sha256 = "0876ik4a4kxa22fwcgm9b2swnc6ngmiakhy4h0brxgmci8h0r9m2";
     };
   };
 
@@ -3112,12 +3112,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-12-08";
+    name = "vim-startify-2018-12-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "5cd4faf2c681c36edfae3aa907d0ab720ff9c6e5";
-      sha256 = "0zs1sxwpi24lfiaz5k5wglm642qrmd8krcv8vjrvg222jq4inhlf";
+      rev = "9c26c7e8dcee2e580f137610ccde1af40a19d2bb";
+      sha256 = "01km6gka0k06kppk9q3c5c1a2jlg5ibid37dv6575kfkibhri3yn";
     };
   };
 
@@ -3192,12 +3192,12 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-11-19";
+    name = "vim-terraform-2018-12-20";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
-      sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
+      rev = "0f62e7937781cee672227f292b59ce687b28f037";
+      sha256 = "1iwsy5hcsxjzcgksfqwcn8lqwys828dsihazixjv01a31d2wrjsk";
     };
   };
 
@@ -3272,12 +3272,12 @@
   };
 
   vim-unimpaired = buildVimPluginFrom2Nix {
-    name = "vim-unimpaired-2018-07-26";
+    name = "vim-unimpaired-2018-12-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
-      rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da";
-      sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv";
+      rev = "9da253e92ca8444be9f67a5b0086c9213b8772e9";
+      sha256 = "0s5jvc618nncsc4dzgr30nf2xfm71jpdsxq90gnxm1730fyln8f3";
     };
   };
 
@@ -3312,12 +3312,12 @@
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-11-25";
+    name = "vim-wakatime-2018-12-19";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
-      sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
+      rev = "227099fba9c60f58c520ec055c79335405d11668";
+      sha256 = "011wjh5iwcp0ixbyfry2rgjiwz46dc1iilhi6zlixkf3lk2qbfih";
     };
   };
 
@@ -3422,12 +3422,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-12";
+    name = "vimtex-2018-12-21";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "6165a4421e7605a96d9b6c83f3ac853bf2f90a03";
-      sha256 = "01yp79w53wyxqjd1dnba069pmj1b56nl52x2r3mfzzldm1p5gx4k";
+      rev = "0715b256f3cdab75c2b7818773f7df297d0a7cac";
+      sha256 = "1kkhhvx3dxd9dv9na724l7kzzlg14xbgh1mh82dwzv91yqikmr2c";
     };
   };
 
@@ -3553,12 +3553,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-12-12";
+    name = "youcompleteme-2018-12-23";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234";
-      sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql";
+      rev = "7997fc5536e8220ed2798c5522a1eb4421577fa2";
+      sha256 = "1662js5dpspmrak92zwy8751qfd1pkp5q7xgw2m6c76ccvv88c5p";
       fetchSubmodules = true;
     };
   };

From ce7899bea513dcc4290b91269334b26f67e76f6f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 23 Dec 2018 23:31:34 +0100
Subject: [PATCH 2/8] vimPlugins.ncm2-jedi: init at 2018-07-18

---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  5 +++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 16 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 38a2a584262..a13dca0019f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -880,6 +880,16 @@
     };
   };
 
+  ncm2-jedi = buildVimPluginFrom2Nix {
+    name = "ncm2-jedi-2018-07-18";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-jedi";
+      rev = "0418d5ca8d4fe6996500eb04517a946f7de83d34";
+      sha256 = "1rbwxsycrn3nis9mj08k70hb174z7cw9p610r6nd8lv4zk1h341z";
+    };
+  };
+
   ncm2-path = buildVimPluginFrom2Nix {
     name = "ncm2-path-2018-09-12";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index e7d95fb50b5..7bdce724ab7 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -177,6 +177,11 @@ with generated;
     dependencies = ["nvim-yarp"];
   });
 
+  ncm2-jedi = ncm2-jedi.overrideAttrs(old: {
+    dependencies = ["nvim-yarp" "ncm2"];
+    passthru.python3Dependencies = ps: with ps; [ jedi ];
+  });
+
   ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
     dependencies = ["ultisnips"];
   });
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7bb07aa3e9d..0fa61a82e3e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -197,6 +197,7 @@ navicore/vissort.vim
 nbouscal/vim-stylish-haskell
 ncm2/ncm2
 ncm2/ncm2-bufword
+ncm2/ncm2-jedi
 ncm2/ncm2-path
 ncm2/ncm2-tmux
 ncm2/ncm2-ultisnips

From b352318cd11d67d49ddb6d1c0cb2cea786e08b46 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 24 Dec 2018 13:02:31 +0100
Subject: [PATCH 3/8] vimUtils: represent vim plugins as derivations

Vim plugins were previously represented as strings by default,
necessitating a `knownPlugins` set. Backwards compatibility is kept
(strings are still accepted), so vam plugins should continue to work.
---
 pkgs/misc/vim-plugins/generated.nix | 361 ++++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/overrides.nix | 162 +++++++------
 pkgs/misc/vim-plugins/update.py     |   1 +
 pkgs/misc/vim-plugins/vim-utils.nix |  58 +++--
 4 files changed, 483 insertions(+), 99 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a13dca0019f..f899199c844 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4,6 +4,7 @@
 {
   a-vim = buildVimPluginFrom2Nix {
     name = "a-vim-2010-11-06";
+    pname = "a-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "a.vim";
@@ -14,6 +15,7 @@
 
   ack-vim = buildVimPluginFrom2Nix {
     name = "ack-vim-2018-02-27";
+    pname = "ack-vim";
     src = fetchFromGitHub {
       owner = "mileszs";
       repo = "ack.vim";
@@ -24,6 +26,7 @@
 
   acp = buildVimPluginFrom2Nix {
     name = "acp-2013-02-05";
+    pname = "acp";
     src = fetchFromGitHub {
       owner = "eikenb";
       repo = "acp";
@@ -34,6 +37,7 @@
 
   agda-vim = buildVimPluginFrom2Nix {
     name = "agda-vim-2018-11-10";
+    pname = "agda-vim";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
@@ -44,6 +48,7 @@
 
   alchemist-vim = buildVimPluginFrom2Nix {
     name = "alchemist-vim-2018-12-07";
+    pname = "alchemist-vim";
     src = fetchFromGitHub {
       owner = "slashmili";
       repo = "alchemist.vim";
@@ -54,6 +59,7 @@
 
   ale = buildVimPluginFrom2Nix {
     name = "ale-2018-12-20";
+    pname = "ale";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
@@ -64,6 +70,7 @@
 
   align = buildVimPluginFrom2Nix {
     name = "align-2012-08-08";
+    pname = "align";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "align";
@@ -74,6 +81,7 @@
 
   argtextobj-vim = buildVimPluginFrom2Nix {
     name = "argtextobj-vim-2010-10-18";
+    pname = "argtextobj-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "argtextobj.vim";
@@ -84,6 +92,7 @@
 
   auto-pairs = buildVimPluginFrom2Nix {
     name = "auto-pairs-2018-09-23";
+    pname = "auto-pairs";
     src = fetchFromGitHub {
       owner = "jiangmiao";
       repo = "auto-pairs";
@@ -94,6 +103,7 @@
 
   autoload_cscope-vim = buildVimPluginFrom2Nix {
     name = "autoload_cscope-vim-2011-01-28";
+    pname = "autoload_cscope-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "autoload_cscope.vim";
@@ -104,6 +114,7 @@
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     name = "awesome-vim-colorschemes-2018-12-16";
+    pname = "awesome-vim-colorschemes";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
@@ -114,6 +125,7 @@
 
   base16-vim = buildVimPluginFrom2Nix {
     name = "base16-vim-2018-11-30";
+    pname = "base16-vim";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
@@ -124,6 +136,7 @@
 
   bats-vim = buildVimPluginFrom2Nix {
     name = "bats-vim-2013-07-03";
+    pname = "bats-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "bats.vim";
@@ -134,6 +147,7 @@
 
   calendar-vim = buildVimPluginFrom2Nix {
     name = "calendar-vim-2018-11-02";
+    pname = "calendar-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
@@ -144,6 +158,7 @@
 
   caw-vim = buildVimPluginFrom2Nix {
     name = "caw-vim-2018-12-17";
+    pname = "caw-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
@@ -154,6 +169,7 @@
 
   changeColorScheme-vim = buildVimPluginFrom2Nix {
     name = "changeColorScheme-vim-2010-10-18";
+    pname = "changeColorScheme-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "changeColorScheme.vim";
@@ -164,6 +180,7 @@
 
   CheckAttach = buildVimPluginFrom2Nix {
     name = "CheckAttach-2018-09-02";
+    pname = "CheckAttach";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "CheckAttach";
@@ -174,6 +191,7 @@
 
   clang_complete = buildVimPluginFrom2Nix {
     name = "clang_complete-2018-09-19";
+    pname = "clang_complete";
     src = fetchFromGitHub {
       owner = "Rip-Rip";
       repo = "clang_complete";
@@ -184,6 +202,7 @@
 
   clighter8 = buildVimPluginFrom2Nix {
     name = "clighter8-2018-07-25";
+    pname = "clighter8";
     src = fetchFromGitHub {
       owner = "bbchung";
       repo = "clighter8";
@@ -194,6 +213,7 @@
 
   Colour-Sampler-Pack = buildVimPluginFrom2Nix {
     name = "Colour-Sampler-Pack-2012-11-30";
+    pname = "Colour-Sampler-Pack";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -204,6 +224,7 @@
 
   command-t = buildVimPluginFrom2Nix {
     name = "command-t-2018-09-19";
+    pname = "command-t";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -215,6 +236,7 @@
 
   committia-vim = buildVimPluginFrom2Nix {
     name = "committia-vim-2018-10-23";
+    pname = "committia-vim";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
@@ -225,6 +247,7 @@
 
   concealedyank-vim = buildVimPluginFrom2Nix {
     name = "concealedyank-vim-2013-03-24";
+    pname = "concealedyank-vim";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "concealedyank.vim";
@@ -235,6 +258,7 @@
 
   context_filetype-vim = buildVimPluginFrom2Nix {
     name = "context_filetype-vim-2018-08-30";
+    pname = "context_filetype-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
@@ -245,6 +269,7 @@
 
   cosco-vim = buildVimPluginFrom2Nix {
     name = "cosco-vim-2018-08-07";
+    pname = "cosco-vim";
     src = fetchFromGitHub {
       owner = "lfilho";
       repo = "cosco.vim";
@@ -255,6 +280,7 @@
 
   cpsm = buildVimPluginFrom2Nix {
     name = "cpsm-2018-09-08";
+    pname = "cpsm";
     src = fetchFromGitHub {
       owner = "nixprime";
       repo = "cpsm";
@@ -265,6 +291,7 @@
 
   csapprox = buildVimPluginFrom2Nix {
     name = "csapprox-2013-07-27";
+    pname = "csapprox";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "csapprox";
@@ -275,6 +302,7 @@
 
   csv-vim = buildVimPluginFrom2Nix {
     name = "csv-vim-2018-10-04";
+    pname = "csv-vim";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
@@ -285,6 +313,7 @@
 
   ctrlp-cmatcher = buildVimPluginFrom2Nix {
     name = "ctrlp-cmatcher-2015-10-15";
+    pname = "ctrlp-cmatcher";
     src = fetchFromGitHub {
       owner = "JazzCore";
       repo = "ctrlp-cmatcher";
@@ -295,6 +324,7 @@
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix {
     name = "ctrlp-py-matcher-2017-11-01";
+    pname = "ctrlp-py-matcher";
     src = fetchFromGitHub {
       owner = "FelikZ";
       repo = "ctrlp-py-matcher";
@@ -305,6 +335,7 @@
 
   ctrlp-z = buildVimPluginFrom2Nix {
     name = "ctrlp-z-2015-10-17";
+    pname = "ctrlp-z";
     src = fetchFromGitHub {
       owner = "amiorin";
       repo = "ctrlp-z";
@@ -315,6 +346,7 @@
 
   ctrlp-vim = buildVimPluginFrom2Nix {
     name = "ctrlp-vim-2018-11-22";
+    pname = "ctrlp-vim";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
@@ -325,6 +357,7 @@
 
   denite-extra = buildVimPluginFrom2Nix {
     name = "denite-extra-2018-09-20";
+    pname = "denite-extra";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-extra";
@@ -335,6 +368,7 @@
 
   denite-git = buildVimPluginFrom2Nix {
     name = "denite-git-2018-07-19";
+    pname = "denite-git";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
@@ -345,6 +379,7 @@
 
   denite-nvim = buildVimPluginFrom2Nix {
     name = "denite-nvim-2018-12-17";
+    pname = "denite-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
@@ -355,6 +390,7 @@
 
   deol-nvim = buildVimPluginFrom2Nix {
     name = "deol-nvim-2018-12-17";
+    pname = "deol-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
@@ -365,6 +401,7 @@
 
   deoplete-clang = buildVimPluginFrom2Nix {
     name = "deoplete-clang-2018-07-01";
+    pname = "deoplete-clang";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
@@ -376,6 +413,7 @@
 
   deoplete-go = buildVimPluginFrom2Nix {
     name = "deoplete-go-2018-11-23";
+    pname = "deoplete-go";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
@@ -387,6 +425,7 @@
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     name = "deoplete-jedi-2018-12-22";
+    pname = "deoplete-jedi";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
@@ -398,6 +437,7 @@
 
   deoplete-julia = buildVimPluginFrom2Nix {
     name = "deoplete-julia-2018-06-11";
+    pname = "deoplete-julia";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "deoplete-julia";
@@ -408,6 +448,7 @@
 
   deoplete-rust = buildVimPluginFrom2Nix {
     name = "deoplete-rust-2017-07-18";
+    pname = "deoplete-rust";
     src = fetchFromGitHub {
       owner = "sebastianmarkow";
       repo = "deoplete-rust";
@@ -418,6 +459,7 @@
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
     name = "deoplete-ternjs-2018-11-29";
+    pname = "deoplete-ternjs";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
@@ -428,6 +470,7 @@
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     name = "deoplete-nvim-2018-12-17";
+    pname = "deoplete-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
@@ -438,6 +481,7 @@
 
   dhall-vim = buildVimPluginFrom2Nix {
     name = "dhall-vim-2018-12-12";
+    pname = "dhall-vim";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
@@ -448,6 +492,7 @@
 
   direnv-vim = buildVimPluginFrom2Nix {
     name = "direnv-vim-2018-11-10";
+    pname = "direnv-vim";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
@@ -458,6 +503,7 @@
 
   echodoc-vim = buildVimPluginFrom2Nix {
     name = "echodoc-vim-2018-12-09";
+    pname = "echodoc-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
@@ -468,6 +514,7 @@
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     name = "editorconfig-vim-2018-11-15";
+    pname = "editorconfig-vim";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
@@ -479,6 +526,7 @@
 
   elm-vim = buildVimPluginFrom2Nix {
     name = "elm-vim-2018-11-13";
+    pname = "elm-vim";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
@@ -489,6 +537,7 @@
 
   emmet-vim = buildVimPluginFrom2Nix {
     name = "emmet-vim-2018-11-29";
+    pname = "emmet-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
@@ -500,6 +549,7 @@
 
   ensime-vim = buildVimPluginFrom2Nix {
     name = "ensime-vim-2018-10-10";
+    pname = "ensime-vim";
     src = fetchFromGitHub {
       owner = "ensime";
       repo = "ensime-vim";
@@ -510,6 +560,7 @@
 
   falcon = buildVimPluginFrom2Nix {
     name = "falcon-2018-12-21";
+    pname = "falcon";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
@@ -520,6 +571,7 @@
 
   fastfold = buildVimPluginFrom2Nix {
     name = "fastfold-2018-09-24";
+    pname = "fastfold";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
@@ -530,6 +582,7 @@
 
   ferret = buildVimPluginFrom2Nix {
     name = "ferret-2018-12-20";
+    pname = "ferret";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
@@ -540,6 +593,7 @@
 
   flake8-vim = buildVimPluginFrom2Nix {
     name = "flake8-vim-2017-02-17";
+    pname = "flake8-vim";
     src = fetchFromGitHub {
       owner = "andviro";
       repo = "flake8-vim";
@@ -551,6 +605,7 @@
 
   floobits-neovim = buildVimPluginFrom2Nix {
     name = "floobits-neovim-2018-08-01";
+    pname = "floobits-neovim";
     src = fetchFromGitHub {
       owner = "floobits";
       repo = "floobits-neovim";
@@ -561,6 +616,7 @@
 
   forms = buildVimPluginFrom2Nix {
     name = "forms-2012-11-28";
+    pname = "forms";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "forms";
@@ -571,6 +627,7 @@
 
   fugitive-gitlab-vim = buildVimPluginFrom2Nix {
     name = "fugitive-gitlab-vim-2018-07-04";
+    pname = "fugitive-gitlab-vim";
     src = fetchFromGitHub {
       owner = "shumphrey";
       repo = "fugitive-gitlab.vim";
@@ -581,6 +638,7 @@
 
   fzf-vim = buildVimPluginFrom2Nix {
     name = "fzf-vim-2018-12-11";
+    pname = "fzf-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
@@ -591,6 +649,7 @@
 
   ghcmod-vim = buildVimPluginFrom2Nix {
     name = "ghcmod-vim-2016-06-19";
+    pname = "ghcmod-vim";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "ghcmod-vim";
@@ -601,6 +660,7 @@
 
   gist-vim = buildVimPluginFrom2Nix {
     name = "gist-vim-2018-11-09";
+    pname = "gist-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
@@ -611,6 +671,7 @@
 
   gitv = buildVimPluginFrom2Nix {
     name = "gitv-2018-11-24";
+    pname = "gitv";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
@@ -621,6 +682,7 @@
 
   goyo-vim = buildVimPluginFrom2Nix {
     name = "goyo-vim-2017-05-31";
+    pname = "goyo-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "goyo.vim";
@@ -631,6 +693,7 @@
 
   gruvbox = buildVimPluginFrom2Nix {
     name = "gruvbox-2018-02-25";
+    pname = "gruvbox";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
@@ -641,6 +704,7 @@
 
   gundo-vim = buildVimPluginFrom2Nix {
     name = "gundo-vim-2017-05-09";
+    pname = "gundo-vim";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "gundo.vim";
@@ -651,6 +715,7 @@
 
   haskell-vim = buildVimPluginFrom2Nix {
     name = "haskell-vim-2018-05-22";
+    pname = "haskell-vim";
     src = fetchFromGitHub {
       owner = "neovimhaskell";
       repo = "haskell-vim";
@@ -661,6 +726,7 @@
 
   hasksyn = buildVimPluginFrom2Nix {
     name = "hasksyn-2014-09-04";
+    pname = "hasksyn";
     src = fetchFromGitHub {
       owner = "travitch";
       repo = "hasksyn";
@@ -671,6 +737,7 @@
 
   hlint-refactor-vim = buildVimPluginFrom2Nix {
     name = "hlint-refactor-vim-2015-12-05";
+    pname = "hlint-refactor-vim";
     src = fetchFromGitHub {
       owner = "mpickering";
       repo = "hlint-refactor-vim";
@@ -681,6 +748,7 @@
 
   iceberg-vim = buildVimPluginFrom2Nix {
     name = "iceberg-vim-2018-10-17";
+    pname = "iceberg-vim";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
@@ -691,6 +759,7 @@
 
   idris-vim = buildVimPluginFrom2Nix {
     name = "idris-vim-2017-12-04";
+    pname = "idris-vim";
     src = fetchFromGitHub {
       owner = "idris-hackers";
       repo = "idris-vim";
@@ -701,6 +770,7 @@
 
   Improved-AnsiEsc = buildVimPluginFrom2Nix {
     name = "Improved-AnsiEsc-2015-08-26";
+    pname = "Improved-AnsiEsc";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Improved-AnsiEsc";
@@ -711,6 +781,7 @@
 
   incsearch-easymotion-vim = buildVimPluginFrom2Nix {
     name = "incsearch-easymotion-vim-2016-01-18";
+    pname = "incsearch-easymotion-vim";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch-easymotion.vim";
@@ -721,6 +792,7 @@
 
   incsearch-vim = buildVimPluginFrom2Nix {
     name = "incsearch-vim-2017-11-24";
+    pname = "incsearch-vim";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch.vim";
@@ -731,6 +803,7 @@
 
   intero-neovim = buildVimPluginFrom2Nix {
     name = "intero-neovim-2018-08-07";
+    pname = "intero-neovim";
     src = fetchFromGitHub {
       owner = "parsonsmatt";
       repo = "intero-neovim";
@@ -741,6 +814,7 @@
 
   iosvkem = buildVimPluginFrom2Nix {
     name = "iosvkem-2018-08-26";
+    pname = "iosvkem";
     src = fetchFromGitHub {
       owner = "neutaaaaan";
       repo = "iosvkem";
@@ -751,6 +825,7 @@
 
   jedi-vim = buildVimPluginFrom2Nix {
     name = "jedi-vim-2018-12-03";
+    pname = "jedi-vim";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
@@ -762,6 +837,7 @@
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     name = "Jenkinsfile-vim-syntax-2018-11-25";
+    pname = "Jenkinsfile-vim-syntax";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
@@ -772,6 +848,7 @@
 
   julia-vim = buildVimPluginFrom2Nix {
     name = "julia-vim-2018-12-11";
+    pname = "julia-vim";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
@@ -782,6 +859,7 @@
 
   last256 = buildVimPluginFrom2Nix {
     name = "last256-2017-06-10";
+    pname = "last256";
     src = fetchFromGitHub {
       owner = "sk1418";
       repo = "last256";
@@ -792,6 +870,7 @@
 
   latex-box = buildVimPluginFrom2Nix {
     name = "latex-box-2015-06-01";
+    pname = "latex-box";
     src = fetchFromGitHub {
       owner = "latex-box-team";
       repo = "latex-box";
@@ -802,6 +881,7 @@
 
   lightline-vim = buildVimPluginFrom2Nix {
     name = "lightline-vim-2018-12-12";
+    pname = "lightline-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
@@ -812,6 +892,7 @@
 
   limelight-vim = buildVimPluginFrom2Nix {
     name = "limelight-vim-2016-06-23";
+    pname = "limelight-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "limelight.vim";
@@ -822,6 +903,7 @@
 
   lushtags = buildVimPluginFrom2Nix {
     name = "lushtags-2017-04-19";
+    pname = "lushtags";
     src = fetchFromGitHub {
       owner = "mkasa";
       repo = "lushtags";
@@ -832,6 +914,7 @@
 
   matchit-zip = buildVimPluginFrom2Nix {
     name = "matchit-zip-2010-10-18";
+    pname = "matchit-zip";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "matchit.zip";
@@ -842,6 +925,7 @@
 
   mayansmoke = buildVimPluginFrom2Nix {
     name = "mayansmoke-2010-10-18";
+    pname = "mayansmoke";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "mayansmoke";
@@ -852,6 +936,7 @@
 
   molokai = buildVimPluginFrom2Nix {
     name = "molokai-2015-11-11";
+    pname = "molokai";
     src = fetchFromGitHub {
       owner = "tomasr";
       repo = "molokai";
@@ -862,6 +947,7 @@
 
   ncm2 = buildVimPluginFrom2Nix {
     name = "ncm2-2018-12-23";
+    pname = "ncm2";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
@@ -872,6 +958,7 @@
 
   ncm2-bufword = buildVimPluginFrom2Nix {
     name = "ncm2-bufword-2018-12-06";
+    pname = "ncm2-bufword";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-bufword";
@@ -882,6 +969,7 @@
 
   ncm2-jedi = buildVimPluginFrom2Nix {
     name = "ncm2-jedi-2018-07-18";
+    pname = "ncm2-jedi";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-jedi";
@@ -892,6 +980,7 @@
 
   ncm2-path = buildVimPluginFrom2Nix {
     name = "ncm2-path-2018-09-12";
+    pname = "ncm2-path";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-path";
@@ -902,6 +991,7 @@
 
   ncm2-tmux = buildVimPluginFrom2Nix {
     name = "ncm2-tmux-2018-12-06";
+    pname = "ncm2-tmux";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-tmux";
@@ -912,6 +1002,7 @@
 
   ncm2-ultisnips = buildVimPluginFrom2Nix {
     name = "ncm2-ultisnips-2018-08-01";
+    pname = "ncm2-ultisnips";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-ultisnips";
@@ -922,6 +1013,7 @@
 
   neco-ghc = buildVimPluginFrom2Nix {
     name = "neco-ghc-2018-05-13";
+    pname = "neco-ghc";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "neco-ghc";
@@ -932,6 +1024,7 @@
 
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-11-09";
+    pname = "neco-look";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
@@ -942,6 +1035,7 @@
 
   neco-syntax = buildVimPluginFrom2Nix {
     name = "neco-syntax-2017-10-01";
+    pname = "neco-syntax";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-syntax";
@@ -952,6 +1046,7 @@
 
   neco-vim = buildVimPluginFrom2Nix {
     name = "neco-vim-2018-10-30";
+    pname = "neco-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
@@ -962,6 +1057,7 @@
 
   neocomplete-vim = buildVimPluginFrom2Nix {
     name = "neocomplete-vim-2018-11-19";
+    pname = "neocomplete-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
@@ -972,6 +1068,7 @@
 
   neodark-vim = buildVimPluginFrom2Nix {
     name = "neodark-vim-2018-10-17";
+    pname = "neodark-vim";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
@@ -982,6 +1079,7 @@
 
   neoformat = buildVimPluginFrom2Nix {
     name = "neoformat-2018-12-21";
+    pname = "neoformat";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
@@ -992,6 +1090,7 @@
 
   neoinclude-vim = buildVimPluginFrom2Nix {
     name = "neoinclude-vim-2018-05-21";
+    pname = "neoinclude-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoinclude.vim";
@@ -1002,6 +1101,7 @@
 
   neomake = buildVimPluginFrom2Nix {
     name = "neomake-2018-12-23";
+    pname = "neomake";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
@@ -1012,6 +1112,7 @@
 
   neomru-vim = buildVimPluginFrom2Nix {
     name = "neomru-vim-2018-11-29";
+    pname = "neomru-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
@@ -1022,6 +1123,7 @@
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     name = "neosnippet-snippets-2018-09-30";
+    pname = "neosnippet-snippets";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
@@ -1032,6 +1134,7 @@
 
   neosnippet-vim = buildVimPluginFrom2Nix {
     name = "neosnippet-vim-2018-12-03";
+    pname = "neosnippet-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
@@ -1042,6 +1145,7 @@
 
   neovim-sensible = buildVimPluginFrom2Nix {
     name = "neovim-sensible-2017-09-20";
+    pname = "neovim-sensible";
     src = fetchFromGitHub {
       owner = "jeffkreeftmeijer";
       repo = "neovim-sensible";
@@ -1052,6 +1156,7 @@
 
   neoyank-vim = buildVimPluginFrom2Nix {
     name = "neoyank-vim-2018-12-03";
+    pname = "neoyank-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
@@ -1062,6 +1167,7 @@
 
   nerdcommenter = buildVimPluginFrom2Nix {
     name = "nerdcommenter-2018-12-03";
+    pname = "nerdcommenter";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
@@ -1072,6 +1178,7 @@
 
   nerdtree = buildVimPluginFrom2Nix {
     name = "nerdtree-2018-12-12";
+    pname = "nerdtree";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
@@ -1082,6 +1189,7 @@
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
     name = "nerdtree-git-plugin-2018-11-15";
+    pname = "nerdtree-git-plugin";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
@@ -1092,6 +1200,7 @@
 
   nim-vim = buildVimPluginFrom2Nix {
     name = "nim-vim-2018-12-16";
+    pname = "nim-vim";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
@@ -1102,6 +1211,7 @@
 
   nvim-cm-racer = buildVimPluginFrom2Nix {
     name = "nvim-cm-racer-2017-07-27";
+    pname = "nvim-cm-racer";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-cm-racer";
@@ -1112,6 +1222,7 @@
 
   nvim-completion-manager = buildVimPluginFrom2Nix {
     name = "nvim-completion-manager-2018-07-27";
+    pname = "nvim-completion-manager";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-completion-manager";
@@ -1122,6 +1233,7 @@
 
   nvim-yarp = buildVimPluginFrom2Nix {
     name = "nvim-yarp-2018-12-23";
+    pname = "nvim-yarp";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
@@ -1132,6 +1244,7 @@
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     name = "nvimdev-nvim-2018-11-07";
+    pname = "nvimdev-nvim";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
@@ -1142,6 +1255,7 @@
 
   onehalf = buildVimPluginFrom2Nix {
     name = "onehalf-2018-10-21";
+    pname = "onehalf";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
@@ -1152,6 +1266,7 @@
 
   open-browser-vim = buildVimPluginFrom2Nix {
     name = "open-browser-vim-2018-11-29";
+    pname = "open-browser-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
@@ -1162,6 +1277,7 @@
 
   papercolor-theme = buildVimPluginFrom2Nix {
     name = "papercolor-theme-2018-09-04";
+    pname = "papercolor-theme";
     src = fetchFromGitHub {
       owner = "NLKNguyen";
       repo = "papercolor-theme";
@@ -1172,6 +1288,7 @@
 
   peskcolor-vim = buildVimPluginFrom2Nix {
     name = "peskcolor-vim-2016-06-11";
+    pname = "peskcolor-vim";
     src = fetchFromGitHub {
       owner = "andsild";
       repo = "peskcolor.vim";
@@ -1182,6 +1299,7 @@
 
   pig-vim = buildVimPluginFrom2Nix {
     name = "pig-vim-2017-06-08";
+    pname = "pig-vim";
     src = fetchFromGitHub {
       owner = "motus";
       repo = "pig.vim";
@@ -1192,6 +1310,7 @@
 
   pony-vim-syntax = buildVimPluginFrom2Nix {
     name = "pony-vim-syntax-2017-09-26";
+    pname = "pony-vim-syntax";
     src = fetchFromGitHub {
       owner = "dleonard0";
       repo = "pony-vim-syntax";
@@ -1202,6 +1321,7 @@
 
   PreserveNoEOL = buildVimPluginFrom2Nix {
     name = "PreserveNoEOL-2013-06-14";
+    pname = "PreserveNoEOL";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "PreserveNoEOL";
@@ -1212,6 +1332,7 @@
 
   psc-ide-vim = buildVimPluginFrom2Nix {
     name = "psc-ide-vim-2018-03-11";
+    pname = "psc-ide-vim";
     src = fetchFromGitHub {
       owner = "frigoeu";
       repo = "psc-ide-vim";
@@ -1222,6 +1343,7 @@
 
   purescript-vim = buildVimPluginFrom2Nix {
     name = "purescript-vim-2018-12-10";
+    pname = "purescript-vim";
     src = fetchFromGitHub {
       owner = "raichoo";
       repo = "purescript-vim";
@@ -1232,6 +1354,7 @@
 
   python-mode = buildVimPluginFrom2Nix {
     name = "python-mode-2018-04-29";
+    pname = "python-mode";
     src = fetchFromGitHub {
       owner = "python-mode";
       repo = "python-mode";
@@ -1242,6 +1365,7 @@
 
   quickfixstatus = buildVimPluginFrom2Nix {
     name = "quickfixstatus-2011-09-03";
+    pname = "quickfixstatus";
     src = fetchFromGitHub {
       owner = "dannyob";
       repo = "quickfixstatus";
@@ -1252,6 +1376,7 @@
 
   rainbow = buildVimPluginFrom2Nix {
     name = "rainbow-2018-07-31";
+    pname = "rainbow";
     src = fetchFromGitHub {
       owner = "luochen1990";
       repo = "rainbow";
@@ -1262,6 +1387,7 @@
 
   rainbow_parentheses-vim = buildVimPluginFrom2Nix {
     name = "rainbow_parentheses-vim-2013-03-05";
+    pname = "rainbow_parentheses-vim";
     src = fetchFromGitHub {
       owner = "kien";
       repo = "rainbow_parentheses.vim";
@@ -1272,6 +1398,7 @@
 
   random-vim = buildVimPluginFrom2Nix {
     name = "random-vim-2010-10-18";
+    pname = "random-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "random.vim";
@@ -1282,6 +1409,7 @@
 
   ranger-vim = buildVimPluginFrom2Nix {
     name = "ranger-vim-2018-12-21";
+    pname = "ranger-vim";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
@@ -1292,6 +1420,7 @@
 
   Recover-vim = buildVimPluginFrom2Nix {
     name = "Recover-vim-2018-10-22";
+    pname = "Recover-vim";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "Recover.vim";
@@ -1302,6 +1431,7 @@
 
   Rename = buildVimPluginFrom2Nix {
     name = "Rename-2011-08-31";
+    pname = "Rename";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Rename";
@@ -1312,6 +1442,7 @@
 
   ReplaceWithRegister = buildVimPluginFrom2Nix {
     name = "ReplaceWithRegister-2014-10-31";
+    pname = "ReplaceWithRegister";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "ReplaceWithRegister";
@@ -1322,6 +1453,7 @@
 
   riv-vim = buildVimPluginFrom2Nix {
     name = "riv-vim-2018-10-17";
+    pname = "riv-vim";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
@@ -1332,6 +1464,7 @@
 
   robotframework-vim = buildVimPluginFrom2Nix {
     name = "robotframework-vim-2017-04-14";
+    pname = "robotframework-vim";
     src = fetchFromGitHub {
       owner = "mfukar";
       repo = "robotframework-vim";
@@ -1342,6 +1475,7 @@
 
   rtorrent-syntax-file = buildVimPluginFrom2Nix {
     name = "rtorrent-syntax-file-2016-03-19";
+    pname = "rtorrent-syntax-file";
     src = fetchFromGitHub {
       owner = "ccarpita";
       repo = "rtorrent-syntax-file";
@@ -1352,6 +1486,7 @@
 
   rust-vim = buildVimPluginFrom2Nix {
     name = "rust-vim-2018-12-23";
+    pname = "rust-vim";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
@@ -1362,6 +1497,7 @@
 
   self = buildVimPluginFrom2Nix {
     name = "self-2014-05-28";
+    pname = "self";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "self";
@@ -1372,6 +1508,7 @@
 
   shabadou-vim = buildVimPluginFrom2Nix {
     name = "shabadou-vim-2016-07-19";
+    pname = "shabadou-vim";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "shabadou.vim";
@@ -1382,6 +1519,7 @@
 
   sourcemap-vim = buildVimPluginFrom2Nix {
     name = "sourcemap-vim-2012-09-19";
+    pname = "sourcemap-vim";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "sourcemap.vim";
@@ -1392,6 +1530,7 @@
 
   Spacegray-vim = buildVimPluginFrom2Nix {
     name = "Spacegray-vim-2018-06-21";
+    pname = "Spacegray-vim";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
@@ -1402,6 +1541,7 @@
 
   spacevim = buildVimPluginFrom2Nix {
     name = "spacevim-2018-03-29";
+    pname = "spacevim";
     src = fetchFromGitHub {
       owner = "ctjhoa";
       repo = "spacevim";
@@ -1412,6 +1552,7 @@
 
   sparkup = buildVimPluginFrom2Nix {
     name = "sparkup-2012-06-11";
+    pname = "sparkup";
     src = fetchFromGitHub {
       owner = "chrisgeo";
       repo = "sparkup";
@@ -1422,6 +1563,7 @@
 
   splice-vim = buildVimPluginFrom2Nix {
     name = "splice-vim-2017-09-03";
+    pname = "splice-vim";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "splice.vim";
@@ -1432,6 +1574,7 @@
 
   supertab = buildVimPluginFrom2Nix {
     name = "supertab-2017-11-14";
+    pname = "supertab";
     src = fetchFromGitHub {
       owner = "ervandew";
       repo = "supertab";
@@ -1442,6 +1585,7 @@
 
   swift-vim = buildVimPluginFrom2Nix {
     name = "swift-vim-2018-09-12";
+    pname = "swift-vim";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
@@ -1452,6 +1596,7 @@
 
   syntastic = buildVimPluginFrom2Nix {
     name = "syntastic-2018-11-24";
+    pname = "syntastic";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
@@ -1462,6 +1607,7 @@
 
   tabmerge = buildVimPluginFrom2Nix {
     name = "tabmerge-2010-10-18";
+    pname = "tabmerge";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "tabmerge";
@@ -1472,6 +1618,7 @@
 
   tabpagebuffer-vim = buildVimPluginFrom2Nix {
     name = "tabpagebuffer-vim-2014-09-30";
+    pname = "tabpagebuffer-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "tabpagebuffer.vim";
@@ -1482,6 +1629,7 @@
 
   tabular = buildVimPluginFrom2Nix {
     name = "tabular-2016-05-04";
+    pname = "tabular";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "tabular";
@@ -1492,6 +1640,7 @@
 
   tagbar = buildVimPluginFrom2Nix {
     name = "tagbar-2017-12-17";
+    pname = "tagbar";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
@@ -1502,6 +1651,7 @@
 
   taglist-vim = buildVimPluginFrom2Nix {
     name = "taglist-vim-2010-10-18";
+    pname = "taglist-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "taglist.vim";
@@ -1512,6 +1662,7 @@
 
   targets-vim = buildVimPluginFrom2Nix {
     name = "targets-vim-2018-12-21";
+    pname = "targets-vim";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
@@ -1522,6 +1673,7 @@
 
   tender-vim = buildVimPluginFrom2Nix {
     name = "tender-vim-2017-03-14";
+    pname = "tender-vim";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
@@ -1532,6 +1684,7 @@
 
   tern_for_vim = buildVimPluginFrom2Nix {
     name = "tern_for_vim-2017-11-27";
+    pname = "tern_for_vim";
     src = fetchFromGitHub {
       owner = "ternjs";
       repo = "tern_for_vim";
@@ -1542,6 +1695,7 @@
 
   thumbnail-vim = buildVimPluginFrom2Nix {
     name = "thumbnail-vim-2017-04-24";
+    pname = "thumbnail-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "thumbnail.vim";
@@ -1552,6 +1706,7 @@
 
   tlib_vim = buildVimPluginFrom2Nix {
     name = "tlib_vim-2018-04-08";
+    pname = "tlib_vim";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
@@ -1562,6 +1717,7 @@
 
   traces-vim = buildVimPluginFrom2Nix {
     name = "traces-vim-2018-12-13";
+    pname = "traces-vim";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
@@ -1572,6 +1728,7 @@
 
   tslime-vim = buildVimPluginFrom2Nix {
     name = "tslime-vim-2018-07-23";
+    pname = "tslime-vim";
     src = fetchFromGitHub {
       owner = "jgdavey";
       repo = "tslime.vim";
@@ -1582,6 +1739,7 @@
 
   tsuquyomi = buildVimPluginFrom2Nix {
     name = "tsuquyomi-2018-10-31";
+    pname = "tsuquyomi";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
@@ -1592,6 +1750,7 @@
 
   typescript-vim = buildVimPluginFrom2Nix {
     name = "typescript-vim-2018-10-17";
+    pname = "typescript-vim";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
@@ -1602,6 +1761,7 @@
 
   ultisnips = buildVimPluginFrom2Nix {
     name = "ultisnips-2018-04-30";
+    pname = "ultisnips";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
@@ -1612,6 +1772,7 @@
 
   undotree = buildVimPluginFrom2Nix {
     name = "undotree-2018-10-15";
+    pname = "undotree";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
@@ -1622,6 +1783,7 @@
 
   unite-vim = buildVimPluginFrom2Nix {
     name = "unite-vim-2018-12-14";
+    pname = "unite-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
@@ -1632,6 +1794,7 @@
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
     name = "verilog_systemverilog-vim-2018-12-08";
+    pname = "verilog_systemverilog-vim";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
@@ -1642,6 +1805,7 @@
 
   vim = buildVimPluginFrom2Nix {
     name = "vim-2018-12-22";
+    pname = "vim";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
@@ -1652,6 +1816,7 @@
 
   vim-abolish = buildVimPluginFrom2Nix {
     name = "vim-abolish-2018-11-25";
+    pname = "vim-abolish";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
@@ -1662,6 +1827,7 @@
 
   vim-addon-actions = buildVimPluginFrom2Nix {
     name = "vim-addon-actions-2018-01-18";
+    pname = "vim-addon-actions";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-actions";
@@ -1672,6 +1838,7 @@
 
   vim-addon-async = buildVimPluginFrom2Nix {
     name = "vim-addon-async-2017-03-20";
+    pname = "vim-addon-async";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-async";
@@ -1682,6 +1849,7 @@
 
   vim-addon-background-cmd = buildVimPluginFrom2Nix {
     name = "vim-addon-background-cmd-2015-12-11";
+    pname = "vim-addon-background-cmd";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-background-cmd";
@@ -1692,6 +1860,7 @@
 
   vim-addon-commenting = buildVimPluginFrom2Nix {
     name = "vim-addon-commenting-2013-06-10";
+    pname = "vim-addon-commenting";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-commenting";
@@ -1702,6 +1871,7 @@
 
   vim-addon-completion = buildVimPluginFrom2Nix {
     name = "vim-addon-completion-2015-02-10";
+    pname = "vim-addon-completion";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-completion";
@@ -1712,6 +1882,7 @@
 
   vim-addon-errorformats = buildVimPluginFrom2Nix {
     name = "vim-addon-errorformats-2014-11-05";
+    pname = "vim-addon-errorformats";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-errorformats";
@@ -1722,6 +1893,7 @@
 
   vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
     name = "vim-addon-goto-thing-at-cursor-2012-01-10";
+    pname = "vim-addon-goto-thing-at-cursor";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-goto-thing-at-cursor";
@@ -1732,6 +1904,7 @@
 
   vim-addon-local-vimrc = buildVimPluginFrom2Nix {
     name = "vim-addon-local-vimrc-2015-03-19";
+    pname = "vim-addon-local-vimrc";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-local-vimrc";
@@ -1742,6 +1915,7 @@
 
   vim-addon-manager = buildVimPluginFrom2Nix {
     name = "vim-addon-manager-2018-07-27";
+    pname = "vim-addon-manager";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-manager";
@@ -1752,6 +1926,7 @@
 
   vim-addon-mru = buildVimPluginFrom2Nix {
     name = "vim-addon-mru-2013-08-08";
+    pname = "vim-addon-mru";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mru";
@@ -1762,6 +1937,7 @@
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix {
     name = "vim-addon-mw-utils-2018-03-09";
+    pname = "vim-addon-mw-utils";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mw-utils";
@@ -1772,6 +1948,7 @@
 
   vim-addon-nix = buildVimPluginFrom2Nix {
     name = "vim-addon-nix-2017-09-11";
+    pname = "vim-addon-nix";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-nix";
@@ -1782,6 +1959,7 @@
 
   vim-addon-other = buildVimPluginFrom2Nix {
     name = "vim-addon-other-2014-07-15";
+    pname = "vim-addon-other";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-other";
@@ -1792,6 +1970,7 @@
 
   vim-addon-php-manual = buildVimPluginFrom2Nix {
     name = "vim-addon-php-manual-2015-01-01";
+    pname = "vim-addon-php-manual";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-php-manual";
@@ -1802,6 +1981,7 @@
 
   vim-addon-signs = buildVimPluginFrom2Nix {
     name = "vim-addon-signs-2013-04-19";
+    pname = "vim-addon-signs";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-signs";
@@ -1812,6 +1992,7 @@
 
   vim-addon-sql = buildVimPluginFrom2Nix {
     name = "vim-addon-sql-2017-02-11";
+    pname = "vim-addon-sql";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-sql";
@@ -1822,6 +2003,7 @@
 
   vim-addon-syntax-checker = buildVimPluginFrom2Nix {
     name = "vim-addon-syntax-checker-2017-06-26";
+    pname = "vim-addon-syntax-checker";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-syntax-checker";
@@ -1832,6 +2014,7 @@
 
   vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
     name = "vim-addon-toggle-buffer-2012-01-13";
+    pname = "vim-addon-toggle-buffer";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-toggle-buffer";
@@ -1842,6 +2025,7 @@
 
   vim-addon-xdebug = buildVimPluginFrom2Nix {
     name = "vim-addon-xdebug-2014-08-29";
+    pname = "vim-addon-xdebug";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-xdebug";
@@ -1852,6 +2036,7 @@
 
   vim-airline = buildVimPluginFrom2Nix {
     name = "vim-airline-2018-12-18";
+    pname = "vim-airline";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
@@ -1862,6 +2047,7 @@
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     name = "vim-airline-themes-2018-11-15";
+    pname = "vim-airline-themes";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
@@ -1872,6 +2058,7 @@
 
   vim-android = buildVimPluginFrom2Nix {
     name = "vim-android-2018-07-31";
+    pname = "vim-android";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
@@ -1882,6 +2069,7 @@
 
   vim-anzu = buildVimPluginFrom2Nix {
     name = "vim-anzu-2018-02-28";
+    pname = "vim-anzu";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-anzu";
@@ -1892,6 +2080,7 @@
 
   vim-auto-save = buildVimPluginFrom2Nix {
     name = "vim-auto-save-2017-11-08";
+    pname = "vim-auto-save";
     src = fetchFromGitHub {
       owner = "907th";
       repo = "vim-auto-save";
@@ -1902,6 +2091,7 @@
 
   vim-autoformat = buildVimPluginFrom2Nix {
     name = "vim-autoformat-2018-12-19";
+    pname = "vim-autoformat";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
@@ -1912,6 +2102,7 @@
 
   vim-bazel = buildVimPluginFrom2Nix {
     name = "vim-bazel-2018-01-11";
+    pname = "vim-bazel";
     src = fetchFromGitHub {
       owner = "bazelbuild";
       repo = "vim-bazel";
@@ -1922,6 +2113,7 @@
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
     name = "vim-better-whitespace-2018-06-11";
+    pname = "vim-better-whitespace";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
@@ -1932,6 +2124,7 @@
 
   vim-buffergator = buildVimPluginFrom2Nix {
     name = "vim-buffergator-2018-05-02";
+    pname = "vim-buffergator";
     src = fetchFromGitHub {
       owner = "jeetsukumaran";
       repo = "vim-buffergator";
@@ -1942,6 +2135,7 @@
 
   vim-bufferline = buildVimPluginFrom2Nix {
     name = "vim-bufferline-2016-02-09";
+    pname = "vim-bufferline";
     src = fetchFromGitHub {
       owner = "bling";
       repo = "vim-bufferline";
@@ -1952,6 +2146,7 @@
 
   vim-closetag = buildVimPluginFrom2Nix {
     name = "vim-closetag-2018-12-08";
+    pname = "vim-closetag";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
@@ -1962,6 +2157,7 @@
 
   vim-codefmt = buildVimPluginFrom2Nix {
     name = "vim-codefmt-2018-12-15";
+    pname = "vim-codefmt";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
@@ -1972,6 +2168,7 @@
 
   vim-coffee-script = buildVimPluginFrom2Nix {
     name = "vim-coffee-script-2018-02-27";
+    pname = "vim-coffee-script";
     src = fetchFromGitHub {
       owner = "kchmck";
       repo = "vim-coffee-script";
@@ -1982,6 +2179,7 @@
 
   vim-colemak = buildVimPluginFrom2Nix {
     name = "vim-colemak-2016-10-16";
+    pname = "vim-colemak";
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "vim-colemak";
@@ -1992,6 +2190,7 @@
 
   vim-colors-solarized = buildVimPluginFrom2Nix {
     name = "vim-colors-solarized-2011-05-09";
+    pname = "vim-colors-solarized";
     src = fetchFromGitHub {
       owner = "altercation";
       repo = "vim-colors-solarized";
@@ -2002,6 +2201,7 @@
 
   vim-colorschemes = buildVimPluginFrom2Nix {
     name = "vim-colorschemes-2018-11-20";
+    pname = "vim-colorschemes";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
@@ -2012,6 +2212,7 @@
 
   vim-colorstepper = buildVimPluginFrom2Nix {
     name = "vim-colorstepper-2016-01-28";
+    pname = "vim-colorstepper";
     src = fetchFromGitHub {
       owner = "jonbri";
       repo = "vim-colorstepper";
@@ -2022,6 +2223,7 @@
 
   vim-commentary = buildVimPluginFrom2Nix {
     name = "vim-commentary-2018-07-27";
+    pname = "vim-commentary";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-commentary";
@@ -2032,6 +2234,7 @@
 
   vim-css-color = buildVimPluginFrom2Nix {
     name = "vim-css-color-2018-11-20";
+    pname = "vim-css-color";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
@@ -2042,6 +2245,7 @@
 
   vim-cursorword = buildVimPluginFrom2Nix {
     name = "vim-cursorword-2017-10-19";
+    pname = "vim-cursorword";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
@@ -2052,6 +2256,7 @@
 
   vim-cute-python = buildVimPluginFrom2Nix {
     name = "vim-cute-python-2016-04-04";
+    pname = "vim-cute-python";
     src = fetchFromGitHub {
       owner = "ehamberg";
       repo = "vim-cute-python";
@@ -2062,6 +2267,7 @@
 
   vim-devicons = buildVimPluginFrom2Nix {
     name = "vim-devicons-2018-06-21";
+    pname = "vim-devicons";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
@@ -2072,6 +2278,7 @@
 
   vim-dirdiff = buildVimPluginFrom2Nix {
     name = "vim-dirdiff-2018-01-31";
+    pname = "vim-dirdiff";
     src = fetchFromGitHub {
       owner = "will133";
       repo = "vim-dirdiff";
@@ -2082,6 +2289,7 @@
 
   vim-dirvish = buildVimPluginFrom2Nix {
     name = "vim-dirvish-2018-12-04";
+    pname = "vim-dirvish";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
@@ -2092,6 +2300,7 @@
 
   vim-dispatch = buildVimPluginFrom2Nix {
     name = "vim-dispatch-2018-10-31";
+    pname = "vim-dispatch";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
@@ -2102,6 +2311,7 @@
 
   vim-docbk = buildVimPluginFrom2Nix {
     name = "vim-docbk-2015-04-01";
+    pname = "vim-docbk";
     src = fetchFromGitHub {
       owner = "jhradilek";
       repo = "vim-docbk";
@@ -2112,6 +2322,7 @@
 
   vim-easy-align = buildVimPluginFrom2Nix {
     name = "vim-easy-align-2017-06-03";
+    pname = "vim-easy-align";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-easy-align";
@@ -2122,6 +2333,7 @@
 
   vim-easygit = buildVimPluginFrom2Nix {
     name = "vim-easygit-2018-07-08";
+    pname = "vim-easygit";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "vim-easygit";
@@ -2132,6 +2344,7 @@
 
   vim-easymotion = buildVimPluginFrom2Nix {
     name = "vim-easymotion-2018-06-04";
+    pname = "vim-easymotion";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
@@ -2142,6 +2355,7 @@
 
   vim-easytags = buildVimPluginFrom2Nix {
     name = "vim-easytags-2015-07-01";
+    pname = "vim-easytags";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-easytags";
@@ -2152,6 +2366,7 @@
 
   vim-eighties = buildVimPluginFrom2Nix {
     name = "vim-eighties-2016-12-15";
+    pname = "vim-eighties";
     src = fetchFromGitHub {
       owner = "justincampbell";
       repo = "vim-eighties";
@@ -2162,6 +2377,7 @@
 
   vim-elixir = buildVimPluginFrom2Nix {
     name = "vim-elixir-2018-12-12";
+    pname = "vim-elixir";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
@@ -2172,6 +2388,7 @@
 
   vim-eunuch = buildVimPluginFrom2Nix {
     name = "vim-eunuch-2018-09-09";
+    pname = "vim-eunuch";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
@@ -2182,6 +2399,7 @@
 
   vim-expand-region = buildVimPluginFrom2Nix {
     name = "vim-expand-region-2013-08-19";
+    pname = "vim-expand-region";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-expand-region";
@@ -2192,6 +2410,7 @@
 
   vim-extradite = buildVimPluginFrom2Nix {
     name = "vim-extradite-2015-09-22";
+    pname = "vim-extradite";
     src = fetchFromGitHub {
       owner = "int3";
       repo = "vim-extradite";
@@ -2202,6 +2421,7 @@
 
   vim-fireplace = buildVimPluginFrom2Nix {
     name = "vim-fireplace-2018-06-01";
+    pname = "vim-fireplace";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
@@ -2212,6 +2432,7 @@
 
   vim-flagship = buildVimPluginFrom2Nix {
     name = "vim-flagship-2018-08-15";
+    pname = "vim-flagship";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-flagship";
@@ -2222,6 +2443,7 @@
 
   vim-flake8 = buildVimPluginFrom2Nix {
     name = "vim-flake8-2018-09-21";
+    pname = "vim-flake8";
     src = fetchFromGitHub {
       owner = "nvie";
       repo = "vim-flake8";
@@ -2232,6 +2454,7 @@
 
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
     name = "vim-ft-diff_fold-2013-02-10";
+    pname = "vim-ft-diff_fold";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-ft-diff_fold";
@@ -2242,6 +2465,7 @@
 
   vim-fugitive = buildVimPluginFrom2Nix {
     name = "vim-fugitive-2018-12-23";
+    pname = "vim-fugitive";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
@@ -2252,6 +2476,7 @@
 
   vim-ghost = buildVimPluginFrom2Nix {
     name = "vim-ghost-2018-12-12";
+    pname = "vim-ghost";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
@@ -2262,6 +2487,7 @@
 
   vim-gista = buildVimPluginFrom2Nix {
     name = "vim-gista-2017-02-20";
+    pname = "vim-gista";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-gista";
@@ -2272,6 +2498,7 @@
 
   vim-gitbranch = buildVimPluginFrom2Nix {
     name = "vim-gitbranch-2017-05-27";
+    pname = "vim-gitbranch";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-gitbranch";
@@ -2282,6 +2509,7 @@
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     name = "vim-gitgutter-2018-12-15";
+    pname = "vim-gitgutter";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
@@ -2292,6 +2520,7 @@
 
   vim-github-dashboard = buildVimPluginFrom2Nix {
     name = "vim-github-dashboard-2018-09-03";
+    pname = "vim-github-dashboard";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-github-dashboard";
@@ -2302,6 +2531,7 @@
 
   vim-go = buildVimPluginFrom2Nix {
     name = "vim-go-2018-12-21";
+    pname = "vim-go";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
@@ -2312,6 +2542,7 @@
 
   vim-grammarous = buildVimPluginFrom2Nix {
     name = "vim-grammarous-2018-09-13";
+    pname = "vim-grammarous";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-grammarous";
@@ -2322,6 +2553,7 @@
 
   vim-grepper = buildVimPluginFrom2Nix {
     name = "vim-grepper-2018-12-22";
+    pname = "vim-grepper";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
@@ -2332,6 +2564,7 @@
 
   vim-gutentags = buildVimPluginFrom2Nix {
     name = "vim-gutentags-2018-11-17";
+    pname = "vim-gutentags";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
@@ -2342,6 +2575,7 @@
 
   vim-hardtime = buildVimPluginFrom2Nix {
     name = "vim-hardtime-2017-03-31";
+    pname = "vim-hardtime";
     src = fetchFromGitHub {
       owner = "takac";
       repo = "vim-hardtime";
@@ -2352,6 +2586,7 @@
 
   vim-haskellconceal = buildVimPluginFrom2Nix {
     name = "vim-haskellconceal-2017-06-15";
+    pname = "vim-haskellconceal";
     src = fetchFromGitHub {
       owner = "twinside";
       repo = "vim-haskellconceal";
@@ -2362,6 +2597,7 @@
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
     name = "vim-haskellConcealPlus-2018-08-07";
+    pname = "vim-haskellConcealPlus";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
@@ -2372,6 +2608,7 @@
 
   vim-hdevtools = buildVimPluginFrom2Nix {
     name = "vim-hdevtools-2018-11-19";
+    pname = "vim-hdevtools";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
@@ -2382,6 +2619,7 @@
 
   vim-hier = buildVimPluginFrom2Nix {
     name = "vim-hier-2011-08-27";
+    pname = "vim-hier";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-hier";
@@ -2392,6 +2630,7 @@
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
     name = "vim-highlightedyank-2018-10-08";
+    pname = "vim-highlightedyank";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
@@ -2402,6 +2641,7 @@
 
   vim-hindent = buildVimPluginFrom2Nix {
     name = "vim-hindent-2018-07-31";
+    pname = "vim-hindent";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-hindent";
@@ -2412,6 +2652,7 @@
 
   vim-hoogle = buildVimPluginFrom2Nix {
     name = "vim-hoogle-2018-03-04";
+    pname = "vim-hoogle";
     src = fetchFromGitHub {
       owner = "Twinside";
       repo = "vim-hoogle";
@@ -2422,6 +2663,7 @@
 
   vim-husk = buildVimPluginFrom2Nix {
     name = "vim-husk-2015-11-29";
+    pname = "vim-husk";
     src = fetchFromGitHub {
       owner = "vim-utils";
       repo = "vim-husk";
@@ -2432,6 +2674,7 @@
 
   vim-iced-coffee-script = buildVimPluginFrom2Nix {
     name = "vim-iced-coffee-script-2013-12-26";
+    pname = "vim-iced-coffee-script";
     src = fetchFromGitHub {
       owner = "noc7c9";
       repo = "vim-iced-coffee-script";
@@ -2442,6 +2685,7 @@
 
   vim-indent-guides = buildVimPluginFrom2Nix {
     name = "vim-indent-guides-2018-05-14";
+    pname = "vim-indent-guides";
     src = fetchFromGitHub {
       owner = "nathanaelkane";
       repo = "vim-indent-guides";
@@ -2452,6 +2696,7 @@
 
   vim-indent-object = buildVimPluginFrom2Nix {
     name = "vim-indent-object-2018-04-08";
+    pname = "vim-indent-object";
     src = fetchFromGitHub {
       owner = "michaeljsmith";
       repo = "vim-indent-object";
@@ -2462,6 +2707,7 @@
 
   vim-ipython = buildVimPluginFrom2Nix {
     name = "vim-ipython-2015-06-23";
+    pname = "vim-ipython";
     src = fetchFromGitHub {
       owner = "ivanov";
       repo = "vim-ipython";
@@ -2472,6 +2718,7 @@
 
   vim-isort = buildVimPluginFrom2Nix {
     name = "vim-isort-2018-08-22";
+    pname = "vim-isort";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
@@ -2482,6 +2729,7 @@
 
   vim-jade = buildVimPluginFrom2Nix {
     name = "vim-jade-2018-09-10";
+    pname = "vim-jade";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
@@ -2492,6 +2740,7 @@
 
   vim-janah = buildVimPluginFrom2Nix {
     name = "vim-janah-2018-10-01";
+    pname = "vim-janah";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-janah";
@@ -2502,6 +2751,7 @@
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     name = "vim-javacomplete2-2018-12-21";
+    pname = "vim-javacomplete2";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
@@ -2512,6 +2762,7 @@
 
   vim-javascript = buildVimPluginFrom2Nix {
     name = "vim-javascript-2018-12-23";
+    pname = "vim-javascript";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
@@ -2522,6 +2773,7 @@
 
   vim-jinja = buildVimPluginFrom2Nix {
     name = "vim-jinja-2016-11-16";
+    pname = "vim-jinja";
     src = fetchFromGitHub {
       owner = "lepture";
       repo = "vim-jinja";
@@ -2532,6 +2784,7 @@
 
   vim-jsbeautify = buildVimPluginFrom2Nix {
     name = "vim-jsbeautify-2018-10-23";
+    pname = "vim-jsbeautify";
     src = fetchFromGitHub {
       owner = "maksimr";
       repo = "vim-jsbeautify";
@@ -2543,6 +2796,7 @@
 
   vim-jsdoc = buildVimPluginFrom2Nix {
     name = "vim-jsdoc-2018-05-05";
+    pname = "vim-jsdoc";
     src = fetchFromGitHub {
       owner = "heavenshell";
       repo = "vim-jsdoc";
@@ -2553,6 +2807,7 @@
 
   vim-json = buildVimPluginFrom2Nix {
     name = "vim-json-2018-01-10";
+    pname = "vim-json";
     src = fetchFromGitHub {
       owner = "elzr";
       repo = "vim-json";
@@ -2563,6 +2818,7 @@
 
   vim-jsonnet = buildVimPluginFrom2Nix {
     name = "vim-jsonnet-2018-10-08";
+    pname = "vim-jsonnet";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
@@ -2573,6 +2829,7 @@
 
   vim-lastplace = buildVimPluginFrom2Nix {
     name = "vim-lastplace-2017-06-13";
+    pname = "vim-lastplace";
     src = fetchFromGitHub {
       owner = "farmergreg";
       repo = "vim-lastplace";
@@ -2583,6 +2840,7 @@
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
     name = "vim-latex-live-preview-2018-09-25";
+    pname = "vim-latex-live-preview";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
@@ -2593,6 +2851,7 @@
 
   vim-lawrencium = buildVimPluginFrom2Nix {
     name = "vim-lawrencium-2018-11-04";
+    pname = "vim-lawrencium";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
@@ -2603,6 +2862,7 @@
 
   vim-leader-guide = buildVimPluginFrom2Nix {
     name = "vim-leader-guide-2018-10-06";
+    pname = "vim-leader-guide";
     src = fetchFromGitHub {
       owner = "hecal3";
       repo = "vim-leader-guide";
@@ -2613,6 +2873,7 @@
 
   vim-ledger = buildVimPluginFrom2Nix {
     name = "vim-ledger-2017-12-12";
+    pname = "vim-ledger";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
@@ -2623,6 +2884,7 @@
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     name = "vim-localvimrc-2018-11-06";
+    pname = "vim-localvimrc";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
@@ -2633,6 +2895,7 @@
 
   vim-logreview = buildVimPluginFrom2Nix {
     name = "vim-logreview-2017-07-08";
+    pname = "vim-logreview";
     src = fetchFromGitHub {
       owner = "andreshazard";
       repo = "vim-logreview";
@@ -2643,6 +2906,7 @@
 
   vim-maktaba = buildVimPluginFrom2Nix {
     name = "vim-maktaba-2018-12-13";
+    pname = "vim-maktaba";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
@@ -2653,6 +2917,7 @@
 
   vim-markdown = buildVimPluginFrom2Nix {
     name = "vim-markdown-2018-10-24";
+    pname = "vim-markdown";
     src = fetchFromGitHub {
       owner = "plasticboy";
       repo = "vim-markdown";
@@ -2663,6 +2928,7 @@
 
   vim-misc = buildVimPluginFrom2Nix {
     name = "vim-misc-2015-05-21";
+    pname = "vim-misc";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-misc";
@@ -2673,6 +2939,7 @@
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
     name = "vim-monokai-pro-2018-12-03";
+    pname = "vim-monokai-pro";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
@@ -2683,6 +2950,7 @@
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     name = "vim-multiple-cursors-2018-10-16";
+    pname = "vim-multiple-cursors";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
@@ -2693,6 +2961,7 @@
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
     name = "vim-nerdtree-tabs-2018-12-21";
+    pname = "vim-nerdtree-tabs";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
@@ -2703,6 +2972,7 @@
 
   vim-niceblock = buildVimPluginFrom2Nix {
     name = "vim-niceblock-2018-09-06";
+    pname = "vim-niceblock";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-niceblock";
@@ -2713,6 +2983,7 @@
 
   vim-nix = buildVimPluginFrom2Nix {
     name = "vim-nix-2018-08-27";
+    pname = "vim-nix";
     src = fetchFromGitHub {
       owner = "LnL7";
       repo = "vim-nix";
@@ -2723,6 +2994,7 @@
 
   vim-obsession = buildVimPluginFrom2Nix {
     name = "vim-obsession-2018-09-17";
+    pname = "vim-obsession";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
@@ -2733,6 +3005,7 @@
 
   vim-one = buildVimPluginFrom2Nix {
     name = "vim-one-2018-07-22";
+    pname = "vim-one";
     src = fetchFromGitHub {
       owner = "rakr";
       repo = "vim-one";
@@ -2743,6 +3016,7 @@
 
   vim-operator-replace = buildVimPluginFrom2Nix {
     name = "vim-operator-replace-2015-02-24";
+    pname = "vim-operator-replace";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-replace";
@@ -2753,6 +3027,7 @@
 
   vim-operator-surround = buildVimPluginFrom2Nix {
     name = "vim-operator-surround-2018-11-01";
+    pname = "vim-operator-surround";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-operator-surround";
@@ -2763,6 +3038,7 @@
 
   vim-operator-user = buildVimPluginFrom2Nix {
     name = "vim-operator-user-2015-02-17";
+    pname = "vim-operator-user";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-user";
@@ -2773,6 +3049,7 @@
 
   vim-orgmode = buildVimPluginFrom2Nix {
     name = "vim-orgmode-2018-07-25";
+    pname = "vim-orgmode";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
@@ -2783,6 +3060,7 @@
 
   vim-pager = buildVimPluginFrom2Nix {
     name = "vim-pager-2015-08-26";
+    pname = "vim-pager";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-pager";
@@ -2793,6 +3071,7 @@
 
   vim-pandoc = buildVimPluginFrom2Nix {
     name = "vim-pandoc-2018-10-07";
+    pname = "vim-pandoc";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
@@ -2803,6 +3082,7 @@
 
   vim-pandoc-after = buildVimPluginFrom2Nix {
     name = "vim-pandoc-after-2017-11-21";
+    pname = "vim-pandoc-after";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-after";
@@ -2813,6 +3093,7 @@
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
     name = "vim-pandoc-syntax-2017-04-13";
+    pname = "vim-pandoc-syntax";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
@@ -2823,6 +3104,7 @@
 
   vim-pathogen = buildVimPluginFrom2Nix {
     name = "vim-pathogen-2018-12-13";
+    pname = "vim-pathogen";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
@@ -2833,6 +3115,7 @@
 
   vim-peekaboo = buildVimPluginFrom2Nix {
     name = "vim-peekaboo-2017-03-20";
+    pname = "vim-peekaboo";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-peekaboo";
@@ -2843,6 +3126,7 @@
 
   vim-pencil = buildVimPluginFrom2Nix {
     name = "vim-pencil-2017-06-14";
+    pname = "vim-pencil";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-pencil";
@@ -2853,6 +3137,7 @@
 
   vim-plug = buildVimPluginFrom2Nix {
     name = "vim-plug-2018-11-03";
+    pname = "vim-plug";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
@@ -2863,6 +3148,7 @@
 
   vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
     name = "vim-plugin-AnsiEsc-2018-05-10";
+    pname = "vim-plugin-AnsiEsc";
     src = fetchFromGitHub {
       owner = "powerman";
       repo = "vim-plugin-AnsiEsc";
@@ -2873,6 +3159,7 @@
 
   vim-polyglot = buildVimPluginFrom2Nix {
     name = "vim-polyglot-2018-10-10";
+    pname = "vim-polyglot";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
@@ -2883,6 +3170,7 @@
 
   vim-prettyprint = buildVimPluginFrom2Nix {
     name = "vim-prettyprint-2016-07-16";
+    pname = "vim-prettyprint";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-prettyprint";
@@ -2893,6 +3181,7 @@
 
   vim-projectionist = buildVimPluginFrom2Nix {
     name = "vim-projectionist-2018-10-21";
+    pname = "vim-projectionist";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
@@ -2903,6 +3192,7 @@
 
   vim-ps1 = buildVimPluginFrom2Nix {
     name = "vim-ps1-2017-10-20";
+    pname = "vim-ps1";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
@@ -2913,6 +3203,7 @@
 
   vim-puppet = buildVimPluginFrom2Nix {
     name = "vim-puppet-2018-11-15";
+    pname = "vim-puppet";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
@@ -2923,6 +3214,7 @@
 
   vim-qml = buildVimPluginFrom2Nix {
     name = "vim-qml-2018-07-22";
+    pname = "vim-qml";
     src = fetchFromGitHub {
       owner = "peterhoeg";
       repo = "vim-qml";
@@ -2933,6 +3225,7 @@
 
   vim-quickrun = buildVimPluginFrom2Nix {
     name = "vim-quickrun-2018-11-27";
+    pname = "vim-quickrun";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
@@ -2943,6 +3236,7 @@
 
   vim-racer = buildVimPluginFrom2Nix {
     name = "vim-racer-2018-08-26";
+    pname = "vim-racer";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
@@ -2953,6 +3247,7 @@
 
   vim-repeat = buildVimPluginFrom2Nix {
     name = "vim-repeat-2018-07-02";
+    pname = "vim-repeat";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-repeat";
@@ -2963,6 +3258,7 @@
 
   vim-rhubarb = buildVimPluginFrom2Nix {
     name = "vim-rhubarb-2018-11-16";
+    pname = "vim-rhubarb";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
@@ -2973,6 +3269,7 @@
 
   vim-ruby = buildVimPluginFrom2Nix {
     name = "vim-ruby-2018-12-11";
+    pname = "vim-ruby";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
@@ -2983,6 +3280,7 @@
 
   vim-sayonara = buildVimPluginFrom2Nix {
     name = "vim-sayonara-2017-03-13";
+    pname = "vim-sayonara";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-sayonara";
@@ -2993,6 +3291,7 @@
 
   vim-scala = buildVimPluginFrom2Nix {
     name = "vim-scala-2017-11-10";
+    pname = "vim-scala";
     src = fetchFromGitHub {
       owner = "derekwyatt";
       repo = "vim-scala";
@@ -3003,6 +3302,7 @@
 
   vim-scouter = buildVimPluginFrom2Nix {
     name = "vim-scouter-2014-08-10";
+    pname = "vim-scouter";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-scouter";
@@ -3013,6 +3313,7 @@
 
   vim-scriptease = buildVimPluginFrom2Nix {
     name = "vim-scriptease-2018-12-19";
+    pname = "vim-scriptease";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
@@ -3023,6 +3324,7 @@
 
   vim-sensible = buildVimPluginFrom2Nix {
     name = "vim-sensible-2018-10-27";
+    pname = "vim-sensible";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
@@ -3033,6 +3335,7 @@
 
   vim-signature = buildVimPluginFrom2Nix {
     name = "vim-signature-2018-07-06";
+    pname = "vim-signature";
     src = fetchFromGitHub {
       owner = "kshenoy";
       repo = "vim-signature";
@@ -3043,6 +3346,7 @@
 
   vim-signify = buildVimPluginFrom2Nix {
     name = "vim-signify-2018-12-20";
+    pname = "vim-signify";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
@@ -3053,6 +3357,7 @@
 
   vim-sleuth = buildVimPluginFrom2Nix {
     name = "vim-sleuth-2018-08-19";
+    pname = "vim-sleuth";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sleuth";
@@ -3063,6 +3368,7 @@
 
   vim-smalls = buildVimPluginFrom2Nix {
     name = "vim-smalls-2015-05-02";
+    pname = "vim-smalls";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-smalls";
@@ -3073,6 +3379,7 @@
 
   vim-snipmate = buildVimPluginFrom2Nix {
     name = "vim-snipmate-2017-04-20";
+    pname = "vim-snipmate";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
@@ -3083,6 +3390,7 @@
 
   vim-snippets = buildVimPluginFrom2Nix {
     name = "vim-snippets-2018-12-14";
+    pname = "vim-snippets";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
@@ -3093,6 +3401,7 @@
 
   vim-solidity = buildVimPluginFrom2Nix {
     name = "vim-solidity-2018-04-17";
+    pname = "vim-solidity";
     src = fetchFromGitHub {
       owner = "tomlion";
       repo = "vim-solidity";
@@ -3103,6 +3412,7 @@
 
   vim-sort-motion = buildVimPluginFrom2Nix {
     name = "vim-sort-motion-2018-07-15";
+    pname = "vim-sort-motion";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-sort-motion";
@@ -3113,6 +3423,7 @@
 
   vim-speeddating = buildVimPluginFrom2Nix {
     name = "vim-speeddating-2018-10-31";
+    pname = "vim-speeddating";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-speeddating";
@@ -3123,6 +3434,7 @@
 
   vim-startify = buildVimPluginFrom2Nix {
     name = "vim-startify-2018-12-16";
+    pname = "vim-startify";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
@@ -3133,6 +3445,7 @@
 
   vim-stylish-haskell = buildVimPluginFrom2Nix {
     name = "vim-stylish-haskell-2018-08-31";
+    pname = "vim-stylish-haskell";
     src = fetchFromGitHub {
       owner = "nbouscal";
       repo = "vim-stylish-haskell";
@@ -3143,6 +3456,7 @@
 
   vim-stylishask = buildVimPluginFrom2Nix {
     name = "vim-stylishask-2018-07-05";
+    pname = "vim-stylishask";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-stylishask";
@@ -3153,6 +3467,7 @@
 
   vim-surround = buildVimPluginFrom2Nix {
     name = "vim-surround-2018-07-23";
+    pname = "vim-surround";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-surround";
@@ -3163,6 +3478,7 @@
 
   vim-SyntaxRange = buildVimPluginFrom2Nix {
     name = "vim-SyntaxRange-2018-03-09";
+    pname = "vim-SyntaxRange";
     src = fetchFromGitHub {
       owner = "inkarkat";
       repo = "vim-SyntaxRange";
@@ -3173,6 +3489,7 @@
 
   vim-table-mode = buildVimPluginFrom2Nix {
     name = "vim-table-mode-2018-10-21";
+    pname = "vim-table-mode";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
@@ -3183,6 +3500,7 @@
 
   vim-tabpagecd = buildVimPluginFrom2Nix {
     name = "vim-tabpagecd-2013-11-29";
+    pname = "vim-tabpagecd";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-tabpagecd";
@@ -3193,6 +3511,7 @@
 
   vim-tbone = buildVimPluginFrom2Nix {
     name = "vim-tbone-2018-06-28";
+    pname = "vim-tbone";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-tbone";
@@ -3203,6 +3522,7 @@
 
   vim-terraform = buildVimPluginFrom2Nix {
     name = "vim-terraform-2018-12-20";
+    pname = "vim-terraform";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
@@ -3213,6 +3533,7 @@
 
   vim-test = buildVimPluginFrom2Nix {
     name = "vim-test-2018-11-22";
+    pname = "vim-test";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
@@ -3223,6 +3544,7 @@
 
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
     name = "vim-textobj-multiblock-2014-06-02";
+    pname = "vim-textobj-multiblock";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-textobj-multiblock";
@@ -3233,6 +3555,7 @@
 
   vim-themis = buildVimPluginFrom2Nix {
     name = "vim-themis-2017-12-27";
+    pname = "vim-themis";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
@@ -3243,6 +3566,7 @@
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
     name = "vim-tmux-navigator-2018-11-03";
+    pname = "vim-tmux-navigator";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
@@ -3253,6 +3577,7 @@
 
   vim-toml = buildVimPluginFrom2Nix {
     name = "vim-toml-2018-11-27";
+    pname = "vim-toml";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
@@ -3263,6 +3588,7 @@
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
     name = "vim-trailing-whitespace-2017-09-23";
+    pname = "vim-trailing-whitespace";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
@@ -3273,6 +3599,7 @@
 
   vim-tsx = buildVimPluginFrom2Nix {
     name = "vim-tsx-2017-03-16";
+    pname = "vim-tsx";
     src = fetchFromGitHub {
       owner = "ianks";
       repo = "vim-tsx";
@@ -3283,6 +3610,7 @@
 
   vim-unimpaired = buildVimPluginFrom2Nix {
     name = "vim-unimpaired-2018-12-20";
+    pname = "vim-unimpaired";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
@@ -3293,6 +3621,7 @@
 
   vim-vinegar = buildVimPluginFrom2Nix {
     name = "vim-vinegar-2018-08-06";
+    pname = "vim-vinegar";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-vinegar";
@@ -3303,6 +3632,7 @@
 
   vim-visualstar = buildVimPluginFrom2Nix {
     name = "vim-visualstar-2015-08-27";
+    pname = "vim-visualstar";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-visualstar";
@@ -3313,6 +3643,7 @@
 
   vim-vue = buildVimPluginFrom2Nix {
     name = "vim-vue-2018-11-11";
+    pname = "vim-vue";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
@@ -3323,6 +3654,7 @@
 
   vim-wakatime = buildVimPluginFrom2Nix {
     name = "vim-wakatime-2018-12-19";
+    pname = "vim-wakatime";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
@@ -3333,6 +3665,7 @@
 
   vim-watchdogs = buildVimPluginFrom2Nix {
     name = "vim-watchdogs-2017-12-03";
+    pname = "vim-watchdogs";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-watchdogs";
@@ -3343,6 +3676,7 @@
 
   vim-wordy = buildVimPluginFrom2Nix {
     name = "vim-wordy-2018-03-10";
+    pname = "vim-wordy";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-wordy";
@@ -3353,6 +3687,7 @@
 
   vim-xdebug = buildVimPluginFrom2Nix {
     name = "vim-xdebug-2012-08-15";
+    pname = "vim-xdebug";
     src = fetchFromGitHub {
       owner = "joonty";
       repo = "vim-xdebug";
@@ -3363,6 +3698,7 @@
 
   vim-xkbswitch = buildVimPluginFrom2Nix {
     name = "vim-xkbswitch-2017-03-27";
+    pname = "vim-xkbswitch";
     src = fetchFromGitHub {
       owner = "lyokha";
       repo = "vim-xkbswitch";
@@ -3373,6 +3709,7 @@
 
   vim-yapf = buildVimPluginFrom2Nix {
     name = "vim-yapf-2018-10-04";
+    pname = "vim-yapf";
     src = fetchFromGitHub {
       owner = "mindriot101";
       repo = "vim-yapf";
@@ -3383,6 +3720,7 @@
 
   vim2hs = buildVimPluginFrom2Nix {
     name = "vim2hs-2014-04-16";
+    pname = "vim2hs";
     src = fetchFromGitHub {
       owner = "dag";
       repo = "vim2hs";
@@ -3393,6 +3731,7 @@
 
   vimoutliner = buildVimPluginFrom2Nix {
     name = "vimoutliner-2018-07-04";
+    pname = "vimoutliner";
     src = fetchFromGitHub {
       owner = "vimoutliner";
       repo = "vimoutliner";
@@ -3403,6 +3742,7 @@
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
     name = "vimpreviewpandoc-2018-11-05";
+    pname = "vimpreviewpandoc";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
@@ -3413,6 +3753,7 @@
 
   vimproc-vim = buildVimPluginFrom2Nix {
     name = "vimproc-vim-2018-10-11";
+    pname = "vimproc-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimproc.vim";
@@ -3423,6 +3764,7 @@
 
   vimshell-vim = buildVimPluginFrom2Nix {
     name = "vimshell-vim-2018-06-02";
+    pname = "vimshell-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimshell.vim";
@@ -3433,6 +3775,7 @@
 
   vimtex = buildVimPluginFrom2Nix {
     name = "vimtex-2018-12-21";
+    pname = "vimtex";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
@@ -3443,6 +3786,7 @@
 
   vimux = buildVimPluginFrom2Nix {
     name = "vimux-2017-10-24";
+    pname = "vimux";
     src = fetchFromGitHub {
       owner = "benmills";
       repo = "vimux";
@@ -3453,6 +3797,7 @@
 
   vimwiki = buildVimPluginFrom2Nix {
     name = "vimwiki-2018-10-12";
+    pname = "vimwiki";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
@@ -3463,6 +3808,7 @@
 
   vissort-vim = buildVimPluginFrom2Nix {
     name = "vissort-vim-2014-01-31";
+    pname = "vissort-vim";
     src = fetchFromGitHub {
       owner = "navicore";
       repo = "vissort.vim";
@@ -3473,6 +3819,7 @@
 
   vundle = buildVimPluginFrom2Nix {
     name = "vundle-2018-02-03";
+    pname = "vundle";
     src = fetchFromGitHub {
       owner = "gmarik";
       repo = "vundle";
@@ -3483,6 +3830,7 @@
 
   wal-vim = buildVimPluginFrom2Nix {
     name = "wal-vim-2018-06-04";
+    pname = "wal-vim";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
@@ -3493,6 +3841,7 @@
 
   webapi-vim = buildVimPluginFrom2Nix {
     name = "webapi-vim-2018-03-14";
+    pname = "webapi-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "webapi-vim";
@@ -3503,6 +3852,7 @@
 
   wombat256-vim = buildVimPluginFrom2Nix {
     name = "wombat256-vim-2010-10-18";
+    pname = "wombat256-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "wombat256.vim";
@@ -3513,6 +3863,7 @@
 
   workflowish = buildVimPluginFrom2Nix {
     name = "workflowish-2015-12-03";
+    pname = "workflowish";
     src = fetchFromGitHub {
       owner = "lukaszkorecki";
       repo = "workflowish";
@@ -3523,6 +3874,7 @@
 
   xptemplate = buildVimPluginFrom2Nix {
     name = "xptemplate-2017-12-06";
+    pname = "xptemplate";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
@@ -3533,6 +3885,7 @@
 
   xterm-color-table-vim = buildVimPluginFrom2Nix {
     name = "xterm-color-table-vim-2014-01-01";
+    pname = "xterm-color-table-vim";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "xterm-color-table.vim";
@@ -3543,6 +3896,7 @@
 
   YankRing-vim = buildVimPluginFrom2Nix {
     name = "YankRing-vim-2015-07-29";
+    pname = "YankRing-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
@@ -3553,6 +3907,7 @@
 
   yats-vim = buildVimPluginFrom2Nix {
     name = "yats-vim-2018-12-15";
+    pname = "yats-vim";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
@@ -3564,6 +3919,7 @@
 
   youcompleteme = buildVimPluginFrom2Nix {
     name = "youcompleteme-2018-12-23";
+    pname = "youcompleteme";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
@@ -3575,6 +3931,7 @@
 
   YUNOcommit-vim = buildVimPluginFrom2Nix {
     name = "YUNOcommit-vim-2014-11-26";
+    pname = "YUNOcommit-vim";
     src = fetchFromGitHub {
       owner = "esneider";
       repo = "YUNOcommit.vim";
@@ -3585,6 +3942,7 @@
 
   zeavim-vim = buildVimPluginFrom2Nix {
     name = "zeavim-vim-2018-03-22";
+    pname = "zeavim-vim";
     src = fetchFromGitHub {
       owner = "KabbAmine";
       repo = "zeavim.vim";
@@ -3595,6 +3953,7 @@
 
   zenburn = buildVimPluginFrom2Nix {
     name = "zenburn-2018-04-29";
+    pname = "zenburn";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
@@ -3605,6 +3964,7 @@
 
   zig-vim = buildVimPluginFrom2Nix {
     name = "zig-vim-2018-12-12";
+    pname = "zig-vim";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
@@ -3615,6 +3975,7 @@
 
   zoomwintab-vim = buildVimPluginFrom2Nix {
     name = "zoomwintab-vim-2018-04-14";
+    pname = "zoomwintab-vim";
     src = fetchFromGitHub {
       owner = "troydm";
       repo = "zoomwintab.vim";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 7bdce724ab7..d0e55cb4c3f 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -25,14 +25,30 @@ in
 
 generated:
 
-with generated;
+rec {
 
-{
+  # list of plugins that are needed as dependencies somewhere
+  # This is necessary (as opposed to `with generated;`) because
+  # there would otherwise be conflicts with `rec`. `rec` is necessary
+  # however to make sure overriden plugins can be used as dependencies.
+  # This should use a proper package set with fixed-points instead.
+  inherit (generated)
+    self
+    webapi-vim
+    nvim-yarp
+    ultisnips
+    vim-addon-mw-utils
+    tlib_vim
+    vim-addon-signs
+    vim-addon-other
+    vim-addon-errorformats
+    vim-maktaba
+    vim-misc;
 
   vim2nix = buildVimPluginFrom2Nix {
     name = "vim2nix";
     src = ./vim2nix;
-    dependencies = ["vim-addon-manager"];
+    dependencies = [ vim-addon-manager ];
   };
 
   fzfWrapper = buildVimPluginFrom2Nix {
@@ -90,7 +106,7 @@ with generated;
     dependencies = [];
   };
 
-  clang_complete = clang_complete.overrideAttrs(old: {
+  clang_complete = generated.clang_complete.overrideAttrs(old: {
     # In addition to the arguments you pass to your compiler, you also need to
     # specify the path of the C++ std header (if you are using C++).
     # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -107,14 +123,14 @@ with generated;
     '';
   });
 
-  clighter8 = clighter8.overrideAttrs(old: {
+  clighter8 = generated.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
     '';
   });
 
-  command-t = command-t.overrideAttrs(old: {
+  command-t = generated.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -122,7 +138,7 @@ with generated;
     '';
   });
 
-  cpsm = cpsm.overrideAttrs(old: {
+  cpsm = generated.cpsm.overrideAttrs(old: {
     buildInputs = [
       python3
       stdenv
@@ -138,7 +154,7 @@ with generated;
     '';
   });
 
-  ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
+  ctrlp-cmatcher = generated.ctrlp-cmatcher.overrideAttrs(old: {
     buildInputs = [ python ];
     buildPhase = ''
       patchShebangs .
@@ -146,7 +162,7 @@ with generated;
     '';
   });
 
-  deoplete-go = deoplete-go.overrideAttrs(old: {
+  deoplete-go = generated.deoplete-go.overrideAttrs(old: {
     buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
@@ -156,37 +172,33 @@ with generated;
    '';
   });
 
-  ensime-vim = ensime-vim.overrideAttrs(old: {
+  ensime-vim = generated.ensime-vim.overrideAttrs(old: {
     passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-    dependencies = ["vimproc" "vimshell" "self" "forms"];
+    dependencies = [ vimproc-vim vimshell-vim self forms ];
   });
 
-  forms = forms.overrideAttrs(old: {
-    dependencies = ["self"];
+  forms = generated.forms.overrideAttrs(old: {
+    dependencies = [ self ];
   });
 
-  gist-vim = gist-vim.overrideAttrs(old: {
-    dependencies = ["webapi-vim"];
+  gist-vim = generated.gist-vim.overrideAttrs(old: {
+    dependencies = [ webapi-vim ];
   });
 
-  gitv = gitv.overrideAttrs(old: {
-    dependencies = ["gitv"];
+  ncm2 = generated.ncm2.overrideAttrs(old: {
+    dependencies = [ nvim-yarp ];
   });
 
-  ncm2 = ncm2.overrideAttrs(old: {
-    dependencies = ["nvim-yarp"];
-  });
-
-  ncm2-jedi = ncm2-jedi.overrideAttrs(old: {
-    dependencies = ["nvim-yarp" "ncm2"];
+  ncm2-jedi = generated.ncm2-jedi.overrideAttrs(old: {
+    dependencies = [ nvim-yarp ncm2 ];
     passthru.python3Dependencies = ps: with ps; [ jedi ];
   });
 
-  ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
-    dependencies = ["ultisnips"];
+  ncm2-ultisnips = generated.ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = [ ultisnips ];
   });
 
-  taglist-vim = taglist-vim.overrideAttrs(old: {
+  taglist-vim = generated.taglist-vim.overrideAttrs(old: {
     setSourceRoot = ''
       export sourceRoot=taglist
       mkdir taglist
@@ -195,80 +207,80 @@ with generated;
     '';
   });
 
-  vimshell-vim = vimshell-vim.overrideAttrs(old: {
-    dependencies = [ "vimproc-vim" ];
+  vimshell-vim = generated.vimshell-vim.overrideAttrs(old: {
+    dependencies = [ vimproc-vim ];
   });
 
-  vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
+  vim-addon-manager = generated.vim-addon-manager.overrideAttrs(old: {
     buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
   });
 
-  vim-addon-actions = vim-addon-actions.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  vim-addon-actions = generated.vim-addon-actions.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-async = vim-addon-async.overrideAttrs(old: {
-    dependencies = [ "vim-addon-signs" ];
+  vim-addon-async = generated.vim-addon-async.overrideAttrs(old: {
+    dependencies = [ vim-addon-signs ];
   });
 
-  vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" ];
+  vim-addon-background-cmd = generated.vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils ];
   });
 
-  vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
+  vim-addon-completion = generated.vim-addon-completion.overrideAttrs(old: {
+    dependencies = [ tlib_vim ];
   });
 
-  vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
+  vim-addon-goto-thing-at-cursor = generated.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = [ tlib_vim ];
   });
 
-  vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
-    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
+  vim-addon-mru = generated.vim-addon-mru.overrideAttrs(old: {
+    dependencies = [ vim-addon-other vim-addon-mw-utils ];
   });
 
-  vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
+  vim-addon-nix = generated.vim-addon-nix.overrideAttrs(old: {
     dependencies = [
-      "vim-addon-completion"
-      "vim-addon-goto-thing-at-cursor"
-      "vim-addon-errorformats"
-      "vim-addon-actions"
-      "vim-addon-mw-utils" "tlib"
+      vim-addon-completion
+      vim-addon-goto-thing-at-cursor
+      vim-addon-errorformats
+      vim-addon-actions
+      vim-addon-mw-utils tlib_vim
     ];
   });
 
-  vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
-    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
+  vim-addon-sql = generated.vim-addon-sql.overrideAttrs(old: {
+    dependencies = [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
   });
 
-  vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
-    dependencies = ["vim-addon-mw-utils" "tlib"];
+  vim-addon-syntax-checker = generated.vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  vim-addon-toggle-buffer = generated.vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
-    dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
+  vim-addon-xdebug = generated.vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
   });
 
-  vim-bazel = vim-bazel.overrideAttrs(old: {
-    dependencies = ["maktaba"];
+  vim-bazel = generated.vim-bazel.overrideAttrs(old: {
+    dependencies = [ vim-maktaba ];
   });
 
-  vim-codefmt = vim-codefmt.overrideAttrs(old: {
-    dependencies = ["maktaba"];
+  vim-codefmt = generated.vim-codefmt.overrideAttrs(old: {
+    dependencies = [ vim-maktaba ];
   });
 
-  vim-easytags = vim-easytags.overrideAttrs(old: {
-    dependencies = ["vim-misc"];
+  vim-easytags = generated.vim-easytags.overrideAttrs(old: {
+    dependencies = [ vim-misc ];
   });
 
   # change the go_bin_path to point to a path in the nix store. See the code in
   # fatih/vim-go here
   # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
-  vim-go = vim-go.overrideAttrs(old: let
+  vim-go = generated.vim-go.overrideAttrs(old: let
     binPath = lib.makeBinPath [
       asmfmt
       delve
@@ -296,7 +308,7 @@ with generated;
     '';
   });
 
-  vim-grammarous = vim-grammarous.overrideAttrs(old: {
+  vim-grammarous = generated.vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -309,31 +321,31 @@ with generated;
     ];
   });
 
-  vim-hier = vim-hier.overrideAttrs(old: {
+  vim-hier = generated.vim-hier.overrideAttrs(old: {
     buildInputs = [ vim ];
   });
 
-  vim-isort = vim-isort.overrideAttrs(old: {
+  vim-isort = generated.vim-isort.overrideAttrs(old: {
     postPatch = ''
       substituteInPlace ftplugin/python_vimisort.vim \
         --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
     '';
   });
 
-  vim-snipmate = vim-snipmate.overrideAttrs(old: {
-    dependencies = ["vim-addon-mw-utils" "tlib"];
+  vim-snipmate = generated.vim-snipmate.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
 
-  vim-wakatime = vim-wakatime.overrideAttrs(old: {
+  vim-wakatime = generated.vim-wakatime.overrideAttrs(old: {
     buildInputs = [ python ];
   });
 
-  vim-xdebug = vim-xdebug.overrideAttrs(old: {
+  vim-xdebug = generated.vim-xdebug.overrideAttrs(old: {
     postInstall = false;
   });
 
-  vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
+  vim-xkbswitch = generated.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
         --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -341,14 +353,14 @@ with generated;
     buildInputs = [ xkb_switch ];
   });
 
-  vim-yapf = vim-yapf.overrideAttrs(old: {
+  vim-yapf = generated.vim-yapf.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
         --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
     '';
   });
 
-  vimproc-vim = vimproc-vim.overrideAttrs(old: {
+  vimproc-vim = generated.vimproc-vim.overrideAttrs(old: {
     buildInputs = [ which ];
 
     buildPhase = ''
@@ -360,11 +372,11 @@ with generated;
     '';
   });
 
-  YankRing-vim = YankRing-vim.overrideAttrs(old: {
+  YankRing-vim = generated.YankRing-vim.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
-  youcompleteme = youcompleteme.overrideAttrs(old: {
+  youcompleteme = generated.youcompleteme.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
@@ -383,7 +395,7 @@ with generated;
     };
   });
 
-  jedi-vim = jedi-vim.overrideAttrs(old: {
+  jedi-vim = generated.jedi-vim.overrideAttrs(old: {
     # checking for python3 support in vim would be neat, too, but nobody else seems to care
     buildInputs = [ python3Packages.jedi ];
     meta = {
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 3f5e255ae21..b57bff5c09d 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -310,6 +310,7 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
                 f"""
   {plugin.normalized_name} = buildVimPluginFrom2Nix {{
     name = "{plugin.normalized_name}-{plugin.version}";
+    pname = "{plugin.normalized_name}";
     src = fetchFromGitHub {{
       owner = "{owner}";
       repo = "{repo}";
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 7122e2a4230..59d1a980e88 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -150,23 +150,35 @@ vim_with_plugins can be installed like any other application within Nix.
 let
   inherit (stdenv) lib;
 
-  toNames = x:
+  # transitive closure of plugin dependencies
+  transitiveClosure = knownPlugins: plugin:
+  let
+    # vam puts out a list of strings as the dependency list, we need to be able to deal with that.
+    # Because of that, "plugin" may be a string or a derivation. If it is a string, it is resolved
+    # using `knownPlugins`. Otherwise `knownPlugins` can be null.
+    knownPlugins' = if knownPlugins == null then vimPlugins else knownPlugins;
+    pluginDrv = if builtins.isString plugin then knownPlugins'.${plugin} else plugin;
+  in
+    [ pluginDrv ] ++ (
+      lib.unique (builtins.concatLists (map (transitiveClosure knownPlugins) pluginDrv.dependencies or []))
+    );
+
+  findDependenciesRecursively = knownPlugins: plugins: lib.concatMap (transitiveClosure knownPlugins) plugins;
+
+  attrnamesToPlugins = { knownPlugins, names }:
+    map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins;
+
+  pluginToAttrname = plugin:
+    plugin.pname;
+
+  pluginsToAttrnames = plugins: map pluginToAttrname plugins;
+
+  vamDictToNames = x:
       if builtins.isString x then [x]
       else (lib.optional (x ? name) x.name)
             ++ (x.names or []);
-  findDependenciesRecursively = {knownPlugins, names}:
 
-    let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or [];
-
-        recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names;
-
-        recurse = path:
-          let name = builtins.head path;
-          in if builtins.elem name (builtins.tail path)
-            then throw "recursive vim dependencies"
-            else [name] ++ recurseNames path (depsOf name);
-
-    in lib.uniqList { inputList = recurseNames [] names; };
+  rtpPath = "share/vim-plugins";
 
   vimrcFile = {
     packages ? null,
@@ -183,11 +195,11 @@ let
       (let
         knownPlugins = pathogen.knownPlugins or vimPlugins;
 
-        plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
+        plugins = findDependenciesRecursively knownPlugins pathogen.pluginNames;
 
         pluginsEnv = buildEnv {
           name = "pathogen-plugin-env";
-          paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins;
+          paths = map (x: "${x}/${rtpPath}") plugins;
         };
       in
       ''
@@ -228,7 +240,7 @@ let
       (let
         knownPlugins = vam.knownPlugins or vimPlugins;
 
-        names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
+        plugins = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
 
         # Vim almost reads JSON, so eventually JSON support should be added to Nix
         # TODO: proper quoting
@@ -242,9 +254,9 @@ let
       in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
       ''
         let g:nix_plugin_locations = {}
-        ${lib.concatMapStrings (name: ''
-          let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}"
-        '') names}
+        ${lib.concatMapStrings (plugin: ''
+          let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}"
+        '') plugins}
         let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}"
 
         let g:vim_addon_manager = {}
@@ -381,8 +393,6 @@ rec {
     '';
   };
 
-  rtpPath = "share/vim-plugins";
-
   vimHelpTags = ''
   vimHelpTags(){
     if [ -d "$1/doc" ]; then
@@ -450,13 +460,13 @@ rec {
                      if vam != null && vam ? knownPlugins then vam.knownPlugins else
                      if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
                      vimPlugins;
-      pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
-      vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
+      pathogenNames = findDependenciesRecursively knownPlugins pathogen.pluginNames;
+      vamNames = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
       names = (lib.optionals (pathogen != null) pathogenNames) ++
               (lib.optionals (vam != null) vamNames);
       nonNativePlugins = map (name: knownPlugins.${name}) names ++ (lib.optionals (plug != null) plug.plugins);
       nativePluginsConfigs = lib.attrsets.attrValues packages;
-      nativePlugins = lib.concatMap ({start?[], opt?[]}: start++opt) nativePluginsConfigs;
+      nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs;
     in
       nativePlugins ++ nonNativePlugins;
 

From 8e8a09bfc9546edca6623f713bd1be2cb544da21 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 24 Dec 2018 13:13:59 +0100
Subject: [PATCH 4/8] vimUtils: add dependency logic to nativeImpl

nativeImpl previously simply ignored dependency information.
---
 doc/languages-frameworks/vim.section.md |  7 ++++++-
 pkgs/misc/vim-plugins/vim-utils.nix     | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 2cec1543a24..6ed60028ae2 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -48,7 +48,7 @@ neovim.override {
 
 ## Managing plugins with Vim packages
 
-To store you plugins in Vim packages the following example can be used:
+To store you plugins in Vim packages (the native vim plugin manager, see `:help packages`) the following example can be used:
 
 ```
 vim_configurable.customize {
@@ -56,6 +56,8 @@ vim_configurable.customize {
     # loaded on launch
     start = [ youcompleteme fugitive ];
     # manually loadable by calling `:packadd $plugin-name`
+    # however, if a vim plugin has a dependency that is not explicitly listed in
+	# opt that dependency will always be added to start to avoid confusion.
     opt = [ phpCompletion elm-vim ];
     # To automatically load a plugin when opening a filetype, add vimrc lines like:
     # autocmd FileType php :packadd phpCompletion
@@ -63,6 +65,7 @@ vim_configurable.customize {
 }
 ```
 
+`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like.
 For Neovim the syntax is:
 
 ```
@@ -74,6 +77,8 @@ neovim.override {
     packages.myVimPackage = with pkgs.vimPlugins; {
       # see examples below how to use custom packages
       start = [ ];
+      # If a vim plugin has a dependency that is not explicitly listed in
+      # opt that dependency will always be added to start to avoid confusion.
       opt = [ ];
     };
   };
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 59d1a980e88..a8146dbf5d4 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -293,8 +293,18 @@ let
       (let
         link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
         packageLinks = (packageName: {start ? [], opt ? []}:
+        let
+          # `nativeImpl` expects packages to be derivations, not strings (as
+          # opposed to older implementations that have to maintain backwards
+          # compatibility). Therefore we don't need to deal with "knownPlugins"
+          # and can simply pass `null`.
+          depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively null opt);
+          startWithDeps = findDependenciesRecursively null start;
+        in
           ["mkdir -p $out/pack/${packageName}/start"]
-          ++ (builtins.map (link packageName "start") start)
+          # To avoid confusion, even dependencies of optional plugins are added
+          # to `start` (except if they are explicitly listed as optional plugins).
+          ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins)))
           ++ ["mkdir -p $out/pack/${packageName}/opt"]
           ++ (builtins.map (link packageName "opt") opt)
         );

From edf8b984fa549118a9dcb412838cc29425239f00 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 10:32:27 +0100
Subject: [PATCH 5/8] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 136 ++++++++++++++--------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f899199c844..16d2e53212b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -157,13 +157,13 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-12-17";
+    name = "caw-vim-2018-12-25";
     pname = "caw-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "0060d6fbf53e02a153c5faf6eca1d10c1ed7c489";
-      sha256 = "01pngcf7b04rw2a0bmr8xv191wlnsny2rwg5xzhmargzf68fd6lv";
+      rev = "98805a60aef339e55e5b917fdb9f69c74e8d8340";
+      sha256 = "0nn3dg3lnbnfwgvxpjbalw9ff876798jrzlkrnzqkvrwxv6k7ks5";
     };
   };
 
@@ -378,35 +378,35 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-17";
+    name = "denite-nvim-2018-12-24";
     pname = "denite-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "c21dd10b6d1c4fd3805b130e1a6551daadb8c111";
-      sha256 = "0is51kkzf2vqaxhdfsxaq3vzwjcysriqsigfmv8wl80r6nk1nxlp";
+      rev = "f20cd55d249712dd4d5ab7c2b9d8b7f0005c6290";
+      sha256 = "0g31p4n1hvl0vxn7gczbkfs6bvfhabmyfggcc5sfsd27chf49q43";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-12-17";
+    name = "deol-nvim-2018-12-25";
     pname = "deol-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "b052a5aef05bafd2b6dc48e089483eb5839febc6";
-      sha256 = "1y6nx364xg6xh9arvr53kk45j5p5pkhrm1izkqaigwmsnyr2gdjq";
+      rev = "04afcdd5f63153fe14795d1141fae1eb2bb5be42";
+      sha256 = "1pqxscisx2rymn13z7k988n5bskbi00g3hsy711bnjnazq1wdzib";
     };
   };
 
   deoplete-clang = buildVimPluginFrom2Nix {
-    name = "deoplete-clang-2018-07-01";
+    name = "deoplete-clang-2018-12-24";
     pname = "deoplete-clang";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
-      rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97";
-      sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i";
+      rev = "3353ddfb956841c4d0e5a43db5184504a62c066f";
+      sha256 = "07qhv2lqx4k27fhd4zhxpg0l9s8r83q5147sfh9knpbyawg5hw3i";
       fetchSubmodules = true;
     };
   };
@@ -424,13 +424,13 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-22";
+    name = "deoplete-jedi-2018-12-24";
     pname = "deoplete-jedi";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "d3fac767f7034baa3d61baf4f844c5f1b3470817";
-      sha256 = "0m16h2fwz7i7l7l5833jkc97sapg6p56v60yjwilmrlagq4k4bk8";
+      rev = "73c11875fbfaabf6c0b455596cb3f9dfe5d86595";
+      sha256 = "0xaa56d4scihzz2cwg9zqkv36jwpivnska936z9wq0fpr253yzxc";
       fetchSubmodules = true;
     };
   };
@@ -469,24 +469,24 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-17";
+    name = "deoplete-nvim-2018-12-26";
     pname = "deoplete-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "48bcbe06757907de62919d27dc75d51dc1deed3a";
-      sha256 = "1f7l8mczp5kl06swwzbdhbjqc9vw9xnyx1pbxla7wly2djjcawh2";
+      rev = "ec014e3a8d53b7bbc8a3906013975157d09936a1";
+      sha256 = "06z2d552jf7vhmk0dh8my38bmrnfrzqggbs2dyzvqlx3hxrwm14h";
     };
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-12-12";
+    name = "dhall-vim-2018-12-26";
     pname = "dhall-vim";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "ef31cfee6d8c555d44d282e4cec1367512ad7fe9";
-      sha256 = "0r7y614xld5spgpa4c8ms4rm1p8xzsayp91j4jiqhxn6ly6igv7f";
+      rev = "54a0f463d098abf72c76a233a6a3f0f9dd069dfe";
+      sha256 = "0yacjv7kv79yilsyij43m378shzln0qra5c3nc5g2mc2i9hxcial";
     };
   };
 
@@ -581,13 +581,13 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-20";
+    name = "ferret-2018-12-25";
     pname = "ferret";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "b1647292669ddfa13bfd16d2cc3e084b9b01cfbb";
-      sha256 = "1afry4h6ms2h92c0gdcx89z9jb1g2d5wk4swc3xc20x1p32qdql1";
+      rev = "890a01f85a5ac50ad16f151aacd828b31cbe6889";
+      sha256 = "0882mxa5n1cbvq4vzxnv2d5id3lxbv23anjrilbnkklgk1i5fq47";
     };
   };
 
@@ -946,13 +946,13 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-23";
+    name = "ncm2-2018-12-27";
     pname = "ncm2";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "ead80d5e0c8e6079b780a0470c3e893b508fcc5c";
-      sha256 = "082ixcr7v8h349aiyi0rrcp61nxk7g5jp0s1g48rv0mknwkzj9ir";
+      rev = "3b2749be3bb039ce0df34bca2eea4d6cdfe95caa";
+      sha256 = "152fyvkksqkzkcrr2lj9w26v46b0n9pzia10adbka0jx9ppnsv0k";
     };
   };
 
@@ -1100,13 +1100,13 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-23";
+    name = "neomake-2018-12-27";
     pname = "neomake";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "a7fe130028375e7dbc0d17ba5ee6b4d807245875";
-      sha256 = "14wmpf719w05hy9nhgdkpag5chzyai1x227cmmc3sqgdjy6phfxs";
+      rev = "27eef4e95ca18c6b4c01a779b49446b4ddcbe314";
+      sha256 = "038a8ja5rwm6cx804vqzp85gklyfw3gc7d79snc94g8jj6ply6w5";
     };
   };
 
@@ -1166,13 +1166,13 @@
   };
 
   nerdcommenter = buildVimPluginFrom2Nix {
-    name = "nerdcommenter-2018-12-03";
+    name = "nerdcommenter-2018-12-26";
     pname = "nerdcommenter";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "d24868bc85de599ee2424ca93aa5f6991bd3128c";
-      sha256 = "1xrnngrn537757as4jfiaamjq7yymgh8cdbciiwpc6a2qpiscmdb";
+      rev = "371e4d0e099abb86a3016fefd1efae28a4e13856";
+      sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg";
     };
   };
 
@@ -1529,12 +1529,12 @@
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix {
-    name = "Spacegray-vim-2018-06-21";
+    name = "Spacegray-vim-2018-12-25";
     pname = "Spacegray-vim";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
-      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
+      rev = "5dfdefbe083666bf7f3fe2d6cdff650efaa5e1f7";
       sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
     };
   };
@@ -1716,13 +1716,13 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-13";
+    name = "traces-vim-2018-12-25";
     pname = "traces-vim";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "46e01b6159a21c89695b9d03ea3529ddc92d3b1f";
-      sha256 = "0a77qx12kg4hmfz5zb2ng7lhd855gichs9qjrvich32v04qb2rwv";
+      rev = "7fd6019cd817842ec45836c2cec575e3c21fedca";
+      sha256 = "19pdpipng98s7kypkflfaxkhcskrppyb6714xf7y86adi1d2vly1";
     };
   };
 
@@ -1738,13 +1738,13 @@
   };
 
   tsuquyomi = buildVimPluginFrom2Nix {
-    name = "tsuquyomi-2018-10-31";
+    name = "tsuquyomi-2018-12-26";
     pname = "tsuquyomi";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
-      rev = "bdd034d06ed47176ec1ee0bd3dae5bc0aeb053e3";
-      sha256 = "119dxmkarbh0b0k4l59mxr19shks4mv96j3mbz02q0kdq18bgrdq";
+      rev = "fd47e1ac75ee3a09e13a3b7a8f609907c2b6b542";
+      sha256 = "09rivi64z7lhkan7hd7kdg2r1p3l2iplyc9vs1l6dqk3cp9i5rh0";
     };
   };
 
@@ -2464,13 +2464,13 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-12-23";
+    name = "vim-fugitive-2018-12-26";
     pname = "vim-fugitive";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "baee3bbfe87784985a410924a2b3a0008d6b8424";
-      sha256 = "05c99m2ph0iy9fan2l1148f7vs3nii5zbya7hpdiarvs5i35cj53";
+      rev = "a1f9596d2d884e74358bc5017a73f37e34f7b04c";
+      sha256 = "07am7ca8klnnq6iyp5lbqaas9lgz005rpvndcca7r5w0h45dpncw";
     };
   };
 
@@ -2530,13 +2530,13 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-21";
+    name = "vim-go-2018-12-24";
     pname = "vim-go";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "ead0ef3a169e1b990f20cbbbcca8b3bda5056675";
-      sha256 = "1f4v4jilk3hf0xapqq7zm6fx2p8n43baq3j9128ayd0cg5i60352";
+      rev = "23409acfa8b6e4a324730108d01826f0910a8973";
+      sha256 = "1ddbcwag8x26sim4aplslgmcjv8vr9smanh5939m4a1sw7lcg2xv";
     };
   };
 
@@ -2596,13 +2596,13 @@
   };
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
-    name = "vim-haskellConcealPlus-2018-08-07";
+    name = "vim-haskellConcealPlus-2018-12-26";
     pname = "vim-haskellConcealPlus";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
-      rev = "12608ecab20c3eda9a89a55931397b5e020f38a4";
-      sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0";
+      rev = "1d64dd2cdd1e99689e3d79e7ada151213acd5450";
+      sha256 = "0jsfg941qdpibzcg0ypf0nvabmv1bpwgzgzda7hjy1jcai4yrw1g";
     };
   };
 
@@ -2750,13 +2750,13 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-21";
+    name = "vim-javacomplete2-2018-12-25";
     pname = "vim-javacomplete2";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "fd441fde07fe132f1e278bc61354e02277559d2b";
-      sha256 = "11z9q11xgnmsm6dd4bk19pj585qwmi5qrlbs4ga5vyvbvng1xgl5";
+      rev = "0d96e7344eafc0d2ce6888e629668629d6a11f70";
+      sha256 = "18l0s90y3k7cbl1ql6nyhk13nbc97ll3zkzkvln9r189ckj7q1w7";
     };
   };
 
@@ -2938,13 +2938,13 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-12-03";
+    name = "vim-monokai-pro-2018-12-27";
     pname = "vim-monokai-pro";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
-      rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
-      sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
+      rev = "39fcf3b418fc3a01e604cbb5f9c08d79d7d957c0";
+      sha256 = "1k0n9chmilppsiyxhz1ig0ywimbnl4qpzib6ris1cy6kjnl4mdyq";
     };
   };
 
@@ -3158,13 +3158,13 @@
   };
 
   vim-polyglot = buildVimPluginFrom2Nix {
-    name = "vim-polyglot-2018-10-10";
+    name = "vim-polyglot-2018-12-26";
     pname = "vim-polyglot";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "ec1c94306953b678bb36572897bd218fe6c76506";
-      sha256 = "1n3s52ncmdbhygrdycrnqk9sj42413q0ah1q8a7s6q4z6zdm4scz";
+      rev = "c161994e9607399a7b365ab274592bfc4f100306";
+      sha256 = "19gdy7l87hm0i8jiic02v1xb3b660lsprankfgny9za8hk4kq3cq";
     };
   };
 
@@ -3521,24 +3521,24 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-12-20";
+    name = "vim-terraform-2018-12-25";
     pname = "vim-terraform";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "0f62e7937781cee672227f292b59ce687b28f037";
-      sha256 = "1iwsy5hcsxjzcgksfqwcn8lqwys828dsihazixjv01a31d2wrjsk";
+      rev = "259481e063e79392c25f293f8459462f942dd6f9";
+      sha256 = "0w3kwjd5ywnjkkc3cn765ra8mqqmxvk328b0d14b9hndyhs6v8gi";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-11-22";
+    name = "vim-test-2018-12-24";
     pname = "vim-test";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "c4b732003d120d60a2fc009423e34d80fb212651";
-      sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
+      rev = "fceb803bcde722b8a678251defb34f456affb3e3";
+      sha256 = "0g750rrxcgxvimxcpcz9xkjgsdbwnqc3wjvw056ghyy6mvsvq0wj";
     };
   };
 
@@ -3774,13 +3774,13 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-21";
+    name = "vimtex-2018-12-25";
     pname = "vimtex";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "0715b256f3cdab75c2b7818773f7df297d0a7cac";
-      sha256 = "1kkhhvx3dxd9dv9na724l7kzzlg14xbgh1mh82dwzv91yqikmr2c";
+      rev = "0746f21c2311acfec7c7c23bd122ea4eb3eacb4b";
+      sha256 = "0hga30q6b6v6mdzbqbqr6j6i7fdg4i0igpi2gwvx70a2x68d7ybk";
     };
   };
 

From 96b63961017ffc76becda6208e3b9940c49e376a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 10:34:14 +0100
Subject: [PATCH 6/8] vimUtils.buildVimPlugin: derive name from pname and
 version

---
 pkgs/misc/vim-plugins/build-vim-plugin.nix |  54 ++
 pkgs/misc/vim-plugins/generated.nix        | 722 ++++++++++-----------
 pkgs/misc/vim-plugins/update.py            |   2 +-
 pkgs/misc/vim-plugins/vim-utils.nix        |  52 +-
 4 files changed, 417 insertions(+), 413 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/build-vim-plugin.nix

diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix
new file mode 100644
index 00000000000..2646b55de96
--- /dev/null
+++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, rtpPath ? "share/vim-plugins"
+, vim
+}:
+
+rec {
+  addRtp = path: attrs: derivation:
+    derivation // { rtp = "${derivation}/${path}"; } // {
+      overrideAttrs = f: buildVimPlugin (attrs // f attrs);
+    };
+
+  buildVimPlugin = attrs@{
+    name ? "${attrs.pname}-${attrs.version}",
+    namePrefix ? "vimplugin-",
+    src,
+    unpackPhase ? "",
+    configurePhase ? "",
+    buildPhase ? "",
+    preInstall ? "",
+    postInstall ? "",
+    path ? (builtins.parseDrvName name).name,
+    addonInfo ? null,
+    ...
+  }:
+    addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
+      name = namePrefix + name;
+
+      inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
+
+      installPhase = ''
+        runHook preInstall
+
+        target=$out/${rtpPath}/${path}
+        mkdir -p $out/${rtpPath}
+        cp -r . $target
+
+        # build help tags
+        if [ -d "$target/doc" ]; then
+          ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
+        fi
+
+        if [ -n "$addonInfo" ]; then
+          echo "$addonInfo" > $target/addon-info.json
+        fi
+
+        runHook postInstall
+      '';
+    }));
+
+  buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
+    buildPhase = ":";
+    configurePhase =":";
+  } // attrs);
+}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 16d2e53212b..89406e92305 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3,8 +3,8 @@
 
 {
   a-vim = buildVimPluginFrom2Nix {
-    name = "a-vim-2010-11-06";
     pname = "a-vim";
+    version = "2010-11-06";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "a.vim";
@@ -14,8 +14,8 @@
   };
 
   ack-vim = buildVimPluginFrom2Nix {
-    name = "ack-vim-2018-02-27";
     pname = "ack-vim";
+    version = "2018-02-27";
     src = fetchFromGitHub {
       owner = "mileszs";
       repo = "ack.vim";
@@ -25,8 +25,8 @@
   };
 
   acp = buildVimPluginFrom2Nix {
-    name = "acp-2013-02-05";
     pname = "acp";
+    version = "2013-02-05";
     src = fetchFromGitHub {
       owner = "eikenb";
       repo = "acp";
@@ -36,8 +36,8 @@
   };
 
   agda-vim = buildVimPluginFrom2Nix {
-    name = "agda-vim-2018-11-10";
     pname = "agda-vim";
+    version = "2018-11-10";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
@@ -47,8 +47,8 @@
   };
 
   alchemist-vim = buildVimPluginFrom2Nix {
-    name = "alchemist-vim-2018-12-07";
     pname = "alchemist-vim";
+    version = "2018-12-07";
     src = fetchFromGitHub {
       owner = "slashmili";
       repo = "alchemist.vim";
@@ -58,8 +58,8 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-12-20";
     pname = "ale";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
@@ -69,8 +69,8 @@
   };
 
   align = buildVimPluginFrom2Nix {
-    name = "align-2012-08-08";
     pname = "align";
+    version = "2012-08-08";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "align";
@@ -80,8 +80,8 @@
   };
 
   argtextobj-vim = buildVimPluginFrom2Nix {
-    name = "argtextobj-vim-2010-10-18";
     pname = "argtextobj-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "argtextobj.vim";
@@ -91,8 +91,8 @@
   };
 
   auto-pairs = buildVimPluginFrom2Nix {
-    name = "auto-pairs-2018-09-23";
     pname = "auto-pairs";
+    version = "2018-09-23";
     src = fetchFromGitHub {
       owner = "jiangmiao";
       repo = "auto-pairs";
@@ -102,8 +102,8 @@
   };
 
   autoload_cscope-vim = buildVimPluginFrom2Nix {
-    name = "autoload_cscope-vim-2011-01-28";
     pname = "autoload_cscope-vim";
+    version = "2011-01-28";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "autoload_cscope.vim";
@@ -113,8 +113,8 @@
   };
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "awesome-vim-colorschemes-2018-12-16";
     pname = "awesome-vim-colorschemes";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
@@ -124,8 +124,8 @@
   };
 
   base16-vim = buildVimPluginFrom2Nix {
-    name = "base16-vim-2018-11-30";
     pname = "base16-vim";
+    version = "2018-11-30";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
@@ -135,8 +135,8 @@
   };
 
   bats-vim = buildVimPluginFrom2Nix {
-    name = "bats-vim-2013-07-03";
     pname = "bats-vim";
+    version = "2013-07-03";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "bats.vim";
@@ -146,8 +146,8 @@
   };
 
   calendar-vim = buildVimPluginFrom2Nix {
-    name = "calendar-vim-2018-11-02";
     pname = "calendar-vim";
+    version = "2018-11-02";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
@@ -157,8 +157,8 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-12-25";
     pname = "caw-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
@@ -168,8 +168,8 @@
   };
 
   changeColorScheme-vim = buildVimPluginFrom2Nix {
-    name = "changeColorScheme-vim-2010-10-18";
     pname = "changeColorScheme-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "changeColorScheme.vim";
@@ -179,8 +179,8 @@
   };
 
   CheckAttach = buildVimPluginFrom2Nix {
-    name = "CheckAttach-2018-09-02";
     pname = "CheckAttach";
+    version = "2018-09-02";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "CheckAttach";
@@ -190,8 +190,8 @@
   };
 
   clang_complete = buildVimPluginFrom2Nix {
-    name = "clang_complete-2018-09-19";
     pname = "clang_complete";
+    version = "2018-09-19";
     src = fetchFromGitHub {
       owner = "Rip-Rip";
       repo = "clang_complete";
@@ -201,8 +201,8 @@
   };
 
   clighter8 = buildVimPluginFrom2Nix {
-    name = "clighter8-2018-07-25";
     pname = "clighter8";
+    version = "2018-07-25";
     src = fetchFromGitHub {
       owner = "bbchung";
       repo = "clighter8";
@@ -212,8 +212,8 @@
   };
 
   Colour-Sampler-Pack = buildVimPluginFrom2Nix {
-    name = "Colour-Sampler-Pack-2012-11-30";
     pname = "Colour-Sampler-Pack";
+    version = "2012-11-30";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -223,8 +223,8 @@
   };
 
   command-t = buildVimPluginFrom2Nix {
-    name = "command-t-2018-09-19";
     pname = "command-t";
+    version = "2018-09-19";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -235,8 +235,8 @@
   };
 
   committia-vim = buildVimPluginFrom2Nix {
-    name = "committia-vim-2018-10-23";
     pname = "committia-vim";
+    version = "2018-10-23";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
@@ -246,8 +246,8 @@
   };
 
   concealedyank-vim = buildVimPluginFrom2Nix {
-    name = "concealedyank-vim-2013-03-24";
     pname = "concealedyank-vim";
+    version = "2013-03-24";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "concealedyank.vim";
@@ -257,8 +257,8 @@
   };
 
   context_filetype-vim = buildVimPluginFrom2Nix {
-    name = "context_filetype-vim-2018-08-30";
     pname = "context_filetype-vim";
+    version = "2018-08-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
@@ -268,8 +268,8 @@
   };
 
   cosco-vim = buildVimPluginFrom2Nix {
-    name = "cosco-vim-2018-08-07";
     pname = "cosco-vim";
+    version = "2018-08-07";
     src = fetchFromGitHub {
       owner = "lfilho";
       repo = "cosco.vim";
@@ -279,8 +279,8 @@
   };
 
   cpsm = buildVimPluginFrom2Nix {
-    name = "cpsm-2018-09-08";
     pname = "cpsm";
+    version = "2018-09-08";
     src = fetchFromGitHub {
       owner = "nixprime";
       repo = "cpsm";
@@ -290,8 +290,8 @@
   };
 
   csapprox = buildVimPluginFrom2Nix {
-    name = "csapprox-2013-07-27";
     pname = "csapprox";
+    version = "2013-07-27";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "csapprox";
@@ -301,8 +301,8 @@
   };
 
   csv-vim = buildVimPluginFrom2Nix {
-    name = "csv-vim-2018-10-04";
     pname = "csv-vim";
+    version = "2018-10-04";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
@@ -312,8 +312,8 @@
   };
 
   ctrlp-cmatcher = buildVimPluginFrom2Nix {
-    name = "ctrlp-cmatcher-2015-10-15";
     pname = "ctrlp-cmatcher";
+    version = "2015-10-15";
     src = fetchFromGitHub {
       owner = "JazzCore";
       repo = "ctrlp-cmatcher";
@@ -323,8 +323,8 @@
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix {
-    name = "ctrlp-py-matcher-2017-11-01";
     pname = "ctrlp-py-matcher";
+    version = "2017-11-01";
     src = fetchFromGitHub {
       owner = "FelikZ";
       repo = "ctrlp-py-matcher";
@@ -334,8 +334,8 @@
   };
 
   ctrlp-z = buildVimPluginFrom2Nix {
-    name = "ctrlp-z-2015-10-17";
     pname = "ctrlp-z";
+    version = "2015-10-17";
     src = fetchFromGitHub {
       owner = "amiorin";
       repo = "ctrlp-z";
@@ -345,8 +345,8 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-11-22";
     pname = "ctrlp-vim";
+    version = "2018-11-22";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
@@ -356,8 +356,8 @@
   };
 
   denite-extra = buildVimPluginFrom2Nix {
-    name = "denite-extra-2018-09-20";
     pname = "denite-extra";
+    version = "2018-09-20";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-extra";
@@ -367,8 +367,8 @@
   };
 
   denite-git = buildVimPluginFrom2Nix {
-    name = "denite-git-2018-07-19";
     pname = "denite-git";
+    version = "2018-07-19";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
@@ -378,8 +378,8 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-24";
     pname = "denite-nvim";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
@@ -389,8 +389,8 @@
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-12-25";
     pname = "deol-nvim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
@@ -400,8 +400,8 @@
   };
 
   deoplete-clang = buildVimPluginFrom2Nix {
-    name = "deoplete-clang-2018-12-24";
     pname = "deoplete-clang";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
@@ -412,8 +412,8 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-11-23";
     pname = "deoplete-go";
+    version = "2018-11-23";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
@@ -424,8 +424,8 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-24";
     pname = "deoplete-jedi";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
@@ -436,8 +436,8 @@
   };
 
   deoplete-julia = buildVimPluginFrom2Nix {
-    name = "deoplete-julia-2018-06-11";
     pname = "deoplete-julia";
+    version = "2018-06-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "deoplete-julia";
@@ -447,8 +447,8 @@
   };
 
   deoplete-rust = buildVimPluginFrom2Nix {
-    name = "deoplete-rust-2017-07-18";
     pname = "deoplete-rust";
+    version = "2017-07-18";
     src = fetchFromGitHub {
       owner = "sebastianmarkow";
       repo = "deoplete-rust";
@@ -458,8 +458,8 @@
   };
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
-    name = "deoplete-ternjs-2018-11-29";
     pname = "deoplete-ternjs";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
@@ -469,8 +469,8 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-26";
     pname = "deoplete-nvim";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
@@ -480,8 +480,8 @@
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-12-26";
     pname = "dhall-vim";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
@@ -491,8 +491,8 @@
   };
 
   direnv-vim = buildVimPluginFrom2Nix {
-    name = "direnv-vim-2018-11-10";
     pname = "direnv-vim";
+    version = "2018-11-10";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
@@ -502,8 +502,8 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-12-09";
     pname = "echodoc-vim";
+    version = "2018-12-09";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
@@ -513,8 +513,8 @@
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
-    name = "editorconfig-vim-2018-11-15";
     pname = "editorconfig-vim";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
@@ -525,8 +525,8 @@
   };
 
   elm-vim = buildVimPluginFrom2Nix {
-    name = "elm-vim-2018-11-13";
     pname = "elm-vim";
+    version = "2018-11-13";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
@@ -536,8 +536,8 @@
   };
 
   emmet-vim = buildVimPluginFrom2Nix {
-    name = "emmet-vim-2018-11-29";
     pname = "emmet-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
@@ -548,8 +548,8 @@
   };
 
   ensime-vim = buildVimPluginFrom2Nix {
-    name = "ensime-vim-2018-10-10";
     pname = "ensime-vim";
+    version = "2018-10-10";
     src = fetchFromGitHub {
       owner = "ensime";
       repo = "ensime-vim";
@@ -559,8 +559,8 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-12-21";
     pname = "falcon";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
@@ -570,8 +570,8 @@
   };
 
   fastfold = buildVimPluginFrom2Nix {
-    name = "fastfold-2018-09-24";
     pname = "fastfold";
+    version = "2018-09-24";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
@@ -581,8 +581,8 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-25";
     pname = "ferret";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
@@ -592,8 +592,8 @@
   };
 
   flake8-vim = buildVimPluginFrom2Nix {
-    name = "flake8-vim-2017-02-17";
     pname = "flake8-vim";
+    version = "2017-02-17";
     src = fetchFromGitHub {
       owner = "andviro";
       repo = "flake8-vim";
@@ -604,8 +604,8 @@
   };
 
   floobits-neovim = buildVimPluginFrom2Nix {
-    name = "floobits-neovim-2018-08-01";
     pname = "floobits-neovim";
+    version = "2018-08-01";
     src = fetchFromGitHub {
       owner = "floobits";
       repo = "floobits-neovim";
@@ -615,8 +615,8 @@
   };
 
   forms = buildVimPluginFrom2Nix {
-    name = "forms-2012-11-28";
     pname = "forms";
+    version = "2012-11-28";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "forms";
@@ -626,8 +626,8 @@
   };
 
   fugitive-gitlab-vim = buildVimPluginFrom2Nix {
-    name = "fugitive-gitlab-vim-2018-07-04";
     pname = "fugitive-gitlab-vim";
+    version = "2018-07-04";
     src = fetchFromGitHub {
       owner = "shumphrey";
       repo = "fugitive-gitlab.vim";
@@ -637,8 +637,8 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-12-11";
     pname = "fzf-vim";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
@@ -648,8 +648,8 @@
   };
 
   ghcmod-vim = buildVimPluginFrom2Nix {
-    name = "ghcmod-vim-2016-06-19";
     pname = "ghcmod-vim";
+    version = "2016-06-19";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "ghcmod-vim";
@@ -659,8 +659,8 @@
   };
 
   gist-vim = buildVimPluginFrom2Nix {
-    name = "gist-vim-2018-11-09";
     pname = "gist-vim";
+    version = "2018-11-09";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
@@ -670,8 +670,8 @@
   };
 
   gitv = buildVimPluginFrom2Nix {
-    name = "gitv-2018-11-24";
     pname = "gitv";
+    version = "2018-11-24";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
@@ -681,8 +681,8 @@
   };
 
   goyo-vim = buildVimPluginFrom2Nix {
-    name = "goyo-vim-2017-05-31";
     pname = "goyo-vim";
+    version = "2017-05-31";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "goyo.vim";
@@ -692,8 +692,8 @@
   };
 
   gruvbox = buildVimPluginFrom2Nix {
-    name = "gruvbox-2018-02-25";
     pname = "gruvbox";
+    version = "2018-02-25";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
@@ -703,8 +703,8 @@
   };
 
   gundo-vim = buildVimPluginFrom2Nix {
-    name = "gundo-vim-2017-05-09";
     pname = "gundo-vim";
+    version = "2017-05-09";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "gundo.vim";
@@ -714,8 +714,8 @@
   };
 
   haskell-vim = buildVimPluginFrom2Nix {
-    name = "haskell-vim-2018-05-22";
     pname = "haskell-vim";
+    version = "2018-05-22";
     src = fetchFromGitHub {
       owner = "neovimhaskell";
       repo = "haskell-vim";
@@ -725,8 +725,8 @@
   };
 
   hasksyn = buildVimPluginFrom2Nix {
-    name = "hasksyn-2014-09-04";
     pname = "hasksyn";
+    version = "2014-09-04";
     src = fetchFromGitHub {
       owner = "travitch";
       repo = "hasksyn";
@@ -736,8 +736,8 @@
   };
 
   hlint-refactor-vim = buildVimPluginFrom2Nix {
-    name = "hlint-refactor-vim-2015-12-05";
     pname = "hlint-refactor-vim";
+    version = "2015-12-05";
     src = fetchFromGitHub {
       owner = "mpickering";
       repo = "hlint-refactor-vim";
@@ -747,8 +747,8 @@
   };
 
   iceberg-vim = buildVimPluginFrom2Nix {
-    name = "iceberg-vim-2018-10-17";
     pname = "iceberg-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
@@ -758,8 +758,8 @@
   };
 
   idris-vim = buildVimPluginFrom2Nix {
-    name = "idris-vim-2017-12-04";
     pname = "idris-vim";
+    version = "2017-12-04";
     src = fetchFromGitHub {
       owner = "idris-hackers";
       repo = "idris-vim";
@@ -769,8 +769,8 @@
   };
 
   Improved-AnsiEsc = buildVimPluginFrom2Nix {
-    name = "Improved-AnsiEsc-2015-08-26";
     pname = "Improved-AnsiEsc";
+    version = "2015-08-26";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Improved-AnsiEsc";
@@ -780,8 +780,8 @@
   };
 
   incsearch-easymotion-vim = buildVimPluginFrom2Nix {
-    name = "incsearch-easymotion-vim-2016-01-18";
     pname = "incsearch-easymotion-vim";
+    version = "2016-01-18";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch-easymotion.vim";
@@ -791,8 +791,8 @@
   };
 
   incsearch-vim = buildVimPluginFrom2Nix {
-    name = "incsearch-vim-2017-11-24";
     pname = "incsearch-vim";
+    version = "2017-11-24";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch.vim";
@@ -802,8 +802,8 @@
   };
 
   intero-neovim = buildVimPluginFrom2Nix {
-    name = "intero-neovim-2018-08-07";
     pname = "intero-neovim";
+    version = "2018-08-07";
     src = fetchFromGitHub {
       owner = "parsonsmatt";
       repo = "intero-neovim";
@@ -813,8 +813,8 @@
   };
 
   iosvkem = buildVimPluginFrom2Nix {
-    name = "iosvkem-2018-08-26";
     pname = "iosvkem";
+    version = "2018-08-26";
     src = fetchFromGitHub {
       owner = "neutaaaaan";
       repo = "iosvkem";
@@ -824,8 +824,8 @@
   };
 
   jedi-vim = buildVimPluginFrom2Nix {
-    name = "jedi-vim-2018-12-03";
     pname = "jedi-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
@@ -836,8 +836,8 @@
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    name = "Jenkinsfile-vim-syntax-2018-11-25";
     pname = "Jenkinsfile-vim-syntax";
+    version = "2018-11-25";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
@@ -847,8 +847,8 @@
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-12-11";
     pname = "julia-vim";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
@@ -858,8 +858,8 @@
   };
 
   last256 = buildVimPluginFrom2Nix {
-    name = "last256-2017-06-10";
     pname = "last256";
+    version = "2017-06-10";
     src = fetchFromGitHub {
       owner = "sk1418";
       repo = "last256";
@@ -869,8 +869,8 @@
   };
 
   latex-box = buildVimPluginFrom2Nix {
-    name = "latex-box-2015-06-01";
     pname = "latex-box";
+    version = "2015-06-01";
     src = fetchFromGitHub {
       owner = "latex-box-team";
       repo = "latex-box";
@@ -880,8 +880,8 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-12-12";
     pname = "lightline-vim";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
@@ -891,8 +891,8 @@
   };
 
   limelight-vim = buildVimPluginFrom2Nix {
-    name = "limelight-vim-2016-06-23";
     pname = "limelight-vim";
+    version = "2016-06-23";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "limelight.vim";
@@ -902,8 +902,8 @@
   };
 
   lushtags = buildVimPluginFrom2Nix {
-    name = "lushtags-2017-04-19";
     pname = "lushtags";
+    version = "2017-04-19";
     src = fetchFromGitHub {
       owner = "mkasa";
       repo = "lushtags";
@@ -913,8 +913,8 @@
   };
 
   matchit-zip = buildVimPluginFrom2Nix {
-    name = "matchit-zip-2010-10-18";
     pname = "matchit-zip";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "matchit.zip";
@@ -924,8 +924,8 @@
   };
 
   mayansmoke = buildVimPluginFrom2Nix {
-    name = "mayansmoke-2010-10-18";
     pname = "mayansmoke";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "mayansmoke";
@@ -935,8 +935,8 @@
   };
 
   molokai = buildVimPluginFrom2Nix {
-    name = "molokai-2015-11-11";
     pname = "molokai";
+    version = "2015-11-11";
     src = fetchFromGitHub {
       owner = "tomasr";
       repo = "molokai";
@@ -946,8 +946,8 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-27";
     pname = "ncm2";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
@@ -957,8 +957,8 @@
   };
 
   ncm2-bufword = buildVimPluginFrom2Nix {
-    name = "ncm2-bufword-2018-12-06";
     pname = "ncm2-bufword";
+    version = "2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-bufword";
@@ -968,8 +968,8 @@
   };
 
   ncm2-jedi = buildVimPluginFrom2Nix {
-    name = "ncm2-jedi-2018-07-18";
     pname = "ncm2-jedi";
+    version = "2018-07-18";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-jedi";
@@ -979,8 +979,8 @@
   };
 
   ncm2-path = buildVimPluginFrom2Nix {
-    name = "ncm2-path-2018-09-12";
     pname = "ncm2-path";
+    version = "2018-09-12";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-path";
@@ -990,8 +990,8 @@
   };
 
   ncm2-tmux = buildVimPluginFrom2Nix {
-    name = "ncm2-tmux-2018-12-06";
     pname = "ncm2-tmux";
+    version = "2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-tmux";
@@ -1001,8 +1001,8 @@
   };
 
   ncm2-ultisnips = buildVimPluginFrom2Nix {
-    name = "ncm2-ultisnips-2018-08-01";
     pname = "ncm2-ultisnips";
+    version = "2018-08-01";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-ultisnips";
@@ -1012,8 +1012,8 @@
   };
 
   neco-ghc = buildVimPluginFrom2Nix {
-    name = "neco-ghc-2018-05-13";
     pname = "neco-ghc";
+    version = "2018-05-13";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "neco-ghc";
@@ -1023,8 +1023,8 @@
   };
 
   neco-look = buildVimPluginFrom2Nix {
-    name = "neco-look-2018-11-09";
     pname = "neco-look";
+    version = "2018-11-09";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
@@ -1034,8 +1034,8 @@
   };
 
   neco-syntax = buildVimPluginFrom2Nix {
-    name = "neco-syntax-2017-10-01";
     pname = "neco-syntax";
+    version = "2017-10-01";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-syntax";
@@ -1045,8 +1045,8 @@
   };
 
   neco-vim = buildVimPluginFrom2Nix {
-    name = "neco-vim-2018-10-30";
     pname = "neco-vim";
+    version = "2018-10-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
@@ -1056,8 +1056,8 @@
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix {
-    name = "neocomplete-vim-2018-11-19";
     pname = "neocomplete-vim";
+    version = "2018-11-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
@@ -1067,8 +1067,8 @@
   };
 
   neodark-vim = buildVimPluginFrom2Nix {
-    name = "neodark-vim-2018-10-17";
     pname = "neodark-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
@@ -1078,8 +1078,8 @@
   };
 
   neoformat = buildVimPluginFrom2Nix {
-    name = "neoformat-2018-12-21";
     pname = "neoformat";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
@@ -1089,8 +1089,8 @@
   };
 
   neoinclude-vim = buildVimPluginFrom2Nix {
-    name = "neoinclude-vim-2018-05-21";
     pname = "neoinclude-vim";
+    version = "2018-05-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoinclude.vim";
@@ -1100,8 +1100,8 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-27";
     pname = "neomake";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
@@ -1111,8 +1111,8 @@
   };
 
   neomru-vim = buildVimPluginFrom2Nix {
-    name = "neomru-vim-2018-11-29";
     pname = "neomru-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
@@ -1122,8 +1122,8 @@
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
-    name = "neosnippet-snippets-2018-09-30";
     pname = "neosnippet-snippets";
+    version = "2018-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
@@ -1133,8 +1133,8 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-12-03";
     pname = "neosnippet-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
@@ -1144,8 +1144,8 @@
   };
 
   neovim-sensible = buildVimPluginFrom2Nix {
-    name = "neovim-sensible-2017-09-20";
     pname = "neovim-sensible";
+    version = "2017-09-20";
     src = fetchFromGitHub {
       owner = "jeffkreeftmeijer";
       repo = "neovim-sensible";
@@ -1155,8 +1155,8 @@
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-12-03";
     pname = "neoyank-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
@@ -1166,8 +1166,8 @@
   };
 
   nerdcommenter = buildVimPluginFrom2Nix {
-    name = "nerdcommenter-2018-12-26";
     pname = "nerdcommenter";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
@@ -1177,8 +1177,8 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-12-12";
     pname = "nerdtree";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
@@ -1188,8 +1188,8 @@
   };
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
-    name = "nerdtree-git-plugin-2018-11-15";
     pname = "nerdtree-git-plugin";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
@@ -1199,8 +1199,8 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-12-16";
     pname = "nim-vim";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
@@ -1210,8 +1210,8 @@
   };
 
   nvim-cm-racer = buildVimPluginFrom2Nix {
-    name = "nvim-cm-racer-2017-07-27";
     pname = "nvim-cm-racer";
+    version = "2017-07-27";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-cm-racer";
@@ -1221,8 +1221,8 @@
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix {
-    name = "nvim-completion-manager-2018-07-27";
     pname = "nvim-completion-manager";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-completion-manager";
@@ -1232,8 +1232,8 @@
   };
 
   nvim-yarp = buildVimPluginFrom2Nix {
-    name = "nvim-yarp-2018-12-23";
     pname = "nvim-yarp";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
@@ -1243,8 +1243,8 @@
   };
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
-    name = "nvimdev-nvim-2018-11-07";
     pname = "nvimdev-nvim";
+    version = "2018-11-07";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
@@ -1254,8 +1254,8 @@
   };
 
   onehalf = buildVimPluginFrom2Nix {
-    name = "onehalf-2018-10-21";
     pname = "onehalf";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
@@ -1265,8 +1265,8 @@
   };
 
   open-browser-vim = buildVimPluginFrom2Nix {
-    name = "open-browser-vim-2018-11-29";
     pname = "open-browser-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
@@ -1276,8 +1276,8 @@
   };
 
   papercolor-theme = buildVimPluginFrom2Nix {
-    name = "papercolor-theme-2018-09-04";
     pname = "papercolor-theme";
+    version = "2018-09-04";
     src = fetchFromGitHub {
       owner = "NLKNguyen";
       repo = "papercolor-theme";
@@ -1287,8 +1287,8 @@
   };
 
   peskcolor-vim = buildVimPluginFrom2Nix {
-    name = "peskcolor-vim-2016-06-11";
     pname = "peskcolor-vim";
+    version = "2016-06-11";
     src = fetchFromGitHub {
       owner = "andsild";
       repo = "peskcolor.vim";
@@ -1298,8 +1298,8 @@
   };
 
   pig-vim = buildVimPluginFrom2Nix {
-    name = "pig-vim-2017-06-08";
     pname = "pig-vim";
+    version = "2017-06-08";
     src = fetchFromGitHub {
       owner = "motus";
       repo = "pig.vim";
@@ -1309,8 +1309,8 @@
   };
 
   pony-vim-syntax = buildVimPluginFrom2Nix {
-    name = "pony-vim-syntax-2017-09-26";
     pname = "pony-vim-syntax";
+    version = "2017-09-26";
     src = fetchFromGitHub {
       owner = "dleonard0";
       repo = "pony-vim-syntax";
@@ -1320,8 +1320,8 @@
   };
 
   PreserveNoEOL = buildVimPluginFrom2Nix {
-    name = "PreserveNoEOL-2013-06-14";
     pname = "PreserveNoEOL";
+    version = "2013-06-14";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "PreserveNoEOL";
@@ -1331,8 +1331,8 @@
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix {
-    name = "psc-ide-vim-2018-03-11";
     pname = "psc-ide-vim";
+    version = "2018-03-11";
     src = fetchFromGitHub {
       owner = "frigoeu";
       repo = "psc-ide-vim";
@@ -1342,8 +1342,8 @@
   };
 
   purescript-vim = buildVimPluginFrom2Nix {
-    name = "purescript-vim-2018-12-10";
     pname = "purescript-vim";
+    version = "2018-12-10";
     src = fetchFromGitHub {
       owner = "raichoo";
       repo = "purescript-vim";
@@ -1353,8 +1353,8 @@
   };
 
   python-mode = buildVimPluginFrom2Nix {
-    name = "python-mode-2018-04-29";
     pname = "python-mode";
+    version = "2018-04-29";
     src = fetchFromGitHub {
       owner = "python-mode";
       repo = "python-mode";
@@ -1364,8 +1364,8 @@
   };
 
   quickfixstatus = buildVimPluginFrom2Nix {
-    name = "quickfixstatus-2011-09-03";
     pname = "quickfixstatus";
+    version = "2011-09-03";
     src = fetchFromGitHub {
       owner = "dannyob";
       repo = "quickfixstatus";
@@ -1375,8 +1375,8 @@
   };
 
   rainbow = buildVimPluginFrom2Nix {
-    name = "rainbow-2018-07-31";
     pname = "rainbow";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "luochen1990";
       repo = "rainbow";
@@ -1386,8 +1386,8 @@
   };
 
   rainbow_parentheses-vim = buildVimPluginFrom2Nix {
-    name = "rainbow_parentheses-vim-2013-03-05";
     pname = "rainbow_parentheses-vim";
+    version = "2013-03-05";
     src = fetchFromGitHub {
       owner = "kien";
       repo = "rainbow_parentheses.vim";
@@ -1397,8 +1397,8 @@
   };
 
   random-vim = buildVimPluginFrom2Nix {
-    name = "random-vim-2010-10-18";
     pname = "random-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "random.vim";
@@ -1408,8 +1408,8 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-12-21";
     pname = "ranger-vim";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
@@ -1419,8 +1419,8 @@
   };
 
   Recover-vim = buildVimPluginFrom2Nix {
-    name = "Recover-vim-2018-10-22";
     pname = "Recover-vim";
+    version = "2018-10-22";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "Recover.vim";
@@ -1430,8 +1430,8 @@
   };
 
   Rename = buildVimPluginFrom2Nix {
-    name = "Rename-2011-08-31";
     pname = "Rename";
+    version = "2011-08-31";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Rename";
@@ -1441,8 +1441,8 @@
   };
 
   ReplaceWithRegister = buildVimPluginFrom2Nix {
-    name = "ReplaceWithRegister-2014-10-31";
     pname = "ReplaceWithRegister";
+    version = "2014-10-31";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "ReplaceWithRegister";
@@ -1452,8 +1452,8 @@
   };
 
   riv-vim = buildVimPluginFrom2Nix {
-    name = "riv-vim-2018-10-17";
     pname = "riv-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
@@ -1463,8 +1463,8 @@
   };
 
   robotframework-vim = buildVimPluginFrom2Nix {
-    name = "robotframework-vim-2017-04-14";
     pname = "robotframework-vim";
+    version = "2017-04-14";
     src = fetchFromGitHub {
       owner = "mfukar";
       repo = "robotframework-vim";
@@ -1474,8 +1474,8 @@
   };
 
   rtorrent-syntax-file = buildVimPluginFrom2Nix {
-    name = "rtorrent-syntax-file-2016-03-19";
     pname = "rtorrent-syntax-file";
+    version = "2016-03-19";
     src = fetchFromGitHub {
       owner = "ccarpita";
       repo = "rtorrent-syntax-file";
@@ -1485,8 +1485,8 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-12-23";
     pname = "rust-vim";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
@@ -1496,8 +1496,8 @@
   };
 
   self = buildVimPluginFrom2Nix {
-    name = "self-2014-05-28";
     pname = "self";
+    version = "2014-05-28";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "self";
@@ -1507,8 +1507,8 @@
   };
 
   shabadou-vim = buildVimPluginFrom2Nix {
-    name = "shabadou-vim-2016-07-19";
     pname = "shabadou-vim";
+    version = "2016-07-19";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "shabadou.vim";
@@ -1518,8 +1518,8 @@
   };
 
   sourcemap-vim = buildVimPluginFrom2Nix {
-    name = "sourcemap-vim-2012-09-19";
     pname = "sourcemap-vim";
+    version = "2012-09-19";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "sourcemap.vim";
@@ -1529,8 +1529,8 @@
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix {
-    name = "Spacegray-vim-2018-12-25";
     pname = "Spacegray-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
@@ -1540,8 +1540,8 @@
   };
 
   spacevim = buildVimPluginFrom2Nix {
-    name = "spacevim-2018-03-29";
     pname = "spacevim";
+    version = "2018-03-29";
     src = fetchFromGitHub {
       owner = "ctjhoa";
       repo = "spacevim";
@@ -1551,8 +1551,8 @@
   };
 
   sparkup = buildVimPluginFrom2Nix {
-    name = "sparkup-2012-06-11";
     pname = "sparkup";
+    version = "2012-06-11";
     src = fetchFromGitHub {
       owner = "chrisgeo";
       repo = "sparkup";
@@ -1562,8 +1562,8 @@
   };
 
   splice-vim = buildVimPluginFrom2Nix {
-    name = "splice-vim-2017-09-03";
     pname = "splice-vim";
+    version = "2017-09-03";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "splice.vim";
@@ -1573,8 +1573,8 @@
   };
 
   supertab = buildVimPluginFrom2Nix {
-    name = "supertab-2017-11-14";
     pname = "supertab";
+    version = "2017-11-14";
     src = fetchFromGitHub {
       owner = "ervandew";
       repo = "supertab";
@@ -1584,8 +1584,8 @@
   };
 
   swift-vim = buildVimPluginFrom2Nix {
-    name = "swift-vim-2018-09-12";
     pname = "swift-vim";
+    version = "2018-09-12";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
@@ -1595,8 +1595,8 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-11-24";
     pname = "syntastic";
+    version = "2018-11-24";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
@@ -1606,8 +1606,8 @@
   };
 
   tabmerge = buildVimPluginFrom2Nix {
-    name = "tabmerge-2010-10-18";
     pname = "tabmerge";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "tabmerge";
@@ -1617,8 +1617,8 @@
   };
 
   tabpagebuffer-vim = buildVimPluginFrom2Nix {
-    name = "tabpagebuffer-vim-2014-09-30";
     pname = "tabpagebuffer-vim";
+    version = "2014-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "tabpagebuffer.vim";
@@ -1628,8 +1628,8 @@
   };
 
   tabular = buildVimPluginFrom2Nix {
-    name = "tabular-2016-05-04";
     pname = "tabular";
+    version = "2016-05-04";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "tabular";
@@ -1639,8 +1639,8 @@
   };
 
   tagbar = buildVimPluginFrom2Nix {
-    name = "tagbar-2017-12-17";
     pname = "tagbar";
+    version = "2017-12-17";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
@@ -1650,8 +1650,8 @@
   };
 
   taglist-vim = buildVimPluginFrom2Nix {
-    name = "taglist-vim-2010-10-18";
     pname = "taglist-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "taglist.vim";
@@ -1661,8 +1661,8 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-12-21";
     pname = "targets-vim";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
@@ -1672,8 +1672,8 @@
   };
 
   tender-vim = buildVimPluginFrom2Nix {
-    name = "tender-vim-2017-03-14";
     pname = "tender-vim";
+    version = "2017-03-14";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
@@ -1683,8 +1683,8 @@
   };
 
   tern_for_vim = buildVimPluginFrom2Nix {
-    name = "tern_for_vim-2017-11-27";
     pname = "tern_for_vim";
+    version = "2017-11-27";
     src = fetchFromGitHub {
       owner = "ternjs";
       repo = "tern_for_vim";
@@ -1694,8 +1694,8 @@
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix {
-    name = "thumbnail-vim-2017-04-24";
     pname = "thumbnail-vim";
+    version = "2017-04-24";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "thumbnail.vim";
@@ -1705,8 +1705,8 @@
   };
 
   tlib_vim = buildVimPluginFrom2Nix {
-    name = "tlib_vim-2018-04-08";
     pname = "tlib_vim";
+    version = "2018-04-08";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
@@ -1716,8 +1716,8 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-25";
     pname = "traces-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
@@ -1727,8 +1727,8 @@
   };
 
   tslime-vim = buildVimPluginFrom2Nix {
-    name = "tslime-vim-2018-07-23";
     pname = "tslime-vim";
+    version = "2018-07-23";
     src = fetchFromGitHub {
       owner = "jgdavey";
       repo = "tslime.vim";
@@ -1738,8 +1738,8 @@
   };
 
   tsuquyomi = buildVimPluginFrom2Nix {
-    name = "tsuquyomi-2018-12-26";
     pname = "tsuquyomi";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
@@ -1749,8 +1749,8 @@
   };
 
   typescript-vim = buildVimPluginFrom2Nix {
-    name = "typescript-vim-2018-10-17";
     pname = "typescript-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
@@ -1760,8 +1760,8 @@
   };
 
   ultisnips = buildVimPluginFrom2Nix {
-    name = "ultisnips-2018-04-30";
     pname = "ultisnips";
+    version = "2018-04-30";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
@@ -1771,8 +1771,8 @@
   };
 
   undotree = buildVimPluginFrom2Nix {
-    name = "undotree-2018-10-15";
     pname = "undotree";
+    version = "2018-10-15";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
@@ -1782,8 +1782,8 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-12-14";
     pname = "unite-vim";
+    version = "2018-12-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
@@ -1793,8 +1793,8 @@
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-12-08";
     pname = "verilog_systemverilog-vim";
+    version = "2018-12-08";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
@@ -1804,8 +1804,8 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-12-22";
     pname = "vim";
+    version = "2018-12-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
@@ -1815,8 +1815,8 @@
   };
 
   vim-abolish = buildVimPluginFrom2Nix {
-    name = "vim-abolish-2018-11-25";
     pname = "vim-abolish";
+    version = "2018-11-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
@@ -1826,8 +1826,8 @@
   };
 
   vim-addon-actions = buildVimPluginFrom2Nix {
-    name = "vim-addon-actions-2018-01-18";
     pname = "vim-addon-actions";
+    version = "2018-01-18";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-actions";
@@ -1837,8 +1837,8 @@
   };
 
   vim-addon-async = buildVimPluginFrom2Nix {
-    name = "vim-addon-async-2017-03-20";
     pname = "vim-addon-async";
+    version = "2017-03-20";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-async";
@@ -1848,8 +1848,8 @@
   };
 
   vim-addon-background-cmd = buildVimPluginFrom2Nix {
-    name = "vim-addon-background-cmd-2015-12-11";
     pname = "vim-addon-background-cmd";
+    version = "2015-12-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-background-cmd";
@@ -1859,8 +1859,8 @@
   };
 
   vim-addon-commenting = buildVimPluginFrom2Nix {
-    name = "vim-addon-commenting-2013-06-10";
     pname = "vim-addon-commenting";
+    version = "2013-06-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-commenting";
@@ -1870,8 +1870,8 @@
   };
 
   vim-addon-completion = buildVimPluginFrom2Nix {
-    name = "vim-addon-completion-2015-02-10";
     pname = "vim-addon-completion";
+    version = "2015-02-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-completion";
@@ -1881,8 +1881,8 @@
   };
 
   vim-addon-errorformats = buildVimPluginFrom2Nix {
-    name = "vim-addon-errorformats-2014-11-05";
     pname = "vim-addon-errorformats";
+    version = "2014-11-05";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-errorformats";
@@ -1892,8 +1892,8 @@
   };
 
   vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
-    name = "vim-addon-goto-thing-at-cursor-2012-01-10";
     pname = "vim-addon-goto-thing-at-cursor";
+    version = "2012-01-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-goto-thing-at-cursor";
@@ -1903,8 +1903,8 @@
   };
 
   vim-addon-local-vimrc = buildVimPluginFrom2Nix {
-    name = "vim-addon-local-vimrc-2015-03-19";
     pname = "vim-addon-local-vimrc";
+    version = "2015-03-19";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-local-vimrc";
@@ -1914,8 +1914,8 @@
   };
 
   vim-addon-manager = buildVimPluginFrom2Nix {
-    name = "vim-addon-manager-2018-07-27";
     pname = "vim-addon-manager";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-manager";
@@ -1925,8 +1925,8 @@
   };
 
   vim-addon-mru = buildVimPluginFrom2Nix {
-    name = "vim-addon-mru-2013-08-08";
     pname = "vim-addon-mru";
+    version = "2013-08-08";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mru";
@@ -1936,8 +1936,8 @@
   };
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix {
-    name = "vim-addon-mw-utils-2018-03-09";
     pname = "vim-addon-mw-utils";
+    version = "2018-03-09";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mw-utils";
@@ -1947,8 +1947,8 @@
   };
 
   vim-addon-nix = buildVimPluginFrom2Nix {
-    name = "vim-addon-nix-2017-09-11";
     pname = "vim-addon-nix";
+    version = "2017-09-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-nix";
@@ -1958,8 +1958,8 @@
   };
 
   vim-addon-other = buildVimPluginFrom2Nix {
-    name = "vim-addon-other-2014-07-15";
     pname = "vim-addon-other";
+    version = "2014-07-15";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-other";
@@ -1969,8 +1969,8 @@
   };
 
   vim-addon-php-manual = buildVimPluginFrom2Nix {
-    name = "vim-addon-php-manual-2015-01-01";
     pname = "vim-addon-php-manual";
+    version = "2015-01-01";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-php-manual";
@@ -1980,8 +1980,8 @@
   };
 
   vim-addon-signs = buildVimPluginFrom2Nix {
-    name = "vim-addon-signs-2013-04-19";
     pname = "vim-addon-signs";
+    version = "2013-04-19";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-signs";
@@ -1991,8 +1991,8 @@
   };
 
   vim-addon-sql = buildVimPluginFrom2Nix {
-    name = "vim-addon-sql-2017-02-11";
     pname = "vim-addon-sql";
+    version = "2017-02-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-sql";
@@ -2002,8 +2002,8 @@
   };
 
   vim-addon-syntax-checker = buildVimPluginFrom2Nix {
-    name = "vim-addon-syntax-checker-2017-06-26";
     pname = "vim-addon-syntax-checker";
+    version = "2017-06-26";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-syntax-checker";
@@ -2013,8 +2013,8 @@
   };
 
   vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
-    name = "vim-addon-toggle-buffer-2012-01-13";
     pname = "vim-addon-toggle-buffer";
+    version = "2012-01-13";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-toggle-buffer";
@@ -2024,8 +2024,8 @@
   };
 
   vim-addon-xdebug = buildVimPluginFrom2Nix {
-    name = "vim-addon-xdebug-2014-08-29";
     pname = "vim-addon-xdebug";
+    version = "2014-08-29";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-xdebug";
@@ -2035,8 +2035,8 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-12-18";
     pname = "vim-airline";
+    version = "2018-12-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
@@ -2046,8 +2046,8 @@
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
-    name = "vim-airline-themes-2018-11-15";
     pname = "vim-airline-themes";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
@@ -2057,8 +2057,8 @@
   };
 
   vim-android = buildVimPluginFrom2Nix {
-    name = "vim-android-2018-07-31";
     pname = "vim-android";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
@@ -2068,8 +2068,8 @@
   };
 
   vim-anzu = buildVimPluginFrom2Nix {
-    name = "vim-anzu-2018-02-28";
     pname = "vim-anzu";
+    version = "2018-02-28";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-anzu";
@@ -2079,8 +2079,8 @@
   };
 
   vim-auto-save = buildVimPluginFrom2Nix {
-    name = "vim-auto-save-2017-11-08";
     pname = "vim-auto-save";
+    version = "2017-11-08";
     src = fetchFromGitHub {
       owner = "907th";
       repo = "vim-auto-save";
@@ -2090,8 +2090,8 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-12-19";
     pname = "vim-autoformat";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
@@ -2101,8 +2101,8 @@
   };
 
   vim-bazel = buildVimPluginFrom2Nix {
-    name = "vim-bazel-2018-01-11";
     pname = "vim-bazel";
+    version = "2018-01-11";
     src = fetchFromGitHub {
       owner = "bazelbuild";
       repo = "vim-bazel";
@@ -2112,8 +2112,8 @@
   };
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
-    name = "vim-better-whitespace-2018-06-11";
     pname = "vim-better-whitespace";
+    version = "2018-06-11";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
@@ -2123,8 +2123,8 @@
   };
 
   vim-buffergator = buildVimPluginFrom2Nix {
-    name = "vim-buffergator-2018-05-02";
     pname = "vim-buffergator";
+    version = "2018-05-02";
     src = fetchFromGitHub {
       owner = "jeetsukumaran";
       repo = "vim-buffergator";
@@ -2134,8 +2134,8 @@
   };
 
   vim-bufferline = buildVimPluginFrom2Nix {
-    name = "vim-bufferline-2016-02-09";
     pname = "vim-bufferline";
+    version = "2016-02-09";
     src = fetchFromGitHub {
       owner = "bling";
       repo = "vim-bufferline";
@@ -2145,8 +2145,8 @@
   };
 
   vim-closetag = buildVimPluginFrom2Nix {
-    name = "vim-closetag-2018-12-08";
     pname = "vim-closetag";
+    version = "2018-12-08";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
@@ -2156,8 +2156,8 @@
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-12-15";
     pname = "vim-codefmt";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
@@ -2167,8 +2167,8 @@
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix {
-    name = "vim-coffee-script-2018-02-27";
     pname = "vim-coffee-script";
+    version = "2018-02-27";
     src = fetchFromGitHub {
       owner = "kchmck";
       repo = "vim-coffee-script";
@@ -2178,8 +2178,8 @@
   };
 
   vim-colemak = buildVimPluginFrom2Nix {
-    name = "vim-colemak-2016-10-16";
     pname = "vim-colemak";
+    version = "2016-10-16";
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "vim-colemak";
@@ -2189,8 +2189,8 @@
   };
 
   vim-colors-solarized = buildVimPluginFrom2Nix {
-    name = "vim-colors-solarized-2011-05-09";
     pname = "vim-colors-solarized";
+    version = "2011-05-09";
     src = fetchFromGitHub {
       owner = "altercation";
       repo = "vim-colors-solarized";
@@ -2200,8 +2200,8 @@
   };
 
   vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "vim-colorschemes-2018-11-20";
     pname = "vim-colorschemes";
+    version = "2018-11-20";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
@@ -2211,8 +2211,8 @@
   };
 
   vim-colorstepper = buildVimPluginFrom2Nix {
-    name = "vim-colorstepper-2016-01-28";
     pname = "vim-colorstepper";
+    version = "2016-01-28";
     src = fetchFromGitHub {
       owner = "jonbri";
       repo = "vim-colorstepper";
@@ -2222,8 +2222,8 @@
   };
 
   vim-commentary = buildVimPluginFrom2Nix {
-    name = "vim-commentary-2018-07-27";
     pname = "vim-commentary";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-commentary";
@@ -2233,8 +2233,8 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-11-20";
     pname = "vim-css-color";
+    version = "2018-11-20";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
@@ -2244,8 +2244,8 @@
   };
 
   vim-cursorword = buildVimPluginFrom2Nix {
-    name = "vim-cursorword-2017-10-19";
     pname = "vim-cursorword";
+    version = "2017-10-19";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
@@ -2255,8 +2255,8 @@
   };
 
   vim-cute-python = buildVimPluginFrom2Nix {
-    name = "vim-cute-python-2016-04-04";
     pname = "vim-cute-python";
+    version = "2016-04-04";
     src = fetchFromGitHub {
       owner = "ehamberg";
       repo = "vim-cute-python";
@@ -2266,8 +2266,8 @@
   };
 
   vim-devicons = buildVimPluginFrom2Nix {
-    name = "vim-devicons-2018-06-21";
     pname = "vim-devicons";
+    version = "2018-06-21";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
@@ -2277,8 +2277,8 @@
   };
 
   vim-dirdiff = buildVimPluginFrom2Nix {
-    name = "vim-dirdiff-2018-01-31";
     pname = "vim-dirdiff";
+    version = "2018-01-31";
     src = fetchFromGitHub {
       owner = "will133";
       repo = "vim-dirdiff";
@@ -2288,8 +2288,8 @@
   };
 
   vim-dirvish = buildVimPluginFrom2Nix {
-    name = "vim-dirvish-2018-12-04";
     pname = "vim-dirvish";
+    version = "2018-12-04";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
@@ -2299,8 +2299,8 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-10-31";
     pname = "vim-dispatch";
+    version = "2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
@@ -2310,8 +2310,8 @@
   };
 
   vim-docbk = buildVimPluginFrom2Nix {
-    name = "vim-docbk-2015-04-01";
     pname = "vim-docbk";
+    version = "2015-04-01";
     src = fetchFromGitHub {
       owner = "jhradilek";
       repo = "vim-docbk";
@@ -2321,8 +2321,8 @@
   };
 
   vim-easy-align = buildVimPluginFrom2Nix {
-    name = "vim-easy-align-2017-06-03";
     pname = "vim-easy-align";
+    version = "2017-06-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-easy-align";
@@ -2332,8 +2332,8 @@
   };
 
   vim-easygit = buildVimPluginFrom2Nix {
-    name = "vim-easygit-2018-07-08";
     pname = "vim-easygit";
+    version = "2018-07-08";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "vim-easygit";
@@ -2343,8 +2343,8 @@
   };
 
   vim-easymotion = buildVimPluginFrom2Nix {
-    name = "vim-easymotion-2018-06-04";
     pname = "vim-easymotion";
+    version = "2018-06-04";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
@@ -2354,8 +2354,8 @@
   };
 
   vim-easytags = buildVimPluginFrom2Nix {
-    name = "vim-easytags-2015-07-01";
     pname = "vim-easytags";
+    version = "2015-07-01";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-easytags";
@@ -2365,8 +2365,8 @@
   };
 
   vim-eighties = buildVimPluginFrom2Nix {
-    name = "vim-eighties-2016-12-15";
     pname = "vim-eighties";
+    version = "2016-12-15";
     src = fetchFromGitHub {
       owner = "justincampbell";
       repo = "vim-eighties";
@@ -2376,8 +2376,8 @@
   };
 
   vim-elixir = buildVimPluginFrom2Nix {
-    name = "vim-elixir-2018-12-12";
     pname = "vim-elixir";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
@@ -2387,8 +2387,8 @@
   };
 
   vim-eunuch = buildVimPluginFrom2Nix {
-    name = "vim-eunuch-2018-09-09";
     pname = "vim-eunuch";
+    version = "2018-09-09";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
@@ -2398,8 +2398,8 @@
   };
 
   vim-expand-region = buildVimPluginFrom2Nix {
-    name = "vim-expand-region-2013-08-19";
     pname = "vim-expand-region";
+    version = "2013-08-19";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-expand-region";
@@ -2409,8 +2409,8 @@
   };
 
   vim-extradite = buildVimPluginFrom2Nix {
-    name = "vim-extradite-2015-09-22";
     pname = "vim-extradite";
+    version = "2015-09-22";
     src = fetchFromGitHub {
       owner = "int3";
       repo = "vim-extradite";
@@ -2420,8 +2420,8 @@
   };
 
   vim-fireplace = buildVimPluginFrom2Nix {
-    name = "vim-fireplace-2018-06-01";
     pname = "vim-fireplace";
+    version = "2018-06-01";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
@@ -2431,8 +2431,8 @@
   };
 
   vim-flagship = buildVimPluginFrom2Nix {
-    name = "vim-flagship-2018-08-15";
     pname = "vim-flagship";
+    version = "2018-08-15";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-flagship";
@@ -2442,8 +2442,8 @@
   };
 
   vim-flake8 = buildVimPluginFrom2Nix {
-    name = "vim-flake8-2018-09-21";
     pname = "vim-flake8";
+    version = "2018-09-21";
     src = fetchFromGitHub {
       owner = "nvie";
       repo = "vim-flake8";
@@ -2453,8 +2453,8 @@
   };
 
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
-    name = "vim-ft-diff_fold-2013-02-10";
     pname = "vim-ft-diff_fold";
+    version = "2013-02-10";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-ft-diff_fold";
@@ -2464,8 +2464,8 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-12-26";
     pname = "vim-fugitive";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
@@ -2475,8 +2475,8 @@
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-12-12";
     pname = "vim-ghost";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
@@ -2486,8 +2486,8 @@
   };
 
   vim-gista = buildVimPluginFrom2Nix {
-    name = "vim-gista-2017-02-20";
     pname = "vim-gista";
+    version = "2017-02-20";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-gista";
@@ -2497,8 +2497,8 @@
   };
 
   vim-gitbranch = buildVimPluginFrom2Nix {
-    name = "vim-gitbranch-2017-05-27";
     pname = "vim-gitbranch";
+    version = "2017-05-27";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-gitbranch";
@@ -2508,8 +2508,8 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-12-15";
     pname = "vim-gitgutter";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
@@ -2519,8 +2519,8 @@
   };
 
   vim-github-dashboard = buildVimPluginFrom2Nix {
-    name = "vim-github-dashboard-2018-09-03";
     pname = "vim-github-dashboard";
+    version = "2018-09-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-github-dashboard";
@@ -2530,8 +2530,8 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-24";
     pname = "vim-go";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
@@ -2541,8 +2541,8 @@
   };
 
   vim-grammarous = buildVimPluginFrom2Nix {
-    name = "vim-grammarous-2018-09-13";
     pname = "vim-grammarous";
+    version = "2018-09-13";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-grammarous";
@@ -2552,8 +2552,8 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-12-22";
     pname = "vim-grepper";
+    version = "2018-12-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
@@ -2563,8 +2563,8 @@
   };
 
   vim-gutentags = buildVimPluginFrom2Nix {
-    name = "vim-gutentags-2018-11-17";
     pname = "vim-gutentags";
+    version = "2018-11-17";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
@@ -2574,8 +2574,8 @@
   };
 
   vim-hardtime = buildVimPluginFrom2Nix {
-    name = "vim-hardtime-2017-03-31";
     pname = "vim-hardtime";
+    version = "2017-03-31";
     src = fetchFromGitHub {
       owner = "takac";
       repo = "vim-hardtime";
@@ -2585,8 +2585,8 @@
   };
 
   vim-haskellconceal = buildVimPluginFrom2Nix {
-    name = "vim-haskellconceal-2017-06-15";
     pname = "vim-haskellconceal";
+    version = "2017-06-15";
     src = fetchFromGitHub {
       owner = "twinside";
       repo = "vim-haskellconceal";
@@ -2596,8 +2596,8 @@
   };
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
-    name = "vim-haskellConcealPlus-2018-12-26";
     pname = "vim-haskellConcealPlus";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
@@ -2607,8 +2607,8 @@
   };
 
   vim-hdevtools = buildVimPluginFrom2Nix {
-    name = "vim-hdevtools-2018-11-19";
     pname = "vim-hdevtools";
+    version = "2018-11-19";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
@@ -2618,8 +2618,8 @@
   };
 
   vim-hier = buildVimPluginFrom2Nix {
-    name = "vim-hier-2011-08-27";
     pname = "vim-hier";
+    version = "2011-08-27";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-hier";
@@ -2629,8 +2629,8 @@
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
-    name = "vim-highlightedyank-2018-10-08";
     pname = "vim-highlightedyank";
+    version = "2018-10-08";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
@@ -2640,8 +2640,8 @@
   };
 
   vim-hindent = buildVimPluginFrom2Nix {
-    name = "vim-hindent-2018-07-31";
     pname = "vim-hindent";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-hindent";
@@ -2651,8 +2651,8 @@
   };
 
   vim-hoogle = buildVimPluginFrom2Nix {
-    name = "vim-hoogle-2018-03-04";
     pname = "vim-hoogle";
+    version = "2018-03-04";
     src = fetchFromGitHub {
       owner = "Twinside";
       repo = "vim-hoogle";
@@ -2662,8 +2662,8 @@
   };
 
   vim-husk = buildVimPluginFrom2Nix {
-    name = "vim-husk-2015-11-29";
     pname = "vim-husk";
+    version = "2015-11-29";
     src = fetchFromGitHub {
       owner = "vim-utils";
       repo = "vim-husk";
@@ -2673,8 +2673,8 @@
   };
 
   vim-iced-coffee-script = buildVimPluginFrom2Nix {
-    name = "vim-iced-coffee-script-2013-12-26";
     pname = "vim-iced-coffee-script";
+    version = "2013-12-26";
     src = fetchFromGitHub {
       owner = "noc7c9";
       repo = "vim-iced-coffee-script";
@@ -2684,8 +2684,8 @@
   };
 
   vim-indent-guides = buildVimPluginFrom2Nix {
-    name = "vim-indent-guides-2018-05-14";
     pname = "vim-indent-guides";
+    version = "2018-05-14";
     src = fetchFromGitHub {
       owner = "nathanaelkane";
       repo = "vim-indent-guides";
@@ -2695,8 +2695,8 @@
   };
 
   vim-indent-object = buildVimPluginFrom2Nix {
-    name = "vim-indent-object-2018-04-08";
     pname = "vim-indent-object";
+    version = "2018-04-08";
     src = fetchFromGitHub {
       owner = "michaeljsmith";
       repo = "vim-indent-object";
@@ -2706,8 +2706,8 @@
   };
 
   vim-ipython = buildVimPluginFrom2Nix {
-    name = "vim-ipython-2015-06-23";
     pname = "vim-ipython";
+    version = "2015-06-23";
     src = fetchFromGitHub {
       owner = "ivanov";
       repo = "vim-ipython";
@@ -2717,8 +2717,8 @@
   };
 
   vim-isort = buildVimPluginFrom2Nix {
-    name = "vim-isort-2018-08-22";
     pname = "vim-isort";
+    version = "2018-08-22";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
@@ -2728,8 +2728,8 @@
   };
 
   vim-jade = buildVimPluginFrom2Nix {
-    name = "vim-jade-2018-09-10";
     pname = "vim-jade";
+    version = "2018-09-10";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
@@ -2739,8 +2739,8 @@
   };
 
   vim-janah = buildVimPluginFrom2Nix {
-    name = "vim-janah-2018-10-01";
     pname = "vim-janah";
+    version = "2018-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-janah";
@@ -2750,8 +2750,8 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-25";
     pname = "vim-javacomplete2";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
@@ -2761,8 +2761,8 @@
   };
 
   vim-javascript = buildVimPluginFrom2Nix {
-    name = "vim-javascript-2018-12-23";
     pname = "vim-javascript";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
@@ -2772,8 +2772,8 @@
   };
 
   vim-jinja = buildVimPluginFrom2Nix {
-    name = "vim-jinja-2016-11-16";
     pname = "vim-jinja";
+    version = "2016-11-16";
     src = fetchFromGitHub {
       owner = "lepture";
       repo = "vim-jinja";
@@ -2783,8 +2783,8 @@
   };
 
   vim-jsbeautify = buildVimPluginFrom2Nix {
-    name = "vim-jsbeautify-2018-10-23";
     pname = "vim-jsbeautify";
+    version = "2018-10-23";
     src = fetchFromGitHub {
       owner = "maksimr";
       repo = "vim-jsbeautify";
@@ -2795,8 +2795,8 @@
   };
 
   vim-jsdoc = buildVimPluginFrom2Nix {
-    name = "vim-jsdoc-2018-05-05";
     pname = "vim-jsdoc";
+    version = "2018-05-05";
     src = fetchFromGitHub {
       owner = "heavenshell";
       repo = "vim-jsdoc";
@@ -2806,8 +2806,8 @@
   };
 
   vim-json = buildVimPluginFrom2Nix {
-    name = "vim-json-2018-01-10";
     pname = "vim-json";
+    version = "2018-01-10";
     src = fetchFromGitHub {
       owner = "elzr";
       repo = "vim-json";
@@ -2817,8 +2817,8 @@
   };
 
   vim-jsonnet = buildVimPluginFrom2Nix {
-    name = "vim-jsonnet-2018-10-08";
     pname = "vim-jsonnet";
+    version = "2018-10-08";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
@@ -2828,8 +2828,8 @@
   };
 
   vim-lastplace = buildVimPluginFrom2Nix {
-    name = "vim-lastplace-2017-06-13";
     pname = "vim-lastplace";
+    version = "2017-06-13";
     src = fetchFromGitHub {
       owner = "farmergreg";
       repo = "vim-lastplace";
@@ -2839,8 +2839,8 @@
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
-    name = "vim-latex-live-preview-2018-09-25";
     pname = "vim-latex-live-preview";
+    version = "2018-09-25";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
@@ -2850,8 +2850,8 @@
   };
 
   vim-lawrencium = buildVimPluginFrom2Nix {
-    name = "vim-lawrencium-2018-11-04";
     pname = "vim-lawrencium";
+    version = "2018-11-04";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
@@ -2861,8 +2861,8 @@
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix {
-    name = "vim-leader-guide-2018-10-06";
     pname = "vim-leader-guide";
+    version = "2018-10-06";
     src = fetchFromGitHub {
       owner = "hecal3";
       repo = "vim-leader-guide";
@@ -2872,8 +2872,8 @@
   };
 
   vim-ledger = buildVimPluginFrom2Nix {
-    name = "vim-ledger-2017-12-12";
     pname = "vim-ledger";
+    version = "2017-12-12";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
@@ -2883,8 +2883,8 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-11-06";
     pname = "vim-localvimrc";
+    version = "2018-11-06";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
@@ -2894,8 +2894,8 @@
   };
 
   vim-logreview = buildVimPluginFrom2Nix {
-    name = "vim-logreview-2017-07-08";
     pname = "vim-logreview";
+    version = "2017-07-08";
     src = fetchFromGitHub {
       owner = "andreshazard";
       repo = "vim-logreview";
@@ -2905,8 +2905,8 @@
   };
 
   vim-maktaba = buildVimPluginFrom2Nix {
-    name = "vim-maktaba-2018-12-13";
     pname = "vim-maktaba";
+    version = "2018-12-13";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
@@ -2916,8 +2916,8 @@
   };
 
   vim-markdown = buildVimPluginFrom2Nix {
-    name = "vim-markdown-2018-10-24";
     pname = "vim-markdown";
+    version = "2018-10-24";
     src = fetchFromGitHub {
       owner = "plasticboy";
       repo = "vim-markdown";
@@ -2927,8 +2927,8 @@
   };
 
   vim-misc = buildVimPluginFrom2Nix {
-    name = "vim-misc-2015-05-21";
     pname = "vim-misc";
+    version = "2015-05-21";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-misc";
@@ -2938,8 +2938,8 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-12-27";
     pname = "vim-monokai-pro";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
@@ -2949,8 +2949,8 @@
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
-    name = "vim-multiple-cursors-2018-10-16";
     pname = "vim-multiple-cursors";
+    version = "2018-10-16";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
@@ -2960,8 +2960,8 @@
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
-    name = "vim-nerdtree-tabs-2018-12-21";
     pname = "vim-nerdtree-tabs";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
@@ -2971,8 +2971,8 @@
   };
 
   vim-niceblock = buildVimPluginFrom2Nix {
-    name = "vim-niceblock-2018-09-06";
     pname = "vim-niceblock";
+    version = "2018-09-06";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-niceblock";
@@ -2982,8 +2982,8 @@
   };
 
   vim-nix = buildVimPluginFrom2Nix {
-    name = "vim-nix-2018-08-27";
     pname = "vim-nix";
+    version = "2018-08-27";
     src = fetchFromGitHub {
       owner = "LnL7";
       repo = "vim-nix";
@@ -2993,8 +2993,8 @@
   };
 
   vim-obsession = buildVimPluginFrom2Nix {
-    name = "vim-obsession-2018-09-17";
     pname = "vim-obsession";
+    version = "2018-09-17";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
@@ -3004,8 +3004,8 @@
   };
 
   vim-one = buildVimPluginFrom2Nix {
-    name = "vim-one-2018-07-22";
     pname = "vim-one";
+    version = "2018-07-22";
     src = fetchFromGitHub {
       owner = "rakr";
       repo = "vim-one";
@@ -3015,8 +3015,8 @@
   };
 
   vim-operator-replace = buildVimPluginFrom2Nix {
-    name = "vim-operator-replace-2015-02-24";
     pname = "vim-operator-replace";
+    version = "2015-02-24";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-replace";
@@ -3026,8 +3026,8 @@
   };
 
   vim-operator-surround = buildVimPluginFrom2Nix {
-    name = "vim-operator-surround-2018-11-01";
     pname = "vim-operator-surround";
+    version = "2018-11-01";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-operator-surround";
@@ -3037,8 +3037,8 @@
   };
 
   vim-operator-user = buildVimPluginFrom2Nix {
-    name = "vim-operator-user-2015-02-17";
     pname = "vim-operator-user";
+    version = "2015-02-17";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-user";
@@ -3048,8 +3048,8 @@
   };
 
   vim-orgmode = buildVimPluginFrom2Nix {
-    name = "vim-orgmode-2018-07-25";
     pname = "vim-orgmode";
+    version = "2018-07-25";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
@@ -3059,8 +3059,8 @@
   };
 
   vim-pager = buildVimPluginFrom2Nix {
-    name = "vim-pager-2015-08-26";
     pname = "vim-pager";
+    version = "2015-08-26";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-pager";
@@ -3070,8 +3070,8 @@
   };
 
   vim-pandoc = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-2018-10-07";
     pname = "vim-pandoc";
+    version = "2018-10-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
@@ -3081,8 +3081,8 @@
   };
 
   vim-pandoc-after = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-after-2017-11-21";
     pname = "vim-pandoc-after";
+    version = "2017-11-21";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-after";
@@ -3092,8 +3092,8 @@
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-syntax-2017-04-13";
     pname = "vim-pandoc-syntax";
+    version = "2017-04-13";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
@@ -3103,8 +3103,8 @@
   };
 
   vim-pathogen = buildVimPluginFrom2Nix {
-    name = "vim-pathogen-2018-12-13";
     pname = "vim-pathogen";
+    version = "2018-12-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
@@ -3114,8 +3114,8 @@
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix {
-    name = "vim-peekaboo-2017-03-20";
     pname = "vim-peekaboo";
+    version = "2017-03-20";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-peekaboo";
@@ -3125,8 +3125,8 @@
   };
 
   vim-pencil = buildVimPluginFrom2Nix {
-    name = "vim-pencil-2017-06-14";
     pname = "vim-pencil";
+    version = "2017-06-14";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-pencil";
@@ -3136,8 +3136,8 @@
   };
 
   vim-plug = buildVimPluginFrom2Nix {
-    name = "vim-plug-2018-11-03";
     pname = "vim-plug";
+    version = "2018-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
@@ -3147,8 +3147,8 @@
   };
 
   vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
-    name = "vim-plugin-AnsiEsc-2018-05-10";
     pname = "vim-plugin-AnsiEsc";
+    version = "2018-05-10";
     src = fetchFromGitHub {
       owner = "powerman";
       repo = "vim-plugin-AnsiEsc";
@@ -3158,8 +3158,8 @@
   };
 
   vim-polyglot = buildVimPluginFrom2Nix {
-    name = "vim-polyglot-2018-12-26";
     pname = "vim-polyglot";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
@@ -3169,8 +3169,8 @@
   };
 
   vim-prettyprint = buildVimPluginFrom2Nix {
-    name = "vim-prettyprint-2016-07-16";
     pname = "vim-prettyprint";
+    version = "2016-07-16";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-prettyprint";
@@ -3180,8 +3180,8 @@
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
-    name = "vim-projectionist-2018-10-21";
     pname = "vim-projectionist";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
@@ -3191,8 +3191,8 @@
   };
 
   vim-ps1 = buildVimPluginFrom2Nix {
-    name = "vim-ps1-2017-10-20";
     pname = "vim-ps1";
+    version = "2017-10-20";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
@@ -3202,8 +3202,8 @@
   };
 
   vim-puppet = buildVimPluginFrom2Nix {
-    name = "vim-puppet-2018-11-15";
     pname = "vim-puppet";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
@@ -3213,8 +3213,8 @@
   };
 
   vim-qml = buildVimPluginFrom2Nix {
-    name = "vim-qml-2018-07-22";
     pname = "vim-qml";
+    version = "2018-07-22";
     src = fetchFromGitHub {
       owner = "peterhoeg";
       repo = "vim-qml";
@@ -3224,8 +3224,8 @@
   };
 
   vim-quickrun = buildVimPluginFrom2Nix {
-    name = "vim-quickrun-2018-11-27";
     pname = "vim-quickrun";
+    version = "2018-11-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
@@ -3235,8 +3235,8 @@
   };
 
   vim-racer = buildVimPluginFrom2Nix {
-    name = "vim-racer-2018-08-26";
     pname = "vim-racer";
+    version = "2018-08-26";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
@@ -3246,8 +3246,8 @@
   };
 
   vim-repeat = buildVimPluginFrom2Nix {
-    name = "vim-repeat-2018-07-02";
     pname = "vim-repeat";
+    version = "2018-07-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-repeat";
@@ -3257,8 +3257,8 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-11-16";
     pname = "vim-rhubarb";
+    version = "2018-11-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
@@ -3268,8 +3268,8 @@
   };
 
   vim-ruby = buildVimPluginFrom2Nix {
-    name = "vim-ruby-2018-12-11";
     pname = "vim-ruby";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
@@ -3279,8 +3279,8 @@
   };
 
   vim-sayonara = buildVimPluginFrom2Nix {
-    name = "vim-sayonara-2017-03-13";
     pname = "vim-sayonara";
+    version = "2017-03-13";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-sayonara";
@@ -3290,8 +3290,8 @@
   };
 
   vim-scala = buildVimPluginFrom2Nix {
-    name = "vim-scala-2017-11-10";
     pname = "vim-scala";
+    version = "2017-11-10";
     src = fetchFromGitHub {
       owner = "derekwyatt";
       repo = "vim-scala";
@@ -3301,8 +3301,8 @@
   };
 
   vim-scouter = buildVimPluginFrom2Nix {
-    name = "vim-scouter-2014-08-10";
     pname = "vim-scouter";
+    version = "2014-08-10";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-scouter";
@@ -3312,8 +3312,8 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-12-19";
     pname = "vim-scriptease";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
@@ -3323,8 +3323,8 @@
   };
 
   vim-sensible = buildVimPluginFrom2Nix {
-    name = "vim-sensible-2018-10-27";
     pname = "vim-sensible";
+    version = "2018-10-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
@@ -3334,8 +3334,8 @@
   };
 
   vim-signature = buildVimPluginFrom2Nix {
-    name = "vim-signature-2018-07-06";
     pname = "vim-signature";
+    version = "2018-07-06";
     src = fetchFromGitHub {
       owner = "kshenoy";
       repo = "vim-signature";
@@ -3345,8 +3345,8 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-12-20";
     pname = "vim-signify";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
@@ -3356,8 +3356,8 @@
   };
 
   vim-sleuth = buildVimPluginFrom2Nix {
-    name = "vim-sleuth-2018-08-19";
     pname = "vim-sleuth";
+    version = "2018-08-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sleuth";
@@ -3367,8 +3367,8 @@
   };
 
   vim-smalls = buildVimPluginFrom2Nix {
-    name = "vim-smalls-2015-05-02";
     pname = "vim-smalls";
+    version = "2015-05-02";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-smalls";
@@ -3378,8 +3378,8 @@
   };
 
   vim-snipmate = buildVimPluginFrom2Nix {
-    name = "vim-snipmate-2017-04-20";
     pname = "vim-snipmate";
+    version = "2017-04-20";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
@@ -3389,8 +3389,8 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-12-14";
     pname = "vim-snippets";
+    version = "2018-12-14";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
@@ -3400,8 +3400,8 @@
   };
 
   vim-solidity = buildVimPluginFrom2Nix {
-    name = "vim-solidity-2018-04-17";
     pname = "vim-solidity";
+    version = "2018-04-17";
     src = fetchFromGitHub {
       owner = "tomlion";
       repo = "vim-solidity";
@@ -3411,8 +3411,8 @@
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix {
-    name = "vim-sort-motion-2018-07-15";
     pname = "vim-sort-motion";
+    version = "2018-07-15";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-sort-motion";
@@ -3422,8 +3422,8 @@
   };
 
   vim-speeddating = buildVimPluginFrom2Nix {
-    name = "vim-speeddating-2018-10-31";
     pname = "vim-speeddating";
+    version = "2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-speeddating";
@@ -3433,8 +3433,8 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-12-16";
     pname = "vim-startify";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
@@ -3444,8 +3444,8 @@
   };
 
   vim-stylish-haskell = buildVimPluginFrom2Nix {
-    name = "vim-stylish-haskell-2018-08-31";
     pname = "vim-stylish-haskell";
+    version = "2018-08-31";
     src = fetchFromGitHub {
       owner = "nbouscal";
       repo = "vim-stylish-haskell";
@@ -3455,8 +3455,8 @@
   };
 
   vim-stylishask = buildVimPluginFrom2Nix {
-    name = "vim-stylishask-2018-07-05";
     pname = "vim-stylishask";
+    version = "2018-07-05";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-stylishask";
@@ -3466,8 +3466,8 @@
   };
 
   vim-surround = buildVimPluginFrom2Nix {
-    name = "vim-surround-2018-07-23";
     pname = "vim-surround";
+    version = "2018-07-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-surround";
@@ -3477,8 +3477,8 @@
   };
 
   vim-SyntaxRange = buildVimPluginFrom2Nix {
-    name = "vim-SyntaxRange-2018-03-09";
     pname = "vim-SyntaxRange";
+    version = "2018-03-09";
     src = fetchFromGitHub {
       owner = "inkarkat";
       repo = "vim-SyntaxRange";
@@ -3488,8 +3488,8 @@
   };
 
   vim-table-mode = buildVimPluginFrom2Nix {
-    name = "vim-table-mode-2018-10-21";
     pname = "vim-table-mode";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
@@ -3499,8 +3499,8 @@
   };
 
   vim-tabpagecd = buildVimPluginFrom2Nix {
-    name = "vim-tabpagecd-2013-11-29";
     pname = "vim-tabpagecd";
+    version = "2013-11-29";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-tabpagecd";
@@ -3510,8 +3510,8 @@
   };
 
   vim-tbone = buildVimPluginFrom2Nix {
-    name = "vim-tbone-2018-06-28";
     pname = "vim-tbone";
+    version = "2018-06-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-tbone";
@@ -3521,8 +3521,8 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-12-25";
     pname = "vim-terraform";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
@@ -3532,8 +3532,8 @@
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-12-24";
     pname = "vim-test";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
@@ -3543,8 +3543,8 @@
   };
 
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
-    name = "vim-textobj-multiblock-2014-06-02";
     pname = "vim-textobj-multiblock";
+    version = "2014-06-02";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-textobj-multiblock";
@@ -3554,8 +3554,8 @@
   };
 
   vim-themis = buildVimPluginFrom2Nix {
-    name = "vim-themis-2017-12-27";
     pname = "vim-themis";
+    version = "2017-12-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
@@ -3565,8 +3565,8 @@
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
-    name = "vim-tmux-navigator-2018-11-03";
     pname = "vim-tmux-navigator";
+    version = "2018-11-03";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
@@ -3576,8 +3576,8 @@
   };
 
   vim-toml = buildVimPluginFrom2Nix {
-    name = "vim-toml-2018-11-27";
     pname = "vim-toml";
+    version = "2018-11-27";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
@@ -3587,8 +3587,8 @@
   };
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
-    name = "vim-trailing-whitespace-2017-09-23";
     pname = "vim-trailing-whitespace";
+    version = "2017-09-23";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
@@ -3598,8 +3598,8 @@
   };
 
   vim-tsx = buildVimPluginFrom2Nix {
-    name = "vim-tsx-2017-03-16";
     pname = "vim-tsx";
+    version = "2017-03-16";
     src = fetchFromGitHub {
       owner = "ianks";
       repo = "vim-tsx";
@@ -3609,8 +3609,8 @@
   };
 
   vim-unimpaired = buildVimPluginFrom2Nix {
-    name = "vim-unimpaired-2018-12-20";
     pname = "vim-unimpaired";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
@@ -3620,8 +3620,8 @@
   };
 
   vim-vinegar = buildVimPluginFrom2Nix {
-    name = "vim-vinegar-2018-08-06";
     pname = "vim-vinegar";
+    version = "2018-08-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-vinegar";
@@ -3631,8 +3631,8 @@
   };
 
   vim-visualstar = buildVimPluginFrom2Nix {
-    name = "vim-visualstar-2015-08-27";
     pname = "vim-visualstar";
+    version = "2015-08-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-visualstar";
@@ -3642,8 +3642,8 @@
   };
 
   vim-vue = buildVimPluginFrom2Nix {
-    name = "vim-vue-2018-11-11";
     pname = "vim-vue";
+    version = "2018-11-11";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
@@ -3653,8 +3653,8 @@
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-12-19";
     pname = "vim-wakatime";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
@@ -3664,8 +3664,8 @@
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix {
-    name = "vim-watchdogs-2017-12-03";
     pname = "vim-watchdogs";
+    version = "2017-12-03";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-watchdogs";
@@ -3675,8 +3675,8 @@
   };
 
   vim-wordy = buildVimPluginFrom2Nix {
-    name = "vim-wordy-2018-03-10";
     pname = "vim-wordy";
+    version = "2018-03-10";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-wordy";
@@ -3686,8 +3686,8 @@
   };
 
   vim-xdebug = buildVimPluginFrom2Nix {
-    name = "vim-xdebug-2012-08-15";
     pname = "vim-xdebug";
+    version = "2012-08-15";
     src = fetchFromGitHub {
       owner = "joonty";
       repo = "vim-xdebug";
@@ -3697,8 +3697,8 @@
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix {
-    name = "vim-xkbswitch-2017-03-27";
     pname = "vim-xkbswitch";
+    version = "2017-03-27";
     src = fetchFromGitHub {
       owner = "lyokha";
       repo = "vim-xkbswitch";
@@ -3708,8 +3708,8 @@
   };
 
   vim-yapf = buildVimPluginFrom2Nix {
-    name = "vim-yapf-2018-10-04";
     pname = "vim-yapf";
+    version = "2018-10-04";
     src = fetchFromGitHub {
       owner = "mindriot101";
       repo = "vim-yapf";
@@ -3719,8 +3719,8 @@
   };
 
   vim2hs = buildVimPluginFrom2Nix {
-    name = "vim2hs-2014-04-16";
     pname = "vim2hs";
+    version = "2014-04-16";
     src = fetchFromGitHub {
       owner = "dag";
       repo = "vim2hs";
@@ -3730,8 +3730,8 @@
   };
 
   vimoutliner = buildVimPluginFrom2Nix {
-    name = "vimoutliner-2018-07-04";
     pname = "vimoutliner";
+    version = "2018-07-04";
     src = fetchFromGitHub {
       owner = "vimoutliner";
       repo = "vimoutliner";
@@ -3741,8 +3741,8 @@
   };
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
-    name = "vimpreviewpandoc-2018-11-05";
     pname = "vimpreviewpandoc";
+    version = "2018-11-05";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
@@ -3752,8 +3752,8 @@
   };
 
   vimproc-vim = buildVimPluginFrom2Nix {
-    name = "vimproc-vim-2018-10-11";
     pname = "vimproc-vim";
+    version = "2018-10-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimproc.vim";
@@ -3763,8 +3763,8 @@
   };
 
   vimshell-vim = buildVimPluginFrom2Nix {
-    name = "vimshell-vim-2018-06-02";
     pname = "vimshell-vim";
+    version = "2018-06-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimshell.vim";
@@ -3774,8 +3774,8 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-25";
     pname = "vimtex";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
@@ -3785,8 +3785,8 @@
   };
 
   vimux = buildVimPluginFrom2Nix {
-    name = "vimux-2017-10-24";
     pname = "vimux";
+    version = "2017-10-24";
     src = fetchFromGitHub {
       owner = "benmills";
       repo = "vimux";
@@ -3796,8 +3796,8 @@
   };
 
   vimwiki = buildVimPluginFrom2Nix {
-    name = "vimwiki-2018-10-12";
     pname = "vimwiki";
+    version = "2018-10-12";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
@@ -3807,8 +3807,8 @@
   };
 
   vissort-vim = buildVimPluginFrom2Nix {
-    name = "vissort-vim-2014-01-31";
     pname = "vissort-vim";
+    version = "2014-01-31";
     src = fetchFromGitHub {
       owner = "navicore";
       repo = "vissort.vim";
@@ -3818,8 +3818,8 @@
   };
 
   vundle = buildVimPluginFrom2Nix {
-    name = "vundle-2018-02-03";
     pname = "vundle";
+    version = "2018-02-03";
     src = fetchFromGitHub {
       owner = "gmarik";
       repo = "vundle";
@@ -3829,8 +3829,8 @@
   };
 
   wal-vim = buildVimPluginFrom2Nix {
-    name = "wal-vim-2018-06-04";
     pname = "wal-vim";
+    version = "2018-06-04";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
@@ -3840,8 +3840,8 @@
   };
 
   webapi-vim = buildVimPluginFrom2Nix {
-    name = "webapi-vim-2018-03-14";
     pname = "webapi-vim";
+    version = "2018-03-14";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "webapi-vim";
@@ -3851,8 +3851,8 @@
   };
 
   wombat256-vim = buildVimPluginFrom2Nix {
-    name = "wombat256-vim-2010-10-18";
     pname = "wombat256-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "wombat256.vim";
@@ -3862,8 +3862,8 @@
   };
 
   workflowish = buildVimPluginFrom2Nix {
-    name = "workflowish-2015-12-03";
     pname = "workflowish";
+    version = "2015-12-03";
     src = fetchFromGitHub {
       owner = "lukaszkorecki";
       repo = "workflowish";
@@ -3873,8 +3873,8 @@
   };
 
   xptemplate = buildVimPluginFrom2Nix {
-    name = "xptemplate-2017-12-06";
     pname = "xptemplate";
+    version = "2017-12-06";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
@@ -3884,8 +3884,8 @@
   };
 
   xterm-color-table-vim = buildVimPluginFrom2Nix {
-    name = "xterm-color-table-vim-2014-01-01";
     pname = "xterm-color-table-vim";
+    version = "2014-01-01";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "xterm-color-table.vim";
@@ -3895,8 +3895,8 @@
   };
 
   YankRing-vim = buildVimPluginFrom2Nix {
-    name = "YankRing-vim-2015-07-29";
     pname = "YankRing-vim";
+    version = "2015-07-29";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
@@ -3906,8 +3906,8 @@
   };
 
   yats-vim = buildVimPluginFrom2Nix {
-    name = "yats-vim-2018-12-15";
     pname = "yats-vim";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
@@ -3918,8 +3918,8 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-12-23";
     pname = "youcompleteme";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
@@ -3930,8 +3930,8 @@
   };
 
   YUNOcommit-vim = buildVimPluginFrom2Nix {
-    name = "YUNOcommit-vim-2014-11-26";
     pname = "YUNOcommit-vim";
+    version = "2014-11-26";
     src = fetchFromGitHub {
       owner = "esneider";
       repo = "YUNOcommit.vim";
@@ -3941,8 +3941,8 @@
   };
 
   zeavim-vim = buildVimPluginFrom2Nix {
-    name = "zeavim-vim-2018-03-22";
     pname = "zeavim-vim";
+    version = "2018-03-22";
     src = fetchFromGitHub {
       owner = "KabbAmine";
       repo = "zeavim.vim";
@@ -3952,8 +3952,8 @@
   };
 
   zenburn = buildVimPluginFrom2Nix {
-    name = "zenburn-2018-04-29";
     pname = "zenburn";
+    version = "2018-04-29";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
@@ -3963,8 +3963,8 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-12-12";
     pname = "zig-vim";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
@@ -3974,8 +3974,8 @@
   };
 
   zoomwintab-vim = buildVimPluginFrom2Nix {
-    name = "zoomwintab-vim-2018-04-14";
     pname = "zoomwintab-vim";
+    version = "2018-04-14";
     src = fetchFromGitHub {
       owner = "troydm";
       repo = "zoomwintab.vim";
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index b57bff5c09d..1062241a0cb 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -309,8 +309,8 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
             f.write(
                 f"""
   {plugin.normalized_name} = buildVimPluginFrom2Nix {{
-    name = "{plugin.normalized_name}-{plugin.version}";
     pname = "{plugin.normalized_name}";
+    version = "{plugin.version}";
     src = fetchFromGitHub {{
       owner = "{owner}";
       repo = "{repo}";
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index a8146dbf5d4..1d305cd5349 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -403,59 +403,9 @@ rec {
     '';
   };
 
-  vimHelpTags = ''
-  vimHelpTags(){
-    if [ -d "$1/doc" ]; then
-      ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
-    fi
-  }
-  '';
-
-  addRtp = path: attrs: derivation:
-    derivation // { rtp = "${derivation}/${path}"; } // {
-      overrideAttrs = f: buildVimPlugin (attrs // f attrs);
-    };
-
-  buildVimPlugin = a@{
-    name,
-    namePrefix ? "vimplugin-",
-    src,
-    unpackPhase ? "",
-    configurePhase ? "",
-    buildPhase ? "",
-    preInstall ? "",
-    postInstall ? "",
-    path ? (builtins.parseDrvName name).name,
-    addonInfo ? null,
-    ...
-  }:
-    addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // {
-      name = namePrefix + name;
-
-      inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
-
-      installPhase = ''
-        runHook preInstall
-
-        target=$out/${rtpPath}/${path}
-        mkdir -p $out/${rtpPath}
-        cp -r . $target
-        ${vimHelpTags}
-        vimHelpTags $target
-        if [ -n "$addonInfo" ]; then
-          echo "$addonInfo" > $target/addon-info.json
-        fi
-
-        runHook postInstall
-      '';
-    }));
-
   vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
 
-  buildVimPluginFrom2Nix = a: buildVimPlugin ({
-    buildPhase = ":";
-    configurePhase =":";
-  } // a);
+  inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
 
   requiredPlugins = {
     packages ? {},

From af465293f1cf2e4840e38795726ba2bf8c6d7199 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 11:12:48 +0100
Subject: [PATCH 7/8] vimPlugins: use fixed point

---
 pkgs/misc/vim-plugins/default.nix   |  10 +-
 pkgs/misc/vim-plugins/generated.nix |   9 +-
 pkgs/misc/vim-plugins/overrides.nix | 177 ++++++++++++----------------
 3 files changed, 84 insertions(+), 112 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f5053c2ec6e..b30413ac79c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -5,8 +5,8 @@ let
 
   inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
-  generated = callPackage ./generated.nix {
-    inherit buildVimPluginFrom2Nix;
+  plugins = callPackage ./generated.nix {
+    inherit buildVimPluginFrom2Nix overrides;
   };
 
   # TL;DR
@@ -22,10 +22,8 @@ let
     inherit llvmPackages;
   };
 
-  overriden = generated // (overrides generated);
-
-  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib overriden);
+  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
 
 in
 
-overriden // aliases
+plugins // aliases
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 89406e92305..5ac1793070b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1,5 +1,8 @@
 # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
-{ buildVimPluginFrom2Nix, fetchFromGitHub }:
+{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
+
+let
+  packages = ( self:
 
 {
   a-vim = buildVimPluginFrom2Nix {
@@ -3983,4 +3986,6 @@
       sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6";
     };
   };
-}
\ No newline at end of file
+});
+
+in lib.fix' (lib.extends overrides packages)
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index d0e55cb4c3f..a35e7aaf464 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,10 +1,9 @@
-{config, lib, stdenv
-, python, cmake, vim, vimUtils, ruby
+{ lib, stdenv
+, python, cmake, vim, ruby
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, fzf, skim
 , python3, boost, icu, ncurses
 , ycmd, rake
-, pythonPackages, python3Packages
 , substituteAll
 , languagetool
 , Cocoa, CoreFoundation, CoreServices
@@ -17,50 +16,22 @@
 , impl, iferr, gocode, gocode-gomod, go-tools
 }:
 
-let
-
-  _skim = skim;
-
-in
-
-generated:
-
-rec {
-
-  # list of plugins that are needed as dependencies somewhere
-  # This is necessary (as opposed to `with generated;`) because
-  # there would otherwise be conflicts with `rec`. `rec` is necessary
-  # however to make sure overriden plugins can be used as dependencies.
-  # This should use a proper package set with fixed-points instead.
-  inherit (generated)
-    self
-    webapi-vim
-    nvim-yarp
-    ultisnips
-    vim-addon-mw-utils
-    tlib_vim
-    vim-addon-signs
-    vim-addon-other
-    vim-addon-errorformats
-    vim-maktaba
-    vim-misc;
+self: super: {
 
   vim2nix = buildVimPluginFrom2Nix {
     name = "vim2nix";
     src = ./vim2nix;
-    dependencies = [ vim-addon-manager ];
+    dependencies = with super; [ vim-addon-manager ];
   };
 
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
-    dependencies = [];
   };
 
   skim = buildVimPluginFrom2Nix {
-    name = _skim.name;
-    src = _skim.vim;
-    dependencies = [];
+    name = skim.name;
+    src = skim.vim;
   };
 
   LanguageClient-neovim = let
@@ -86,7 +57,6 @@ rec {
     name = "LanguageClient-neovim-2018-09-07";
     src = LanguageClient-neovim-src;
 
-    dependencies = [];
     propogatedBuildInputs = [ LanguageClient-neovim-bin ];
 
     preFixup = ''
@@ -103,10 +73,9 @@ rec {
       rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
       sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
     };
-    dependencies = [];
   };
 
-  clang_complete = generated.clang_complete.overrideAttrs(old: {
+  clang_complete = super.clang_complete.overrideAttrs(old: {
     # In addition to the arguments you pass to your compiler, you also need to
     # specify the path of the C++ std header (if you are using C++).
     # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -123,14 +92,14 @@ rec {
     '';
   });
 
-  clighter8 = generated.clighter8.overrideAttrs(old: {
+  clighter8 = super.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
     '';
   });
 
-  command-t = generated.command-t.overrideAttrs(old: {
+  command-t = super.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -138,7 +107,7 @@ rec {
     '';
   });
 
-  cpsm = generated.cpsm.overrideAttrs(old: {
+  cpsm = super.cpsm.overrideAttrs(old: {
     buildInputs = [
       python3
       stdenv
@@ -154,7 +123,7 @@ rec {
     '';
   });
 
-  ctrlp-cmatcher = generated.ctrlp-cmatcher.overrideAttrs(old: {
+  ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: {
     buildInputs = [ python ];
     buildPhase = ''
       patchShebangs .
@@ -162,7 +131,7 @@ rec {
     '';
   });
 
-  deoplete-go = generated.deoplete-go.overrideAttrs(old: {
+  deoplete-go = super.deoplete-go.overrideAttrs(old: {
     buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
@@ -172,33 +141,33 @@ rec {
    '';
   });
 
-  ensime-vim = generated.ensime-vim.overrideAttrs(old: {
+  ensime-vim = super.ensime-vim.overrideAttrs(old: {
     passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-    dependencies = [ vimproc-vim vimshell-vim self forms ];
+    dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
   });
 
-  forms = generated.forms.overrideAttrs(old: {
-    dependencies = [ self ];
+  forms = super.forms.overrideAttrs(old: {
+    dependencies = with super; [ super.self ];
   });
 
-  gist-vim = generated.gist-vim.overrideAttrs(old: {
-    dependencies = [ webapi-vim ];
+  gist-vim = super.gist-vim.overrideAttrs(old: {
+    dependencies = with super; [ webapi-vim ];
   });
 
-  ncm2 = generated.ncm2.overrideAttrs(old: {
-    dependencies = [ nvim-yarp ];
+  ncm2 = super.ncm2.overrideAttrs(old: {
+    dependencies = with super; [ nvim-yarp ];
   });
 
-  ncm2-jedi = generated.ncm2-jedi.overrideAttrs(old: {
-    dependencies = [ nvim-yarp ncm2 ];
+  ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: {
+    dependencies = with super; [ nvim-yarp ncm2 ];
     passthru.python3Dependencies = ps: with ps; [ jedi ];
   });
 
-  ncm2-ultisnips = generated.ncm2-ultisnips.overrideAttrs(old: {
-    dependencies = [ ultisnips ];
+  ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = with super; [ ultisnips ];
   });
 
-  taglist-vim = generated.taglist-vim.overrideAttrs(old: {
+  taglist-vim = super.taglist-vim.overrideAttrs(old: {
     setSourceRoot = ''
       export sourceRoot=taglist
       mkdir taglist
@@ -207,40 +176,40 @@ rec {
     '';
   });
 
-  vimshell-vim = generated.vimshell-vim.overrideAttrs(old: {
-    dependencies = [ vimproc-vim ];
+  vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
+    dependencies = with super; [ vimproc-vim ];
   });
 
-  vim-addon-manager = generated.vim-addon-manager.overrideAttrs(old: {
+  vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: {
     buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
   });
 
-  vim-addon-actions = generated.vim-addon-actions.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-async = generated.vim-addon-async.overrideAttrs(old: {
-    dependencies = [ vim-addon-signs ];
+  vim-addon-async = super.vim-addon-async.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-signs ];
   });
 
-  vim-addon-background-cmd = generated.vim-addon-background-cmd.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils ];
+  vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils ];
   });
 
-  vim-addon-completion = generated.vim-addon-completion.overrideAttrs(old: {
-    dependencies = [ tlib_vim ];
+  vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: {
+    dependencies = with super; [ tlib_vim ];
   });
 
-  vim-addon-goto-thing-at-cursor = generated.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
-    dependencies = [ tlib_vim ];
+  vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = with super; [ tlib_vim ];
   });
 
-  vim-addon-mru = generated.vim-addon-mru.overrideAttrs(old: {
-    dependencies = [ vim-addon-other vim-addon-mw-utils ];
+  vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
   });
 
-  vim-addon-nix = generated.vim-addon-nix.overrideAttrs(old: {
-    dependencies = [
+  vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: {
+    dependencies = with super; [
       vim-addon-completion
       vim-addon-goto-thing-at-cursor
       vim-addon-errorformats
@@ -249,38 +218,38 @@ rec {
     ];
   });
 
-  vim-addon-sql = generated.vim-addon-sql.overrideAttrs(old: {
-    dependencies = [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
+  vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
   });
 
-  vim-addon-syntax-checker = generated.vim-addon-syntax-checker.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-toggle-buffer = generated.vim-addon-toggle-buffer.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-xdebug = generated.vim-addon-xdebug.overrideAttrs(old: {
-    dependencies = [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
+  vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
   });
 
-  vim-bazel = generated.vim-bazel.overrideAttrs(old: {
-    dependencies = [ vim-maktaba ];
+  vim-bazel = super.vim-bazel.overrideAttrs(old: {
+    dependencies = with super; [ vim-maktaba ];
   });
 
-  vim-codefmt = generated.vim-codefmt.overrideAttrs(old: {
-    dependencies = [ vim-maktaba ];
+  vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
+    dependencies = with super; [ vim-maktaba ];
   });
 
-  vim-easytags = generated.vim-easytags.overrideAttrs(old: {
-    dependencies = [ vim-misc ];
+  vim-easytags = super.vim-easytags.overrideAttrs(old: {
+    dependencies = with super; [ vim-misc ];
   });
 
   # change the go_bin_path to point to a path in the nix store. See the code in
   # fatih/vim-go here
   # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
-  vim-go = generated.vim-go.overrideAttrs(old: let
+  vim-go = super.vim-go.overrideAttrs(old: let
     binPath = lib.makeBinPath [
       asmfmt
       delve
@@ -308,7 +277,7 @@ rec {
     '';
   });
 
-  vim-grammarous = generated.vim-grammarous.overrideAttrs(old: {
+  vim-grammarous = super.vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -321,31 +290,31 @@ rec {
     ];
   });
 
-  vim-hier = generated.vim-hier.overrideAttrs(old: {
+  vim-hier = super.vim-hier.overrideAttrs(old: {
     buildInputs = [ vim ];
   });
 
-  vim-isort = generated.vim-isort.overrideAttrs(old: {
+  vim-isort = super.vim-isort.overrideAttrs(old: {
     postPatch = ''
       substituteInPlace ftplugin/python_vimisort.vim \
-        --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+        --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
     '';
   });
 
-  vim-snipmate = generated.vim-snipmate.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-snipmate = super.vim-snipmate.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
 
-  vim-wakatime = generated.vim-wakatime.overrideAttrs(old: {
+  vim-wakatime = super.vim-wakatime.overrideAttrs(old: {
     buildInputs = [ python ];
   });
 
-  vim-xdebug = generated.vim-xdebug.overrideAttrs(old: {
+  vim-xdebug = super.vim-xdebug.overrideAttrs(old: {
     postInstall = false;
   });
 
-  vim-xkbswitch = generated.vim-xkbswitch.overrideAttrs(old: {
+  vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
         --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -353,14 +322,14 @@ rec {
     buildInputs = [ xkb_switch ];
   });
 
-  vim-yapf = generated.vim-yapf.overrideAttrs(old: {
+  vim-yapf = super.vim-yapf.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
     '';
   });
 
-  vimproc-vim = generated.vimproc-vim.overrideAttrs(old: {
+  vimproc-vim = super.vimproc-vim.overrideAttrs(old: {
     buildInputs = [ which ];
 
     buildPhase = ''
@@ -372,11 +341,11 @@ rec {
     '';
   });
 
-  YankRing-vim = generated.YankRing-vim.overrideAttrs(old: {
+  YankRing-vim = super.YankRing-vim.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
-  youcompleteme = generated.youcompleteme.overrideAttrs(old: {
+  youcompleteme = super.youcompleteme.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
@@ -395,9 +364,9 @@ rec {
     };
   });
 
-  jedi-vim = generated.jedi-vim.overrideAttrs(old: {
+  jedi-vim = super.jedi-vim.overrideAttrs(old: {
     # checking for python3 support in vim would be neat, too, but nobody else seems to care
-    buildInputs = [ python3Packages.jedi ];
+    buildInputs = [ python3.pkgs.jedi ];
     meta = {
       description = "code-completion for python using python-jedi";
       license = stdenv.lib.licenses.mit;

From 58b4351b38b35a5adb86c7ef91fe8bf431ca4c9b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 28 Dec 2018 13:31:58 +0100
Subject: [PATCH 8/8] vimPlugins.taglist-vim: fix build

The override actually broke the build, no idea why it was added
originally. The build works fine without it.
---
 pkgs/misc/vim-plugins/overrides.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index a35e7aaf464..307681111ac 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -167,15 +167,6 @@ self: super: {
     dependencies = with super; [ ultisnips ];
   });
 
-  taglist-vim = super.taglist-vim.overrideAttrs(old: {
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-  });
-
   vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
     dependencies = with super; [ vimproc-vim ];
   });