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.

1 files changed, 361 insertions, 0 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";