diff options
Diffstat (limited to 'pkgs/misc/vim-plugins')
| -rw-r--r-- | pkgs/misc/vim-plugins/aliases.nix | 14 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/deprecated.json | 18 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 761 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 231 | ||||
| -rwxr-xr-x | pkgs/misc/vim-plugins/update.py | 114 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 65 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 19 |
8 files changed, 811 insertions, 412 deletions
diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index cfdd629369c0..4cfb6ccd372f 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -30,12 +30,17 @@ let (removeRecurseForDerivations (checkInPkgs n alias))) aliases; -in -mapAliases { + deprecations = lib.mapAttrs (old: info: + throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." + ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + +in +mapAliases ({ airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; + BufOnly = BufOnly-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18 @@ -67,7 +72,7 @@ mapAliases { ghc-mod-vim = ghcmod-vim; ghcmod = ghcmod-vim; goyo = goyo-vim; - Gist = gist-vim; + Gist = vim-gist; gitgutter = vim-gitgutter; gundo = gundo-vim; Gundo = gundo-vim; # backwards compat, added 2015-10-03 @@ -133,7 +138,6 @@ mapAliases { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing-vim; Yankring = YankRing-vim; - YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; -} +} // deprecations) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 20cbbf275c3a..e6bca9484a26 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -11,7 +11,6 @@ let # TL;DR # * Add your plugin to ./vim-plugin-names - # * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names # * run ./update.py # # If additional modifications to the build process are required, diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json new file mode 100644 index 000000000000..2c02982f6c60 --- /dev/null +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -0,0 +1,18 @@ +{ + "gist-vim": { + "date": "2020-03-27", + "new": "vim-gist" + }, + "vim-jade": { + "date": "2020-03-27", + "new": "vim-pug" + }, + "vundle": { + "date": "2020-03-27", + "new": "Vundle.vim" + }, + "youcompleteme": { + "date": "2020-03-27", + "new": "YouCompleteMe" + } +} \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5c7f8295aa6d..68d2aae23ce4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-02-25"; + version = "2020-03-11"; src = fetchFromGitHub { - owner = "w0rp"; + owner = "dense-analysis"; repo = "ale"; - rev = "634c81fd465269f59e3db878fe8405828e6d2da9"; - sha256 = "1lcqyj0yjdhm2kdk0p6pr8avjnb7gm4hg0dygm6fpjz3f078n9py"; + rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; + sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; }; }; @@ -125,6 +125,17 @@ let }; }; + ats-vim = buildVimPluginFrom2Nix { + pname = "ats-vim"; + version = "2020-03-03"; + src = fetchFromGitHub { + owner = "vmchale"; + repo = "ats-vim"; + rev = "045fa53f1e0699e980c5c7cd85ecf237ae527ff0"; + sha256 = "1rpqy40kw0cn2h02ly71syvwz5j77xfmrs4mijkn7k0dxgamhy5s"; + }; + }; + auto-git-diff = buildVimPluginFrom2Nix { pname = "auto-git-diff"; version = "2019-09-23"; @@ -160,12 +171,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-02-27"; + version = "2020-03-13"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "b8bdaca805a059eed03a4f439578d373798c6d74"; - sha256 = "1gmip6fggm5scbry9r1ggaq2fiy5xhwsj6ql24fa5jylyf1gfm26"; + rev = "fa05cbe493224dc132eb623025e94a5e29fdcccd"; + sha256 = "062pi6dqxg3dfbb4qw5fg9d9jh6zpbrznkg1sim2j1c8g67mlpfl"; }; }; @@ -224,6 +235,17 @@ let }; }; + BufOnly-vim = buildVimPluginFrom2Nix { + pname = "BufOnly-vim"; + version = "2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "BufOnly.vim"; + rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7"; + sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl"; + }; + }; + calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; version = "2020-02-14"; @@ -283,7 +305,7 @@ let pname = "clang_complete"; version = "2018-09-19"; src = fetchFromGitHub { - owner = "Rip-Rip"; + owner = "xavierd"; repo = "clang_complete"; rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; @@ -347,23 +369,34 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-02-27"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "fc720742d1f7fed7a0737ee92235d743f2a86a12"; - sha256 = "0qx3wsdnjnfxi6dg3z9pdcqnj2rhwnprz3ypch6ysyshlbvbs9ag"; + rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4"; + sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2020-02-13"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "fa76d5c34d048b97eb53cf5e13f6d9acf975c92e"; - sha256 = "0wizc10g7jxrf2da15hdnjn471w0fgyaw13j9qf7gyhcsmdx1x5w"; + rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52"; + sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj"; + }; + }; + + coc-fzf = buildVimPluginFrom2Nix { + pname = "coc-fzf"; + version = "2020-03-06"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "coc-fzf"; + rev = "ca394b48ac9c78ce95d6cdf3807927a7b6bcfcbe"; + sha256 = "1nsqdp2zma7rlzynm58z43vk5hyrcz8kn7ak32979p4a3fvdyj5c"; }; }; @@ -424,34 +457,34 @@ let coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2019-11-11"; + version = "2020-03-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "13c8b482662f964af89e167a438f06493f347617"; - sha256 = "19sqv2bflr4aw8hkq9rh8r2b9llx4dbirp5755jbvd62bvizab2d"; + rev = "33ca64c00ee5c0d759a6f537b23971476b85f8e3"; + sha256 = "07mblxxvl95kfy0wwm5r75j6y3v8fvyh6cwiza5rg1z9dlw1xddw"; }; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-02-10"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "25c1f7661a9ce6898924228115b671469c958a1a"; - sha256 = "1cqy6a9cs0ns5ifglxhrmd6lvfnlfx6ni44xq3gayh4lnyxdlc8p"; + rev = "21761f5e9a48baf3dbb6540ff180f6071c1ed8c6"; + sha256 = "101n3cmhvm4hxznk5w4n7lbk552cwsyf28axa1d5rr838r3zg5wi"; }; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-02-27"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "4dd4685ef44f1a38ea20b373f2a20b82304d68e0"; - sha256 = "1q165kh4k59ikivs9pwp6w9jla6li8hcln5zbpkxhis6sh9g3bn6"; + rev = "a4a82cd0ea5fb71399ca02c03456e9862a54eec8"; + sha256 = "1cj05rzzwacf0c2gk0zhb5ln6pywyc35p2walna80ncpyniyk6k2"; }; }; @@ -468,12 +501,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2020-01-02"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd"; - sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5"; + rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; + sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; }; }; @@ -534,12 +567,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-02-19"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "aaa059bb998418850ec2d7958a5df16e96e76d59"; - sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j"; + rev = "881de16a72440c2db7ecc0a68ae0d32a2e5e6864"; + sha256 = "12dwr6r30b78rhj2b19x2l48ri7qzvl2ggr9x6189fhbz4h25rs5"; }; }; @@ -554,6 +587,17 @@ let }; }; + coc-spell-checker = buildVimPluginFrom2Nix { + pname = "coc-spell-checker"; + version = "2020-03-16"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-spell-checker"; + rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; + sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; + }; + }; + coc-stylelint = buildVimPluginFrom2Nix { pname = "coc-stylelint"; version = "2019-08-20"; @@ -600,23 +644,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-02-07"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "89998609d4b117083738aa06cb138765810ac0e7"; - sha256 = "118acn2vzb51mqxnx50lhibfqivzzfqsbyd5hy5qfl2p8gd67c0k"; + rev = "54bea1ec1ab44802a155f876a4d1cc2c44b2bc42"; + sha256 = "0npjc7c3x9mdqc6asav1f2wwv4p6lb5hk7c1p9b7m3vjg21w0k22"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-11-13"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0"; - sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb"; + rev = "8072352a371261a922f30a89a6b5c6b07123da84"; + sha256 = "1nb33ndl0pzxw30ibs6p4qaa781cni93ffgypcc69wg4b2r4341a"; }; }; @@ -644,23 +688,23 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2020-02-09"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "d9b2a7ec6275e25bb89e875f73d99ff8a3e58877"; - sha256 = "05xgz3lhfzd93ldac0jw7i68f1s3p3ikg22gvl3v2va8r1rf01hh"; + rev = "338192a2434b96b139fb8c07d260da00b3100997"; + sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; }; }; coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-12-11"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5"; - sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf"; + rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; + sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; }; }; @@ -722,12 +766,12 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-01-08"; + version = "2020-03-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "cbe3c0069e6a13bd9bfcd9739c0770f7fd4b4ef4"; - sha256 = "07mnch8vi7snx8jfz32hkg4v4ml2ywb8yn0jycshn317j253fbmj"; + rev = "f200fe69939089da9e61bd9a3ff75b4ef7adc708"; + sha256 = "06pclan83yww5qf26fmqhby8iks0rzlxgpk254vxmkihbypvpa51"; }; }; @@ -766,12 +810,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-02-05"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "0663b09f9203cb38ef113254b461047c7e3c43e7"; - sha256 = "14icc2a5hylknz8sigmbxwamf9ck4lsjjykyxjycrnwjrpasl8sv"; + rev = "e7fb581122df54fe9770cc5e565bef450e7d2478"; + sha256 = "1h15n1pdci34idks218r4kpwna1zb25hk8prsqzvjkj8mc6ch67y"; }; }; @@ -821,12 +865,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-12-03"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "ff468225ce2c8834b944ba6e040fe18a28a67cff"; - sha256 = "1h4yw71dj67q57d7iiw22silcmji5ibp4bj18kgm0gvwa53hy7hh"; + rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8"; + sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6"; }; }; @@ -878,7 +922,7 @@ let pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-extra"; rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; @@ -887,34 +931,34 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-02-26"; + version = "2020-03-02"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-git"; - rev = "0c7ffefa872ca19d61ecec6e014a797f0c25e98f"; - sha256 = "11mz76x7pj2p3k3d8ycjvrwdjrabrdcssw5lr529r9dardkqchzl"; + rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; + sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-02-23"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "e435b78c3fa878dba7bbb03ee7cd95df6ce7a836"; - sha256 = "10lz16l34ran96i5902hw9zw3qbfdz712bdjkdwvaijmgnj464s5"; + rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b"; + sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-11-27"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5"; - sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10"; + rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb"; + sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx"; }; }; @@ -922,7 +966,7 @@ let pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-clang"; rev = "2ea262e98edcb66e828f9077fcc844100320eb63"; sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; @@ -978,7 +1022,7 @@ let pname = "deoplete-go"; version = "2020-01-01"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-go"; rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; @@ -999,12 +1043,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-02-03"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "2d2ff2382fd67574c233d0ce48150b26eb7f6809"; - sha256 = "1hwmf0hnyvznciysj3k0gcycmvl2mvv8krmc26bi430q89gxgq56"; + rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f"; + sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; fetchSubmodules = true; }; }; @@ -1033,12 +1077,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-01-10"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "7a8c44f423bc4339c092a759abaad40131d2c98a"; - sha256 = "1gg9j26xq668s4gbww0p2x8pkh3ssbzgyp2hxppk2ws7x8c2cihi"; + rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; + sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; }; }; @@ -1110,12 +1154,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-02-27"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "08582f7c52aa53d63f9a7a714fab9137d6ea48f0"; - sha256 = "1bnz9q6rz95w8xw9vhzhfrfr6r8zdgf0ihylvjaa2kzxir7sngm2"; + rev = "1439c621dc94016c504e1732ce8270081a42768f"; + sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f"; }; }; @@ -1154,23 +1198,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-02-27"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "577b7e7d083e37c0c15158cbd761de7cd831e682"; - sha256 = "1cmp80s4k7sslj4vd919wwlinzmy0yghnczwzrwgk9yf0jclk4nv"; + rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c"; + sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-01-31"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "21fbc2afe8f30e98b890fb42fc6bc18fc0c0380e"; - sha256 = "1za9q891bxc355qn7v0wasnvf2j6pvhizbp6ycj411hjcw90jwns"; + rev = "c5804257c6b38c5537b71ac91ed051c70eaeb5e5"; + sha256 = "147cqfwzaxwc1fzvynwdvx1cvx6zziamcayrvacqxs7vzjnz8lx7"; fetchSubmodules = true; }; }; @@ -1188,12 +1232,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-10-08"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "5f559fae12a8babf414376906197dbd751e11380"; - sha256 = "0z9lny12hckc635zafh1mdh58pikz5k19kkhxj1m77h15rwwms7f"; + rev = "c7643e5b616430f766528b225528a5228adb43df"; + sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv"; fetchSubmodules = true; }; }; @@ -1222,23 +1266,23 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-02-26"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "7128e3a6778347ff7848d9f8a423f63b94e6d9b9"; - sha256 = "0s4sd982z3f8cppcz4hja788jgcm1gsh6qn8lw9535i6bmphn027"; + rev = "b7ef5d0e1b15ce007ecf6adb94270c0d3468d90e"; + sha256 = "1dcf6ic74r1lg0a3zqhfp1wk2f7j8nsykfvrk2d0j7waj2xsni4v"; }; }; far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-02-15"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "f9d916497e2bf26e6e7072b0375f6c484170311a"; - sha256 = "02ych1rrj8n6caczphnmvmir8x661p94kc0kh9bffmz7hjk6586q"; + rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; + sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; }; }; @@ -1289,12 +1333,12 @@ let float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2019-04-07"; + version = "2020-02-29"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3"; - sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd"; + rev = "cbc23a28e8ea92d7c8dc22e727a62d42ef65086a"; + sha256 = "1qv05qv89sbh1cafl2597lj95yv8yxpxm3sxbbclrls1962f7hgy"; }; }; @@ -1333,12 +1377,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-02-19"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "48a2d80a24d19bfaafd91005786653bc49303c62"; - sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5"; + rev = "d4d36b412bdc53e8bdaf0e2714a2227f51781d68"; + sha256 = "0wbq8ckgzw867qqwjzm48jnbgp7yjl1vim7nsyk1wjm2d8z0xjm9"; }; }; @@ -1355,23 +1399,23 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-12-13"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b"; - sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj"; + rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; + sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; }; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-01-27"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "dfa37af1baa37c1eb0a34d9bf303b5f2aa9fbc4c"; - sha256 = "1cx0bj1c1ynzqqvjx0rrbkbhkql6zs11k6sbpbn7gdch4437cjzs"; + rev = "63b7813cac0e67cba1ace94b42ef1af291e35e47"; + sha256 = "1p4blbngaxdlacmrqiyxw8y4d0jiws104np68d31mfnvqghylcdy"; }; }; @@ -1386,17 +1430,6 @@ let }; }; - gist-vim = buildVimPluginFrom2Nix { - pname = "gist-vim"; - version = "2020-01-29"; - src = fetchFromGitHub { - owner = "mattn"; - repo = "gist-vim"; - rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; - sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; - }; - }; - gitignore-vim = buildVimPluginFrom2Nix { pname = "gitignore-vim"; version = "2014-03-16"; @@ -1441,6 +1474,17 @@ let }; }; + gruvbox-community = buildVimPluginFrom2Nix { + pname = "gruvbox-community"; + version = "2020-02-24"; + src = fetchFromGitHub { + owner = "gruvbox-community"; + repo = "gruvbox"; + rev = "f5711c15480b83378bde13306fa997057c0c81cd"; + sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; + }; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; version = "2020-01-15"; @@ -1498,12 +1542,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-11-07"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "dc4b4b5838d126c22c44229a3ee170f6ac79ba86"; - sha256 = "1hicambipbgwf22fax782gpfmcndcpikj3bpf8v91wd5fxm7ik74"; + rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; + sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; }; }; @@ -1531,12 +1575,12 @@ let increment-activator = buildVimPluginFrom2Nix { pname = "increment-activator"; - version = "2019-05-09"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "nishigori"; repo = "increment-activator"; - rev = "f341baf93b172aee646c90ff2ce28de0f897561b"; - sha256 = "0hda6h3qz6ynpl996rk1rm6xnxgkaz108v28qg0w6wm7qzynbmnv"; + rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; + sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; }; }; @@ -1564,12 +1608,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2019-10-26"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "bb548a975ebe4576073ca025eeb2743b4465ce1d"; - sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn"; + rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; + sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; }; }; @@ -1619,12 +1663,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-02-27"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "686f39ac002ca31acd663ae8749982144484ff95"; - sha256 = "0ll0rnw00kl58a3dpvcx85dmd5j2figg6cc87qld2mn169qcx354"; + rev = "e83112f9aab147ab485ee7af72e01d047c5206d3"; + sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; fetchSubmodules = true; }; }; @@ -1664,12 +1708,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-02-13"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "8c0b9e8f87091ff17abbca752fa30e3a34ebb5a1"; - sha256 = "013c0zgh0d0zanys38k3q0bxp9xd5xjz92kjsr3b0in371yc7wv1"; + rev = "8ea33c2e5c3dd5cc82b2a86a9f7c97b8219aeb9c"; + sha256 = "0i7n5fs0a717il71yny8dsrvyyskj9cahg1wnx8nrkyn3x06myhh"; }; }; @@ -1774,23 +1818,23 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-02-02"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "05aaec7d82f15c135f97063d534332b3fd388474"; - sha256 = "11vp244x912fipfp8h61v7m361kjs6jq6g843avwskpjb2b4b40f"; + rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf"; + sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03"; }; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-02-19"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "3077a653988ff1f3d6483a2281650ac6da5b7559"; - sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym"; + rev = "3a8383f2efbd7496c17a70bf4593773f6149435f"; + sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9"; }; }; @@ -1805,14 +1849,25 @@ let }; }; + lightline-bufferline = buildVimPluginFrom2Nix { + pname = "lightline-bufferline"; + version = "2020-02-14"; + src = fetchFromGitHub { + owner = "mengelbrecht"; + repo = "lightline-bufferline"; + rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; + sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; + }; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-02-15"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "e8577f3654cac97ee18faae28c80a2200aaaad5a"; - sha256 = "15jw9qvj1dqqfnf52yqvs11r9hzw42aviz89q1gx6yqmvjd5py4v"; + rev = "893bd90787abfec52a2543074e444fc6a9e0cf78"; + sha256 = "0cgzkyhpr1p184yc9b3m259i5mnwdyj5zg80idywvv2gh8phw2y7"; }; }; @@ -1884,12 +1939,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-02-10"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "605ea0ddcec45b33ec7db69119822a9a5d538823"; - sha256 = "1pjmxx3wxss25vdb5dqppr7ngkd9w52gzf6ani99flw3rzkmg9c5"; + rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; + sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; }; }; @@ -2016,12 +2071,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-01-05"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9"; - sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4"; + rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; + sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; }; }; @@ -2038,12 +2093,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-02-20"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0"; - sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n"; + rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae"; + sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy"; }; }; @@ -2071,34 +2126,34 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-02-06"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "caa9b82220237865a2fbb846b0fa63f4a6a9eb7a"; - sha256 = "1rvc4za0vb5if144v07vj0aw7axq3mh1idhismyc4y31pfz59nap"; + rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54"; + sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a"; }; }; NeoSolarized = buildVimPluginFrom2Nix { pname = "NeoSolarized"; - version = "2018-05-07"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "icymind"; repo = "NeoSolarized"; - rev = "1af4bf6835f0fbf156c6391dc228cae6ea967053"; - sha256 = "1l98yh3438anq33a094p5qrnhcm60nr28crs0v4nfah7lfdy5mc2"; + rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; + sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; }; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-02-15"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "dacbae9d844e678c785db7c9d7988df7a405e572"; - sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv"; + rev = "ee8bba435bed2ecadafb97ff00c2b7b07eedc1b4"; + sha256 = "190k2b0nzkkpakkfwbhmnh5q0b9vj882lvvnzw6dyiq5w5z59pxb"; }; }; @@ -2139,7 +2194,7 @@ let pname = "nerdcommenter"; version = "2020-02-19"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdcommenter"; rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; @@ -2150,7 +2205,7 @@ let pname = "nerdtree"; version = "2020-02-20"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdtree"; rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; @@ -2190,17 +2245,6 @@ let }; }; - notational-fzf-vim = buildVimPluginFrom2Nix { - pname = "notational-fzf-vim"; - version = "2019-12-03"; - src = fetchFromGitHub { - owner = "alok"; - repo = "notational-fzf-vim"; - rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914"; - sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi"; - }; - }; - NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; version = "2019-12-12"; @@ -2236,12 +2280,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-02-13"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "64c471aa17ec1980a8f3304c11f00fa4174234bf"; - sha256 = "0nc6rn1wvdhka23jc52r7kccq81qda1ilal5c1qp0x0hr9ada58l"; + rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; + sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; }; }; @@ -2258,12 +2302,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-02-25"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "1739274e24087565760b35a789a28bc217308ecf"; - sha256 = "08lmpagkxqgn06375bib8z9k3hm7b6q139vbkzc2hxpbg3xd4jfs"; + rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67"; + sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg"; }; }; @@ -2313,23 +2357,23 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2020-02-08"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "cb1b3b957d391e15eac41a2c9695086472d6638f"; - sha256 = "0sd72arqqk6kpr3mxdvdcqsb0lcf80gbswxzd5piafwidkmk7m5n"; + rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d"; + sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw"; }; }; open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2020-02-20"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "a1091492328a57fac02e80641a86c9c64a95ebe1"; - sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw"; + rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89"; + sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v"; }; }; @@ -2447,7 +2491,7 @@ let pname = "purescript-vim"; version = "2018-12-10"; src = fetchFromGitHub { - owner = "raichoo"; + owner = "purescript-contrib"; repo = "purescript-vim"; rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; @@ -2467,12 +2511,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2019-04-22"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "994576d997a52b4c7828149e9f1325d1c4691ae2"; - sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd"; + rev = "49b00ee08176636384c98690a4719565372f68b9"; + sha256 = "0lsmrmjrhyi1rm4sp3hs9lhs8v8ff50zc1gy4bg6gsxw4c1ghl3q"; }; }; @@ -2590,7 +2634,7 @@ let pname = "riv-vim"; version = "2020-02-17"; src = fetchFromGitHub { - owner = "Rykka"; + owner = "gu-fan"; repo = "riv.vim"; rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; @@ -2621,12 +2665,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-02-03"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "db0137dfad4690621e01dbae780fb4a2dd7dbf27"; - sha256 = "1c5yynl6clq6rvr17ma49npfiw5ssarrn8hdz9vgqwkvf879icmd"; + rev = "255a81f091a08786e004f215651227a2fef3a64c"; + sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g"; }; }; @@ -2665,12 +2709,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2020-02-25"; + version = "2020-03-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "fb0607ff91ac3b2fb2fa226be12bec1ccef4f1e1"; - sha256 = "1d2rsxb8ag42ba0bqj9g7ax56v36vch6x2q768q73plagiwr4jzy"; + rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; + sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; }; }; @@ -2696,6 +2740,17 @@ let }; }; + SimpylFold = buildVimPluginFrom2Nix { + pname = "SimpylFold"; + version = "2017-06-13"; + src = fetchFromGitHub { + owner = "tmhedberg"; + repo = "SimpylFold"; + rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; + sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + }; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -2731,12 +2786,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-02-23"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "c35ee8509a9f690366b7d8c04cded9d9f07d8a86"; - sha256 = "18y7z79469lkcn293zyly306hm7dr1sq9dvnl69nc4a82cdpaha8"; + rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5"; + sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d"; }; }; @@ -2795,6 +2850,17 @@ let }; }; + splitjoin-vim = buildVimPluginFrom2Nix { + pname = "splitjoin-vim"; + version = "2020-03-10"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "splitjoin.vim"; + rev = "fef5079e9dee55c2cf879ce2a4412fb5dcb40808"; + sha256 = "1v6cm86klzbmzx2grzxprpxci3001yjfbnwdd1891rfggjlm4wj9"; + }; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -2821,7 +2887,7 @@ let pname = "sved"; version = "2019-01-25"; src = fetchFromGitHub { - owner = "peder2tm"; + owner = "peterbjorgensen"; repo = "sved"; rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; @@ -2843,7 +2909,7 @@ let pname = "syntastic"; version = "2020-01-29"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "vim-syntastic"; repo = "syntastic"; rev = "f3766538720116f099a8b1517f76ae2f094afd20"; sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; @@ -2918,12 +2984,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-02-21"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "20e85e8c2346bd1f60f1ef55c5e32bb54a7a22fc"; - sha256 = "0k8w924gyrx71kifj6cdgxbzlv5v4cp9gdy5bhc53cgn9nfjgapw"; + rev = "b9a075e36e9d8817b15e2edcdb8b6bf51a8d479c"; + sha256 = "1vyg2n7s8981km05zpfhzcvb1adwc26l034w9w1bjil72fywdad0"; }; }; @@ -3029,12 +3095,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-01-21"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "785af7476e0db2522372ef585c86947fc5625c81"; - sha256 = "1grjd7zpds9vgllf4y7iymbkxi9kaks1dccgmhkp0vas8hlvpiy6"; + rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; + sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; }; }; @@ -3051,12 +3117,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-02-27"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "129d33fc34a72ced857f3cfb72ff10caf10f0020"; - sha256 = "1hf6d4rr2y4msjxqh0pjpdh6237992497wfj8jy0jalnp2j8icbx"; + rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; + sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; }; }; @@ -3073,12 +3139,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-02-27"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "582b715562c953ea9a1f043443f98793cfbc0d47"; - sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf"; + rev = "fc2e986f34dc6b21e80d54845a7b538003129feb"; + sha256 = "0h76726rnqrdvmm9bpgnrli66rg18b2snw077wz0zvcz7g0l9a24"; }; }; @@ -3139,12 +3205,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-01-02"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "5a633625615c79f87786d74ea925790ccdd82aba"; - sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5"; + rev = "ed490ae07168ecd1636b9fe0998baeb770b87cd9"; + sha256 = "0b23r37az36kzlzr3k483r1yy142nmz09hc9wkwchs2zns30bqky"; }; }; @@ -3370,12 +3436,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-02-27"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "774cd8b08ff1569f86cba78e24ee06e448f86b4f"; - sha256 = "09hhgsbg5nnmzdpz4wclwgjnkxg2l1rvizhmv0wd7g6sshs9i83w"; + rev = "119477060d55bb5de173b28f310d430af5593618"; + sha256 = "0hgq13iigpk8cy0lyamaz135019qbxc5nckgv0363ilhk4k5ilrd"; }; }; @@ -3436,12 +3502,23 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-02-21"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "db57d849f31cd81075c82d4827426a326de76dae"; - sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w"; + rev = "80bda05d0f5383af0a09b9ca4a2918a23d372f60"; + sha256 = "1dgqz73cprn2s3xpdfpyjq7bmwjpdrz8b3kf6mwkajgxjl89sv7m"; + }; + }; + + vim-automkdir = buildVimPluginFrom2Nix { + pname = "vim-automkdir"; + version = "2016-01-17"; + src = fetchFromGitHub { + owner = "benizi"; + repo = "vim-automkdir"; + rev = "dec143a8d9b266f73a42c63ede85bfc26280f79d"; + sha256 = "00ix0y1ijbis8pj7pf6gv2g5z2s7kxwlr0viybwrs0li5acym6jp"; }; }; @@ -3557,12 +3634,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-02-26"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6d69f933f243ed3d7797641bd41c0e65d245c931"; - sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn"; + rev = "d6676620f7a85fa49e8893cad041df59497fd845"; + sha256 = "01wrlq9h2wzngi8qna0zrwycrp0iqp7qsijyby287zbckrs25rnd"; }; }; @@ -3689,12 +3766,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-02-01"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "80c4a28ad90a32fb40f01df44e6208bb7709753d"; - sha256 = "1cn605aj3qa11df8arhdsd6x0rpkz83w1r6a3g21cwd5j37x6gkr"; + rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; + sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; }; }; @@ -3722,12 +3799,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-02-08"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "b06f5418a434644f64ba9f218472b5aa86eb03a6"; - sha256 = "0prfygwiwv6i59p45rrvk0d5s68fc25hw5r44z9a90n6f8xsn740"; + rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d"; + sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl"; }; }; @@ -3854,12 +3931,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-02-21"; + version = "2020-03-11"; src = fetchFromGitHub { - owner = "elixir-lang"; + owner = "elixir-editors"; repo = "vim-elixir"; - rev = "85afa5e0de0ba0d640898e9d232552795fc726d2"; - sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm"; + rev = "088cfc407460dea7b81c10b29db23843f85e7919"; + sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; }; }; @@ -4030,12 +4107,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-02-23"; + version = "2020-03-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c452181975761f8b055b88eb1c98f736323510fd"; - sha256 = "0zx9p9y45h26imrzw9nm5balxw7dmv94ynd7cn8mvml29v0awv2g"; + rev = "0e35c9bbc78159318e7b7ffd228f09a96afb8fde"; + sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b"; }; }; @@ -4050,6 +4127,17 @@ let }; }; + vim-gist = buildVimPluginFrom2Nix { + pname = "vim-gist"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "vim-gist"; + rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; + sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; + }; + }; + vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; version = "2020-01-04"; @@ -4074,12 +4162,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-02-24"; + version = "2020-03-12"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "c337eef1b735906411577f488e977be69506ef08"; - sha256 = "10sz744djns1qn9lh7npzvnmkqbr34zgk78cag6ss45bnczqx1h7"; + rev = "0e509fb0ac56b24203800a1fab35162c8da9c9b4"; + sha256 = "0m1vqbgsch4vxs5y8kk03mys2qdzsfik5n0gxp1hl8a7fb3dlqsm"; }; }; @@ -4107,12 +4195,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-02-27"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1bf0d57e01f930ccc1db3dacb3c169d6dc78d2cb"; - sha256 = "18imfrn948c20y7ymgh1xqsd82939dswj7hkf0b0fnsi0w9ydddk"; + rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762"; + sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w"; }; }; @@ -4217,12 +4305,12 @@ let vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2020-01-30"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "3871624ec89c9e8257b20044fd48a1836c05cbfc"; - sha256 = "0n99rva98m6qillax8anx9kby5n2826qql83wa4x3ibdjk1zng69"; + rev = "931cc6bd53e4a1fdbe592751f0e13c0e401f0a49"; + sha256 = "091qw0zlc80micn29wb6r8m4f7pplcv8bx1yfvbn3cba77qyj3nb"; }; }; @@ -4369,17 +4457,6 @@ let }; }; - vim-jade = buildVimPluginFrom2Nix { - pname = "vim-jade"; - version = "2019-09-23"; - src = fetchFromGitHub { - owner = "digitaltoad"; - repo = "vim-jade"; - rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; - sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; - }; - }; - vim-janah = buildVimPluginFrom2Nix { pname = "vim-janah"; version = "2018-10-01"; @@ -4482,12 +4559,23 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-12-21"; + version = "2020-03-14"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "838cfce82df8cf99df5e3a200ad23f6c0f027550"; - sha256 = "0305q9vf454h3hzkax5lpwzfwr9d573kqpsrlfsny69wgkrkvcax"; + rev = "05f9953fcaccc18a8f5c1ee9db06ac2b26662347"; + sha256 = "1l9rpymz6xb9x0kd8p90hyl4yjn59sf590kmi18cvr4piaqa796y"; + }; + }; + + vim-kitty-navigator = buildVimPluginFrom2Nix { + pname = "vim-kitty-navigator"; + version = "2019-11-04"; + src = fetchFromGitHub { + owner = "knubie"; + repo = "vim-kitty-navigator"; + rev = "c32357892f10117291461631d51a6bfd20e72b9a"; + sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; }; }; @@ -4603,23 +4691,23 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-02-11"; + version = "2020-03-22"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "62c6f6aa227b1b3ef5e7cf7df9f0a9c1d855d7fe"; - sha256 = "1qimz08rqm4ch6dr0znwxl328593kmz0yxdqq15g1yrw4ig0fi22"; + rev = "3dd7a19e8689847956266e0be1bbfb4ca12da746"; + sha256 = "0dj1b8v9iz67m833x1z3s7jac0jpfxgs43ylc6m0v3al67qcb0mj"; }; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2019-08-14"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ed4357d2caf1d04bd229a24191098759f94b2e25"; - sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v"; + rev = "b31525d7f6170c68f900abe24748ac9fbaf1ee4d"; + sha256 = "0d6qss18dq36hvxv1if1aaylljsnp2isxajb5xh4zr4cxarrzbfi"; }; }; @@ -4680,12 +4768,12 @@ let vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2019-10-12"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "d99c93733f3461466773b52b26392cf9b35717c0"; - sha256 = "05vk9hgdldgmijawblslf4sly67lqxljx1y9qs4dl2cbvz8gw882"; + rev = "c18f35725a5b0d569bfe6921fc4f56c029324828"; + sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc"; }; }; @@ -4834,12 +4922,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-12-13"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f"; - sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv"; + rev = "44faafa1d846691645b66e83f198f46afa755a6e"; + sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn"; }; }; @@ -4856,12 +4944,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-01-31"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2bbb80576a62f58417e05d8600bb5647868bedf7"; - sha256 = "0b90dfngcssjxmvmjdrlzs0xkly5dhn8rldzzmj75x7z7r1dxchl"; + rev = "c473c298d570622d520f455698a95356e55d6dcf"; + sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd"; }; }; @@ -4988,12 +5076,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-01-25"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "35ea4d2b9072594b6c0ccf87bde7978ed9f94755"; - sha256 = "0r72q4wbja6qxk64lhqh6871xlndwi87w5cnxfq9bh7cnrx9dzhy"; + rev = "e86e0ad36ef9501acbc3e8c63a1d4fab104e47cb"; + sha256 = "0xr0fv26bxas315bvz0fkw11cg5j301vmy02a2aii90ljvyviv77"; }; }; @@ -5043,12 +5131,23 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-02-17"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "72de10080dcb7a906a51ed4eba67611c400df142"; - sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416"; + rev = "2decf51f19834434e34f1a8d79056b7014120ca3"; + sha256 = "1hph6w6mrlma96ys1nk9v46hscmplkpp2y7xq1ld2bnfs4wab3v8"; + }; + }; + + vim-pug = buildVimPluginFrom2Nix { + pname = "vim-pug"; + version = "2019-09-23"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-pug"; + rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; + sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; }; }; @@ -5063,6 +5162,17 @@ let }; }; + vim-python-pep8-indent = buildVimPluginFrom2Nix { + pname = "vim-python-pep8-indent"; + version = "2019-05-13"; + src = fetchFromGitHub { + owner = "hynek"; + repo = "vim-python-pep8-indent"; + rev = "b3a7395ce49b13145bbb54b1cdbfe6a33585bfe9"; + sha256 = "0gkbjcwdizqivsrn0p1gdn1170jimkk1vyxhyr286nb5qxj2n8hh"; + }; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2019-12-20"; @@ -5087,12 +5197,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-02-06"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "bbfc89cef6ceda1a1bad2ece124be323134b74a8"; - sha256 = "1x6y95zps8bxdbcj5939yvw2nz65w1038rs60cjz0xjk0h6360zz"; + rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; + sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; }; }; @@ -5329,12 +5439,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-01-05"; + version = "2020-02-29"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521"; - sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx"; + rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; + sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; }; }; @@ -5351,12 +5461,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-02-27"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "66975121c7c824cb7c4fa8f2ea53f824e538e3cb"; - sha256 = "0m1pw3iq29jpp439yzkaszjg1jiz5qkd16vfkskmk2kkg84y3kqn"; + rev = "6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25"; + sha256 = "0hc914c74dy22nm9bx2qd37py8f2xf3ylnfr3v4lvbxpnlpahjjc"; }; }; @@ -5483,12 +5593,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-12-17"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b"; - sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv"; + rev = "6412352b544bda764a9616c3090abb09729526bc"; + sha256 = "1z5v849vjbk4mdgkxs73b2nnvmqx7l6h3ycdb16qdhp9kppwmbvv"; }; }; @@ -5516,23 +5626,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-02-27"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a0046044670c412bcccc44aa80e5642785fb57a2"; - sha256 = "0c1qzc3ds7gvsp2vk7cszy11x57angmjwq1skfsk1zz7vgzhcj2i"; + rev = "89c47c6c68f6260ba34ee0733437d863046fbe95"; + sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-02-24"; + version = "2020-03-21"; src = fetchFromGitHub { - owner = "janko-m"; + owner = "janko"; repo = "vim-test"; - rev = "1dba5d0328b2d632a418dfc7b417ae83455cc342"; - sha256 = "0rm1ckriwajhskyybnq83m027lhki8p7c5cykzl5f05ax9rfiva6"; + rev = "b302a325116d8708dc0721b7cd97ff59536f4e75"; + sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97"; }; }; @@ -5604,12 +5714,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-02-16"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "734262315544ec4c78acdabd1ac9aae18644fcad"; - sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w"; + rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; + sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; }; }; @@ -5855,6 +5965,17 @@ let }; }; + vimacs = buildVimPluginFrom2Nix { + pname = "vimacs"; + version = "2016-03-24"; + src = fetchFromGitHub { + owner = "andrep"; + repo = "vimacs"; + rev = "7b8e297722d55089f0f0535fe6422533c98112fb"; + sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f"; + }; + }; + vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; version = "2020-01-12"; @@ -5945,12 +6066,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-02-27"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "63593e05440bde5f1f4dbcd30447f410940f94c3"; - sha256 = "19fxcqbvxx2b60cj03qcaawwi88b7y4wamw9fk278d7q64933h2z"; + rev = "8c59031d50feeec8b4f3549f70f82564975265f0"; + sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1"; }; }; @@ -5989,21 +6110,21 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-02-27"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "6c8173a10633541fe99d54cc693874806e08858c"; - sha256 = "08p4xkrgzfb9b3r738lnsp4hrly9p5bbzcv446qcflbxmbmy3fw4"; + rev = "e7b362fffe3a5d1f21bd560d0455e19ff8192997"; + sha256 = "15nmls0m5hajh4k1kjibp299hdhyyjkcax44fmkjq51xlfb1nhc9"; }; }; - vundle = buildVimPluginFrom2Nix { - pname = "vundle"; + Vundle-vim = buildVimPluginFrom2Nix { + pname = "Vundle-vim"; version = "2019-08-17"; src = fetchFromGitHub { - owner = "gmarik"; - repo = "vundle"; + owner = "VundleVim"; + repo = "Vundle.vim"; rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; @@ -6011,12 +6132,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2020-01-31"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "4c880407bcb6a873e83f845168e8a4ce90dfa856"; - sha256 = "1ms9v8zwijz15m0vj2pg1p1svbvh9ghd072hgiqlbwphi2a5g9gn"; + rev = "10f228ce1e7947f62be412f916229131b7710239"; + sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; }; @@ -6099,24 +6220,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-02-20"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184"; - sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn"; + rev = "4d3f69a3a5f56bae9475a96c3291ffdcbd9ff0b1"; + sha256 = "0f3dq4lrm9xzh780fd471b7ddibfzb9vfq1k6gn53pmqpiw6a498"; fetchSubmodules = true; }; }; - youcompleteme = buildVimPluginFrom2Nix { - pname = "youcompleteme"; - version = "2020-02-19"; + YouCompleteMe = buildVimPluginFrom2Nix { + pname = "YouCompleteMe"; + version = "2020-03-18"; src = fetchFromGitHub { - owner = "valloric"; - repo = "youcompleteme"; - rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d"; - sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk"; + owner = "ycm-core"; + repo = "YouCompleteMe"; + rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"; + sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8"; fetchSubmodules = true; }; }; @@ -6158,7 +6279,7 @@ let pname = "zig-vim"; version = "2020-02-10"; src = fetchFromGitHub { - owner = "zig-lang"; + owner = "ziglang"; repo = "zig.vim"; rev = "55b690029791022fd7818ebd0ee395e8976899fe"; sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 431c0f032c4b..39596da24bb0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -10,6 +10,7 @@ , languagetool , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix +, nodePackages # coc-go dependency , go @@ -28,9 +29,6 @@ # vCoolor dependency , gnome3 - -# notational-fzf-vim dependencies -, ripgrep }: self: super: { @@ -67,10 +65,7 @@ self: super: { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c"; + cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -131,6 +126,78 @@ self: super: { ''; }); + coc-css = buildVimPluginFrom2Nix { + pname = "coc-css"; + version = nodePackages.coc-css.version; + src = "${nodePackages.coc-css}/lib/node_modules/coc-css"; + }; + + coc-emmet = buildVimPluginFrom2Nix { + pname = "coc-emmet"; + version = nodePackages.coc-emmet.version; + src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet"; + }; + + coc-eslint = buildVimPluginFrom2Nix { + pname = "coc-eslint"; + version = nodePackages.coc-eslint.version; + src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint"; + }; + + coc-git = buildVimPluginFrom2Nix { + pname = "coc-git"; + version = nodePackages.coc-git.version; + src = "${nodePackages.coc-git}/lib/node_modules/coc-git"; + }; + + coc-highlight = buildVimPluginFrom2Nix { + pname = "coc-highlight"; + version = nodePackages.coc-highlight.version; + src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight"; + }; + + coc-html = buildVimPluginFrom2Nix { + pname = "coc-html"; + version = nodePackages.coc-html.version; + src = "${nodePackages.coc-html}/lib/node_modules/coc-html"; + }; + + coc-imselect = buildVimPluginFrom2Nix { + pname = "coc-imselect"; + version = nodePackages.coc-imselect.version; + src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect"; + }; + + coc-java = buildVimPluginFrom2Nix { + pname = "coc-java"; + version = nodePackages.coc-java.version; + src = "${nodePackages.coc-java}/lib/node_modules/coc-java"; + }; + + coc-jest = buildVimPluginFrom2Nix { + pname = "coc-jest"; + version = nodePackages.coc-jest.version; + src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest"; + }; + + coc-json = buildVimPluginFrom2Nix { + pname = "coc-json"; + version = nodePackages.coc-json.version; + src = "${nodePackages.coc-json}/lib/node_modules/coc-json"; + }; + + coc-lists = buildVimPluginFrom2Nix { + pname = "coc-lists"; + version = nodePackages.coc-lists.version; + src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists"; + }; + + coc-metals = buildVimPluginFrom2Nix { + pname = "coc-metals"; + version = nodePackages.coc-metals.version; + src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; + }; + # Only official releases contains the required index.js file # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { @@ -144,6 +211,114 @@ self: super: { }; }; + coc-pairs = buildVimPluginFrom2Nix { + pname = "coc-pairs"; + version = nodePackages.coc-pairs.version; + src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs"; + }; + + coc-prettier = buildVimPluginFrom2Nix { + pname = "coc-prettier"; + version = nodePackages.coc-prettier.version; + src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier"; + }; + + coc-python = buildVimPluginFrom2Nix { + pname = "coc-python"; + version = nodePackages.coc-python.version; + src = "${nodePackages.coc-python}/lib/node_modules/coc-python"; + }; + + coc-r-lsp = buildVimPluginFrom2Nix { + pname = "coc-r-lsp"; + version = nodePackages.coc-r-lsp.version; + src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp"; + }; + + coc-rls = buildVimPluginFrom2Nix { + pname = "coc-rls"; + version = nodePackages.coc-rls.version; + src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; + }; + + coc-smartf = buildVimPluginFrom2Nix { + pname = "coc-smartf"; + version = nodePackages.coc-smartf.version; + src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf"; + }; + + coc-snippets = buildVimPluginFrom2Nix { + pname = "coc-snippets"; + version = nodePackages.coc-snippets.version; + src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets"; + }; + + coc-solargraph = buildVimPluginFrom2Nix { + pname = "coc-solargraph"; + version = nodePackages.coc-solargraph.version; + src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph"; + }; + + coc-stylelint = buildVimPluginFrom2Nix { + pname = "coc-stylelint"; + version = nodePackages.coc-stylelint.version; + src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint"; + }; + + coc-tabnine = buildVimPluginFrom2Nix { + pname = "coc-tabnine"; + version = nodePackages.coc-tabnine.version; + src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine"; + }; + + coc-tslint = buildVimPluginFrom2Nix { + pname = "coc-tslint"; + version = nodePackages.coc-tslint.version; + src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint"; + }; + + coc-tslint-plugin = buildVimPluginFrom2Nix { + pname = "coc-tslint-plugin"; + version = nodePackages.coc-tslint-plugin.version; + src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin"; + }; + + coc-tsserver = buildVimPluginFrom2Nix { + pname = "coc-tsserver"; + version = nodePackages.coc-tsserver.version; + src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver"; + }; + + coc-vetur = buildVimPluginFrom2Nix { + pname = "coc-vetur"; + version = nodePackages.coc-vetur.version; + src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur"; + }; + + coc-vimtex = buildVimPluginFrom2Nix { + pname = "coc-vimtex"; + version = nodePackages.coc-vimtex.version; + src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex"; + }; + + coc-wxml = buildVimPluginFrom2Nix { + pname = "coc-wxml"; + version = nodePackages.coc-wxml.version; + src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml"; + }; + + coc-yaml = buildVimPluginFrom2Nix { + pname = "coc-yaml"; + version = nodePackages.coc-yaml.version; + src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml"; + }; + + coc-yank = buildVimPluginFrom2Nix { + pname = "coc-yank"; + version = nodePackages.coc-yank.version; + src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank"; + }; + command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -218,22 +393,10 @@ self: super: { configurePhase = "cd plugins/nvim"; }); - gist-vim = super.gist-vim.overrideAttrs(old: { + vim-gist = super.vim-gist.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); - gruvbox-community = buildVimPluginFrom2Nix { - pname = "gruvbox-community"; - version = "2019-05-31"; - src = fetchFromGitHub { - owner = "gruvbox-community"; - repo = "gruvbox"; - rev = "e122091dad968a5524f3e8136615a479c7b6f247"; - sha256 = "1hncjyfi1gbw62b2pngy5qxyzibrhbyzgfmm9a58sdh1272l8ls8"; - }; - meta.maintainers = with stdenv.lib.maintainers; [ minijackson ]; - }; - meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -252,17 +415,6 @@ self: super: { ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { dependencies = with super; [ ultisnips ]; }); - - notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: { - dependencies = with self; [ fzf-vim ]; - patchPhase = '' - substituteInPlace plugin/notational_fzf.vim \ - --replace "'rg'" "'${ripgrep}/bin/rg'" \ - --replace \ - "let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \ - "let s:python_executable = '${python3}/bin/python3'" - ''; - }); fzf-vim = super.fzf-vim.overrideAttrs(old: { dependencies = [ self.fzfWrapper ]; @@ -296,6 +448,21 @@ self: super: { }; }); + vimacs = super.vimacs.overrideAttrs(old: { + buildPhase = '' + substituteInPlace bin/vim \ + --replace '/usr/bin/vim' 'vim' \ + --replace '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = with stdenv.lib; { + description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ millerjason ]; + }; + }); vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; @@ -476,7 +643,7 @@ self: super: { sourceRoot = "."; }); - youcompleteme = super.youcompleteme.overrideAttrs(old: { + YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 0ef93ac569ab..0055e8eccbce 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -10,12 +10,14 @@ import argparse import functools +import http import json import os import subprocess import sys import traceback import urllib.error +import urllib.parse import urllib.request import xml.etree.ElementTree as ET from datetime import datetime @@ -32,6 +34,7 @@ ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " ROOT = Path(__file__).parent DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") +DEPRECATED = ROOT.joinpath("deprecated.json") import time from functools import wraps @@ -71,9 +74,11 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa class Repo: - def __init__(self, owner: str, name: str) -> None: + def __init__(self, owner: str, name: str, alias: str) -> None: self.owner = owner self.name = name + self.alias = alias + self.redirect: Dict[str, str] = {} def url(self, path: str) -> str: return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) @@ -96,7 +101,9 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req: + commit_url = self.url("commits/master.atom") + with urllib.request.urlopen(commit_url, timeout=10) as req: + self.check_for_redirect(commit_url, req) xml = req.read() root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) @@ -111,6 +118,19 @@ class Repo: updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") return Path(str(url.path)).name, updated + def check_for_redirect(self, url: str, req: http.client.HTTPResponse): + response_url = req.geturl() + if url != response_url: + new_owner, new_name = ( + urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2] + ) + end_line = "\n" if self.alias is None else f" as {self.alias}\n" + plugin_line = "{owner}/{name}" + end_line + + old_plugin = plugin_line.format(owner=self.owner, name=self.name) + new_plugin = plugin_line.format(owner=new_owner, name=new_name) + self.redirect[old_plugin] = new_plugin + def prefetch_git(self, ref: str) -> str: data = subprocess.check_output( ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] @@ -197,15 +217,17 @@ def get_current_plugins() -> List[Plugin]: return plugins -def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Plugin: - repo = Repo(user, repo_name) +def prefetch_plugin( + user: str, repo_name: str, alias: str, cache: "Cache" +) -> Tuple[Plugin, Dict[str, str]]: + repo = Repo(user, repo_name, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cached_plugin is not None: cached_plugin.name = alias or repo_name cached_plugin.date = date - return cached_plugin + return cached_plugin, repo.redirect print(f"prefetch {user}/{repo_name}") if has_submodules: @@ -213,7 +235,10 @@ def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Pl else: sha256 = repo.prefetch_github(commit) - return Plugin(alias or repo_name, commit, has_submodules, sha256, date=date) + return ( + Plugin(alias or repo_name, commit, has_submodules, sha256, date=date), + repo.redirect, + ) def print_download_error(plugin: str, ex: Exception): @@ -227,20 +252,22 @@ def print_download_error(plugin: str, ex: Exception): def check_results( - results: List[Tuple[str, str, Union[Exception, Plugin]]] -) -> List[Tuple[str, str, Plugin]]: + results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]] +) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]: failures: List[Tuple[str, Exception]] = [] plugins = [] - for (owner, name, result) in results: + redirects: Dict[str, str] = {} + for (owner, name, result, redirect) in results: if isinstance(result, Exception): failures.append((name, result)) else: plugins.append((owner, name, result)) + redirects.update(redirect) print(f"{len(results) - len(failures)} plugins were checked", end="") if len(failures) == 0: print() - return plugins + return plugins, redirects else: print(f", {len(failures)} plugin(s) could not be downloaded:\n") @@ -328,15 +355,15 @@ class Cache: def prefetch( args: Tuple[str, str, str], cache: Cache -) -> Tuple[str, str, Union[Exception, Plugin]]: +) -> Tuple[str, str, Union[Exception, Plugin], dict]: assert len(args) == 3 owner, repo, alias = args try: - plugin = prefetch_plugin(owner, repo, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, alias, cache) cache[plugin.commit] = plugin - return (owner, repo, plugin) + return (owner, repo, plugin, redirect) except Exception as e: - return (owner, repo, e) + return (owner, repo, e, {}) header = ( @@ -386,6 +413,49 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") +def rewrite_input(input_file: Path, output_file: Path, redirects: dict): + with open(input_file, "r") as f: + lines = f.readlines() + + if redirects: + lines = [redirects.get(line, line) for line in lines] + + cur_date_iso = datetime.now().strftime("%Y-%m-%d") + with open(DEPRECATED, "r") as f: + deprecations = json.load(f) + for old, new in redirects.items(): + old_name = old.split("/")[1].split(" ")[0].strip("\n") + new_name = new.split("/")[1].split(" ")[0].strip("\n") + if old_name != new_name: + deprecations[old_name] = { + "new": new_name, + "date": cur_date_iso, + } + with open(DEPRECATED, "w") as f: + json.dump(deprecations, f, indent=4, sort_keys=True) + + print( + f"""\ +Redirects have been detected and {input_file} has been updated. Please take the +following steps: + 1. Go ahead and commit just the updated expressions as you intended to do: + git add {output_file} + git commit -m "vimPlugins: Update" + 2. Run this script again so these changes will be reflected in the + generated expressions: + ./update.py + 3. Commit {input_file} along with deprecations and generated expressions: + git add {output_file} {input_file} {DEPRECATED} + git commit -m "vimPlugins: Update redirects" + """ + ) + + lines = sorted(lines, key=str.casefold) + + with open(input_file, "w") as f: + f.writelines(lines) + + def parse_args(): parser = argparse.ArgumentParser( description=( @@ -407,6 +477,14 @@ def parse_args(): default=DEFAULT_OUT, help="Filename to save generated nix code", ) + parser.add_argument( + "--proc", + "-p", + dest="proc", + type=int, + default=30, + help="Number of concurrent processes to spawn.", + ) return parser.parse_args() @@ -421,17 +499,17 @@ def main() -> None: prefetch_with_cache = functools.partial(prefetch, cache=cache) try: - # synchronous variant for debugging - # results = list(map(prefetch_with_cache, plugin_names)) - pool = Pool(processes=30) + pool = Pool(processes=args.proc) results = pool.map(prefetch_with_cache, plugin_names) finally: cache.store() - plugins = check_results(results) + plugins, redirects = check_results(results) generate_nix(plugins, args.outfile) + rewrite_input(args.input_file, args.outfile, redirects) + if __name__ == "__main__": main() diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bfa2ffc47d3f..f2a68ab5a79b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,16 +4,18 @@ airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax albfan/nerdtree-git-plugin -alok/notational-fzf-vim altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent alx741/vim-stylishask amiorin/ctrlp-z +andrep/vimacs andreshazard/vim-logreview +AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim andys8/vim-elm-syntax +antoinemadec/coc-fzf ap/vim-css-color arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 @@ -21,6 +23,7 @@ autozimu/LanguageClient-neovim ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 +benizi/vim-automkdir benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools @@ -35,8 +38,6 @@ brooth/far.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml -chemzqm/denite-extra -chemzqm/denite-git Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim @@ -57,22 +58,25 @@ cocopon/iceberg.vim cohama/lexima.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim -dag/vim2hs dag/vim-fish +dag/vim2hs dannyob/quickfixstatus darfink/starsearch.vim dart-lang/dart-vim-plugin david-a-wheeler/vim-metamath davidhalter/jedi-vim dcharbon/vim-flatbuffers +dense-analysis/ale +deoplete-plugins/deoplete-clang deoplete-plugins/deoplete-dictionary +deoplete-plugins/deoplete-go deoplete-plugins/deoplete-jedi deoplete-plugins/deoplete-zsh derekelkins/agda-vim derekwyatt/vim-scala dhruvasagar/vim-prosession dhruvasagar/vim-table-mode -digitaltoad/vim-jade +digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dracula/vim @@ -85,7 +89,7 @@ easymotion/vim-easymotion editorconfig/editorconfig-vim ehamberg/vim-cute-python eikenb/acp -elixir-lang/vim-elixir +elixir-editors/vim-elixir elmcast/elm-vim elzr/vim-json embear/vim-localvimrc @@ -108,7 +112,6 @@ garbas/vim-snipmate gentoo/gentoo-syntax gibiansky/vim-textobj-haskell glts/vim-textobj-comment -gmarik/vundle godlygeek/csapprox godlygeek/tabular google/vim-codefmt @@ -117,6 +120,8 @@ google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette gregsexton/gitv +gruvbox-community/gruvbox as gruvbox-community +gu-fan/riv.vim guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp @@ -133,6 +138,8 @@ honza/vim-snippets hotwatermorning/auto-git-diff hsanson/vim-android hsitz/VimOrganizer +hynek/vim-python-pep8-indent +iamcco/coc-spell-checker ianks/vim-tsx icymind/NeoSolarized idris-hackers/idris-vim @@ -146,7 +153,7 @@ itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim -janko-m/vim-test +janko/vim-test jaredgorski/SpaceCamp JazzCore/ctrlp-cmatcher jceb/vim-hier @@ -202,6 +209,7 @@ kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim kien/rainbow_parentheses.vim +knubie/vim-kitty-navigator konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons @@ -258,7 +266,7 @@ markonm/traces.vim martinda/Jenkinsfile-vim-syntax mattn/calendar-vim as mattn-calendar-vim mattn/emmet-vim -mattn/gist-vim +mattn/vim-gist mattn/webapi-vim matze/vim-move maximbaz/lightline-ale @@ -266,6 +274,7 @@ MaxMEllon/vim-jsx-pretty mbbill/undotree megaannum/forms megaannum/self +mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi mhinz/vim-grepper @@ -313,8 +322,8 @@ neoclide/coc-neco neoclide/coc-pairs neoclide/coc-prettier neoclide/coc-python -neoclide/coc-rls neoclide/coc-r-lsp +neoclide/coc-rls neoclide/coc-smartf neoclide/coc-snippets neoclide/coc-solargraph @@ -328,12 +337,14 @@ neoclide/coc-vimtex neoclide/coc-wxml neoclide/coc-yaml neoclide/coc-yank +neoclide/denite-extra +neoclide/denite-git neoclide/vim-easygit neomake/neomake +neovim/nvim-lsp +neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim -neovim/nvimdev.nvim -neovim/nvim-lsp neutaaaaan/iosvkem nfnty/vim-nftables nicoe/deoplete-khard @@ -354,7 +365,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim -peder2tm/sved +peterbjorgensen/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown @@ -362,7 +373,10 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +preservim/nerdcommenter +preservim/nerdtree ptzz/lf.vim +purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill @@ -371,7 +385,6 @@ racer-rust/vim-racer rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/vim-ghost -raichoo/purescript-vim Raimondi/delimitMate rakr/vim-one rbgrouleff/bclose.vim @@ -381,7 +394,6 @@ reedes/vim-wordy rhysd/committia.vim rhysd/vim-grammarous rhysd/vim-operator-surround -Rip-Rip/clang_complete rodjek/vim-puppet romainl/vim-cool ron89/thesaurus_query.vim @@ -391,15 +403,11 @@ roxma/nvim-yarp RRethy/vim-illuminate rust-lang/rust.vim ryanoasis/vim-devicons -Rykka/riv.vim ryvnf/readline.vim sakhnik/nvim-gdb saltstack/salt-vim samoshkin/vim-mergetool sbdchd/neoformat -scrooloose/nerdcommenter -scrooloose/nerdtree -scrooloose/syntastic sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github sheerun/vim-polyglot @@ -443,6 +451,7 @@ ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc +tmhedberg/SimpylFold thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -501,22 +510,20 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope -valloric/youcompleteme Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes -vimlab/split-term.vim -vimoutliner/vimoutliner vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax vim-ruby/vim-ruby +vim-scripts/a.vim vim-scripts/align vim-scripts/argtextobj.vim vim-scripts/autoload_cscope.vim -vim-scripts/a.vim vim-scripts/bats.vim +vim-scripts/BufOnly.vim vim-scripts/changeColorScheme.vim vim-scripts/Colour-Sampler-Pack vim-scripts/DoxygenToolkit.vim @@ -537,11 +544,15 @@ vim-scripts/taglist.vim vim-scripts/utl.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim +vim-syntastic/syntastic vim-utils/vim-husk +vimlab/split-term.vim +vimoutliner/vimoutliner vimwiki/vimwiki vito-c/jq.vim +vmchale/ats-vim vmchale/dhall-vim -w0rp/ale +VundleVim/Vundle.vim wakatime/vim-wakatime wannesm/wmgraphviz.vim wellle/targets.vim @@ -550,11 +561,11 @@ will133/vim-dirdiff wincent/command-t wincent/ferret wsdjeg/vim-fetch +xavierd/clang_complete xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +ycm-core/YouCompleteMe Yggdroot/indentLine zah/nim.vim -zchee/deoplete-clang -zchee/deoplete-go -zig-lang/zig.vim +ziglang/zig.vim diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 81cd77f3edb5..d745198e6a40 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -250,13 +250,14 @@ let # plugins with dependencies plugins = findDependenciesRecursively specifiedPlugins; - # Vim almost reads JSON, so eventually JSON support should be added to Nix - # TODO: proper quoting - toNix = x: - if (builtins.isString x) then "'${x}'" - else if builtins.isAttrs x && builtins ? out then toNix x # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" + # Convert scalars, lists, and attrs, to VimL equivalents + toVimL = x: + if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'" + else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation + else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}" + else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]" + else if builtins.isInt x || builtins.isFloat x then builtins.toString x + else if builtins.isBool x then (if x then "1" else "0") else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; @@ -293,9 +294,9 @@ let endif endif - " tell vam about which plugins to load when: + " tell vam which plugins to load, and when: let l = [] - ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins} + ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries} call vam#Scripts(l, {}) ''); |