git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52767 from timokau/vim-plugin-updates

Fix vim-plugin dependencies

commit22d0f320e88f8444b0477d83189761ebfa63fcbd authorTimo Kaufmann <timokau@zoho.com> dateFri 28 Dec 2018, 13:48 (8 years ago) parent1c8fea158b4351
8 files changed+1020−638
doc/languages-frameworks/vim.section.md+6−1 pkgs/misc/vim-plugins/build-vim-plugin.nix+54 pkgs/misc/vim-plugins/default.nix+4−6 pkgs/misc/vim-plugins/generated.nix+829−453 pkgs/misc/vim-plugins/overrides.nix+78−101 pkgs/misc/vim-plugins/update.py+2−1 pkgs/misc/vim-plugins/vim-plugin-names+1 pkgs/misc/vim-plugins/vim-utils.nix+46−76
doc/languages-frameworks/vim.section.md+6−1
@@ -48,7 +48,7 @@ neovim.override {
4848
4949## Managing plugins with Vim packages
5050
51−To store you plugins in Vim packages the following example can be used:
51+To store you plugins in Vim packages (the native vim plugin manager, see `:help packages`) the following example can be used:
5252
5353```
5454vim_configurable.customize {
@@ -56,6 +56,8 @@ vim_configurable.customize {
5656 # loaded on launch
5757 start = [ youcompleteme fugitive ];
5858 # manually loadable by calling `:packadd $plugin-name`
59+ # however, if a vim plugin has a dependency that is not explicitly listed in
60+ # opt that dependency will always be added to start to avoid confusion.
5961 opt = [ phpCompletion elm-vim ];
6062 # To automatically load a plugin when opening a filetype, add vimrc lines like:
6163 # autocmd FileType php :packadd phpCompletion
@@ -63,6 +65,7 @@ vim_configurable.customize {
6365}
6466```
6567
68+`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like.
6669For Neovim the syntax is:
6770
6871```
@@ -74,6 +77,8 @@ neovim.override {
7477 packages.myVimPackage = with pkgs.vimPlugins; {
7578 # see examples below how to use custom packages
7679 start = [ ];
80+ # If a vim plugin has a dependency that is not explicitly listed in
81+ # opt that dependency will always be added to start to avoid confusion.
7782 opt = [ ];
7883 };
7984 };
pkgs/misc/vim-plugins/build-vim-plugin.nixnew file+54
@@ -0,0 +1,54 @@
1+{ stdenv
2+, rtpPath ? "share/vim-plugins"
3+, vim
4+}:
5+
6+rec {
7+ addRtp = path: attrs: derivation:
8+ derivation // { rtp = "${derivation}/${path}"; } // {
9+ overrideAttrs = f: buildVimPlugin (attrs // f attrs);
10+ };
11+
12+ buildVimPlugin = attrs@{
13+ name ? "${attrs.pname}-${attrs.version}",
14+ namePrefix ? "vimplugin-",
15+ src,
16+ unpackPhase ? "",
17+ configurePhase ? "",
18+ buildPhase ? "",
19+ preInstall ? "",
20+ postInstall ? "",
21+ path ? (builtins.parseDrvName name).name,
22+ addonInfo ? null,
23+ ...
24+ }:
25+ addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
26+ name = namePrefix + name;
27+
28+ inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
29+
30+ installPhase = ''
31+ runHook preInstall
32+
33+ target=$out/${rtpPath}/${path}
34+ mkdir -p $out/${rtpPath}
35+ cp -r . $target
36+
37+ # build help tags
38+ if [ -d "$target/doc" ]; then
39+ ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
40+ fi
41+
42+ if [ -n "$addonInfo" ]; then
43+ echo "$addonInfo" > $target/addon-info.json
44+ fi
45+
46+ runHook postInstall
47+ '';
48+ }));
49+
50+ buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
51+ buildPhase = ":";
52+ configurePhase =":";
53+ } // attrs);
54+}
pkgs/misc/vim-plugins/default.nix+4−6
@@ -5,8 +5,8 @@ let
55
66 inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
77
8− generated = callPackage ./generated.nix {
9− inherit buildVimPluginFrom2Nix;
8+ plugins = callPackage ./generated.nix {
9+ inherit buildVimPluginFrom2Nix overrides;
1010 };
1111
1212 # TL;DR
@@ -22,10 +22,8 @@ let
2222 inherit llvmPackages;
2323 };
2424
25− overriden = generated // (overrides generated);
26−
27− aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib overriden);
25+ aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
2826
2927in
3028
31−overriden // aliases
29+plugins // aliases
pkgs/misc/vim-plugins/generated.nix+829−453
@@ -1,9 +1,13 @@
11# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
2−{ buildVimPluginFrom2Nix, fetchFromGitHub }:
2+{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
3+
4+let
5+ packages = ( self:
36
47{
58 a-vim = buildVimPluginFrom2Nix {
6− name = "a-vim-2010-11-06";
9+ pname = "a-vim";
10+ version = "2010-11-06";
711 src = fetchFromGitHub {
812 owner = "vim-scripts";
913 repo = "a.vim";
@@ -13,7 +17,8 @@
1317 };
1418
1519 ack-vim = buildVimPluginFrom2Nix {
16− name = "ack-vim-2018-02-27";
20+ pname = "ack-vim";
21+ version = "2018-02-27";
1722 src = fetchFromGitHub {
1823 owner = "mileszs";
1924 repo = "ack.vim";
@@ -23,7 +28,8 @@
2328 };
2429
2530 acp = buildVimPluginFrom2Nix {
26− name = "acp-2013-02-05";
31+ pname = "acp";
32+ version = "2013-02-05";
2733 src = fetchFromGitHub {
2834 owner = "eikenb";
2935 repo = "acp";
@@ -33,7 +39,8 @@
3339 };
3440
3541 agda-vim = buildVimPluginFrom2Nix {
36− name = "agda-vim-2018-11-10";
42+ pname = "agda-vim";
43+ version = "2018-11-10";
3744 src = fetchFromGitHub {
3845 owner = "derekelkins";
3946 repo = "agda-vim";
@@ -43,7 +50,8 @@
4350 };
4451
4552 alchemist-vim = buildVimPluginFrom2Nix {
46− name = "alchemist-vim-2018-12-07";
53+ pname = "alchemist-vim";
54+ version = "2018-12-07";
4755 src = fetchFromGitHub {
4856 owner = "slashmili";
4957 repo = "alchemist.vim";
@@ -53,17 +61,19 @@
5361 };
5462
5563 ale = buildVimPluginFrom2Nix {
56− name = "ale-2018-12-10";
64+ pname = "ale";
65+ version = "2018-12-20";
5766 src = fetchFromGitHub {
5867 owner = "w0rp";
5968 repo = "ale";
60− rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d";
61− sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp";
69+ rev = "73ca1e71918a0b50b7bbcbed91857c3618ad93cc";
70+ sha256 = "0q2wmpprr6mva6k7d8280cpf8ia6g7fbzw309fb0291y7241v5j1";
6271 };
6372 };
6473
6574 align = buildVimPluginFrom2Nix {
66− name = "align-2012-08-08";
75+ pname = "align";
76+ version = "2012-08-08";
6777 src = fetchFromGitHub {
6878 owner = "vim-scripts";
6979 repo = "align";
@@ -73,7 +83,8 @@
7383 };
7484
7585 argtextobj-vim = buildVimPluginFrom2Nix {
76− name = "argtextobj-vim-2010-10-18";
86+ pname = "argtextobj-vim";
87+ version = "2010-10-18";
7788 src = fetchFromGitHub {
7889 owner = "vim-scripts";
7990 repo = "argtextobj.vim";
@@ -83,7 +94,8 @@
8394 };
8495
8596 auto-pairs = buildVimPluginFrom2Nix {
86− name = "auto-pairs-2018-09-23";
97+ pname = "auto-pairs";
98+ version = "2018-09-23";
8799 src = fetchFromGitHub {
88100 owner = "jiangmiao";
89101 repo = "auto-pairs";
@@ -93,7 +105,8 @@
93105 };
94106
95107 autoload_cscope-vim = buildVimPluginFrom2Nix {
96− name = "autoload_cscope-vim-2011-01-28";
108+ pname = "autoload_cscope-vim";
109+ version = "2011-01-28";
97110 src = fetchFromGitHub {
98111 owner = "vim-scripts";
99112 repo = "autoload_cscope.vim";
@@ -103,17 +116,19 @@
103116 };
104117
105118 awesome-vim-colorschemes = buildVimPluginFrom2Nix {
106− name = "awesome-vim-colorschemes-2018-10-30";
119+ pname = "awesome-vim-colorschemes";
120+ version = "2018-12-16";
107121 src = fetchFromGitHub {
108122 owner = "rafi";
109123 repo = "awesome-vim-colorschemes";
110− rev = "21d1c93da95d58bead99f3226f9447f5b035afe1";
111− sha256 = "1niwwyxgq7k7mbi05lnpz12lbmn9mam9x4qvzxcbvxsqqp2zzsj8";
124+ rev = "680930f34bf5d4007dbaee66aba2dd688cbb3098";
125+ sha256 = "0jk4fm2ivf6r91yra7ddyxfbh2swf315zvmrm5ym605xcsiwv0nw";
112126 };
113127 };
114128
115129 base16-vim = buildVimPluginFrom2Nix {
116− name = "base16-vim-2018-11-30";
130+ pname = "base16-vim";
131+ version = "2018-11-30";
117132 src = fetchFromGitHub {
118133 owner = "chriskempson";
119134 repo = "base16-vim";
@@ -123,7 +138,8 @@
123138 };
124139
125140 bats-vim = buildVimPluginFrom2Nix {
126− name = "bats-vim-2013-07-03";
141+ pname = "bats-vim";
142+ version = "2013-07-03";
127143 src = fetchFromGitHub {
128144 owner = "vim-scripts";
129145 repo = "bats.vim";
@@ -133,7 +149,8 @@
133149 };
134150
135151 calendar-vim = buildVimPluginFrom2Nix {
136− name = "calendar-vim-2018-11-02";
152+ pname = "calendar-vim";
153+ version = "2018-11-02";
137154 src = fetchFromGitHub {
138155 owner = "itchyny";
139156 repo = "calendar.vim";
@@ -143,17 +160,19 @@
143160 };
144161
145162 caw-vim = buildVimPluginFrom2Nix {
146− name = "caw-vim-2018-11-07";
163+ pname = "caw-vim";
164+ version = "2018-12-25";
147165 src = fetchFromGitHub {
148166 owner = "tyru";
149167 repo = "caw.vim";
150− rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
151− sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
168+ rev = "98805a60aef339e55e5b917fdb9f69c74e8d8340";
169+ sha256 = "0nn3dg3lnbnfwgvxpjbalw9ff876798jrzlkrnzqkvrwxv6k7ks5";
152170 };
153171 };
154172
155173 changeColorScheme-vim = buildVimPluginFrom2Nix {
156− name = "changeColorScheme-vim-2010-10-18";
174+ pname = "changeColorScheme-vim";
175+ version = "2010-10-18";
157176 src = fetchFromGitHub {
158177 owner = "vim-scripts";
159178 repo = "changeColorScheme.vim";
@@ -163,7 +182,8 @@
163182 };
164183
165184 CheckAttach = buildVimPluginFrom2Nix {
166− name = "CheckAttach-2018-09-02";
185+ pname = "CheckAttach";
186+ version = "2018-09-02";
167187 src = fetchFromGitHub {
168188 owner = "chrisbra";
169189 repo = "CheckAttach";
@@ -173,7 +193,8 @@
173193 };
174194
175195 clang_complete = buildVimPluginFrom2Nix {
176− name = "clang_complete-2018-09-19";
196+ pname = "clang_complete";
197+ version = "2018-09-19";
177198 src = fetchFromGitHub {
178199 owner = "Rip-Rip";
179200 repo = "clang_complete";
@@ -183,7 +204,8 @@
183204 };
184205
185206 clighter8 = buildVimPluginFrom2Nix {
186− name = "clighter8-2018-07-25";
207+ pname = "clighter8";
208+ version = "2018-07-25";
187209 src = fetchFromGitHub {
188210 owner = "bbchung";
189211 repo = "clighter8";
@@ -193,7 +215,8 @@
193215 };
194216
195217 Colour-Sampler-Pack = buildVimPluginFrom2Nix {
196− name = "Colour-Sampler-Pack-2012-11-30";
218+ pname = "Colour-Sampler-Pack";
219+ version = "2012-11-30";
197220 src = fetchFromGitHub {
198221 owner = "vim-scripts";
199222 repo = "Colour-Sampler-Pack";
@@ -203,7 +226,8 @@
203226 };
204227
205228 command-t = buildVimPluginFrom2Nix {
206− name = "command-t-2018-09-19";
229+ pname = "command-t";
230+ version = "2018-09-19";
207231 src = fetchFromGitHub {
208232 owner = "wincent";
209233 repo = "command-t";
@@ -214,7 +238,8 @@
214238 };
215239
216240 committia-vim = buildVimPluginFrom2Nix {
217− name = "committia-vim-2018-10-23";
241+ pname = "committia-vim";
242+ version = "2018-10-23";
218243 src = fetchFromGitHub {
219244 owner = "rhysd";
220245 repo = "committia.vim";
@@ -224,7 +249,8 @@
224249 };
225250
226251 concealedyank-vim = buildVimPluginFrom2Nix {
227− name = "concealedyank-vim-2013-03-24";
252+ pname = "concealedyank-vim";
253+ version = "2013-03-24";
228254 src = fetchFromGitHub {
229255 owner = "chikatoike";
230256 repo = "concealedyank.vim";
@@ -234,7 +260,8 @@
234260 };
235261
236262 context_filetype-vim = buildVimPluginFrom2Nix {
237− name = "context_filetype-vim-2018-08-30";
263+ pname = "context_filetype-vim";
264+ version = "2018-08-30";
238265 src = fetchFromGitHub {
239266 owner = "Shougo";
240267 repo = "context_filetype.vim";
@@ -244,7 +271,8 @@
244271 };
245272
246273 cosco-vim = buildVimPluginFrom2Nix {
247− name = "cosco-vim-2018-08-07";
274+ pname = "cosco-vim";
275+ version = "2018-08-07";
248276 src = fetchFromGitHub {
249277 owner = "lfilho";
250278 repo = "cosco.vim";
@@ -254,7 +282,8 @@
254282 };
255283
256284 cpsm = buildVimPluginFrom2Nix {
257− name = "cpsm-2018-09-08";
285+ pname = "cpsm";
286+ version = "2018-09-08";
258287 src = fetchFromGitHub {
259288 owner = "nixprime";
260289 repo = "cpsm";
@@ -264,7 +293,8 @@
264293 };
265294
266295 csapprox = buildVimPluginFrom2Nix {
267− name = "csapprox-2013-07-27";
296+ pname = "csapprox";
297+ version = "2013-07-27";
268298 src = fetchFromGitHub {
269299 owner = "godlygeek";
270300 repo = "csapprox";
@@ -274,7 +304,8 @@
274304 };
275305
276306 csv-vim = buildVimPluginFrom2Nix {
277− name = "csv-vim-2018-10-04";
307+ pname = "csv-vim";
308+ version = "2018-10-04";
278309 src = fetchFromGitHub {
279310 owner = "chrisbra";
280311 repo = "csv.vim";
@@ -284,7 +315,8 @@
284315 };
285316
286317 ctrlp-cmatcher = buildVimPluginFrom2Nix {
287− name = "ctrlp-cmatcher-2015-10-15";
318+ pname = "ctrlp-cmatcher";
319+ version = "2015-10-15";
288320 src = fetchFromGitHub {
289321 owner = "JazzCore";
290322 repo = "ctrlp-cmatcher";
@@ -294,7 +326,8 @@
294326 };
295327
296328 ctrlp-py-matcher = buildVimPluginFrom2Nix {
297− name = "ctrlp-py-matcher-2017-11-01";
329+ pname = "ctrlp-py-matcher";
330+ version = "2017-11-01";
298331 src = fetchFromGitHub {
299332 owner = "FelikZ";
300333 repo = "ctrlp-py-matcher";
@@ -304,7 +337,8 @@
304337 };
305338
306339 ctrlp-z = buildVimPluginFrom2Nix {
307− name = "ctrlp-z-2015-10-17";
340+ pname = "ctrlp-z";
341+ version = "2015-10-17";
308342 src = fetchFromGitHub {
309343 owner = "amiorin";
310344 repo = "ctrlp-z";
@@ -314,7 +348,8 @@
314348 };
315349
316350 ctrlp-vim = buildVimPluginFrom2Nix {
317− name = "ctrlp-vim-2018-11-22";
351+ pname = "ctrlp-vim";
352+ version = "2018-11-22";
318353 src = fetchFromGitHub {
319354 owner = "ctrlpvim";
320355 repo = "ctrlp.vim";
@@ -324,7 +359,8 @@
324359 };
325360
326361 denite-extra = buildVimPluginFrom2Nix {
327− name = "denite-extra-2018-09-20";
362+ pname = "denite-extra";
363+ version = "2018-09-20";
328364 src = fetchFromGitHub {
329365 owner = "chemzqm";
330366 repo = "denite-extra";
@@ -334,7 +370,8 @@
334370 };
335371
336372 denite-git = buildVimPluginFrom2Nix {
337− name = "denite-git-2018-07-19";
373+ pname = "denite-git";
374+ version = "2018-07-19";
338375 src = fetchFromGitHub {
339376 owner = "chemzqm";
340377 repo = "denite-git";
@@ -344,38 +381,42 @@
344381 };
345382
346383 denite-nvim = buildVimPluginFrom2Nix {
347− name = "denite-nvim-2018-12-11";
384+ pname = "denite-nvim";
385+ version = "2018-12-24";
348386 src = fetchFromGitHub {
349387 owner = "Shougo";
350388 repo = "denite.nvim";
351− rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17";
352− sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al";
389+ rev = "f20cd55d249712dd4d5ab7c2b9d8b7f0005c6290";
390+ sha256 = "0g31p4n1hvl0vxn7gczbkfs6bvfhabmyfggcc5sfsd27chf49q43";
353391 };
354392 };
355393
356394 deol-nvim = buildVimPluginFrom2Nix {
357− name = "deol-nvim-2018-10-12";
395+ pname = "deol-nvim";
396+ version = "2018-12-25";
358397 src = fetchFromGitHub {
359398 owner = "Shougo";
360399 repo = "deol.nvim";
361− rev = "04a5295ebad2df1a2141b85dc0b78cc51ea86fb4";
362− sha256 = "1v5qip8kzrsq8qmmjrvhm15d9wrn48iz2s62qddcgvc0sdzk1y64";
400+ rev = "04afcdd5f63153fe14795d1141fae1eb2bb5be42";
401+ sha256 = "1pqxscisx2rymn13z7k988n5bskbi00g3hsy711bnjnazq1wdzib";
363402 };
364403 };
365404
366405 deoplete-clang = buildVimPluginFrom2Nix {
367− name = "deoplete-clang-2018-07-01";
406+ pname = "deoplete-clang";
407+ version = "2018-12-24";
368408 src = fetchFromGitHub {
369409 owner = "zchee";
370410 repo = "deoplete-clang";
371− rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97";
372− sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i";
411+ rev = "3353ddfb956841c4d0e5a43db5184504a62c066f";
412+ sha256 = "07qhv2lqx4k27fhd4zhxpg0l9s8r83q5147sfh9knpbyawg5hw3i";
373413 fetchSubmodules = true;
374414 };
375415 };
376416
377417 deoplete-go = buildVimPluginFrom2Nix {
378− name = "deoplete-go-2018-11-23";
418+ pname = "deoplete-go";
419+ version = "2018-11-23";
379420 src = fetchFromGitHub {
380421 owner = "zchee";
381422 repo = "deoplete-go";
@@ -386,18 +427,20 @@
386427 };
387428
388429 deoplete-jedi = buildVimPluginFrom2Nix {
389− name = "deoplete-jedi-2018-12-03";
430+ pname = "deoplete-jedi";
431+ version = "2018-12-24";
390432 src = fetchFromGitHub {
391433 owner = "zchee";
392434 repo = "deoplete-jedi";
393− rev = "583ee29a0a0fe6206f3f106b8866ff2b663fde74";
394− sha256 = "0lbiwk6fc1z9i3sx4y62gsl3yr8pzv09s4wwxq1k8cziddbiypig";
435+ rev = "73c11875fbfaabf6c0b455596cb3f9dfe5d86595";
436+ sha256 = "0xaa56d4scihzz2cwg9zqkv36jwpivnska936z9wq0fpr253yzxc";
395437 fetchSubmodules = true;
396438 };
397439 };
398440
399441 deoplete-julia = buildVimPluginFrom2Nix {
400− name = "deoplete-julia-2018-06-11";
442+ pname = "deoplete-julia";
443+ version = "2018-06-11";
401444 src = fetchFromGitHub {
402445 owner = "JuliaEditorSupport";
403446 repo = "deoplete-julia";
@@ -407,7 +450,8 @@
407450 };
408451
409452 deoplete-rust = buildVimPluginFrom2Nix {
410− name = "deoplete-rust-2017-07-18";
453+ pname = "deoplete-rust";
454+ version = "2017-07-18";
411455 src = fetchFromGitHub {
412456 owner = "sebastianmarkow";
413457 repo = "deoplete-rust";
@@ -417,7 +461,8 @@
417461 };
418462
419463 deoplete-ternjs = buildVimPluginFrom2Nix {
420− name = "deoplete-ternjs-2018-11-29";
464+ pname = "deoplete-ternjs";
465+ version = "2018-11-29";
421466 src = fetchFromGitHub {
422467 owner = "carlitux";
423468 repo = "deoplete-ternjs";
@@ -427,27 +472,30 @@
427472 };
428473
429474 deoplete-nvim = buildVimPluginFrom2Nix {
430− name = "deoplete-nvim-2018-12-11";
475+ pname = "deoplete-nvim";
476+ version = "2018-12-26";
431477 src = fetchFromGitHub {
432478 owner = "Shougo";
433479 repo = "deoplete.nvim";
434− rev = "04159b053ae83933d67225c53c36d98e516fa729";
435− sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115";
480+ rev = "ec014e3a8d53b7bbc8a3906013975157d09936a1";
481+ sha256 = "06z2d552jf7vhmk0dh8my38bmrnfrzqggbs2dyzvqlx3hxrwm14h";
436482 };
437483 };
438484
439485 dhall-vim = buildVimPluginFrom2Nix {
440− name = "dhall-vim-2018-12-12";
486+ pname = "dhall-vim";
487+ version = "2018-12-26";
441488 src = fetchFromGitHub {
442489 owner = "vmchale";
443490 repo = "dhall-vim";
444− rev = "ef31cfee6d8c555d44d282e4cec1367512ad7fe9";
445− sha256 = "0r7y614xld5spgpa4c8ms4rm1p8xzsayp91j4jiqhxn6ly6igv7f";
491+ rev = "54a0f463d098abf72c76a233a6a3f0f9dd069dfe";
492+ sha256 = "0yacjv7kv79yilsyij43m378shzln0qra5c3nc5g2mc2i9hxcial";
446493 };
447494 };
448495
449496 direnv-vim = buildVimPluginFrom2Nix {
450− name = "direnv-vim-2018-11-10";
497+ pname = "direnv-vim";
498+ version = "2018-11-10";
451499 src = fetchFromGitHub {
452500 owner = "direnv";
453501 repo = "direnv.vim";
@@ -457,7 +505,8 @@
457505 };
458506
459507 echodoc-vim = buildVimPluginFrom2Nix {
460− name = "echodoc-vim-2018-12-09";
508+ pname = "echodoc-vim";
509+ version = "2018-12-09";
461510 src = fetchFromGitHub {
462511 owner = "Shougo";
463512 repo = "echodoc.vim";
@@ -467,7 +516,8 @@
467516 };
468517
469518 editorconfig-vim = buildVimPluginFrom2Nix {
470− name = "editorconfig-vim-2018-11-15";
519+ pname = "editorconfig-vim";
520+ version = "2018-11-15";
471521 src = fetchFromGitHub {
472522 owner = "editorconfig";
473523 repo = "editorconfig-vim";
@@ -478,7 +528,8 @@
478528 };
479529
480530 elm-vim = buildVimPluginFrom2Nix {
481− name = "elm-vim-2018-11-13";
531+ pname = "elm-vim";
532+ version = "2018-11-13";
482533 src = fetchFromGitHub {
483534 owner = "elmcast";
484535 repo = "elm-vim";
@@ -488,7 +539,8 @@
488539 };
489540
490541 emmet-vim = buildVimPluginFrom2Nix {
491− name = "emmet-vim-2018-11-29";
542+ pname = "emmet-vim";
543+ version = "2018-11-29";
492544 src = fetchFromGitHub {
493545 owner = "mattn";
494546 repo = "emmet-vim";
@@ -499,7 +551,8 @@
499551 };
500552
501553 ensime-vim = buildVimPluginFrom2Nix {
502− name = "ensime-vim-2018-10-10";
554+ pname = "ensime-vim";
555+ version = "2018-10-10";
503556 src = fetchFromGitHub {
504557 owner = "ensime";
505558 repo = "ensime-vim";
@@ -509,17 +562,19 @@
509562 };
510563
511564 falcon = buildVimPluginFrom2Nix {
512− name = "falcon-2018-11-30";
565+ pname = "falcon";
566+ version = "2018-12-21";
513567 src = fetchFromGitHub {
514568 owner = "fenetikm";
515569 repo = "falcon";
516− rev = "070f2132266d85059f36496ed277527d5b8f00a1";
517− sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
570+ rev = "92489daf912f33c743fb07b170a563aa53a8a0a6";
571+ sha256 = "1a3yahjvp98icfv6a6d0z0v70rb9i0580iik2jjbcdmbri5jbnj2";
518572 };
519573 };
520574
521575 fastfold = buildVimPluginFrom2Nix {
522− name = "fastfold-2018-09-24";
576+ pname = "fastfold";
577+ version = "2018-09-24";
523578 src = fetchFromGitHub {
524579 owner = "konfekt";
525580 repo = "fastfold";
@@ -529,17 +584,19 @@
529584 };
530585
531586 ferret = buildVimPluginFrom2Nix {
532− name = "ferret-2018-12-04";
587+ pname = "ferret";
588+ version = "2018-12-25";
533589 src = fetchFromGitHub {
534590 owner = "wincent";
535591 repo = "ferret";
536− rev = "fbef13c37f0083ecbcec131c2a8f62079f3cdacb";
537− sha256 = "1ajrwg5fg3myhazsdfprlj50qlw25jk1viy1cny6mzhbvmb80qln";
592+ rev = "890a01f85a5ac50ad16f151aacd828b31cbe6889";
593+ sha256 = "0882mxa5n1cbvq4vzxnv2d5id3lxbv23anjrilbnkklgk1i5fq47";
538594 };
539595 };
540596
541597 flake8-vim = buildVimPluginFrom2Nix {
542− name = "flake8-vim-2017-02-17";
598+ pname = "flake8-vim";
599+ version = "2017-02-17";
543600 src = fetchFromGitHub {
544601 owner = "andviro";
545602 repo = "flake8-vim";
@@ -550,7 +607,8 @@
550607 };
551608
552609 floobits-neovim = buildVimPluginFrom2Nix {
553− name = "floobits-neovim-2018-08-01";
610+ pname = "floobits-neovim";
611+ version = "2018-08-01";
554612 src = fetchFromGitHub {
555613 owner = "floobits";
556614 repo = "floobits-neovim";
@@ -560,7 +618,8 @@
560618 };
561619
562620 forms = buildVimPluginFrom2Nix {
563− name = "forms-2012-11-28";
621+ pname = "forms";
622+ version = "2012-11-28";
564623 src = fetchFromGitHub {
565624 owner = "megaannum";
566625 repo = "forms";
@@ -570,7 +629,8 @@
570629 };
571630
572631 fugitive-gitlab-vim = buildVimPluginFrom2Nix {
573− name = "fugitive-gitlab-vim-2018-07-04";
632+ pname = "fugitive-gitlab-vim";
633+ version = "2018-07-04";
574634 src = fetchFromGitHub {
575635 owner = "shumphrey";
576636 repo = "fugitive-gitlab.vim";
@@ -580,7 +640,8 @@
580640 };
581641
582642 fzf-vim = buildVimPluginFrom2Nix {
583− name = "fzf-vim-2018-12-11";
643+ pname = "fzf-vim";
644+ version = "2018-12-11";
584645 src = fetchFromGitHub {
585646 owner = "junegunn";
586647 repo = "fzf.vim";
@@ -590,7 +651,8 @@
590651 };
591652
592653 ghcmod-vim = buildVimPluginFrom2Nix {
593− name = "ghcmod-vim-2016-06-19";
654+ pname = "ghcmod-vim";
655+ version = "2016-06-19";
594656 src = fetchFromGitHub {
595657 owner = "eagletmt";
596658 repo = "ghcmod-vim";
@@ -600,7 +662,8 @@
600662 };
601663
602664 gist-vim = buildVimPluginFrom2Nix {
603− name = "gist-vim-2018-11-09";
665+ pname = "gist-vim";
666+ version = "2018-11-09";
604667 src = fetchFromGitHub {
605668 owner = "mattn";
606669 repo = "gist-vim";
@@ -610,7 +673,8 @@
610673 };
611674
612675 gitv = buildVimPluginFrom2Nix {
613− name = "gitv-2018-11-24";
676+ pname = "gitv";
677+ version = "2018-11-24";
614678 src = fetchFromGitHub {
615679 owner = "gregsexton";
616680 repo = "gitv";
@@ -620,7 +684,8 @@
620684 };
621685
622686 goyo-vim = buildVimPluginFrom2Nix {
623− name = "goyo-vim-2017-05-31";
687+ pname = "goyo-vim";
688+ version = "2017-05-31";
624689 src = fetchFromGitHub {
625690 owner = "junegunn";
626691 repo = "goyo.vim";
@@ -630,7 +695,8 @@
630695 };
631696
632697 gruvbox = buildVimPluginFrom2Nix {
633− name = "gruvbox-2018-02-25";
698+ pname = "gruvbox";
699+ version = "2018-02-25";
634700 src = fetchFromGitHub {
635701 owner = "morhetz";
636702 repo = "gruvbox";
@@ -640,7 +706,8 @@
640706 };
641707
642708 gundo-vim = buildVimPluginFrom2Nix {
643− name = "gundo-vim-2017-05-09";
709+ pname = "gundo-vim";
710+ version = "2017-05-09";
644711 src = fetchFromGitHub {
645712 owner = "sjl";
646713 repo = "gundo.vim";
@@ -650,7 +717,8 @@
650717 };
651718
652719 haskell-vim = buildVimPluginFrom2Nix {
653− name = "haskell-vim-2018-05-22";
720+ pname = "haskell-vim";
721+ version = "2018-05-22";
654722 src = fetchFromGitHub {
655723 owner = "neovimhaskell";
656724 repo = "haskell-vim";
@@ -660,7 +728,8 @@
660728 };
661729
662730 hasksyn = buildVimPluginFrom2Nix {
663− name = "hasksyn-2014-09-04";
731+ pname = "hasksyn";
732+ version = "2014-09-04";
664733 src = fetchFromGitHub {
665734 owner = "travitch";
666735 repo = "hasksyn";
@@ -670,7 +739,8 @@
670739 };
671740
672741 hlint-refactor-vim = buildVimPluginFrom2Nix {
673− name = "hlint-refactor-vim-2015-12-05";
742+ pname = "hlint-refactor-vim";
743+ version = "2015-12-05";
674744 src = fetchFromGitHub {
675745 owner = "mpickering";
676746 repo = "hlint-refactor-vim";
@@ -680,7 +750,8 @@
680750 };
681751
682752 iceberg-vim = buildVimPluginFrom2Nix {
683− name = "iceberg-vim-2018-10-17";
753+ pname = "iceberg-vim";
754+ version = "2018-10-17";
684755 src = fetchFromGitHub {
685756 owner = "cocopon";
686757 repo = "iceberg.vim";
@@ -690,7 +761,8 @@
690761 };
691762
692763 idris-vim = buildVimPluginFrom2Nix {
693− name = "idris-vim-2017-12-04";
764+ pname = "idris-vim";
765+ version = "2017-12-04";
694766 src = fetchFromGitHub {
695767 owner = "idris-hackers";
696768 repo = "idris-vim";
@@ -700,7 +772,8 @@
700772 };
701773
702774 Improved-AnsiEsc = buildVimPluginFrom2Nix {
703− name = "Improved-AnsiEsc-2015-08-26";
775+ pname = "Improved-AnsiEsc";
776+ version = "2015-08-26";
704777 src = fetchFromGitHub {
705778 owner = "vim-scripts";
706779 repo = "Improved-AnsiEsc";
@@ -710,7 +783,8 @@
710783 };
711784
712785 incsearch-easymotion-vim = buildVimPluginFrom2Nix {
713− name = "incsearch-easymotion-vim-2016-01-18";
786+ pname = "incsearch-easymotion-vim";
787+ version = "2016-01-18";
714788 src = fetchFromGitHub {
715789 owner = "haya14busa";
716790 repo = "incsearch-easymotion.vim";
@@ -720,7 +794,8 @@
720794 };
721795
722796 incsearch-vim = buildVimPluginFrom2Nix {
723− name = "incsearch-vim-2017-11-24";
797+ pname = "incsearch-vim";
798+ version = "2017-11-24";
724799 src = fetchFromGitHub {
725800 owner = "haya14busa";
726801 repo = "incsearch.vim";
@@ -730,7 +805,8 @@
730805 };
731806
732807 intero-neovim = buildVimPluginFrom2Nix {
733− name = "intero-neovim-2018-08-07";
808+ pname = "intero-neovim";
809+ version = "2018-08-07";
734810 src = fetchFromGitHub {
735811 owner = "parsonsmatt";
736812 repo = "intero-neovim";
@@ -740,7 +816,8 @@
740816 };
741817
742818 iosvkem = buildVimPluginFrom2Nix {
743− name = "iosvkem-2018-08-26";
819+ pname = "iosvkem";
820+ version = "2018-08-26";
744821 src = fetchFromGitHub {
745822 owner = "neutaaaaan";
746823 repo = "iosvkem";
@@ -750,7 +827,8 @@
750827 };
751828
752829 jedi-vim = buildVimPluginFrom2Nix {
753− name = "jedi-vim-2018-12-03";
830+ pname = "jedi-vim";
831+ version = "2018-12-03";
754832 src = fetchFromGitHub {
755833 owner = "davidhalter";
756834 repo = "jedi-vim";
@@ -761,7 +839,8 @@
761839 };
762840
763841 Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
764− name = "Jenkinsfile-vim-syntax-2018-11-25";
842+ pname = "Jenkinsfile-vim-syntax";
843+ version = "2018-11-25";
765844 src = fetchFromGitHub {
766845 owner = "martinda";
767846 repo = "Jenkinsfile-vim-syntax";
@@ -771,7 +850,8 @@
771850 };
772851
773852 julia-vim = buildVimPluginFrom2Nix {
774− name = "julia-vim-2018-12-11";
853+ pname = "julia-vim";
854+ version = "2018-12-11";
775855 src = fetchFromGitHub {
776856 owner = "JuliaEditorSupport";
777857 repo = "julia-vim";
@@ -781,7 +861,8 @@
781861 };
782862
783863 last256 = buildVimPluginFrom2Nix {
784− name = "last256-2017-06-10";
864+ pname = "last256";
865+ version = "2017-06-10";
785866 src = fetchFromGitHub {
786867 owner = "sk1418";
787868 repo = "last256";
@@ -791,7 +872,8 @@
791872 };
792873
793874 latex-box = buildVimPluginFrom2Nix {
794− name = "latex-box-2015-06-01";
875+ pname = "latex-box";
876+ version = "2015-06-01";
795877 src = fetchFromGitHub {
796878 owner = "latex-box-team";
797879 repo = "latex-box";
@@ -801,7 +883,8 @@
801883 };
802884
803885 lightline-vim = buildVimPluginFrom2Nix {
804− name = "lightline-vim-2018-12-12";
886+ pname = "lightline-vim";
887+ version = "2018-12-12";
805888 src = fetchFromGitHub {
806889 owner = "itchyny";
807890 repo = "lightline.vim";
@@ -811,7 +894,8 @@
811894 };
812895
813896 limelight-vim = buildVimPluginFrom2Nix {
814− name = "limelight-vim-2016-06-23";
897+ pname = "limelight-vim";
898+ version = "2016-06-23";
815899 src = fetchFromGitHub {
816900 owner = "junegunn";
817901 repo = "limelight.vim";
@@ -821,7 +905,8 @@
821905 };
822906
823907 lushtags = buildVimPluginFrom2Nix {
824− name = "lushtags-2017-04-19";
908+ pname = "lushtags";
909+ version = "2017-04-19";
825910 src = fetchFromGitHub {
826911 owner = "mkasa";
827912 repo = "lushtags";
@@ -831,7 +916,8 @@
831916 };
832917
833918 matchit-zip = buildVimPluginFrom2Nix {
834− name = "matchit-zip-2010-10-18";
919+ pname = "matchit-zip";
920+ version = "2010-10-18";
835921 src = fetchFromGitHub {
836922 owner = "vim-scripts";
837923 repo = "matchit.zip";
@@ -841,7 +927,8 @@
841927 };
842928
843929 mayansmoke = buildVimPluginFrom2Nix {
844− name = "mayansmoke-2010-10-18";
930+ pname = "mayansmoke";
931+ version = "2010-10-18";
845932 src = fetchFromGitHub {
846933 owner = "vim-scripts";
847934 repo = "mayansmoke";
@@ -851,7 +938,8 @@
851938 };
852939
853940 molokai = buildVimPluginFrom2Nix {
854− name = "molokai-2015-11-11";
941+ pname = "molokai";
942+ version = "2015-11-11";
855943 src = fetchFromGitHub {
856944 owner = "tomasr";
857945 repo = "molokai";
@@ -861,17 +949,19 @@
861949 };
862950
863951 ncm2 = buildVimPluginFrom2Nix {
864− name = "ncm2-2018-12-08";
952+ pname = "ncm2";
953+ version = "2018-12-27";
865954 src = fetchFromGitHub {
866955 owner = "ncm2";
867956 repo = "ncm2";
868− rev = "40d1eb9b52805e0e81bbaac4bb87788007ad19de";
869− sha256 = "1awbzm3vgp31afjlbagxjzzxxgwmy2axhnyhcal7x1rk93cr78iw";
957+ rev = "3b2749be3bb039ce0df34bca2eea4d6cdfe95caa";
958+ sha256 = "152fyvkksqkzkcrr2lj9w26v46b0n9pzia10adbka0jx9ppnsv0k";
870959 };
871960 };
872961
873962 ncm2-bufword = buildVimPluginFrom2Nix {
874− name = "ncm2-bufword-2018-12-06";
963+ pname = "ncm2-bufword";
964+ version = "2018-12-06";
875965 src = fetchFromGitHub {
876966 owner = "ncm2";
877967 repo = "ncm2-bufword";
@@ -880,8 +970,20 @@
880970 };
881971 };
882972
973+ ncm2-jedi = buildVimPluginFrom2Nix {
974+ pname = "ncm2-jedi";
975+ version = "2018-07-18";
976+ src = fetchFromGitHub {
977+ owner = "ncm2";
978+ repo = "ncm2-jedi";
979+ rev = "0418d5ca8d4fe6996500eb04517a946f7de83d34";
980+ sha256 = "1rbwxsycrn3nis9mj08k70hb174z7cw9p610r6nd8lv4zk1h341z";
981+ };
982+ };
983+
883984 ncm2-path = buildVimPluginFrom2Nix {
884− name = "ncm2-path-2018-09-12";
985+ pname = "ncm2-path";
986+ version = "2018-09-12";
885987 src = fetchFromGitHub {
886988 owner = "ncm2";
887989 repo = "ncm2-path";
@@ -891,7 +993,8 @@
891993 };
892994
893995 ncm2-tmux = buildVimPluginFrom2Nix {
894− name = "ncm2-tmux-2018-12-06";
996+ pname = "ncm2-tmux";
997+ version = "2018-12-06";
895998 src = fetchFromGitHub {
896999 owner = "ncm2";
8971000 repo = "ncm2-tmux";
@@ -901,7 +1004,8 @@
9011004 };
9021005
9031006 ncm2-ultisnips = buildVimPluginFrom2Nix {
904− name = "ncm2-ultisnips-2018-08-01";
1007+ pname = "ncm2-ultisnips";
1008+ version = "2018-08-01";
9051009 src = fetchFromGitHub {
9061010 owner = "ncm2";
9071011 repo = "ncm2-ultisnips";
@@ -911,7 +1015,8 @@
9111015 };
9121016
9131017 neco-ghc = buildVimPluginFrom2Nix {
914− name = "neco-ghc-2018-05-13";
1018+ pname = "neco-ghc";
1019+ version = "2018-05-13";
9151020 src = fetchFromGitHub {
9161021 owner = "eagletmt";
9171022 repo = "neco-ghc";
@@ -921,7 +1026,8 @@
9211026 };
9221027
9231028 neco-look = buildVimPluginFrom2Nix {
924− name = "neco-look-2018-11-09";
1029+ pname = "neco-look";
1030+ version = "2018-11-09";
9251031 src = fetchFromGitHub {
9261032 owner = "ujihisa";
9271033 repo = "neco-look";
@@ -931,7 +1037,8 @@
9311037 };
9321038
9331039 neco-syntax = buildVimPluginFrom2Nix {
934− name = "neco-syntax-2017-10-01";
1040+ pname = "neco-syntax";
1041+ version = "2017-10-01";
9351042 src = fetchFromGitHub {
9361043 owner = "Shougo";
9371044 repo = "neco-syntax";
@@ -941,7 +1048,8 @@
9411048 };
9421049
9431050 neco-vim = buildVimPluginFrom2Nix {
944− name = "neco-vim-2018-10-30";
1051+ pname = "neco-vim";
1052+ version = "2018-10-30";
9451053 src = fetchFromGitHub {
9461054 owner = "Shougo";
9471055 repo = "neco-vim";
@@ -951,7 +1059,8 @@
9511059 };
9521060
9531061 neocomplete-vim = buildVimPluginFrom2Nix {
954− name = "neocomplete-vim-2018-11-19";
1062+ pname = "neocomplete-vim";
1063+ version = "2018-11-19";
9551064 src = fetchFromGitHub {
9561065 owner = "Shougo";
9571066 repo = "neocomplete.vim";
@@ -961,7 +1070,8 @@
9611070 };
9621071
9631072 neodark-vim = buildVimPluginFrom2Nix {
964− name = "neodark-vim-2018-10-17";
1073+ pname = "neodark-vim";
1074+ version = "2018-10-17";
9651075 src = fetchFromGitHub {
9661076 owner = "KeitaNakamura";
9671077 repo = "neodark.vim";
@@ -971,17 +1081,19 @@
9711081 };
9721082
9731083 neoformat = buildVimPluginFrom2Nix {
974− name = "neoformat-2018-09-22";
1084+ pname = "neoformat";
1085+ version = "2018-12-21";
9751086 src = fetchFromGitHub {
9761087 owner = "sbdchd";
9771088 repo = "neoformat";
978− rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07";
979− sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw";
1089+ rev = "fec5be9e3ee10d8311fb78944fdaa8547480f3d9";
1090+ sha256 = "0wzw59pw22gqd9db6j1yvyz5l2xvrcw3gwjcg03pys9ynwd0vcjs";
9801091 };
9811092 };
9821093
9831094 neoinclude-vim = buildVimPluginFrom2Nix {
984− name = "neoinclude-vim-2018-05-21";
1095+ pname = "neoinclude-vim";
1096+ version = "2018-05-21";
9851097 src = fetchFromGitHub {
9861098 owner = "Shougo";
9871099 repo = "neoinclude.vim";
@@ -991,17 +1103,19 @@
9911103 };
9921104
9931105 neomake = buildVimPluginFrom2Nix {
994− name = "neomake-2018-12-15";
1106+ pname = "neomake";
1107+ version = "2018-12-27";
9951108 src = fetchFromGitHub {
9961109 owner = "benekastah";
9971110 repo = "neomake";
998− rev = "b84769baf9f04e1018ca16bb5d22287500c25e43";
999− sha256 = "0wfh0332yczq42pr2fyv5bv3ryf09021n1nsfrgiyrcy00k62r4j";
1111+ rev = "27eef4e95ca18c6b4c01a779b49446b4ddcbe314";
1112+ sha256 = "038a8ja5rwm6cx804vqzp85gklyfw3gc7d79snc94g8jj6ply6w5";
10001113 };
10011114 };
10021115
10031116 neomru-vim = buildVimPluginFrom2Nix {
1004− name = "neomru-vim-2018-11-29";
1117+ pname = "neomru-vim";
1118+ version = "2018-11-29";
10051119 src = fetchFromGitHub {
10061120 owner = "Shougo";
10071121 repo = "neomru.vim";
@@ -1011,7 +1125,8 @@
10111125 };
10121126
10131127 neosnippet-snippets = buildVimPluginFrom2Nix {
1014− name = "neosnippet-snippets-2018-09-30";
1128+ pname = "neosnippet-snippets";
1129+ version = "2018-09-30";
10151130 src = fetchFromGitHub {
10161131 owner = "Shougo";
10171132 repo = "neosnippet-snippets";
@@ -1021,7 +1136,8 @@
10211136 };
10221137
10231138 neosnippet-vim = buildVimPluginFrom2Nix {
1024− name = "neosnippet-vim-2018-12-03";
1139+ pname = "neosnippet-vim";
1140+ version = "2018-12-03";
10251141 src = fetchFromGitHub {
10261142 owner = "Shougo";
10271143 repo = "neosnippet.vim";
@@ -1031,7 +1147,8 @@
10311147 };
10321148
10331149 neovim-sensible = buildVimPluginFrom2Nix {
1034− name = "neovim-sensible-2017-09-20";
1150+ pname = "neovim-sensible";
1151+ version = "2017-09-20";
10351152 src = fetchFromGitHub {
10361153 owner = "jeffkreeftmeijer";
10371154 repo = "neovim-sensible";
@@ -1041,7 +1158,8 @@
10411158 };
10421159
10431160 neoyank-vim = buildVimPluginFrom2Nix {
1044− name = "neoyank-vim-2018-12-03";
1161+ pname = "neoyank-vim";
1162+ version = "2018-12-03";
10451163 src = fetchFromGitHub {
10461164 owner = "Shougo";
10471165 repo = "neoyank.vim";
@@ -1051,17 +1169,19 @@
10511169 };
10521170
10531171 nerdcommenter = buildVimPluginFrom2Nix {
1054− name = "nerdcommenter-2018-12-03";
1172+ pname = "nerdcommenter";
1173+ version = "2018-12-26";
10551174 src = fetchFromGitHub {
10561175 owner = "scrooloose";
10571176 repo = "nerdcommenter";
1058− rev = "d24868bc85de599ee2424ca93aa5f6991bd3128c";
1059− sha256 = "1xrnngrn537757as4jfiaamjq7yymgh8cdbciiwpc6a2qpiscmdb";
1177+ rev = "371e4d0e099abb86a3016fefd1efae28a4e13856";
1178+ sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg";
10601179 };
10611180 };
10621181
10631182 nerdtree = buildVimPluginFrom2Nix {
1064− name = "nerdtree-2018-12-12";
1183+ pname = "nerdtree";
1184+ version = "2018-12-12";
10651185 src = fetchFromGitHub {
10661186 owner = "scrooloose";
10671187 repo = "nerdtree";
@@ -1071,7 +1191,8 @@
10711191 };
10721192
10731193 nerdtree-git-plugin = buildVimPluginFrom2Nix {
1074− name = "nerdtree-git-plugin-2018-11-15";
1194+ pname = "nerdtree-git-plugin";
1195+ version = "2018-11-15";
10751196 src = fetchFromGitHub {
10761197 owner = "albfan";
10771198 repo = "nerdtree-git-plugin";
@@ -1081,17 +1202,19 @@
10811202 };
10821203
10831204 nim-vim = buildVimPluginFrom2Nix {
1084− name = "nim-vim-2018-12-13";
1205+ pname = "nim-vim";
1206+ version = "2018-12-16";
10851207 src = fetchFromGitHub {
10861208 owner = "zah";
10871209 repo = "nim.vim";
1088− rev = "358e2e013056af5ad09b3e2963e3390db8677680";
1089− sha256 = "0ygyxcbbf6vqimzi71gdq40xx7kyi03yc73h5lyycnzwqc7wyxm2";
1210+ rev = "21731384b8f0675e3d666e98dd6625508c30f3af";
1211+ sha256 = "15l897xyli4wr5adgciizqnpqv80l95ykf2xq5kvc4icgj93gwga";
10901212 };
10911213 };
10921214
10931215 nvim-cm-racer = buildVimPluginFrom2Nix {
1094− name = "nvim-cm-racer-2017-07-27";
1216+ pname = "nvim-cm-racer";
1217+ version = "2017-07-27";
10951218 src = fetchFromGitHub {
10961219 owner = "roxma";
10971220 repo = "nvim-cm-racer";
@@ -1101,7 +1224,8 @@
11011224 };
11021225
11031226 nvim-completion-manager = buildVimPluginFrom2Nix {
1104− name = "nvim-completion-manager-2018-07-27";
1227+ pname = "nvim-completion-manager";
1228+ version = "2018-07-27";
11051229 src = fetchFromGitHub {
11061230 owner = "roxma";
11071231 repo = "nvim-completion-manager";
@@ -1111,17 +1235,19 @@
11111235 };
11121236
11131237 nvim-yarp = buildVimPluginFrom2Nix {
1114− name = "nvim-yarp-2018-09-14";
1238+ pname = "nvim-yarp";
1239+ version = "2018-12-23";
11151240 src = fetchFromGitHub {
11161241 owner = "roxma";
11171242 repo = "nvim-yarp";
1118− rev = "5443ac06b3989baa9262adec810503e0234c316e";
1119− sha256 = "0b6gmsbgzgwidl0rpkwzr2l1qxd9aw5pvj8izflf6gz36r2irszq";
1243+ rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0";
1244+ sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v";
11201245 };
11211246 };
11221247
11231248 nvimdev-nvim = buildVimPluginFrom2Nix {
1124− name = "nvimdev-nvim-2018-11-07";
1249+ pname = "nvimdev-nvim";
1250+ version = "2018-11-07";
11251251 src = fetchFromGitHub {
11261252 owner = "neovim";
11271253 repo = "nvimdev.nvim";
@@ -1131,7 +1257,8 @@
11311257 };
11321258
11331259 onehalf = buildVimPluginFrom2Nix {
1134− name = "onehalf-2018-10-21";
1260+ pname = "onehalf";
1261+ version = "2018-10-21";
11351262 src = fetchFromGitHub {
11361263 owner = "sonph";
11371264 repo = "onehalf";
@@ -1141,7 +1268,8 @@
11411268 };
11421269
11431270 open-browser-vim = buildVimPluginFrom2Nix {
1144− name = "open-browser-vim-2018-11-29";
1271+ pname = "open-browser-vim";
1272+ version = "2018-11-29";
11451273 src = fetchFromGitHub {
11461274 owner = "tyru";
11471275 repo = "open-browser.vim";
@@ -1151,7 +1279,8 @@
11511279 };
11521280
11531281 papercolor-theme = buildVimPluginFrom2Nix {
1154− name = "papercolor-theme-2018-09-04";
1282+ pname = "papercolor-theme";
1283+ version = "2018-09-04";
11551284 src = fetchFromGitHub {
11561285 owner = "NLKNguyen";
11571286 repo = "papercolor-theme";
@@ -1161,7 +1290,8 @@
11611290 };
11621291
11631292 peskcolor-vim = buildVimPluginFrom2Nix {
1164− name = "peskcolor-vim-2016-06-11";
1293+ pname = "peskcolor-vim";
1294+ version = "2016-06-11";
11651295 src = fetchFromGitHub {
11661296 owner = "andsild";
11671297 repo = "peskcolor.vim";
@@ -1171,7 +1301,8 @@
11711301 };
11721302
11731303 pig-vim = buildVimPluginFrom2Nix {
1174− name = "pig-vim-2017-06-08";
1304+ pname = "pig-vim";
1305+ version = "2017-06-08";
11751306 src = fetchFromGitHub {
11761307 owner = "motus";
11771308 repo = "pig.vim";
@@ -1181,7 +1312,8 @@
11811312 };
11821313
11831314 pony-vim-syntax = buildVimPluginFrom2Nix {
1184− name = "pony-vim-syntax-2017-09-26";
1315+ pname = "pony-vim-syntax";
1316+ version = "2017-09-26";
11851317 src = fetchFromGitHub {
11861318 owner = "dleonard0";
11871319 repo = "pony-vim-syntax";
@@ -1191,7 +1323,8 @@
11911323 };
11921324
11931325 PreserveNoEOL = buildVimPluginFrom2Nix {
1194− name = "PreserveNoEOL-2013-06-14";
1326+ pname = "PreserveNoEOL";
1327+ version = "2013-06-14";
11951328 src = fetchFromGitHub {
11961329 owner = "vim-scripts";
11971330 repo = "PreserveNoEOL";
@@ -1201,7 +1334,8 @@
12011334 };
12021335
12031336 psc-ide-vim = buildVimPluginFrom2Nix {
1204− name = "psc-ide-vim-2018-03-11";
1337+ pname = "psc-ide-vim";
1338+ version = "2018-03-11";
12051339 src = fetchFromGitHub {
12061340 owner = "frigoeu";
12071341 repo = "psc-ide-vim";
@@ -1211,7 +1345,8 @@
12111345 };
12121346
12131347 purescript-vim = buildVimPluginFrom2Nix {
1214− name = "purescript-vim-2018-12-10";
1348+ pname = "purescript-vim";
1349+ version = "2018-12-10";
12151350 src = fetchFromGitHub {
12161351 owner = "raichoo";
12171352 repo = "purescript-vim";
@@ -1221,7 +1356,8 @@
12211356 };
12221357
12231358 python-mode = buildVimPluginFrom2Nix {
1224− name = "python-mode-2018-04-29";
1359+ pname = "python-mode";
1360+ version = "2018-04-29";
12251361 src = fetchFromGitHub {
12261362 owner = "python-mode";
12271363 repo = "python-mode";
@@ -1231,7 +1367,8 @@
12311367 };
12321368
12331369 quickfixstatus = buildVimPluginFrom2Nix {
1234− name = "quickfixstatus-2011-09-03";
1370+ pname = "quickfixstatus";
1371+ version = "2011-09-03";
12351372 src = fetchFromGitHub {
12361373 owner = "dannyob";
12371374 repo = "quickfixstatus";
@@ -1241,7 +1378,8 @@
12411378 };
12421379
12431380 rainbow = buildVimPluginFrom2Nix {
1244− name = "rainbow-2018-07-31";
1381+ pname = "rainbow";
1382+ version = "2018-07-31";
12451383 src = fetchFromGitHub {
12461384 owner = "luochen1990";
12471385 repo = "rainbow";
@@ -1251,7 +1389,8 @@
12511389 };
12521390
12531391 rainbow_parentheses-vim = buildVimPluginFrom2Nix {
1254− name = "rainbow_parentheses-vim-2013-03-05";
1392+ pname = "rainbow_parentheses-vim";
1393+ version = "2013-03-05";
12551394 src = fetchFromGitHub {
12561395 owner = "kien";
12571396 repo = "rainbow_parentheses.vim";
@@ -1261,7 +1400,8 @@
12611400 };
12621401
12631402 random-vim = buildVimPluginFrom2Nix {
1264− name = "random-vim-2010-10-18";
1403+ pname = "random-vim";
1404+ version = "2010-10-18";
12651405 src = fetchFromGitHub {
12661406 owner = "vim-scripts";
12671407 repo = "random.vim";
@@ -1271,17 +1411,19 @@
12711411 };
12721412
12731413 ranger-vim = buildVimPluginFrom2Nix {
1274− name = "ranger-vim-2018-11-30";
1414+ pname = "ranger-vim";
1415+ version = "2018-12-21";
12751416 src = fetchFromGitHub {
12761417 owner = "rafaqz";
12771418 repo = "ranger.vim";
1278− rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
1279− sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
1419+ rev = "0bd9e8122f79655f58142389c595513b855cf05d";
1420+ sha256 = "0vpfdn01vy065hpc9ii56dsx35cxpmw2k6cidjdl0czy30vyjy94";
12801421 };
12811422 };
12821423
12831424 Recover-vim = buildVimPluginFrom2Nix {
1284− name = "Recover-vim-2018-10-22";
1425+ pname = "Recover-vim";
1426+ version = "2018-10-22";
12851427 src = fetchFromGitHub {
12861428 owner = "chrisbra";
12871429 repo = "Recover.vim";
@@ -1291,7 +1433,8 @@
12911433 };
12921434
12931435 Rename = buildVimPluginFrom2Nix {
1294− name = "Rename-2011-08-31";
1436+ pname = "Rename";
1437+ version = "2011-08-31";
12951438 src = fetchFromGitHub {
12961439 owner = "vim-scripts";
12971440 repo = "Rename";
@@ -1301,7 +1444,8 @@
13011444 };
13021445
13031446 ReplaceWithRegister = buildVimPluginFrom2Nix {
1304− name = "ReplaceWithRegister-2014-10-31";
1447+ pname = "ReplaceWithRegister";
1448+ version = "2014-10-31";
13051449 src = fetchFromGitHub {
13061450 owner = "vim-scripts";
13071451 repo = "ReplaceWithRegister";
@@ -1311,7 +1455,8 @@
13111455 };
13121456
13131457 riv-vim = buildVimPluginFrom2Nix {
1314− name = "riv-vim-2018-10-17";
1458+ pname = "riv-vim";
1459+ version = "2018-10-17";
13151460 src = fetchFromGitHub {
13161461 owner = "Rykka";
13171462 repo = "riv.vim";
@@ -1321,7 +1466,8 @@
13211466 };
13221467
13231468 robotframework-vim = buildVimPluginFrom2Nix {
1324− name = "robotframework-vim-2017-04-14";
1469+ pname = "robotframework-vim";
1470+ version = "2017-04-14";
13251471 src = fetchFromGitHub {
13261472 owner = "mfukar";
13271473 repo = "robotframework-vim";
@@ -1331,7 +1477,8 @@
13311477 };
13321478
13331479 rtorrent-syntax-file = buildVimPluginFrom2Nix {
1334− name = "rtorrent-syntax-file-2016-03-19";
1480+ pname = "rtorrent-syntax-file";
1481+ version = "2016-03-19";
13351482 src = fetchFromGitHub {
13361483 owner = "ccarpita";
13371484 repo = "rtorrent-syntax-file";
@@ -1341,17 +1488,19 @@
13411488 };
13421489
13431490 rust-vim = buildVimPluginFrom2Nix {
1344− name = "rust-vim-2018-11-29";
1491+ pname = "rust-vim";
1492+ version = "2018-12-23";
13451493 src = fetchFromGitHub {
13461494 owner = "rust-lang";
13471495 repo = "rust.vim";
1348− rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
1349− sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
1496+ rev = "c6312525ce948e603aec827fba8842a5dea92a9c";
1497+ sha256 = "11ki4zfnnizvdpymddxb7l1qmx1090xn5hiwhxifsrlg1c0dn3dp";
13501498 };
13511499 };
13521500
13531501 self = buildVimPluginFrom2Nix {
1354− name = "self-2014-05-28";
1502+ pname = "self";
1503+ version = "2014-05-28";
13551504 src = fetchFromGitHub {
13561505 owner = "megaannum";
13571506 repo = "self";
@@ -1361,7 +1510,8 @@
13611510 };
13621511
13631512 shabadou-vim = buildVimPluginFrom2Nix {
1364− name = "shabadou-vim-2016-07-19";
1513+ pname = "shabadou-vim";
1514+ version = "2016-07-19";
13651515 src = fetchFromGitHub {
13661516 owner = "osyo-manga";
13671517 repo = "shabadou.vim";
@@ -1371,7 +1521,8 @@
13711521 };
13721522
13731523 sourcemap-vim = buildVimPluginFrom2Nix {
1374− name = "sourcemap-vim-2012-09-19";
1524+ pname = "sourcemap-vim";
1525+ version = "2012-09-19";
13751526 src = fetchFromGitHub {
13761527 owner = "chikatoike";
13771528 repo = "sourcemap.vim";
@@ -1381,17 +1532,19 @@
13811532 };
13821533
13831534 Spacegray-vim = buildVimPluginFrom2Nix {
1384− name = "Spacegray-vim-2018-06-21";
1535+ pname = "Spacegray-vim";
1536+ version = "2018-12-25";
13851537 src = fetchFromGitHub {
13861538 owner = "ajh17";
13871539 repo = "Spacegray.vim";
1388− rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
1540+ rev = "5dfdefbe083666bf7f3fe2d6cdff650efaa5e1f7";
13891541 sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
13901542 };
13911543 };
13921544
13931545 spacevim = buildVimPluginFrom2Nix {
1394− name = "spacevim-2018-03-29";
1546+ pname = "spacevim";
1547+ version = "2018-03-29";
13951548 src = fetchFromGitHub {
13961549 owner = "ctjhoa";
13971550 repo = "spacevim";
@@ -1401,7 +1554,8 @@
14011554 };
14021555
14031556 sparkup = buildVimPluginFrom2Nix {
1404− name = "sparkup-2012-06-11";
1557+ pname = "sparkup";
1558+ version = "2012-06-11";
14051559 src = fetchFromGitHub {
14061560 owner = "chrisgeo";
14071561 repo = "sparkup";
@@ -1411,7 +1565,8 @@
14111565 };
14121566
14131567 splice-vim = buildVimPluginFrom2Nix {
1414− name = "splice-vim-2017-09-03";
1568+ pname = "splice-vim";
1569+ version = "2017-09-03";
14151570 src = fetchFromGitHub {
14161571 owner = "sjl";
14171572 repo = "splice.vim";
@@ -1421,7 +1576,8 @@
14211576 };
14221577
14231578 supertab = buildVimPluginFrom2Nix {
1424− name = "supertab-2017-11-14";
1579+ pname = "supertab";
1580+ version = "2017-11-14";
14251581 src = fetchFromGitHub {
14261582 owner = "ervandew";
14271583 repo = "supertab";
@@ -1431,7 +1587,8 @@
14311587 };
14321588
14331589 swift-vim = buildVimPluginFrom2Nix {
1434− name = "swift-vim-2018-09-12";
1590+ pname = "swift-vim";
1591+ version = "2018-09-12";
14351592 src = fetchFromGitHub {
14361593 owner = "keith";
14371594 repo = "swift.vim";
@@ -1441,7 +1598,8 @@
14411598 };
14421599
14431600 syntastic = buildVimPluginFrom2Nix {
1444− name = "syntastic-2018-11-24";
1601+ pname = "syntastic";
1602+ version = "2018-11-24";
14451603 src = fetchFromGitHub {
14461604 owner = "scrooloose";
14471605 repo = "syntastic";
@@ -1451,7 +1609,8 @@
14511609 };
14521610
14531611 tabmerge = buildVimPluginFrom2Nix {
1454− name = "tabmerge-2010-10-18";
1612+ pname = "tabmerge";
1613+ version = "2010-10-18";
14551614 src = fetchFromGitHub {
14561615 owner = "vim-scripts";
14571616 repo = "tabmerge";
@@ -1461,7 +1620,8 @@
14611620 };
14621621
14631622 tabpagebuffer-vim = buildVimPluginFrom2Nix {
1464− name = "tabpagebuffer-vim-2014-09-30";
1623+ pname = "tabpagebuffer-vim";
1624+ version = "2014-09-30";
14651625 src = fetchFromGitHub {
14661626 owner = "Shougo";
14671627 repo = "tabpagebuffer.vim";
@@ -1471,7 +1631,8 @@
14711631 };
14721632
14731633 tabular = buildVimPluginFrom2Nix {
1474− name = "tabular-2016-05-04";
1634+ pname = "tabular";
1635+ version = "2016-05-04";
14751636 src = fetchFromGitHub {
14761637 owner = "godlygeek";
14771638 repo = "tabular";
@@ -1481,7 +1642,8 @@
14811642 };
14821643
14831644 tagbar = buildVimPluginFrom2Nix {
1484− name = "tagbar-2017-12-17";
1645+ pname = "tagbar";
1646+ version = "2017-12-17";
14851647 src = fetchFromGitHub {
14861648 owner = "majutsushi";
14871649 repo = "tagbar";
@@ -1491,7 +1653,8 @@
14911653 };
14921654
14931655 taglist-vim = buildVimPluginFrom2Nix {
1494− name = "taglist-vim-2010-10-18";
1656+ pname = "taglist-vim";
1657+ version = "2010-10-18";
14951658 src = fetchFromGitHub {
14961659 owner = "vim-scripts";
14971660 repo = "taglist.vim";
@@ -1501,17 +1664,19 @@
15011664 };
15021665
15031666 targets-vim = buildVimPluginFrom2Nix {
1504− name = "targets-vim-2018-11-01";
1667+ pname = "targets-vim";
1668+ version = "2018-12-21";
15051669 src = fetchFromGitHub {
15061670 owner = "wellle";
15071671 repo = "targets.vim";
1508− rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
1509− sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
1672+ rev = "55c9c40e47af660677725b68fcfe7e88d9985889";
1673+ sha256 = "0jywlb5yxkyxn6vrdd3vd7q522llr2jplcl9yf97v89x3kmwpbqy";
15101674 };
15111675 };
15121676
15131677 tender-vim = buildVimPluginFrom2Nix {
1514− name = "tender-vim-2017-03-14";
1678+ pname = "tender-vim";
1679+ version = "2017-03-14";
15151680 src = fetchFromGitHub {
15161681 owner = "jacoborus";
15171682 repo = "tender.vim";
@@ -1521,7 +1686,8 @@
15211686 };
15221687
15231688 tern_for_vim = buildVimPluginFrom2Nix {
1524− name = "tern_for_vim-2017-11-27";
1689+ pname = "tern_for_vim";
1690+ version = "2017-11-27";
15251691 src = fetchFromGitHub {
15261692 owner = "ternjs";
15271693 repo = "tern_for_vim";
@@ -1531,7 +1697,8 @@
15311697 };
15321698
15331699 thumbnail-vim = buildVimPluginFrom2Nix {
1534− name = "thumbnail-vim-2017-04-24";
1700+ pname = "thumbnail-vim";
1701+ version = "2017-04-24";
15351702 src = fetchFromGitHub {
15361703 owner = "itchyny";
15371704 repo = "thumbnail.vim";
@@ -1541,7 +1708,8 @@
15411708 };
15421709
15431710 tlib_vim = buildVimPluginFrom2Nix {
1544− name = "tlib_vim-2018-04-08";
1711+ pname = "tlib_vim";
1712+ version = "2018-04-08";
15451713 src = fetchFromGitHub {
15461714 owner = "tomtom";
15471715 repo = "tlib_vim";
@@ -1551,17 +1719,19 @@
15511719 };
15521720
15531721 traces-vim = buildVimPluginFrom2Nix {
1554− name = "traces-vim-2018-12-13";
1722+ pname = "traces-vim";
1723+ version = "2018-12-25";
15551724 src = fetchFromGitHub {
15561725 owner = "markonm";
15571726 repo = "traces.vim";
1558− rev = "46e01b6159a21c89695b9d03ea3529ddc92d3b1f";
1559− sha256 = "0a77qx12kg4hmfz5zb2ng7lhd855gichs9qjrvich32v04qb2rwv";
1727+ rev = "7fd6019cd817842ec45836c2cec575e3c21fedca";
1728+ sha256 = "19pdpipng98s7kypkflfaxkhcskrppyb6714xf7y86adi1d2vly1";
15601729 };
15611730 };
15621731
15631732 tslime-vim = buildVimPluginFrom2Nix {
1564− name = "tslime-vim-2018-07-23";
1733+ pname = "tslime-vim";
1734+ version = "2018-07-23";
15651735 src = fetchFromGitHub {
15661736 owner = "jgdavey";
15671737 repo = "tslime.vim";
@@ -1571,17 +1741,19 @@
15711741 };
15721742
15731743 tsuquyomi = buildVimPluginFrom2Nix {
1574− name = "tsuquyomi-2018-10-31";
1744+ pname = "tsuquyomi";
1745+ version = "2018-12-26";
15751746 src = fetchFromGitHub {
15761747 owner = "Quramy";
15771748 repo = "tsuquyomi";
1578− rev = "bdd034d06ed47176ec1ee0bd3dae5bc0aeb053e3";
1579− sha256 = "119dxmkarbh0b0k4l59mxr19shks4mv96j3mbz02q0kdq18bgrdq";
1749+ rev = "fd47e1ac75ee3a09e13a3b7a8f609907c2b6b542";
1750+ sha256 = "09rivi64z7lhkan7hd7kdg2r1p3l2iplyc9vs1l6dqk3cp9i5rh0";
15801751 };
15811752 };
15821753
15831754 typescript-vim = buildVimPluginFrom2Nix {
1584− name = "typescript-vim-2018-10-17";
1755+ pname = "typescript-vim";
1756+ version = "2018-10-17";
15851757 src = fetchFromGitHub {
15861758 owner = "leafgarland";
15871759 repo = "typescript-vim";
@@ -1591,7 +1763,8 @@
15911763 };
15921764
15931765 ultisnips = buildVimPluginFrom2Nix {
1594− name = "ultisnips-2018-04-30";
1766+ pname = "ultisnips";
1767+ version = "2018-04-30";
15951768 src = fetchFromGitHub {
15961769 owner = "SirVer";
15971770 repo = "ultisnips";
@@ -1601,7 +1774,8 @@
16011774 };
16021775
16031776 undotree = buildVimPluginFrom2Nix {
1604− name = "undotree-2018-10-15";
1777+ pname = "undotree";
1778+ version = "2018-10-15";
16051779 src = fetchFromGitHub {
16061780 owner = "mbbill";
16071781 repo = "undotree";
@@ -1611,7 +1785,8 @@
16111785 };
16121786
16131787 unite-vim = buildVimPluginFrom2Nix {
1614− name = "unite-vim-2018-12-14";
1788+ pname = "unite-vim";
1789+ version = "2018-12-14";
16151790 src = fetchFromGitHub {
16161791 owner = "Shougo";
16171792 repo = "unite.vim";
@@ -1621,7 +1796,8 @@
16211796 };
16221797
16231798 verilog_systemverilog-vim = buildVimPluginFrom2Nix {
1624− name = "verilog_systemverilog-vim-2018-12-08";
1799+ pname = "verilog_systemverilog-vim";
1800+ version = "2018-12-08";
16251801 src = fetchFromGitHub {
16261802 owner = "vhda";
16271803 repo = "verilog_systemverilog.vim";
@@ -1631,17 +1807,19 @@
16311807 };
16321808
16331809 vim = buildVimPluginFrom2Nix {
1634− name = "vim-2018-11-25";
1810+ pname = "vim";
1811+ version = "2018-12-22";
16351812 src = fetchFromGitHub {
16361813 owner = "dracula";
16371814 repo = "vim";
1638− rev = "f24e259073994b4f76d125332954d26748fcc581";
1639− sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
1815+ rev = "88b2e4086966a36beebd146b67f83e19079142c9";
1816+ sha256 = "14l1vkja1179b10ikg7i39z4vi5zm1c5call54sa5jb5c68fjbvr";
16401817 };
16411818 };
16421819
16431820 vim-abolish = buildVimPluginFrom2Nix {
1644− name = "vim-abolish-2018-11-25";
1821+ pname = "vim-abolish";
1822+ version = "2018-11-25";
16451823 src = fetchFromGitHub {
16461824 owner = "tpope";
16471825 repo = "vim-abolish";
@@ -1651,7 +1829,8 @@
16511829 };
16521830
16531831 vim-addon-actions = buildVimPluginFrom2Nix {
1654− name = "vim-addon-actions-2018-01-18";
1832+ pname = "vim-addon-actions";
1833+ version = "2018-01-18";
16551834 src = fetchFromGitHub {
16561835 owner = "MarcWeber";
16571836 repo = "vim-addon-actions";
@@ -1661,7 +1840,8 @@
16611840 };
16621841
16631842 vim-addon-async = buildVimPluginFrom2Nix {
1664− name = "vim-addon-async-2017-03-20";
1843+ pname = "vim-addon-async";
1844+ version = "2017-03-20";
16651845 src = fetchFromGitHub {
16661846 owner = "MarcWeber";
16671847 repo = "vim-addon-async";
@@ -1671,7 +1851,8 @@
16711851 };
16721852
16731853 vim-addon-background-cmd = buildVimPluginFrom2Nix {
1674− name = "vim-addon-background-cmd-2015-12-11";
1854+ pname = "vim-addon-background-cmd";
1855+ version = "2015-12-11";
16751856 src = fetchFromGitHub {
16761857 owner = "MarcWeber";
16771858 repo = "vim-addon-background-cmd";
@@ -1681,7 +1862,8 @@
16811862 };
16821863
16831864 vim-addon-commenting = buildVimPluginFrom2Nix {
1684− name = "vim-addon-commenting-2013-06-10";
1865+ pname = "vim-addon-commenting";
1866+ version = "2013-06-10";
16851867 src = fetchFromGitHub {
16861868 owner = "MarcWeber";
16871869 repo = "vim-addon-commenting";
@@ -1691,7 +1873,8 @@
16911873 };
16921874
16931875 vim-addon-completion = buildVimPluginFrom2Nix {
1694− name = "vim-addon-completion-2015-02-10";
1876+ pname = "vim-addon-completion";
1877+ version = "2015-02-10";
16951878 src = fetchFromGitHub {
16961879 owner = "MarcWeber";
16971880 repo = "vim-addon-completion";
@@ -1701,7 +1884,8 @@
17011884 };
17021885
17031886 vim-addon-errorformats = buildVimPluginFrom2Nix {
1704− name = "vim-addon-errorformats-2014-11-05";
1887+ pname = "vim-addon-errorformats";
1888+ version = "2014-11-05";
17051889 src = fetchFromGitHub {
17061890 owner = "MarcWeber";
17071891 repo = "vim-addon-errorformats";
@@ -1711,7 +1895,8 @@
17111895 };
17121896
17131897 vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
1714− name = "vim-addon-goto-thing-at-cursor-2012-01-10";
1898+ pname = "vim-addon-goto-thing-at-cursor";
1899+ version = "2012-01-10";
17151900 src = fetchFromGitHub {
17161901 owner = "MarcWeber";
17171902 repo = "vim-addon-goto-thing-at-cursor";
@@ -1721,7 +1906,8 @@
17211906 };
17221907
17231908 vim-addon-local-vimrc = buildVimPluginFrom2Nix {
1724− name = "vim-addon-local-vimrc-2015-03-19";
1909+ pname = "vim-addon-local-vimrc";
1910+ version = "2015-03-19";
17251911 src = fetchFromGitHub {
17261912 owner = "MarcWeber";
17271913 repo = "vim-addon-local-vimrc";
@@ -1731,7 +1917,8 @@
17311917 };
17321918
17331919 vim-addon-manager = buildVimPluginFrom2Nix {
1734− name = "vim-addon-manager-2018-07-27";
1920+ pname = "vim-addon-manager";
1921+ version = "2018-07-27";
17351922 src = fetchFromGitHub {
17361923 owner = "MarcWeber";
17371924 repo = "vim-addon-manager";
@@ -1741,7 +1928,8 @@
17411928 };
17421929
17431930 vim-addon-mru = buildVimPluginFrom2Nix {
1744− name = "vim-addon-mru-2013-08-08";
1931+ pname = "vim-addon-mru";
1932+ version = "2013-08-08";
17451933 src = fetchFromGitHub {
17461934 owner = "MarcWeber";
17471935 repo = "vim-addon-mru";
@@ -1751,7 +1939,8 @@
17511939 };
17521940
17531941 vim-addon-mw-utils = buildVimPluginFrom2Nix {
1754− name = "vim-addon-mw-utils-2018-03-09";
1942+ pname = "vim-addon-mw-utils";
1943+ version = "2018-03-09";
17551944 src = fetchFromGitHub {
17561945 owner = "MarcWeber";
17571946 repo = "vim-addon-mw-utils";
@@ -1761,7 +1950,8 @@
17611950 };
17621951
17631952 vim-addon-nix = buildVimPluginFrom2Nix {
1764− name = "vim-addon-nix-2017-09-11";
1953+ pname = "vim-addon-nix";
1954+ version = "2017-09-11";
17651955 src = fetchFromGitHub {
17661956 owner = "MarcWeber";
17671957 repo = "vim-addon-nix";
@@ -1771,7 +1961,8 @@
17711961 };
17721962
17731963 vim-addon-other = buildVimPluginFrom2Nix {
1774− name = "vim-addon-other-2014-07-15";
1964+ pname = "vim-addon-other";
1965+ version = "2014-07-15";
17751966 src = fetchFromGitHub {
17761967 owner = "MarcWeber";
17771968 repo = "vim-addon-other";
@@ -1781,7 +1972,8 @@
17811972 };
17821973
17831974 vim-addon-php-manual = buildVimPluginFrom2Nix {
1784− name = "vim-addon-php-manual-2015-01-01";
1975+ pname = "vim-addon-php-manual";
1976+ version = "2015-01-01";
17851977 src = fetchFromGitHub {
17861978 owner = "MarcWeber";
17871979 repo = "vim-addon-php-manual";
@@ -1791,7 +1983,8 @@
17911983 };
17921984
17931985 vim-addon-signs = buildVimPluginFrom2Nix {
1794− name = "vim-addon-signs-2013-04-19";
1986+ pname = "vim-addon-signs";
1987+ version = "2013-04-19";
17951988 src = fetchFromGitHub {
17961989 owner = "MarcWeber";
17971990 repo = "vim-addon-signs";
@@ -1801,7 +1994,8 @@
18011994 };
18021995
18031996 vim-addon-sql = buildVimPluginFrom2Nix {
1804− name = "vim-addon-sql-2017-02-11";
1997+ pname = "vim-addon-sql";
1998+ version = "2017-02-11";
18051999 src = fetchFromGitHub {
18062000 owner = "MarcWeber";
18072001 repo = "vim-addon-sql";
@@ -1811,7 +2005,8 @@
18112005 };
18122006
18132007 vim-addon-syntax-checker = buildVimPluginFrom2Nix {
1814− name = "vim-addon-syntax-checker-2017-06-26";
2008+ pname = "vim-addon-syntax-checker";
2009+ version = "2017-06-26";
18152010 src = fetchFromGitHub {
18162011 owner = "MarcWeber";
18172012 repo = "vim-addon-syntax-checker";
@@ -1821,7 +2016,8 @@
18212016 };
18222017
18232018 vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
1824− name = "vim-addon-toggle-buffer-2012-01-13";
2019+ pname = "vim-addon-toggle-buffer";
2020+ version = "2012-01-13";
18252021 src = fetchFromGitHub {
18262022 owner = "MarcWeber";
18272023 repo = "vim-addon-toggle-buffer";
@@ -1831,7 +2027,8 @@
18312027 };
18322028
18332029 vim-addon-xdebug = buildVimPluginFrom2Nix {
1834− name = "vim-addon-xdebug-2014-08-29";
2030+ pname = "vim-addon-xdebug";
2031+ version = "2014-08-29";
18352032 src = fetchFromGitHub {
18362033 owner = "MarcWeber";
18372034 repo = "vim-addon-xdebug";
@@ -1841,17 +2038,19 @@
18412038 };
18422039
18432040 vim-airline = buildVimPluginFrom2Nix {
1844− name = "vim-airline-2018-12-10";
2041+ pname = "vim-airline";
2042+ version = "2018-12-18";
18452043 src = fetchFromGitHub {
18462044 owner = "vim-airline";
18472045 repo = "vim-airline";
1848− rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60";
1849− sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr";
2046+ rev = "72888d87ea57761f21c9f67cd0c0faa5904795eb";
2047+ sha256 = "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd";
18502048 };
18512049 };
18522050
18532051 vim-airline-themes = buildVimPluginFrom2Nix {
1854− name = "vim-airline-themes-2018-11-15";
2052+ pname = "vim-airline-themes";
2053+ version = "2018-11-15";
18552054 src = fetchFromGitHub {
18562055 owner = "vim-airline";
18572056 repo = "vim-airline-themes";
@@ -1861,7 +2060,8 @@
18612060 };
18622061
18632062 vim-android = buildVimPluginFrom2Nix {
1864− name = "vim-android-2018-07-31";
2063+ pname = "vim-android";
2064+ version = "2018-07-31";
18652065 src = fetchFromGitHub {
18662066 owner = "hsanson";
18672067 repo = "vim-android";
@@ -1871,7 +2071,8 @@
18712071 };
18722072
18732073 vim-anzu = buildVimPluginFrom2Nix {
1874− name = "vim-anzu-2018-02-28";
2074+ pname = "vim-anzu";
2075+ version = "2018-02-28";
18752076 src = fetchFromGitHub {
18762077 owner = "osyo-manga";
18772078 repo = "vim-anzu";
@@ -1881,7 +2082,8 @@
18812082 };
18822083
18832084 vim-auto-save = buildVimPluginFrom2Nix {
1884− name = "vim-auto-save-2017-11-08";
2085+ pname = "vim-auto-save";
2086+ version = "2017-11-08";
18852087 src = fetchFromGitHub {
18862088 owner = "907th";
18872089 repo = "vim-auto-save";
@@ -1891,17 +2093,19 @@
18912093 };
18922094
18932095 vim-autoformat = buildVimPluginFrom2Nix {
1894− name = "vim-autoformat-2018-12-10";
2096+ pname = "vim-autoformat";
2097+ version = "2018-12-19";
18952098 src = fetchFromGitHub {
18962099 owner = "Chiel92";
18972100 repo = "vim-autoformat";
1898− rev = "c203080645936e73b2124040bc963386eeb44f5e";
1899− sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9";
2101+ rev = "4f993fad63f98b844a5bd728c5a963c0da404e1a";
2102+ sha256 = "12c8yqwwm7n63r3gpl5zc5qd9mq3xdzk4rj4s91ni5x6njirpjzf";
19002103 };
19012104 };
19022105
19032106 vim-bazel = buildVimPluginFrom2Nix {
1904− name = "vim-bazel-2018-01-11";
2107+ pname = "vim-bazel";
2108+ version = "2018-01-11";
19052109 src = fetchFromGitHub {
19062110 owner = "bazelbuild";
19072111 repo = "vim-bazel";
@@ -1911,7 +2115,8 @@
19112115 };
19122116
19132117 vim-better-whitespace = buildVimPluginFrom2Nix {
1914− name = "vim-better-whitespace-2018-06-11";
2118+ pname = "vim-better-whitespace";
2119+ version = "2018-06-11";
19152120 src = fetchFromGitHub {
19162121 owner = "ntpeters";
19172122 repo = "vim-better-whitespace";
@@ -1921,7 +2126,8 @@
19212126 };
19222127
19232128 vim-buffergator = buildVimPluginFrom2Nix {
1924− name = "vim-buffergator-2018-05-02";
2129+ pname = "vim-buffergator";
2130+ version = "2018-05-02";
19252131 src = fetchFromGitHub {
19262132 owner = "jeetsukumaran";
19272133 repo = "vim-buffergator";
@@ -1931,7 +2137,8 @@
19312137 };
19322138
19332139 vim-bufferline = buildVimPluginFrom2Nix {
1934− name = "vim-bufferline-2016-02-09";
2140+ pname = "vim-bufferline";
2141+ version = "2016-02-09";
19352142 src = fetchFromGitHub {
19362143 owner = "bling";
19372144 repo = "vim-bufferline";
@@ -1941,7 +2148,8 @@
19412148 };
19422149
19432150 vim-closetag = buildVimPluginFrom2Nix {
1944− name = "vim-closetag-2018-12-08";
2151+ pname = "vim-closetag";
2152+ version = "2018-12-08";
19452153 src = fetchFromGitHub {
19462154 owner = "alvan";
19472155 repo = "vim-closetag";
@@ -1951,17 +2159,19 @@
19512159 };
19522160
19532161 vim-codefmt = buildVimPluginFrom2Nix {
1954− name = "vim-codefmt-2018-12-14";
2162+ pname = "vim-codefmt";
2163+ version = "2018-12-15";
19552164 src = fetchFromGitHub {
19562165 owner = "google";
19572166 repo = "vim-codefmt";
1958− rev = "62c09d51dd5fda2cbd579a3c4f261bbf34a1f655";
1959− sha256 = "10bv35xm0qs44sff5nkp3pvvvi1fh339m4a2fcnnz2bbd0nal8dl";
2167+ rev = "2147649088e977852c168a2173f13e0e04d555ed";
2168+ sha256 = "17kc9zwj3flj32riqsknwik5b5fr042yr3qn7w9wqk0m2vdid4mv";
19602169 };
19612170 };
19622171
19632172 vim-coffee-script = buildVimPluginFrom2Nix {
1964− name = "vim-coffee-script-2018-02-27";
2173+ pname = "vim-coffee-script";
2174+ version = "2018-02-27";
19652175 src = fetchFromGitHub {
19662176 owner = "kchmck";
19672177 repo = "vim-coffee-script";
@@ -1971,7 +2181,8 @@
19712181 };
19722182
19732183 vim-colemak = buildVimPluginFrom2Nix {
1974− name = "vim-colemak-2016-10-16";
2184+ pname = "vim-colemak";
2185+ version = "2016-10-16";
19752186 src = fetchFromGitHub {
19762187 owner = "kalbasit";
19772188 repo = "vim-colemak";
@@ -1981,7 +2192,8 @@
19812192 };
19822193
19832194 vim-colors-solarized = buildVimPluginFrom2Nix {
1984− name = "vim-colors-solarized-2011-05-09";
2195+ pname = "vim-colors-solarized";
2196+ version = "2011-05-09";
19852197 src = fetchFromGitHub {
19862198 owner = "altercation";
19872199 repo = "vim-colors-solarized";
@@ -1991,7 +2203,8 @@
19912203 };
19922204
19932205 vim-colorschemes = buildVimPluginFrom2Nix {
1994− name = "vim-colorschemes-2018-11-20";
2206+ pname = "vim-colorschemes";
2207+ version = "2018-11-20";
19952208 src = fetchFromGitHub {
19962209 owner = "flazz";
19972210 repo = "vim-colorschemes";
@@ -2001,7 +2214,8 @@
20012214 };
20022215
20032216 vim-colorstepper = buildVimPluginFrom2Nix {
2004− name = "vim-colorstepper-2016-01-28";
2217+ pname = "vim-colorstepper";
2218+ version = "2016-01-28";
20052219 src = fetchFromGitHub {
20062220 owner = "jonbri";
20072221 repo = "vim-colorstepper";
@@ -2011,7 +2225,8 @@
20112225 };
20122226
20132227 vim-commentary = buildVimPluginFrom2Nix {
2014− name = "vim-commentary-2018-07-27";
2228+ pname = "vim-commentary";
2229+ version = "2018-07-27";
20152230 src = fetchFromGitHub {
20162231 owner = "tpope";
20172232 repo = "vim-commentary";
@@ -2021,7 +2236,8 @@
20212236 };
20222237
20232238 vim-css-color = buildVimPluginFrom2Nix {
2024− name = "vim-css-color-2018-11-20";
2239+ pname = "vim-css-color";
2240+ version = "2018-11-20";
20252241 src = fetchFromGitHub {
20262242 owner = "ap";
20272243 repo = "vim-css-color";
@@ -2031,7 +2247,8 @@
20312247 };
20322248
20332249 vim-cursorword = buildVimPluginFrom2Nix {
2034− name = "vim-cursorword-2017-10-19";
2250+ pname = "vim-cursorword";
2251+ version = "2017-10-19";
20352252 src = fetchFromGitHub {
20362253 owner = "itchyny";
20372254 repo = "vim-cursorword";
@@ -2041,7 +2258,8 @@
20412258 };
20422259
20432260 vim-cute-python = buildVimPluginFrom2Nix {
2044− name = "vim-cute-python-2016-04-04";
2261+ pname = "vim-cute-python";
2262+ version = "2016-04-04";
20452263 src = fetchFromGitHub {
20462264 owner = "ehamberg";
20472265 repo = "vim-cute-python";
@@ -2051,7 +2269,8 @@
20512269 };
20522270
20532271 vim-devicons = buildVimPluginFrom2Nix {
2054− name = "vim-devicons-2018-06-21";
2272+ pname = "vim-devicons";
2273+ version = "2018-06-21";
20552274 src = fetchFromGitHub {
20562275 owner = "ryanoasis";
20572276 repo = "vim-devicons";
@@ -2061,7 +2280,8 @@
20612280 };
20622281
20632282 vim-dirdiff = buildVimPluginFrom2Nix {
2064− name = "vim-dirdiff-2018-01-31";
2283+ pname = "vim-dirdiff";
2284+ version = "2018-01-31";
20652285 src = fetchFromGitHub {
20662286 owner = "will133";
20672287 repo = "vim-dirdiff";
@@ -2071,7 +2291,8 @@
20712291 };
20722292
20732293 vim-dirvish = buildVimPluginFrom2Nix {
2074− name = "vim-dirvish-2018-12-04";
2294+ pname = "vim-dirvish";
2295+ version = "2018-12-04";
20752296 src = fetchFromGitHub {
20762297 owner = "justinmk";
20772298 repo = "vim-dirvish";
@@ -2081,7 +2302,8 @@
20812302 };
20822303
20832304 vim-dispatch = buildVimPluginFrom2Nix {
2084− name = "vim-dispatch-2018-10-31";
2305+ pname = "vim-dispatch";
2306+ version = "2018-10-31";
20852307 src = fetchFromGitHub {
20862308 owner = "tpope";
20872309 repo = "vim-dispatch";
@@ -2091,7 +2313,8 @@
20912313 };
20922314
20932315 vim-docbk = buildVimPluginFrom2Nix {
2094− name = "vim-docbk-2015-04-01";
2316+ pname = "vim-docbk";
2317+ version = "2015-04-01";
20952318 src = fetchFromGitHub {
20962319 owner = "jhradilek";
20972320 repo = "vim-docbk";
@@ -2101,7 +2324,8 @@
21012324 };
21022325
21032326 vim-easy-align = buildVimPluginFrom2Nix {
2104− name = "vim-easy-align-2017-06-03";
2327+ pname = "vim-easy-align";
2328+ version = "2017-06-03";
21052329 src = fetchFromGitHub {
21062330 owner = "junegunn";
21072331 repo = "vim-easy-align";
@@ -2111,7 +2335,8 @@
21112335 };
21122336
21132337 vim-easygit = buildVimPluginFrom2Nix {
2114− name = "vim-easygit-2018-07-08";
2338+ pname = "vim-easygit";
2339+ version = "2018-07-08";
21152340 src = fetchFromGitHub {
21162341 owner = "neoclide";
21172342 repo = "vim-easygit";
@@ -2121,7 +2346,8 @@
21212346 };
21222347
21232348 vim-easymotion = buildVimPluginFrom2Nix {
2124− name = "vim-easymotion-2018-06-04";
2349+ pname = "vim-easymotion";
2350+ version = "2018-06-04";
21252351 src = fetchFromGitHub {
21262352 owner = "easymotion";
21272353 repo = "vim-easymotion";
@@ -2131,7 +2357,8 @@
21312357 };
21322358
21332359 vim-easytags = buildVimPluginFrom2Nix {
2134− name = "vim-easytags-2015-07-01";
2360+ pname = "vim-easytags";
2361+ version = "2015-07-01";
21352362 src = fetchFromGitHub {
21362363 owner = "xolox";
21372364 repo = "vim-easytags";
@@ -2141,7 +2368,8 @@
21412368 };
21422369
21432370 vim-eighties = buildVimPluginFrom2Nix {
2144− name = "vim-eighties-2016-12-15";
2371+ pname = "vim-eighties";
2372+ version = "2016-12-15";
21452373 src = fetchFromGitHub {
21462374 owner = "justincampbell";
21472375 repo = "vim-eighties";
@@ -2151,7 +2379,8 @@
21512379 };
21522380
21532381 vim-elixir = buildVimPluginFrom2Nix {
2154− name = "vim-elixir-2018-12-12";
2382+ pname = "vim-elixir";
2383+ version = "2018-12-12";
21552384 src = fetchFromGitHub {
21562385 owner = "elixir-lang";
21572386 repo = "vim-elixir";
@@ -2161,7 +2390,8 @@
21612390 };
21622391
21632392 vim-eunuch = buildVimPluginFrom2Nix {
2164− name = "vim-eunuch-2018-09-09";
2393+ pname = "vim-eunuch";
2394+ version = "2018-09-09";
21652395 src = fetchFromGitHub {
21662396 owner = "tpope";
21672397 repo = "vim-eunuch";
@@ -2171,7 +2401,8 @@
21712401 };
21722402
21732403 vim-expand-region = buildVimPluginFrom2Nix {
2174− name = "vim-expand-region-2013-08-19";
2404+ pname = "vim-expand-region";
2405+ version = "2013-08-19";
21752406 src = fetchFromGitHub {
21762407 owner = "terryma";
21772408 repo = "vim-expand-region";
@@ -2181,7 +2412,8 @@
21812412 };
21822413
21832414 vim-extradite = buildVimPluginFrom2Nix {
2184− name = "vim-extradite-2015-09-22";
2415+ pname = "vim-extradite";
2416+ version = "2015-09-22";
21852417 src = fetchFromGitHub {
21862418 owner = "int3";
21872419 repo = "vim-extradite";
@@ -2191,7 +2423,8 @@
21912423 };
21922424
21932425 vim-fireplace = buildVimPluginFrom2Nix {
2194− name = "vim-fireplace-2018-06-01";
2426+ pname = "vim-fireplace";
2427+ version = "2018-06-01";
21952428 src = fetchFromGitHub {
21962429 owner = "tpope";
21972430 repo = "vim-fireplace";
@@ -2201,7 +2434,8 @@
22012434 };
22022435
22032436 vim-flagship = buildVimPluginFrom2Nix {
2204− name = "vim-flagship-2018-08-15";
2437+ pname = "vim-flagship";
2438+ version = "2018-08-15";
22052439 src = fetchFromGitHub {
22062440 owner = "tpope";
22072441 repo = "vim-flagship";
@@ -2211,7 +2445,8 @@
22112445 };
22122446
22132447 vim-flake8 = buildVimPluginFrom2Nix {
2214− name = "vim-flake8-2018-09-21";
2448+ pname = "vim-flake8";
2449+ version = "2018-09-21";
22152450 src = fetchFromGitHub {
22162451 owner = "nvie";
22172452 repo = "vim-flake8";
@@ -2221,7 +2456,8 @@
22212456 };
22222457
22232458 vim-ft-diff_fold = buildVimPluginFrom2Nix {
2224− name = "vim-ft-diff_fold-2013-02-10";
2459+ pname = "vim-ft-diff_fold";
2460+ version = "2013-02-10";
22252461 src = fetchFromGitHub {
22262462 owner = "thinca";
22272463 repo = "vim-ft-diff_fold";
@@ -2231,17 +2467,19 @@
22312467 };
22322468
22332469 vim-fugitive = buildVimPluginFrom2Nix {
2234− name = "vim-fugitive-2018-11-22";
2470+ pname = "vim-fugitive";
2471+ version = "2018-12-26";
22352472 src = fetchFromGitHub {
22362473 owner = "tpope";
22372474 repo = "vim-fugitive";
2238− rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
2239− sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
2475+ rev = "a1f9596d2d884e74358bc5017a73f37e34f7b04c";
2476+ sha256 = "07am7ca8klnnq6iyp5lbqaas9lgz005rpvndcca7r5w0h45dpncw";
22402477 };
22412478 };
22422479
22432480 vim-ghost = buildVimPluginFrom2Nix {
2244− name = "vim-ghost-2018-12-12";
2481+ pname = "vim-ghost";
2482+ version = "2018-12-12";
22452483 src = fetchFromGitHub {
22462484 owner = "raghur";
22472485 repo = "vim-ghost";
@@ -2251,7 +2489,8 @@
22512489 };
22522490
22532491 vim-gista = buildVimPluginFrom2Nix {
2254− name = "vim-gista-2017-02-20";
2492+ pname = "vim-gista";
2493+ version = "2017-02-20";
22552494 src = fetchFromGitHub {
22562495 owner = "lambdalisue";
22572496 repo = "vim-gista";
@@ -2261,7 +2500,8 @@
22612500 };
22622501
22632502 vim-gitbranch = buildVimPluginFrom2Nix {
2264− name = "vim-gitbranch-2017-05-27";
2503+ pname = "vim-gitbranch";
2504+ version = "2017-05-27";
22652505 src = fetchFromGitHub {
22662506 owner = "itchyny";
22672507 repo = "vim-gitbranch";
@@ -2271,17 +2511,19 @@
22712511 };
22722512
22732513 vim-gitgutter = buildVimPluginFrom2Nix {
2274− name = "vim-gitgutter-2018-12-13";
2514+ pname = "vim-gitgutter";
2515+ version = "2018-12-15";
22752516 src = fetchFromGitHub {
22762517 owner = "airblade";
22772518 repo = "vim-gitgutter";
2278− rev = "5c636b128ed40f3ed926d18adb307e01dfc082f8";
2279− sha256 = "014ylh6cmrfw7qp6nrjz0dr4f5v09fmmfi729kpkf97lx79sd37i";
2519+ rev = "1d422b9f98194e38bc56e54192c9bc66d95c21f1";
2520+ sha256 = "1xv4brbhpxx23q2wklxxclzj9n1fi34m2rj0syf7ggp9fy7y50dk";
22802521 };
22812522 };
22822523
22832524 vim-github-dashboard = buildVimPluginFrom2Nix {
2284− name = "vim-github-dashboard-2018-09-03";
2525+ pname = "vim-github-dashboard";
2526+ version = "2018-09-03";
22852527 src = fetchFromGitHub {
22862528 owner = "junegunn";
22872529 repo = "vim-github-dashboard";
@@ -2291,17 +2533,19 @@
22912533 };
22922534
22932535 vim-go = buildVimPluginFrom2Nix {
2294− name = "vim-go-2018-12-12";
2536+ pname = "vim-go";
2537+ version = "2018-12-24";
22952538 src = fetchFromGitHub {
22962539 owner = "fatih";
22972540 repo = "vim-go";
2298− rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27";
2299− sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw";
2541+ rev = "23409acfa8b6e4a324730108d01826f0910a8973";
2542+ sha256 = "1ddbcwag8x26sim4aplslgmcjv8vr9smanh5939m4a1sw7lcg2xv";
23002543 };
23012544 };
23022545
23032546 vim-grammarous = buildVimPluginFrom2Nix {
2304− name = "vim-grammarous-2018-09-13";
2547+ pname = "vim-grammarous";
2548+ version = "2018-09-13";
23052549 src = fetchFromGitHub {
23062550 owner = "rhysd";
23072551 repo = "vim-grammarous";
@@ -2311,17 +2555,19 @@
23112555 };
23122556
23132557 vim-grepper = buildVimPluginFrom2Nix {
2314− name = "vim-grepper-2018-11-08";
2558+ pname = "vim-grepper";
2559+ version = "2018-12-22";
23152560 src = fetchFromGitHub {
23162561 owner = "mhinz";
23172562 repo = "vim-grepper";
2318− rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
2319− sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
2563+ rev = "9b62e6bdd9de9fe027363bbde68e9e32d937cfa0";
2564+ sha256 = "15j65qcnyfdkzyyv7504anaic891v5kvnqszcz37y5j15zjs5c02";
23202565 };
23212566 };
23222567
23232568 vim-gutentags = buildVimPluginFrom2Nix {
2324− name = "vim-gutentags-2018-11-17";
2569+ pname = "vim-gutentags";
2570+ version = "2018-11-17";
23252571 src = fetchFromGitHub {
23262572 owner = "ludovicchabant";
23272573 repo = "vim-gutentags";
@@ -2331,7 +2577,8 @@
23312577 };
23322578
23332579 vim-hardtime = buildVimPluginFrom2Nix {
2334− name = "vim-hardtime-2017-03-31";
2580+ pname = "vim-hardtime";
2581+ version = "2017-03-31";
23352582 src = fetchFromGitHub {
23362583 owner = "takac";
23372584 repo = "vim-hardtime";
@@ -2341,7 +2588,8 @@
23412588 };
23422589
23432590 vim-haskellconceal = buildVimPluginFrom2Nix {
2344− name = "vim-haskellconceal-2017-06-15";
2591+ pname = "vim-haskellconceal";
2592+ version = "2017-06-15";
23452593 src = fetchFromGitHub {
23462594 owner = "twinside";
23472595 repo = "vim-haskellconceal";
@@ -2351,17 +2599,19 @@
23512599 };
23522600
23532601 vim-haskellConcealPlus = buildVimPluginFrom2Nix {
2354− name = "vim-haskellConcealPlus-2018-08-07";
2602+ pname = "vim-haskellConcealPlus";
2603+ version = "2018-12-26";
23552604 src = fetchFromGitHub {
23562605 owner = "enomsg";
23572606 repo = "vim-haskellConcealPlus";
2358− rev = "12608ecab20c3eda9a89a55931397b5e020f38a4";
2359− sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0";
2607+ rev = "1d64dd2cdd1e99689e3d79e7ada151213acd5450";
2608+ sha256 = "0jsfg941qdpibzcg0ypf0nvabmv1bpwgzgzda7hjy1jcai4yrw1g";
23602609 };
23612610 };
23622611
23632612 vim-hdevtools = buildVimPluginFrom2Nix {
2364− name = "vim-hdevtools-2018-11-19";
2613+ pname = "vim-hdevtools";
2614+ version = "2018-11-19";
23652615 src = fetchFromGitHub {
23662616 owner = "bitc";
23672617 repo = "vim-hdevtools";
@@ -2371,7 +2621,8 @@
23712621 };
23722622
23732623 vim-hier = buildVimPluginFrom2Nix {
2374− name = "vim-hier-2011-08-27";
2624+ pname = "vim-hier";
2625+ version = "2011-08-27";
23752626 src = fetchFromGitHub {
23762627 owner = "jceb";
23772628 repo = "vim-hier";
@@ -2381,7 +2632,8 @@
23812632 };
23822633
23832634 vim-highlightedyank = buildVimPluginFrom2Nix {
2384− name = "vim-highlightedyank-2018-10-08";
2635+ pname = "vim-highlightedyank";
2636+ version = "2018-10-08";
23852637 src = fetchFromGitHub {
23862638 owner = "machakann";
23872639 repo = "vim-highlightedyank";
@@ -2391,7 +2643,8 @@
23912643 };
23922644
23932645 vim-hindent = buildVimPluginFrom2Nix {
2394− name = "vim-hindent-2018-07-31";
2646+ pname = "vim-hindent";
2647+ version = "2018-07-31";
23952648 src = fetchFromGitHub {
23962649 owner = "alx741";
23972650 repo = "vim-hindent";
@@ -2401,7 +2654,8 @@
24012654 };
24022655
24032656 vim-hoogle = buildVimPluginFrom2Nix {
2404− name = "vim-hoogle-2018-03-04";
2657+ pname = "vim-hoogle";
2658+ version = "2018-03-04";
24052659 src = fetchFromGitHub {
24062660 owner = "Twinside";
24072661 repo = "vim-hoogle";
@@ -2411,7 +2665,8 @@
24112665 };
24122666
24132667 vim-husk = buildVimPluginFrom2Nix {
2414− name = "vim-husk-2015-11-29";
2668+ pname = "vim-husk";
2669+ version = "2015-11-29";
24152670 src = fetchFromGitHub {
24162671 owner = "vim-utils";
24172672 repo = "vim-husk";
@@ -2421,7 +2676,8 @@
24212676 };
24222677
24232678 vim-iced-coffee-script = buildVimPluginFrom2Nix {
2424− name = "vim-iced-coffee-script-2013-12-26";
2679+ pname = "vim-iced-coffee-script";
2680+ version = "2013-12-26";
24252681 src = fetchFromGitHub {
24262682 owner = "noc7c9";
24272683 repo = "vim-iced-coffee-script";
@@ -2431,7 +2687,8 @@
24312687 };
24322688
24332689 vim-indent-guides = buildVimPluginFrom2Nix {
2434− name = "vim-indent-guides-2018-05-14";
2690+ pname = "vim-indent-guides";
2691+ version = "2018-05-14";
24352692 src = fetchFromGitHub {
24362693 owner = "nathanaelkane";
24372694 repo = "vim-indent-guides";
@@ -2441,7 +2698,8 @@
24412698 };
24422699
24432700 vim-indent-object = buildVimPluginFrom2Nix {
2444− name = "vim-indent-object-2018-04-08";
2701+ pname = "vim-indent-object";
2702+ version = "2018-04-08";
24452703 src = fetchFromGitHub {
24462704 owner = "michaeljsmith";
24472705 repo = "vim-indent-object";
@@ -2451,7 +2709,8 @@
24512709 };
24522710
24532711 vim-ipython = buildVimPluginFrom2Nix {
2454− name = "vim-ipython-2015-06-23";
2712+ pname = "vim-ipython";
2713+ version = "2015-06-23";
24552714 src = fetchFromGitHub {
24562715 owner = "ivanov";
24572716 repo = "vim-ipython";
@@ -2461,7 +2720,8 @@
24612720 };
24622721
24632722 vim-isort = buildVimPluginFrom2Nix {
2464− name = "vim-isort-2018-08-22";
2723+ pname = "vim-isort";
2724+ version = "2018-08-22";
24652725 src = fetchFromGitHub {
24662726 owner = "fisadev";
24672727 repo = "vim-isort";
@@ -2471,7 +2731,8 @@
24712731 };
24722732
24732733 vim-jade = buildVimPluginFrom2Nix {
2474− name = "vim-jade-2018-09-10";
2734+ pname = "vim-jade";
2735+ version = "2018-09-10";
24752736 src = fetchFromGitHub {
24762737 owner = "digitaltoad";
24772738 repo = "vim-jade";
@@ -2481,7 +2742,8 @@
24812742 };
24822743
24832744 vim-janah = buildVimPluginFrom2Nix {
2484− name = "vim-janah-2018-10-01";
2745+ pname = "vim-janah";
2746+ version = "2018-10-01";
24852747 src = fetchFromGitHub {
24862748 owner = "mhinz";
24872749 repo = "vim-janah";
@@ -2491,27 +2753,30 @@
24912753 };
24922754
24932755 vim-javacomplete2 = buildVimPluginFrom2Nix {
2494− name = "vim-javacomplete2-2018-12-14";
2756+ pname = "vim-javacomplete2";
2757+ version = "2018-12-25";
24952758 src = fetchFromGitHub {
24962759 owner = "artur-shaik";
24972760 repo = "vim-javacomplete2";
2498− rev = "e896e0b249f6115a921cb27aaabdb688374d9f21";
2499− sha256 = "0lqhb5kgswvsni456nmskrmn9lrnxwg523x5yaylm8s71w3kv1a6";
2761+ rev = "0d96e7344eafc0d2ce6888e629668629d6a11f70";
2762+ sha256 = "18l0s90y3k7cbl1ql6nyhk13nbc97ll3zkzkvln9r189ckj7q1w7";
25002763 };
25012764 };
25022765
25032766 vim-javascript = buildVimPluginFrom2Nix {
2504− name = "vim-javascript-2018-08-29";
2767+ pname = "vim-javascript";
2768+ version = "2018-12-23";
25052769 src = fetchFromGitHub {
25062770 owner = "pangloss";
25072771 repo = "vim-javascript";
2508− rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28";
2509− sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl";
2772+ rev = "50c135735611946707d04757fdc0cde5537659ae";
2773+ sha256 = "175w6a5x8wcssd5ix32gmyc4s4v7l4nmhhzvs28n3lwias8cm2q9";
25102774 };
25112775 };
25122776
25132777 vim-jinja = buildVimPluginFrom2Nix {
2514− name = "vim-jinja-2016-11-16";
2778+ pname = "vim-jinja";
2779+ version = "2016-11-16";
25152780 src = fetchFromGitHub {
25162781 owner = "lepture";
25172782 repo = "vim-jinja";
@@ -2521,7 +2786,8 @@
25212786 };
25222787
25232788 vim-jsbeautify = buildVimPluginFrom2Nix {
2524− name = "vim-jsbeautify-2018-10-23";
2789+ pname = "vim-jsbeautify";
2790+ version = "2018-10-23";
25252791 src = fetchFromGitHub {
25262792 owner = "maksimr";
25272793 repo = "vim-jsbeautify";
@@ -2532,7 +2798,8 @@
25322798 };
25332799
25342800 vim-jsdoc = buildVimPluginFrom2Nix {
2535− name = "vim-jsdoc-2018-05-05";
2801+ pname = "vim-jsdoc";
2802+ version = "2018-05-05";
25362803 src = fetchFromGitHub {
25372804 owner = "heavenshell";
25382805 repo = "vim-jsdoc";
@@ -2542,7 +2809,8 @@
25422809 };
25432810
25442811 vim-json = buildVimPluginFrom2Nix {
2545− name = "vim-json-2018-01-10";
2812+ pname = "vim-json";
2813+ version = "2018-01-10";
25462814 src = fetchFromGitHub {
25472815 owner = "elzr";
25482816 repo = "vim-json";
@@ -2552,7 +2820,8 @@
25522820 };
25532821
25542822 vim-jsonnet = buildVimPluginFrom2Nix {
2555− name = "vim-jsonnet-2018-10-08";
2823+ pname = "vim-jsonnet";
2824+ version = "2018-10-08";
25562825 src = fetchFromGitHub {
25572826 owner = "google";
25582827 repo = "vim-jsonnet";
@@ -2562,7 +2831,8 @@
25622831 };
25632832
25642833 vim-lastplace = buildVimPluginFrom2Nix {
2565− name = "vim-lastplace-2017-06-13";
2834+ pname = "vim-lastplace";
2835+ version = "2017-06-13";
25662836 src = fetchFromGitHub {
25672837 owner = "farmergreg";
25682838 repo = "vim-lastplace";
@@ -2572,7 +2842,8 @@
25722842 };
25732843
25742844 vim-latex-live-preview = buildVimPluginFrom2Nix {
2575− name = "vim-latex-live-preview-2018-09-25";
2845+ pname = "vim-latex-live-preview";
2846+ version = "2018-09-25";
25762847 src = fetchFromGitHub {
25772848 owner = "xuhdev";
25782849 repo = "vim-latex-live-preview";
@@ -2582,7 +2853,8 @@
25822853 };
25832854
25842855 vim-lawrencium = buildVimPluginFrom2Nix {
2585− name = "vim-lawrencium-2018-11-04";
2856+ pname = "vim-lawrencium";
2857+ version = "2018-11-04";
25862858 src = fetchFromGitHub {
25872859 owner = "ludovicchabant";
25882860 repo = "vim-lawrencium";
@@ -2592,7 +2864,8 @@
25922864 };
25932865
25942866 vim-leader-guide = buildVimPluginFrom2Nix {
2595− name = "vim-leader-guide-2018-10-06";
2867+ pname = "vim-leader-guide";
2868+ version = "2018-10-06";
25962869 src = fetchFromGitHub {
25972870 owner = "hecal3";
25982871 repo = "vim-leader-guide";
@@ -2602,7 +2875,8 @@
26022875 };
26032876
26042877 vim-ledger = buildVimPluginFrom2Nix {
2605− name = "vim-ledger-2017-12-12";
2878+ pname = "vim-ledger";
2879+ version = "2017-12-12";
26062880 src = fetchFromGitHub {
26072881 owner = "ledger";
26082882 repo = "vim-ledger";
@@ -2612,7 +2886,8 @@
26122886 };
26132887
26142888 vim-localvimrc = buildVimPluginFrom2Nix {
2615− name = "vim-localvimrc-2018-11-06";
2889+ pname = "vim-localvimrc";
2890+ version = "2018-11-06";
26162891 src = fetchFromGitHub {
26172892 owner = "embear";
26182893 repo = "vim-localvimrc";
@@ -2622,7 +2897,8 @@
26222897 };
26232898
26242899 vim-logreview = buildVimPluginFrom2Nix {
2625− name = "vim-logreview-2017-07-08";
2900+ pname = "vim-logreview";
2901+ version = "2017-07-08";
26262902 src = fetchFromGitHub {
26272903 owner = "andreshazard";
26282904 repo = "vim-logreview";
@@ -2632,7 +2908,8 @@
26322908 };
26332909
26342910 vim-maktaba = buildVimPluginFrom2Nix {
2635− name = "vim-maktaba-2018-12-13";
2911+ pname = "vim-maktaba";
2912+ version = "2018-12-13";
26362913 src = fetchFromGitHub {
26372914 owner = "google";
26382915 repo = "vim-maktaba";
@@ -2642,7 +2919,8 @@
26422919 };
26432920
26442921 vim-markdown = buildVimPluginFrom2Nix {
2645− name = "vim-markdown-2018-10-24";
2922+ pname = "vim-markdown";
2923+ version = "2018-10-24";
26462924 src = fetchFromGitHub {
26472925 owner = "plasticboy";
26482926 repo = "vim-markdown";
@@ -2652,7 +2930,8 @@
26522930 };
26532931
26542932 vim-misc = buildVimPluginFrom2Nix {
2655− name = "vim-misc-2015-05-21";
2933+ pname = "vim-misc";
2934+ version = "2015-05-21";
26562935 src = fetchFromGitHub {
26572936 owner = "xolox";
26582937 repo = "vim-misc";
@@ -2662,17 +2941,19 @@
26622941 };
26632942
26642943 vim-monokai-pro = buildVimPluginFrom2Nix {
2665− name = "vim-monokai-pro-2018-12-03";
2944+ pname = "vim-monokai-pro";
2945+ version = "2018-12-27";
26662946 src = fetchFromGitHub {
26672947 owner = "phanviet";
26682948 repo = "vim-monokai-pro";
2669− rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
2670− sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
2949+ rev = "39fcf3b418fc3a01e604cbb5f9c08d79d7d957c0";
2950+ sha256 = "1k0n9chmilppsiyxhz1ig0ywimbnl4qpzib6ris1cy6kjnl4mdyq";
26712951 };
26722952 };
26732953
26742954 vim-multiple-cursors = buildVimPluginFrom2Nix {
2675− name = "vim-multiple-cursors-2018-10-16";
2955+ pname = "vim-multiple-cursors";
2956+ version = "2018-10-16";
26762957 src = fetchFromGitHub {
26772958 owner = "terryma";
26782959 repo = "vim-multiple-cursors";
@@ -2682,17 +2963,19 @@
26822963 };
26832964
26842965 vim-nerdtree-tabs = buildVimPluginFrom2Nix {
2685− name = "vim-nerdtree-tabs-2018-05-05";
2966+ pname = "vim-nerdtree-tabs";
2967+ version = "2018-12-21";
26862968 src = fetchFromGitHub {
26872969 owner = "jistr";
26882970 repo = "vim-nerdtree-tabs";
2689− rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
2690− sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
2971+ rev = "07d19f0299762669c6f93fbadb8249da6ba9de62";
2972+ sha256 = "16iqhp5l6xvq0k8bq9ngqfhish1fwggpmvd7ni1fh5dqr00iii9x";
26912973 };
26922974 };
26932975
26942976 vim-niceblock = buildVimPluginFrom2Nix {
2695− name = "vim-niceblock-2018-09-06";
2977+ pname = "vim-niceblock";
2978+ version = "2018-09-06";
26962979 src = fetchFromGitHub {
26972980 owner = "kana";
26982981 repo = "vim-niceblock";
@@ -2702,7 +2985,8 @@
27022985 };
27032986
27042987 vim-nix = buildVimPluginFrom2Nix {
2705− name = "vim-nix-2018-08-27";
2988+ pname = "vim-nix";
2989+ version = "2018-08-27";
27062990 src = fetchFromGitHub {
27072991 owner = "LnL7";
27082992 repo = "vim-nix";
@@ -2712,7 +2996,8 @@
27122996 };
27132997
27142998 vim-obsession = buildVimPluginFrom2Nix {
2715− name = "vim-obsession-2018-09-17";
2999+ pname = "vim-obsession";
3000+ version = "2018-09-17";
27163001 src = fetchFromGitHub {
27173002 owner = "tpope";
27183003 repo = "vim-obsession";
@@ -2722,7 +3007,8 @@
27223007 };
27233008
27243009 vim-one = buildVimPluginFrom2Nix {
2725− name = "vim-one-2018-07-22";
3010+ pname = "vim-one";
3011+ version = "2018-07-22";
27263012 src = fetchFromGitHub {
27273013 owner = "rakr";
27283014 repo = "vim-one";
@@ -2732,7 +3018,8 @@
27323018 };
27333019
27343020 vim-operator-replace = buildVimPluginFrom2Nix {
2735− name = "vim-operator-replace-2015-02-24";
3021+ pname = "vim-operator-replace";
3022+ version = "2015-02-24";
27363023 src = fetchFromGitHub {
27373024 owner = "kana";
27383025 repo = "vim-operator-replace";
@@ -2742,7 +3029,8 @@
27423029 };
27433030
27443031 vim-operator-surround = buildVimPluginFrom2Nix {
2745− name = "vim-operator-surround-2018-11-01";
3032+ pname = "vim-operator-surround";
3033+ version = "2018-11-01";
27463034 src = fetchFromGitHub {
27473035 owner = "rhysd";
27483036 repo = "vim-operator-surround";
@@ -2752,7 +3040,8 @@
27523040 };
27533041
27543042 vim-operator-user = buildVimPluginFrom2Nix {
2755− name = "vim-operator-user-2015-02-17";
3043+ pname = "vim-operator-user";
3044+ version = "2015-02-17";
27563045 src = fetchFromGitHub {
27573046 owner = "kana";
27583047 repo = "vim-operator-user";
@@ -2762,7 +3051,8 @@
27623051 };
27633052
27643053 vim-orgmode = buildVimPluginFrom2Nix {
2765− name = "vim-orgmode-2018-07-25";
3054+ pname = "vim-orgmode";
3055+ version = "2018-07-25";
27663056 src = fetchFromGitHub {
27673057 owner = "jceb";
27683058 repo = "vim-orgmode";
@@ -2772,7 +3062,8 @@
27723062 };
27733063
27743064 vim-pager = buildVimPluginFrom2Nix {
2775− name = "vim-pager-2015-08-26";
3065+ pname = "vim-pager";
3066+ version = "2015-08-26";
27763067 src = fetchFromGitHub {
27773068 owner = "lambdalisue";
27783069 repo = "vim-pager";
@@ -2782,7 +3073,8 @@
27823073 };
27833074
27843075 vim-pandoc = buildVimPluginFrom2Nix {
2785− name = "vim-pandoc-2018-10-07";
3076+ pname = "vim-pandoc";
3077+ version = "2018-10-07";
27863078 src = fetchFromGitHub {
27873079 owner = "vim-pandoc";
27883080 repo = "vim-pandoc";
@@ -2792,7 +3084,8 @@
27923084 };
27933085
27943086 vim-pandoc-after = buildVimPluginFrom2Nix {
2795− name = "vim-pandoc-after-2017-11-21";
3087+ pname = "vim-pandoc-after";
3088+ version = "2017-11-21";
27963089 src = fetchFromGitHub {
27973090 owner = "vim-pandoc";
27983091 repo = "vim-pandoc-after";
@@ -2802,7 +3095,8 @@
28023095 };
28033096
28043097 vim-pandoc-syntax = buildVimPluginFrom2Nix {
2805− name = "vim-pandoc-syntax-2017-04-13";
3098+ pname = "vim-pandoc-syntax";
3099+ version = "2017-04-13";
28063100 src = fetchFromGitHub {
28073101 owner = "vim-pandoc";
28083102 repo = "vim-pandoc-syntax";
@@ -2812,7 +3106,8 @@
28123106 };
28133107
28143108 vim-pathogen = buildVimPluginFrom2Nix {
2815− name = "vim-pathogen-2018-12-13";
3109+ pname = "vim-pathogen";
3110+ version = "2018-12-13";
28163111 src = fetchFromGitHub {
28173112 owner = "tpope";
28183113 repo = "vim-pathogen";
@@ -2822,7 +3117,8 @@
28223117 };
28233118
28243119 vim-peekaboo = buildVimPluginFrom2Nix {
2825− name = "vim-peekaboo-2017-03-20";
3120+ pname = "vim-peekaboo";
3121+ version = "2017-03-20";
28263122 src = fetchFromGitHub {
28273123 owner = "junegunn";
28283124 repo = "vim-peekaboo";
@@ -2832,7 +3128,8 @@
28323128 };
28333129
28343130 vim-pencil = buildVimPluginFrom2Nix {
2835− name = "vim-pencil-2017-06-14";
3131+ pname = "vim-pencil";
3132+ version = "2017-06-14";
28363133 src = fetchFromGitHub {
28373134 owner = "reedes";
28383135 repo = "vim-pencil";
@@ -2842,7 +3139,8 @@
28423139 };
28433140
28443141 vim-plug = buildVimPluginFrom2Nix {
2845− name = "vim-plug-2018-11-03";
3142+ pname = "vim-plug";
3143+ version = "2018-11-03";
28463144 src = fetchFromGitHub {
28473145 owner = "junegunn";
28483146 repo = "vim-plug";
@@ -2852,7 +3150,8 @@
28523150 };
28533151
28543152 vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
2855− name = "vim-plugin-AnsiEsc-2018-05-10";
3153+ pname = "vim-plugin-AnsiEsc";
3154+ version = "2018-05-10";
28563155 src = fetchFromGitHub {
28573156 owner = "powerman";
28583157 repo = "vim-plugin-AnsiEsc";
@@ -2862,17 +3161,19 @@
28623161 };
28633162
28643163 vim-polyglot = buildVimPluginFrom2Nix {
2865− name = "vim-polyglot-2018-10-10";
3164+ pname = "vim-polyglot";
3165+ version = "2018-12-26";
28663166 src = fetchFromGitHub {
28673167 owner = "sheerun";
28683168 repo = "vim-polyglot";
2869− rev = "ec1c94306953b678bb36572897bd218fe6c76506";
2870− sha256 = "1n3s52ncmdbhygrdycrnqk9sj42413q0ah1q8a7s6q4z6zdm4scz";
3169+ rev = "c161994e9607399a7b365ab274592bfc4f100306";
3170+ sha256 = "19gdy7l87hm0i8jiic02v1xb3b660lsprankfgny9za8hk4kq3cq";
28713171 };
28723172 };
28733173
28743174 vim-prettyprint = buildVimPluginFrom2Nix {
2875− name = "vim-prettyprint-2016-07-16";
3175+ pname = "vim-prettyprint";
3176+ version = "2016-07-16";
28763177 src = fetchFromGitHub {
28773178 owner = "thinca";
28783179 repo = "vim-prettyprint";
@@ -2882,7 +3183,8 @@
28823183 };
28833184
28843185 vim-projectionist = buildVimPluginFrom2Nix {
2885− name = "vim-projectionist-2018-10-21";
3186+ pname = "vim-projectionist";
3187+ version = "2018-10-21";
28863188 src = fetchFromGitHub {
28873189 owner = "tpope";
28883190 repo = "vim-projectionist";
@@ -2892,7 +3194,8 @@
28923194 };
28933195
28943196 vim-ps1 = buildVimPluginFrom2Nix {
2895− name = "vim-ps1-2017-10-20";
3197+ pname = "vim-ps1";
3198+ version = "2017-10-20";
28963199 src = fetchFromGitHub {
28973200 owner = "PProvost";
28983201 repo = "vim-ps1";
@@ -2902,7 +3205,8 @@
29023205 };
29033206
29043207 vim-puppet = buildVimPluginFrom2Nix {
2905− name = "vim-puppet-2018-11-15";
3208+ pname = "vim-puppet";
3209+ version = "2018-11-15";
29063210 src = fetchFromGitHub {
29073211 owner = "rodjek";
29083212 repo = "vim-puppet";
@@ -2912,7 +3216,8 @@
29123216 };
29133217
29143218 vim-qml = buildVimPluginFrom2Nix {
2915− name = "vim-qml-2018-07-22";
3219+ pname = "vim-qml";
3220+ version = "2018-07-22";
29163221 src = fetchFromGitHub {
29173222 owner = "peterhoeg";
29183223 repo = "vim-qml";
@@ -2922,7 +3227,8 @@
29223227 };
29233228
29243229 vim-quickrun = buildVimPluginFrom2Nix {
2925− name = "vim-quickrun-2018-11-27";
3230+ pname = "vim-quickrun";
3231+ version = "2018-11-27";
29263232 src = fetchFromGitHub {
29273233 owner = "thinca";
29283234 repo = "vim-quickrun";
@@ -2932,7 +3238,8 @@
29323238 };
29333239
29343240 vim-racer = buildVimPluginFrom2Nix {
2935− name = "vim-racer-2018-08-26";
3241+ pname = "vim-racer";
3242+ version = "2018-08-26";
29363243 src = fetchFromGitHub {
29373244 owner = "racer-rust";
29383245 repo = "vim-racer";
@@ -2942,7 +3249,8 @@
29423249 };
29433250
29443251 vim-repeat = buildVimPluginFrom2Nix {
2945− name = "vim-repeat-2018-07-02";
3252+ pname = "vim-repeat";
3253+ version = "2018-07-02";
29463254 src = fetchFromGitHub {
29473255 owner = "tpope";
29483256 repo = "vim-repeat";
@@ -2952,7 +3260,8 @@
29523260 };
29533261
29543262 vim-rhubarb = buildVimPluginFrom2Nix {
2955− name = "vim-rhubarb-2018-11-16";
3263+ pname = "vim-rhubarb";
3264+ version = "2018-11-16";
29563265 src = fetchFromGitHub {
29573266 owner = "tpope";
29583267 repo = "vim-rhubarb";
@@ -2962,7 +3271,8 @@
29623271 };
29633272
29643273 vim-ruby = buildVimPluginFrom2Nix {
2965− name = "vim-ruby-2018-12-11";
3274+ pname = "vim-ruby";
3275+ version = "2018-12-11";
29663276 src = fetchFromGitHub {
29673277 owner = "vim-ruby";
29683278 repo = "vim-ruby";
@@ -2972,7 +3282,8 @@
29723282 };
29733283
29743284 vim-sayonara = buildVimPluginFrom2Nix {
2975− name = "vim-sayonara-2017-03-13";
3285+ pname = "vim-sayonara";
3286+ version = "2017-03-13";
29763287 src = fetchFromGitHub {
29773288 owner = "mhinz";
29783289 repo = "vim-sayonara";
@@ -2982,7 +3293,8 @@
29823293 };
29833294
29843295 vim-scala = buildVimPluginFrom2Nix {
2985− name = "vim-scala-2017-11-10";
3296+ pname = "vim-scala";
3297+ version = "2017-11-10";
29863298 src = fetchFromGitHub {
29873299 owner = "derekwyatt";
29883300 repo = "vim-scala";
@@ -2992,7 +3304,8 @@
29923304 };
29933305
29943306 vim-scouter = buildVimPluginFrom2Nix {
2995− name = "vim-scouter-2014-08-10";
3307+ pname = "vim-scouter";
3308+ version = "2014-08-10";
29963309 src = fetchFromGitHub {
29973310 owner = "thinca";
29983311 repo = "vim-scouter";
@@ -3002,17 +3315,19 @@
30023315 };
30033316
30043317 vim-scriptease = buildVimPluginFrom2Nix {
3005− name = "vim-scriptease-2018-11-03";
3318+ pname = "vim-scriptease";
3319+ version = "2018-12-19";
30063320 src = fetchFromGitHub {
30073321 owner = "tpope";
30083322 repo = "vim-scriptease";
3009− rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
3010− sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
3323+ rev = "386f19cd92f7b30cd830784ae22ebbe7033564aa";
3324+ sha256 = "122bnx9j1pdgpkfph48l4zngak1hjlijbksim05iypi7sd0bvix9";
30113325 };
30123326 };
30133327
30143328 vim-sensible = buildVimPluginFrom2Nix {
3015− name = "vim-sensible-2018-10-27";
3329+ pname = "vim-sensible";
3330+ version = "2018-10-27";
30163331 src = fetchFromGitHub {
30173332 owner = "tpope";
30183333 repo = "vim-sensible";
@@ -3022,7 +3337,8 @@
30223337 };
30233338
30243339 vim-signature = buildVimPluginFrom2Nix {
3025− name = "vim-signature-2018-07-06";
3340+ pname = "vim-signature";
3341+ version = "2018-07-06";
30263342 src = fetchFromGitHub {
30273343 owner = "kshenoy";
30283344 repo = "vim-signature";
@@ -3032,17 +3348,19 @@
30323348 };
30333349
30343350 vim-signify = buildVimPluginFrom2Nix {
3035− name = "vim-signify-2018-11-16";
3351+ pname = "vim-signify";
3352+ version = "2018-12-20";
30363353 src = fetchFromGitHub {
30373354 owner = "mhinz";
30383355 repo = "vim-signify";
3039− rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
3040− sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
3356+ rev = "ea6db3c7df7671584df0a37a2436a919332d0b7c";
3357+ sha256 = "0876ik4a4kxa22fwcgm9b2swnc6ngmiakhy4h0brxgmci8h0r9m2";
30413358 };
30423359 };
30433360
30443361 vim-sleuth = buildVimPluginFrom2Nix {
3045− name = "vim-sleuth-2018-08-19";
3362+ pname = "vim-sleuth";
3363+ version = "2018-08-19";
30463364 src = fetchFromGitHub {
30473365 owner = "tpope";
30483366 repo = "vim-sleuth";
@@ -3052,7 +3370,8 @@
30523370 };
30533371
30543372 vim-smalls = buildVimPluginFrom2Nix {
3055− name = "vim-smalls-2015-05-02";
3373+ pname = "vim-smalls";
3374+ version = "2015-05-02";
30563375 src = fetchFromGitHub {
30573376 owner = "t9md";
30583377 repo = "vim-smalls";
@@ -3062,7 +3381,8 @@
30623381 };
30633382
30643383 vim-snipmate = buildVimPluginFrom2Nix {
3065− name = "vim-snipmate-2017-04-20";
3384+ pname = "vim-snipmate";
3385+ version = "2017-04-20";
30663386 src = fetchFromGitHub {
30673387 owner = "garbas";
30683388 repo = "vim-snipmate";
@@ -3072,7 +3392,8 @@
30723392 };
30733393
30743394 vim-snippets = buildVimPluginFrom2Nix {
3075− name = "vim-snippets-2018-12-14";
3395+ pname = "vim-snippets";
3396+ version = "2018-12-14";
30763397 src = fetchFromGitHub {
30773398 owner = "honza";
30783399 repo = "vim-snippets";
@@ -3082,7 +3403,8 @@
30823403 };
30833404
30843405 vim-solidity = buildVimPluginFrom2Nix {
3085− name = "vim-solidity-2018-04-17";
3406+ pname = "vim-solidity";
3407+ version = "2018-04-17";
30863408 src = fetchFromGitHub {
30873409 owner = "tomlion";
30883410 repo = "vim-solidity";
@@ -3092,7 +3414,8 @@
30923414 };
30933415
30943416 vim-sort-motion = buildVimPluginFrom2Nix {
3095− name = "vim-sort-motion-2018-07-15";
3417+ pname = "vim-sort-motion";
3418+ version = "2018-07-15";
30963419 src = fetchFromGitHub {
30973420 owner = "christoomey";
30983421 repo = "vim-sort-motion";
@@ -3102,7 +3425,8 @@
31023425 };
31033426
31043427 vim-speeddating = buildVimPluginFrom2Nix {
3105− name = "vim-speeddating-2018-10-31";
3428+ pname = "vim-speeddating";
3429+ version = "2018-10-31";
31063430 src = fetchFromGitHub {
31073431 owner = "tpope";
31083432 repo = "vim-speeddating";
@@ -3112,17 +3436,19 @@
31123436 };
31133437
31143438 vim-startify = buildVimPluginFrom2Nix {
3115− name = "vim-startify-2018-12-08";
3439+ pname = "vim-startify";
3440+ version = "2018-12-16";
31163441 src = fetchFromGitHub {
31173442 owner = "mhinz";
31183443 repo = "vim-startify";
3119− rev = "5cd4faf2c681c36edfae3aa907d0ab720ff9c6e5";
3120− sha256 = "0zs1sxwpi24lfiaz5k5wglm642qrmd8krcv8vjrvg222jq4inhlf";
3444+ rev = "9c26c7e8dcee2e580f137610ccde1af40a19d2bb";
3445+ sha256 = "01km6gka0k06kppk9q3c5c1a2jlg5ibid37dv6575kfkibhri3yn";
31213446 };
31223447 };
31233448
31243449 vim-stylish-haskell = buildVimPluginFrom2Nix {
3125− name = "vim-stylish-haskell-2018-08-31";
3450+ pname = "vim-stylish-haskell";
3451+ version = "2018-08-31";
31263452 src = fetchFromGitHub {
31273453 owner = "nbouscal";
31283454 repo = "vim-stylish-haskell";
@@ -3132,7 +3458,8 @@
31323458 };
31333459
31343460 vim-stylishask = buildVimPluginFrom2Nix {
3135− name = "vim-stylishask-2018-07-05";
3461+ pname = "vim-stylishask";
3462+ version = "2018-07-05";
31363463 src = fetchFromGitHub {
31373464 owner = "alx741";
31383465 repo = "vim-stylishask";
@@ -3142,7 +3469,8 @@
31423469 };
31433470
31443471 vim-surround = buildVimPluginFrom2Nix {
3145− name = "vim-surround-2018-07-23";
3472+ pname = "vim-surround";
3473+ version = "2018-07-23";
31463474 src = fetchFromGitHub {
31473475 owner = "tpope";
31483476 repo = "vim-surround";
@@ -3152,7 +3480,8 @@
31523480 };
31533481
31543482 vim-SyntaxRange = buildVimPluginFrom2Nix {
3155− name = "vim-SyntaxRange-2018-03-09";
3483+ pname = "vim-SyntaxRange";
3484+ version = "2018-03-09";
31563485 src = fetchFromGitHub {
31573486 owner = "inkarkat";
31583487 repo = "vim-SyntaxRange";
@@ -3162,7 +3491,8 @@
31623491 };
31633492
31643493 vim-table-mode = buildVimPluginFrom2Nix {
3165− name = "vim-table-mode-2018-10-21";
3494+ pname = "vim-table-mode";
3495+ version = "2018-10-21";
31663496 src = fetchFromGitHub {
31673497 owner = "dhruvasagar";
31683498 repo = "vim-table-mode";
@@ -3172,7 +3502,8 @@
31723502 };
31733503
31743504 vim-tabpagecd = buildVimPluginFrom2Nix {
3175− name = "vim-tabpagecd-2013-11-29";
3505+ pname = "vim-tabpagecd";
3506+ version = "2013-11-29";
31763507 src = fetchFromGitHub {
31773508 owner = "kana";
31783509 repo = "vim-tabpagecd";
@@ -3182,7 +3513,8 @@
31823513 };
31833514
31843515 vim-tbone = buildVimPluginFrom2Nix {
3185− name = "vim-tbone-2018-06-28";
3516+ pname = "vim-tbone";
3517+ version = "2018-06-28";
31863518 src = fetchFromGitHub {
31873519 owner = "tpope";
31883520 repo = "vim-tbone";
@@ -3192,27 +3524,30 @@
31923524 };
31933525
31943526 vim-terraform = buildVimPluginFrom2Nix {
3195− name = "vim-terraform-2018-11-19";
3527+ pname = "vim-terraform";
3528+ version = "2018-12-25";
31963529 src = fetchFromGitHub {
31973530 owner = "hashivim";
31983531 repo = "vim-terraform";
3199− rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
3200− sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
3532+ rev = "259481e063e79392c25f293f8459462f942dd6f9";
3533+ sha256 = "0w3kwjd5ywnjkkc3cn765ra8mqqmxvk328b0d14b9hndyhs6v8gi";
32013534 };
32023535 };
32033536
32043537 vim-test = buildVimPluginFrom2Nix {
3205− name = "vim-test-2018-11-22";
3538+ pname = "vim-test";
3539+ version = "2018-12-24";
32063540 src = fetchFromGitHub {
32073541 owner = "janko-m";
32083542 repo = "vim-test";
3209− rev = "c4b732003d120d60a2fc009423e34d80fb212651";
3210− sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
3543+ rev = "fceb803bcde722b8a678251defb34f456affb3e3";
3544+ sha256 = "0g750rrxcgxvimxcpcz9xkjgsdbwnqc3wjvw056ghyy6mvsvq0wj";
32113545 };
32123546 };
32133547
32143548 vim-textobj-multiblock = buildVimPluginFrom2Nix {
3215− name = "vim-textobj-multiblock-2014-06-02";
3549+ pname = "vim-textobj-multiblock";
3550+ version = "2014-06-02";
32163551 src = fetchFromGitHub {
32173552 owner = "osyo-manga";
32183553 repo = "vim-textobj-multiblock";
@@ -3222,7 +3557,8 @@
32223557 };
32233558
32243559 vim-themis = buildVimPluginFrom2Nix {
3225− name = "vim-themis-2017-12-27";
3560+ pname = "vim-themis";
3561+ version = "2017-12-27";
32263562 src = fetchFromGitHub {
32273563 owner = "thinca";
32283564 repo = "vim-themis";
@@ -3232,7 +3568,8 @@
32323568 };
32333569
32343570 vim-tmux-navigator = buildVimPluginFrom2Nix {
3235− name = "vim-tmux-navigator-2018-11-03";
3571+ pname = "vim-tmux-navigator";
3572+ version = "2018-11-03";
32363573 src = fetchFromGitHub {
32373574 owner = "christoomey";
32383575 repo = "vim-tmux-navigator";
@@ -3242,7 +3579,8 @@
32423579 };
32433580
32443581 vim-toml = buildVimPluginFrom2Nix {
3245− name = "vim-toml-2018-11-27";
3582+ pname = "vim-toml";
3583+ version = "2018-11-27";
32463584 src = fetchFromGitHub {
32473585 owner = "cespare";
32483586 repo = "vim-toml";
@@ -3252,7 +3590,8 @@
32523590 };
32533591
32543592 vim-trailing-whitespace = buildVimPluginFrom2Nix {
3255− name = "vim-trailing-whitespace-2017-09-23";
3593+ pname = "vim-trailing-whitespace";
3594+ version = "2017-09-23";
32563595 src = fetchFromGitHub {
32573596 owner = "bronson";
32583597 repo = "vim-trailing-whitespace";
@@ -3262,7 +3601,8 @@
32623601 };
32633602
32643603 vim-tsx = buildVimPluginFrom2Nix {
3265− name = "vim-tsx-2017-03-16";
3604+ pname = "vim-tsx";
3605+ version = "2017-03-16";
32663606 src = fetchFromGitHub {
32673607 owner = "ianks";
32683608 repo = "vim-tsx";
@@ -3272,17 +3612,19 @@
32723612 };
32733613
32743614 vim-unimpaired = buildVimPluginFrom2Nix {
3275− name = "vim-unimpaired-2018-07-26";
3615+ pname = "vim-unimpaired";
3616+ version = "2018-12-20";
32763617 src = fetchFromGitHub {
32773618 owner = "tpope";
32783619 repo = "vim-unimpaired";
3279− rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da";
3280− sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv";
3620+ rev = "9da253e92ca8444be9f67a5b0086c9213b8772e9";
3621+ sha256 = "0s5jvc618nncsc4dzgr30nf2xfm71jpdsxq90gnxm1730fyln8f3";
32813622 };
32823623 };
32833624
32843625 vim-vinegar = buildVimPluginFrom2Nix {
3285− name = "vim-vinegar-2018-08-06";
3626+ pname = "vim-vinegar";
3627+ version = "2018-08-06";
32863628 src = fetchFromGitHub {
32873629 owner = "tpope";
32883630 repo = "vim-vinegar";
@@ -3292,7 +3634,8 @@
32923634 };
32933635
32943636 vim-visualstar = buildVimPluginFrom2Nix {
3295− name = "vim-visualstar-2015-08-27";
3637+ pname = "vim-visualstar";
3638+ version = "2015-08-27";
32963639 src = fetchFromGitHub {
32973640 owner = "thinca";
32983641 repo = "vim-visualstar";
@@ -3302,7 +3645,8 @@
33023645 };
33033646
33043647 vim-vue = buildVimPluginFrom2Nix {
3305− name = "vim-vue-2018-11-11";
3648+ pname = "vim-vue";
3649+ version = "2018-11-11";
33063650 src = fetchFromGitHub {
33073651 owner = "posva";
33083652 repo = "vim-vue";
@@ -3312,17 +3656,19 @@
33123656 };
33133657
33143658 vim-wakatime = buildVimPluginFrom2Nix {
3315− name = "vim-wakatime-2018-11-25";
3659+ pname = "vim-wakatime";
3660+ version = "2018-12-19";
33163661 src = fetchFromGitHub {
33173662 owner = "wakatime";
33183663 repo = "vim-wakatime";
3319− rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
3320− sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
3664+ rev = "227099fba9c60f58c520ec055c79335405d11668";
3665+ sha256 = "011wjh5iwcp0ixbyfry2rgjiwz46dc1iilhi6zlixkf3lk2qbfih";
33213666 };
33223667 };
33233668
33243669 vim-watchdogs = buildVimPluginFrom2Nix {
3325− name = "vim-watchdogs-2017-12-03";
3670+ pname = "vim-watchdogs";
3671+ version = "2017-12-03";
33263672 src = fetchFromGitHub {
33273673 owner = "osyo-manga";
33283674 repo = "vim-watchdogs";
@@ -3332,7 +3678,8 @@
33323678 };
33333679
33343680 vim-wordy = buildVimPluginFrom2Nix {
3335− name = "vim-wordy-2018-03-10";
3681+ pname = "vim-wordy";
3682+ version = "2018-03-10";
33363683 src = fetchFromGitHub {
33373684 owner = "reedes";
33383685 repo = "vim-wordy";
@@ -3342,7 +3689,8 @@
33423689 };
33433690
33443691 vim-xdebug = buildVimPluginFrom2Nix {
3345− name = "vim-xdebug-2012-08-15";
3692+ pname = "vim-xdebug";
3693+ version = "2012-08-15";
33463694 src = fetchFromGitHub {
33473695 owner = "joonty";
33483696 repo = "vim-xdebug";
@@ -3352,7 +3700,8 @@
33523700 };
33533701
33543702 vim-xkbswitch = buildVimPluginFrom2Nix {
3355− name = "vim-xkbswitch-2017-03-27";
3703+ pname = "vim-xkbswitch";
3704+ version = "2017-03-27";
33563705 src = fetchFromGitHub {
33573706 owner = "lyokha";
33583707 repo = "vim-xkbswitch";
@@ -3362,7 +3711,8 @@
33623711 };
33633712
33643713 vim-yapf = buildVimPluginFrom2Nix {
3365− name = "vim-yapf-2018-10-04";
3714+ pname = "vim-yapf";
3715+ version = "2018-10-04";
33663716 src = fetchFromGitHub {
33673717 owner = "mindriot101";
33683718 repo = "vim-yapf";
@@ -3372,7 +3722,8 @@
33723722 };
33733723
33743724 vim2hs = buildVimPluginFrom2Nix {
3375− name = "vim2hs-2014-04-16";
3725+ pname = "vim2hs";
3726+ version = "2014-04-16";
33763727 src = fetchFromGitHub {
33773728 owner = "dag";
33783729 repo = "vim2hs";
@@ -3382,7 +3733,8 @@
33823733 };
33833734
33843735 vimoutliner = buildVimPluginFrom2Nix {
3385− name = "vimoutliner-2018-07-04";
3736+ pname = "vimoutliner";
3737+ version = "2018-07-04";
33863738 src = fetchFromGitHub {
33873739 owner = "vimoutliner";
33883740 repo = "vimoutliner";
@@ -3392,7 +3744,8 @@
33923744 };
33933745
33943746 vimpreviewpandoc = buildVimPluginFrom2Nix {
3395− name = "vimpreviewpandoc-2018-11-05";
3747+ pname = "vimpreviewpandoc";
3748+ version = "2018-11-05";
33963749 src = fetchFromGitHub {
33973750 owner = "tex";
33983751 repo = "vimpreviewpandoc";
@@ -3402,7 +3755,8 @@
34023755 };
34033756
34043757 vimproc-vim = buildVimPluginFrom2Nix {
3405− name = "vimproc-vim-2018-10-11";
3758+ pname = "vimproc-vim";
3759+ version = "2018-10-11";
34063760 src = fetchFromGitHub {
34073761 owner = "Shougo";
34083762 repo = "vimproc.vim";
@@ -3412,7 +3766,8 @@
34123766 };
34133767
34143768 vimshell-vim = buildVimPluginFrom2Nix {
3415− name = "vimshell-vim-2018-06-02";
3769+ pname = "vimshell-vim";
3770+ version = "2018-06-02";
34163771 src = fetchFromGitHub {
34173772 owner = "Shougo";
34183773 repo = "vimshell.vim";
@@ -3422,17 +3777,19 @@
34223777 };
34233778
34243779 vimtex = buildVimPluginFrom2Nix {
3425− name = "vimtex-2018-12-12";
3780+ pname = "vimtex";
3781+ version = "2018-12-25";
34263782 src = fetchFromGitHub {
34273783 owner = "lervag";
34283784 repo = "vimtex";
3429− rev = "6165a4421e7605a96d9b6c83f3ac853bf2f90a03";
3430− sha256 = "01yp79w53wyxqjd1dnba069pmj1b56nl52x2r3mfzzldm1p5gx4k";
3785+ rev = "0746f21c2311acfec7c7c23bd122ea4eb3eacb4b";
3786+ sha256 = "0hga30q6b6v6mdzbqbqr6j6i7fdg4i0igpi2gwvx70a2x68d7ybk";
34313787 };
34323788 };
34333789
34343790 vimux = buildVimPluginFrom2Nix {
3435− name = "vimux-2017-10-24";
3791+ pname = "vimux";
3792+ version = "2017-10-24";
34363793 src = fetchFromGitHub {
34373794 owner = "benmills";
34383795 repo = "vimux";
@@ -3442,7 +3799,8 @@
34423799 };
34433800
34443801 vimwiki = buildVimPluginFrom2Nix {
3445− name = "vimwiki-2018-10-12";
3802+ pname = "vimwiki";
3803+ version = "2018-10-12";
34463804 src = fetchFromGitHub {
34473805 owner = "vimwiki";
34483806 repo = "vimwiki";
@@ -3452,7 +3810,8 @@
34523810 };
34533811
34543812 vissort-vim = buildVimPluginFrom2Nix {
3455− name = "vissort-vim-2014-01-31";
3813+ pname = "vissort-vim";
3814+ version = "2014-01-31";
34563815 src = fetchFromGitHub {
34573816 owner = "navicore";
34583817 repo = "vissort.vim";
@@ -3462,7 +3821,8 @@
34623821 };
34633822
34643823 vundle = buildVimPluginFrom2Nix {
3465− name = "vundle-2018-02-03";
3824+ pname = "vundle";
3825+ version = "2018-02-03";
34663826 src = fetchFromGitHub {
34673827 owner = "gmarik";
34683828 repo = "vundle";
@@ -3472,7 +3832,8 @@
34723832 };
34733833
34743834 wal-vim = buildVimPluginFrom2Nix {
3475− name = "wal-vim-2018-06-04";
3835+ pname = "wal-vim";
3836+ version = "2018-06-04";
34763837 src = fetchFromGitHub {
34773838 owner = "dylanaraps";
34783839 repo = "wal.vim";
@@ -3482,7 +3843,8 @@
34823843 };
34833844
34843845 webapi-vim = buildVimPluginFrom2Nix {
3485− name = "webapi-vim-2018-03-14";
3846+ pname = "webapi-vim";
3847+ version = "2018-03-14";
34863848 src = fetchFromGitHub {
34873849 owner = "mattn";
34883850 repo = "webapi-vim";
@@ -3492,7 +3854,8 @@
34923854 };
34933855
34943856 wombat256-vim = buildVimPluginFrom2Nix {
3495− name = "wombat256-vim-2010-10-18";
3857+ pname = "wombat256-vim";
3858+ version = "2010-10-18";
34963859 src = fetchFromGitHub {
34973860 owner = "vim-scripts";
34983861 repo = "wombat256.vim";
@@ -3502,7 +3865,8 @@
35023865 };
35033866
35043867 workflowish = buildVimPluginFrom2Nix {
3505− name = "workflowish-2015-12-03";
3868+ pname = "workflowish";
3869+ version = "2015-12-03";
35063870 src = fetchFromGitHub {
35073871 owner = "lukaszkorecki";
35083872 repo = "workflowish";
@@ -3512,7 +3876,8 @@
35123876 };
35133877
35143878 xptemplate = buildVimPluginFrom2Nix {
3515− name = "xptemplate-2017-12-06";
3879+ pname = "xptemplate";
3880+ version = "2017-12-06";
35163881 src = fetchFromGitHub {
35173882 owner = "drmingdrmer";
35183883 repo = "xptemplate";
@@ -3522,7 +3887,8 @@
35223887 };
35233888
35243889 xterm-color-table-vim = buildVimPluginFrom2Nix {
3525− name = "xterm-color-table-vim-2014-01-01";
3890+ pname = "xterm-color-table-vim";
3891+ version = "2014-01-01";
35263892 src = fetchFromGitHub {
35273893 owner = "guns";
35283894 repo = "xterm-color-table.vim";
@@ -3532,7 +3898,8 @@
35323898 };
35333899
35343900 YankRing-vim = buildVimPluginFrom2Nix {
3535− name = "YankRing-vim-2015-07-29";
3901+ pname = "YankRing-vim";
3902+ version = "2015-07-29";
35363903 src = fetchFromGitHub {
35373904 owner = "vim-scripts";
35383905 repo = "YankRing.vim";
@@ -3542,7 +3909,8 @@
35423909 };
35433910
35443911 yats-vim = buildVimPluginFrom2Nix {
3545− name = "yats-vim-2018-12-15";
3912+ pname = "yats-vim";
3913+ version = "2018-12-15";
35463914 src = fetchFromGitHub {
35473915 owner = "HerringtonDarkholme";
35483916 repo = "yats.vim";
@@ -3553,18 +3921,20 @@
35533921 };
35543922
35553923 youcompleteme = buildVimPluginFrom2Nix {
3556− name = "youcompleteme-2018-12-12";
3924+ pname = "youcompleteme";
3925+ version = "2018-12-23";
35573926 src = fetchFromGitHub {
35583927 owner = "valloric";
35593928 repo = "youcompleteme";
3560− rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234";
3561− sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql";
3929+ rev = "7997fc5536e8220ed2798c5522a1eb4421577fa2";
3930+ sha256 = "1662js5dpspmrak92zwy8751qfd1pkp5q7xgw2m6c76ccvv88c5p";
35623931 fetchSubmodules = true;
35633932 };
35643933 };
35653934
35663935 YUNOcommit-vim = buildVimPluginFrom2Nix {
3567− name = "YUNOcommit-vim-2014-11-26";
3936+ pname = "YUNOcommit-vim";
3937+ version = "2014-11-26";
35683938 src = fetchFromGitHub {
35693939 owner = "esneider";
35703940 repo = "YUNOcommit.vim";
@@ -3574,7 +3944,8 @@
35743944 };
35753945
35763946 zeavim-vim = buildVimPluginFrom2Nix {
3577− name = "zeavim-vim-2018-03-22";
3947+ pname = "zeavim-vim";
3948+ version = "2018-03-22";
35783949 src = fetchFromGitHub {
35793950 owner = "KabbAmine";
35803951 repo = "zeavim.vim";
@@ -3584,7 +3955,8 @@
35843955 };
35853956
35863957 zenburn = buildVimPluginFrom2Nix {
3587− name = "zenburn-2018-04-29";
3958+ pname = "zenburn";
3959+ version = "2018-04-29";
35883960 src = fetchFromGitHub {
35893961 owner = "jnurmine";
35903962 repo = "zenburn";
@@ -3594,7 +3966,8 @@
35943966 };
35953967
35963968 zig-vim = buildVimPluginFrom2Nix {
3597− name = "zig-vim-2018-12-12";
3969+ pname = "zig-vim";
3970+ version = "2018-12-12";
35983971 src = fetchFromGitHub {
35993972 owner = "zig-lang";
36003973 repo = "zig.vim";
@@ -3604,7 +3977,8 @@
36043977 };
36053978
36063979 zoomwintab-vim = buildVimPluginFrom2Nix {
3607− name = "zoomwintab-vim-2018-04-14";
3980+ pname = "zoomwintab-vim";
3981+ version = "2018-04-14";
36083982 src = fetchFromGitHub {
36093983 owner = "troydm";
36103984 repo = "zoomwintab.vim";
@@ -3612,4 +3986,6 @@
36123986 sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6";
36133987 };
36143988 };
3615−}
3989+});
3990+
3991+in lib.fix' (lib.extends overrides packages)
pkgs/misc/vim-plugins/overrides.nix+78−101
@@ -1,10 +1,9 @@
1−{config, lib, stdenv
2−, python, cmake, vim, vimUtils, ruby
1+{ lib, stdenv
2+, python, cmake, vim, ruby
33, which, fetchgit, llvmPackages, rustPlatform
44, xkb_switch, fzf, skim
55, python3, boost, icu, ncurses
66, ycmd, rake
7−, pythonPackages, python3Packages
87, substituteAll
98, languagetool
109, Cocoa, CoreFoundation, CoreServices
@@ -17,34 +16,22 @@
1716, impl, iferr, gocode, gocode-gomod, go-tools
1817}:
1918
20−let
21−
22− _skim = skim;
23−
24−in
25−
26−generated:
27−
28−with generated;
29−
30−{
19+self: super: {
3120
3221 vim2nix = buildVimPluginFrom2Nix {
3322 name = "vim2nix";
3423 src = ./vim2nix;
35− dependencies = ["vim-addon-manager"];
24+ dependencies = with super; [ vim-addon-manager ];
3625 };
3726
3827 fzfWrapper = buildVimPluginFrom2Nix {
3928 name = fzf.name;
4029 src = fzf.src;
41− dependencies = [];
4230 };
4331
4432 skim = buildVimPluginFrom2Nix {
45− name = _skim.name;
46− src = _skim.vim;
47− dependencies = [];
33+ name = skim.name;
34+ src = skim.vim;
4835 };
4936
5037 LanguageClient-neovim = let
@@ -70,7 +57,6 @@ with generated;
7057 name = "LanguageClient-neovim-2018-09-07";
7158 src = LanguageClient-neovim-src;
7259
73− dependencies = [];
7460 propogatedBuildInputs = [ LanguageClient-neovim-bin ];
7561
7662 preFixup = ''
@@ -87,10 +73,9 @@ with generated;
8773 rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
8874 sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
8975 };
90− dependencies = [];
9176 };
9277
93− clang_complete = clang_complete.overrideAttrs(old: {
78+ clang_complete = super.clang_complete.overrideAttrs(old: {
9479 # In addition to the arguments you pass to your compiler, you also need to
9580 # specify the path of the C++ std header (if you are using C++).
9681 # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -107,14 +92,14 @@ with generated;
10792 '';
10893 });
10994
110− clighter8 = clighter8.overrideAttrs(old: {
95+ clighter8 = super.clighter8.overrideAttrs(old: {
11196 preFixup = ''
11297 sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
11398 -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
11499 '';
115100 });
116101
117− command-t = command-t.overrideAttrs(old: {
102+ command-t = super.command-t.overrideAttrs(old: {
118103 buildInputs = [ ruby rake ];
119104 buildPhase = ''
120105 rake make
@@ -122,7 +107,7 @@ with generated;
122107 '';
123108 });
124109
125− cpsm = cpsm.overrideAttrs(old: {
110+ cpsm = super.cpsm.overrideAttrs(old: {
126111 buildInputs = [
127112 python3
128113 stdenv
@@ -138,7 +123,7 @@ with generated;
138123 '';
139124 });
140125
141− ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
126+ ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: {
142127 buildInputs = [ python ];
143128 buildPhase = ''
144129 patchShebangs .
@@ -146,7 +131,7 @@ with generated;
146131 '';
147132 });
148133
149− deoplete-go = deoplete-go.overrideAttrs(old: {
134+ deoplete-go = super.deoplete-go.overrideAttrs(old: {
150135 buildInputs = [ python3 ];
151136 buildPhase = ''
152137 pushd ./rplugin/python3/deoplete/ujson
@@ -156,114 +141,106 @@ with generated;
156141 '';
157142 });
158143
159− ensime-vim = ensime-vim.overrideAttrs(old: {
144+ ensime-vim = super.ensime-vim.overrideAttrs(old: {
160145 passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
161− dependencies = ["vimproc" "vimshell" "self" "forms"];
162− });
163−
164− forms = forms.overrideAttrs(old: {
165− dependencies = ["self"];
146+ dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
166147 });
167148
168− gist-vim = gist-vim.overrideAttrs(old: {
169− dependencies = ["webapi-vim"];
149+ forms = super.forms.overrideAttrs(old: {
150+ dependencies = with super; [ super.self ];
170151 });
171152
172− gitv = gitv.overrideAttrs(old: {
173− dependencies = ["gitv"];
153+ gist-vim = super.gist-vim.overrideAttrs(old: {
154+ dependencies = with super; [ webapi-vim ];
174155 });
175156
176− ncm2 = ncm2.overrideAttrs(old: {
177− dependencies = ["nvim-yarp"];
157+ ncm2 = super.ncm2.overrideAttrs(old: {
158+ dependencies = with super; [ nvim-yarp ];
178159 });
179160
180− ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
181− dependencies = ["ultisnips"];
161+ ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: {
162+ dependencies = with super; [ nvim-yarp ncm2 ];
163+ passthru.python3Dependencies = ps: with ps; [ jedi ];
182164 });
183165
184− taglist-vim = taglist-vim.overrideAttrs(old: {
185− setSourceRoot = ''
186− export sourceRoot=taglist
187− mkdir taglist
188− mv doc taglist
189− mv plugin taglist
190− '';
166+ ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
167+ dependencies = with super; [ ultisnips ];
191168 });
192169
193− vimshell-vim = vimshell-vim.overrideAttrs(old: {
194− dependencies = [ "vimproc-vim" ];
170+ vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
171+ dependencies = with super; [ vimproc-vim ];
195172 });
196173
197− vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
174+ vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: {
198175 buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
199176 });
200177
201− vim-addon-actions = vim-addon-actions.overrideAttrs(old: {
202− dependencies = [ "vim-addon-mw-utils" "tlib" ];
178+ vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: {
179+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
203180 });
204181
205− vim-addon-async = vim-addon-async.overrideAttrs(old: {
206− dependencies = [ "vim-addon-signs" ];
182+ vim-addon-async = super.vim-addon-async.overrideAttrs(old: {
183+ dependencies = with super; [ vim-addon-signs ];
207184 });
208185
209− vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: {
210− dependencies = [ "vim-addon-mw-utils" ];
186+ vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: {
187+ dependencies = with super; [ vim-addon-mw-utils ];
211188 });
212189
213− vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
214− dependencies = [ "tlib" ];
190+ vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: {
191+ dependencies = with super; [ tlib_vim ];
215192 });
216193
217− vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
218− dependencies = [ "tlib" ];
194+ vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
195+ dependencies = with super; [ tlib_vim ];
219196 });
220197
221− vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
222− dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
198+ vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: {
199+ dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
223200 });
224201
225− vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
226− dependencies = [
227− "vim-addon-completion"
228− "vim-addon-goto-thing-at-cursor"
229− "vim-addon-errorformats"
230− "vim-addon-actions"
231− "vim-addon-mw-utils" "tlib"
202+ vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: {
203+ dependencies = with super; [
204+ vim-addon-completion
205+ vim-addon-goto-thing-at-cursor
206+ vim-addon-errorformats
207+ vim-addon-actions
208+ vim-addon-mw-utils tlib_vim
232209 ];
233210 });
234211
235− vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
236− dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
212+ vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: {
213+ dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
237214 });
238215
239− vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
240− dependencies = ["vim-addon-mw-utils" "tlib"];
216+ vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: {
217+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
241218 });
242219
243− vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
244− dependencies = [ "vim-addon-mw-utils" "tlib" ];
220+ vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: {
221+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
245222 });
246223
247− vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
248− dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
224+ vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: {
225+ dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
249226 });
250227
251− vim-bazel = vim-bazel.overrideAttrs(old: {
252− dependencies = ["maktaba"];
228+ vim-bazel = super.vim-bazel.overrideAttrs(old: {
229+ dependencies = with super; [ vim-maktaba ];
253230 });
254231
255− vim-codefmt = vim-codefmt.overrideAttrs(old: {
256− dependencies = ["maktaba"];
232+ vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
233+ dependencies = with super; [ vim-maktaba ];
257234 });
258235
259− vim-easytags = vim-easytags.overrideAttrs(old: {
260− dependencies = ["vim-misc"];
236+ vim-easytags = super.vim-easytags.overrideAttrs(old: {
237+ dependencies = with super; [ vim-misc ];
261238 });
262239
263240 # change the go_bin_path to point to a path in the nix store. See the code in
264241 # fatih/vim-go here
265242 # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
266− vim-go = vim-go.overrideAttrs(old: let
243+ vim-go = super.vim-go.overrideAttrs(old: let
267244 binPath = lib.makeBinPath [
268245 asmfmt
269246 delve
@@ -291,7 +268,7 @@ with generated;
291268 '';
292269 });
293270
294− vim-grammarous = vim-grammarous.overrideAttrs(old: {
271+ vim-grammarous = super.vim-grammarous.overrideAttrs(old: {
295272 # use `:GrammarousCheck` to initialize checking
296273 # In neovim, you also want to use set
297274 # let g:grammarous#show_first_error = 1
@@ -304,31 +281,31 @@ with generated;
304281 ];
305282 });
306283
307− vim-hier = vim-hier.overrideAttrs(old: {
284+ vim-hier = super.vim-hier.overrideAttrs(old: {
308285 buildInputs = [ vim ];
309286 });
310287
311− vim-isort = vim-isort.overrideAttrs(old: {
288+ vim-isort = super.vim-isort.overrideAttrs(old: {
312289 postPatch = ''
313290 substituteInPlace ftplugin/python_vimisort.vim \
314− --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
291+ --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
315292 '';
316293 });
317294
318− vim-snipmate = vim-snipmate.overrideAttrs(old: {
319− dependencies = ["vim-addon-mw-utils" "tlib"];
295+ vim-snipmate = super.vim-snipmate.overrideAttrs(old: {
296+ dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
320297 });
321298
322299
323− vim-wakatime = vim-wakatime.overrideAttrs(old: {
300+ vim-wakatime = super.vim-wakatime.overrideAttrs(old: {
324301 buildInputs = [ python ];
325302 });
326303
327− vim-xdebug = vim-xdebug.overrideAttrs(old: {
304+ vim-xdebug = super.vim-xdebug.overrideAttrs(old: {
328305 postInstall = false;
329306 });
330307
331− vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
308+ vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
332309 patchPhase = ''
333310 substituteInPlace plugin/xkbswitch.vim \
334311 --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -336,14 +313,14 @@ with generated;
336313 buildInputs = [ xkb_switch ];
337314 });
338315
339− vim-yapf = vim-yapf.overrideAttrs(old: {
316+ vim-yapf = super.vim-yapf.overrideAttrs(old: {
340317 buildPhase = ''
341318 substituteInPlace ftplugin/python_yapf.vim \
342− --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
319+ --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
343320 '';
344321 });
345322
346− vimproc-vim = vimproc-vim.overrideAttrs(old: {
323+ vimproc-vim = super.vimproc-vim.overrideAttrs(old: {
347324 buildInputs = [ which ];
348325
349326 buildPhase = ''
@@ -355,11 +332,11 @@ with generated;
355332 '';
356333 });
357334
358− YankRing-vim = YankRing-vim.overrideAttrs(old: {
335+ YankRing-vim = super.YankRing-vim.overrideAttrs(old: {
359336 sourceRoot = ".";
360337 });
361338
362− youcompleteme = youcompleteme.overrideAttrs(old: {
339+ youcompleteme = super.youcompleteme.overrideAttrs(old: {
363340 buildPhase = ''
364341 substituteInPlace plugin/youcompleteme.vim \
365342 --replace "'ycm_path_to_python_interpreter', '''" \
@@ -378,9 +355,9 @@ with generated;
378355 };
379356 });
380357
381− jedi-vim = jedi-vim.overrideAttrs(old: {
358+ jedi-vim = super.jedi-vim.overrideAttrs(old: {
382359 # checking for python3 support in vim would be neat, too, but nobody else seems to care
383− buildInputs = [ python3Packages.jedi ];
360+ buildInputs = [ python3.pkgs.jedi ];
384361 meta = {
385362 description = "code-completion for python using python-jedi";
386363 license = stdenv.lib.licenses.mit;
pkgs/misc/vim-plugins/update.py+2−1
@@ -309,7 +309,8 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
309309 f.write(
310310 f"""
311311 {plugin.normalized_name} = buildVimPluginFrom2Nix {{
312− name = "{plugin.normalized_name}-{plugin.version}";
312+ pname = "{plugin.normalized_name}";
313+ version = "{plugin.version}";
313314 src = fetchFromGitHub {{
314315 owner = "{owner}";
315316 repo = "{repo}";
pkgs/misc/vim-plugins/vim-plugin-names+1
@@ -197,6 +197,7 @@ navicore/vissort.vim
197197nbouscal/vim-stylish-haskell
198198ncm2/ncm2
199199ncm2/ncm2-bufword
200+ncm2/ncm2-jedi
200201ncm2/ncm2-path
201202ncm2/ncm2-tmux
202203ncm2/ncm2-ultisnips
pkgs/misc/vim-plugins/vim-utils.nix+46−76
@@ -150,23 +150,35 @@ vim_with_plugins can be installed like any other application within Nix.
150150let
151151 inherit (stdenv) lib;
152152
153− toNames = x:
153+ # transitive closure of plugin dependencies
154+ transitiveClosure = knownPlugins: plugin:
155+ let
156+ # vam puts out a list of strings as the dependency list, we need to be able to deal with that.
157+ # Because of that, "plugin" may be a string or a derivation. If it is a string, it is resolved
158+ # using `knownPlugins`. Otherwise `knownPlugins` can be null.
159+ knownPlugins' = if knownPlugins == null then vimPlugins else knownPlugins;
160+ pluginDrv = if builtins.isString plugin then knownPlugins'.${plugin} else plugin;
161+ in
162+ [ pluginDrv ] ++ (
163+ lib.unique (builtins.concatLists (map (transitiveClosure knownPlugins) pluginDrv.dependencies or []))
164+ );
165+
166+ findDependenciesRecursively = knownPlugins: plugins: lib.concatMap (transitiveClosure knownPlugins) plugins;
167+
168+ attrnamesToPlugins = { knownPlugins, names }:
169+ map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins;
170+
171+ pluginToAttrname = plugin:
172+ plugin.pname;
173+
174+ pluginsToAttrnames = plugins: map pluginToAttrname plugins;
175+
176+ vamDictToNames = x:
154177 if builtins.isString x then [x]
155178 else (lib.optional (x ? name) x.name)
156179 ++ (x.names or []);
157− findDependenciesRecursively = {knownPlugins, names}:
158180
159− let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or [];
160−
161− recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names;
162−
163− recurse = path:
164− let name = builtins.head path;
165− in if builtins.elem name (builtins.tail path)
166− then throw "recursive vim dependencies"
167− else [name] ++ recurseNames path (depsOf name);
168−
169− in lib.uniqList { inputList = recurseNames [] names; };
181+ rtpPath = "share/vim-plugins";
170182
171183 vimrcFile = {
172184 packages ? null,
@@ -183,11 +195,11 @@ let
183195 (let
184196 knownPlugins = pathogen.knownPlugins or vimPlugins;
185197
186− plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
198+ plugins = findDependenciesRecursively knownPlugins pathogen.pluginNames;
187199
188200 pluginsEnv = buildEnv {
189201 name = "pathogen-plugin-env";
190− paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins;
202+ paths = map (x: "${x}/${rtpPath}") plugins;
191203 };
192204 in
193205 ''
@@ -228,7 +240,7 @@ let
228240 (let
229241 knownPlugins = vam.knownPlugins or vimPlugins;
230242
231− names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
243+ plugins = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
232244
233245 # Vim almost reads JSON, so eventually JSON support should be added to Nix
234246 # TODO: proper quoting
@@ -242,9 +254,9 @@ let
242254 in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
243255 ''
244256 let g:nix_plugin_locations = {}
245− ${lib.concatMapStrings (name: ''
246− let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}"
247− '') names}
257+ ${lib.concatMapStrings (plugin: ''
258+ let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}"
259+ '') plugins}
248260 let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}"
249261
250262 let g:vim_addon_manager = {}
@@ -281,8 +293,18 @@ let
281293 (let
282294 link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
283295 packageLinks = (packageName: {start ? [], opt ? []}:
296+ let
297+ # `nativeImpl` expects packages to be derivations, not strings (as
298+ # opposed to older implementations that have to maintain backwards
299+ # compatibility). Therefore we don't need to deal with "knownPlugins"
300+ # and can simply pass `null`.
301+ depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively null opt);
302+ startWithDeps = findDependenciesRecursively null start;
303+ in
284304 ["mkdir -p $out/pack/${packageName}/start"]
285− ++ (builtins.map (link packageName "start") start)
305+ # To avoid confusion, even dependencies of optional plugins are added
306+ # to `start` (except if they are explicitly listed as optional plugins).
307+ ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins)))
286308 ++ ["mkdir -p $out/pack/${packageName}/opt"]
287309 ++ (builtins.map (link packageName "opt") opt)
288310 );
@@ -381,61 +403,9 @@ rec {
381403 '';
382404 };
383405
384− rtpPath = "share/vim-plugins";
385−
386− vimHelpTags = ''
387− vimHelpTags(){
388− if [ -d "$1/doc" ]; then
389− ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
390− fi
391− }
392− '';
393−
394− addRtp = path: attrs: derivation:
395− derivation // { rtp = "${derivation}/${path}"; } // {
396− overrideAttrs = f: buildVimPlugin (attrs // f attrs);
397− };
398−
399− buildVimPlugin = a@{
400− name,
401− namePrefix ? "vimplugin-",
402− src,
403− unpackPhase ? "",
404− configurePhase ? "",
405− buildPhase ? "",
406− preInstall ? "",
407− postInstall ? "",
408− path ? (builtins.parseDrvName name).name,
409− addonInfo ? null,
410− ...
411− }:
412− addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // {
413− name = namePrefix + name;
414−
415− inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
416−
417− installPhase = ''
418− runHook preInstall
419−
420− target=$out/${rtpPath}/${path}
421− mkdir -p $out/${rtpPath}
422− cp -r . $target
423− ${vimHelpTags}
424− vimHelpTags $target
425− if [ -n "$addonInfo" ]; then
426− echo "$addonInfo" > $target/addon-info.json
427− fi
428−
429− runHook postInstall
430− '';
431− }));
432−
433406 vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
434407
435− buildVimPluginFrom2Nix = a: buildVimPlugin ({
436− buildPhase = ":";
437− configurePhase =":";
438− } // a);
408+ inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
439409
440410 requiredPlugins = {
441411 packages ? {},
@@ -450,13 +420,13 @@ rec {
450420 if vam != null && vam ? knownPlugins then vam.knownPlugins else
451421 if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
452422 vimPlugins;
453− pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
454− vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
423+ pathogenNames = findDependenciesRecursively knownPlugins pathogen.pluginNames;
424+ vamNames = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
455425 names = (lib.optionals (pathogen != null) pathogenNames) ++
456426 (lib.optionals (vam != null) vamNames);
457427 nonNativePlugins = map (name: knownPlugins.${name}) names ++ (lib.optionals (plug != null) plug.plugins);
458428 nativePluginsConfigs = lib.attrsets.attrValues packages;
459− nativePlugins = lib.concatMap ({start?[], opt?[]}: start++opt) nativePluginsConfigs;
429+ nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs;
460430 in
461431 nativePlugins ++ nonNativePlugins;
462432