diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/vim-plugins')
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/aliases.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/default.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/deprecated.json | 18 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/generated.nix | 771 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/overrides.nix | 71 | ||||
-rwxr-xr-x | nixpkgs/pkgs/misc/vim-plugins/update.py | 223 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names | 68 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix | 19 |
8 files changed, 741 insertions, 444 deletions
diff --git a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix index cfdd629369c..4cfb6ccd372 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/vim-plugins/default.nix b/nixpkgs/pkgs/misc/vim-plugins/default.nix index 20cbbf275c3..e6bca9484a2 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/nixpkgs/pkgs/misc/vim-plugins/deprecated.json new file mode 100644 index 00000000000..218a1ab622f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 1ce4cf0b7a3..f506efda449 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -1,6 +1,5 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: { @@ -39,23 +38,23 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-01-03"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a"; - sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni"; + rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; + sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; }; }; alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2020-01-10"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "a5158d2e731afe3bca25a6a76eb706ff34e155b0"; - sha256 = "0r1xiw0f46if7whxan2asi1klyijlyaf61p0xg5v81nnh64w6lhs"; + rev = "9fc2594deea196897997c31e68056b7977f13495"; + sha256 = "1mnghdw3yhqh1lzjqfrmwrvnx391dkayfzkgcpx7sx01hnvqc9ib"; }; }; @@ -63,7 +62,7 @@ let pname = "ale"; version = "2020-03-11"; src = fetchFromGitHub { - owner = "w0rp"; + owner = "dense-analysis"; repo = "ale"; rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; @@ -83,12 +82,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-02-09"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "8da127b946b519a271a73dc6f337e97190a958c9"; - sha256 = "0df6nhc39xnxll2smxyj6fxqvkq7v2s44cs2n4zzdg80w1wswkgd"; + rev = "ad76abd6bccfa1a5195d20f7964c6393fe1a9524"; + sha256 = "098jnybc11cxv2q8396hx9r814i5793y7a9kdl4ambpbvhm86vad"; }; }; @@ -125,6 +124,17 @@ let }; }; + ats-vim = buildVimPluginFrom2Nix { + pname = "ats-vim"; + version = "2020-03-24"; + src = fetchFromGitHub { + owner = "vmchale"; + repo = "ats-vim"; + rev = "a17576687217a2e8066356cc211afb99b5de65e8"; + sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; + }; + }; + auto-git-diff = buildVimPluginFrom2Nix { pname = "auto-git-diff"; version = "2019-09-23"; @@ -160,12 +170,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-03-13"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "fa05cbe493224dc132eb623025e94a5e29fdcccd"; - sha256 = "062pi6dqxg3dfbb4qw5fg9d9jh6zpbrznkg1sim2j1c8g67mlpfl"; + rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; + sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; }; }; @@ -224,6 +234,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"; @@ -248,12 +269,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-01-27"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "364e803cfae22a9ef6d7543631495ba8644f3cce"; - sha256 = "0rfy490584qrqa01p3yp7wzgqxn69vbdg37fydj43ah8i1vj3w76"; + rev = "00ba51adaa5c2e6100a57e452fb6f5b6f1548f7a"; + sha256 = "0jmy81l726in57l89874lmfbgqz2gir81xa0np9c7rqypwrwg5r1"; }; }; @@ -283,7 +304,7 @@ let pname = "clang_complete"; version = "2018-09-19"; src = fetchFromGitHub { - owner = "Rip-Rip"; + owner = "xavierd"; repo = "clang_complete"; rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; @@ -345,14 +366,25 @@ let }; }; + coc-fzf = buildVimPluginFrom2Nix { + pname = "coc-fzf"; + version = "2020-04-04"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "coc-fzf"; + rev = "e4f640215a55f1e3447aa872de7a4d83d003964c"; + sha256 = "1q78qw6nagd0wis6ixg7y290692a9fsrjmrv9cdiv7l8q4whqync"; + }; + }; + coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-03-11"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4"; - sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q"; + rev = "54dba825875c6bd9e5a77121662d40c96bcedd99"; + sha256 = "007j7kkhp8j7l65frkbmvldfjq2jirpz60n6ascjsy5vq471i7n4"; }; }; @@ -380,12 +412,12 @@ let coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-02-10"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "2221768187a1bb87af44715bce563bc7fc6917ab"; - sha256 = "04rial5fvyq68qj66ys33sgw7020r81jjsxsycm6y0shn8pjd33y"; + rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; + sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; }; }; @@ -402,23 +434,23 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-02-27"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "4c5124b38f1b2a252bf4713cce67a1bb0cf04b5d"; - sha256 = "1ygr4dpbjgy3872fc9kaivgbplkyc9l9wmifxkapp9s9ll11c7l0"; + rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f"; + sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr"; }; }; coc-jest = buildVimPluginFrom2Nix { pname = "coc-jest"; - version = "2019-06-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-jest"; - rev = "a893464148ab205ef717f543e205c0ae6cb05009"; - sha256 = "0d83cmpiq2x0v7bbnyka30pp1rl33idb6zfisahc25ycnkh32212"; + rev = "3fac1864ef1af87ee096f0ab6514a4b890363231"; + sha256 = "1z2sbzr84gh935553g6bfkpx7s4i37s200a1s9dqay9cq92jh7hy"; }; }; @@ -446,23 +478,23 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-03-14"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "5b25ccfbb628d6645a20c27dd161b0eae30cf7c8"; - sha256 = "1l62lia82yzx9crlby71i84zp48xjfpkan14va72mg482fl7akfs"; + rev = "675477fc9c95d87000eee343e7e478db5519654b"; + sha256 = "1x66hp1hxlyacijj1gbffa6cqv8lg6mralxa6rkqyby6wgiydswy"; }; }; coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; - version = "2020-01-11"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-neco"; - rev = "e203327ff80c56fc51d85f73df9049455edf1a56"; - sha256 = "1snfb92pahdfkch0cwhd0pcmia35al518351np2hq8dhbs7fc02n"; + rev = "fe130c2c3b883f8b58f70f15bf36c73923faa3d9"; + sha256 = "1yzh3p1xx6k6rnr9skdvy5lsb7hz4kh2y537ill8a7770y936vn8"; }; }; @@ -479,12 +511,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-11-29"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484"; - sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk"; + rev = "77e32b628e9b5fc6732f8b43ba6aca36a2e3f305"; + sha256 = "13hfmdy0r4mlsvzvj0n0ik2dsxwkn58fkfqv6dgfxdc55nxwgkv0"; }; }; @@ -534,12 +566,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-03-13"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "725167224850eed7e792c8fad667b1fb780d8385"; - sha256 = "07crnlh71ycdp1p3xlkmgwq83k12kprain8yhvfzas068f8080hg"; + rev = "62aa65069c92bf7753bb122559e8807ec304a6f4"; + sha256 = "1fb884c841hpzhzv26fsq5yli3k5vk8yjq0l55zvlg3a2mxfpj6z"; }; }; @@ -556,12 +588,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-02-19"; + version = "2020-03-16"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "c956e288a4d0ffff85e920970776d89dc9c65099"; - sha256 = "00xavbkdx019f6xm6bwf3xqgyvbp3sz7ddnjxfvgah97gwy0q7xs"; + rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; + sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; }; }; @@ -611,34 +643,34 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-03-09"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "dae0cc36b0245a601d4431ae8dd2319eaa919058"; - sha256 = "1559c0hwyknz1j6vbigywg1fjads4wf8by59z0sri6aah9q77q2z"; + rev = "17fdfd9462bdc6780ab3087ca9293411ca147490"; + sha256 = "1rwpjj24v1px8pkj21g36cl1nir6c4lhrsslf3i6hk41xa8jw64z"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-11-13"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0"; - sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb"; + rev = "314df846b6bc2be9b7c808ed949a1fd693bba402"; + sha256 = "14fmyrfmyk66wbfnbb2iwy7azjk10d8gyrv5p950aagmv8shif52"; }; }; coc-vimtex = buildVimPluginFrom2Nix { pname = "coc-vimtex"; - version = "2019-06-20"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vimtex"; - rev = "842b37bb4078863ca5f070731e21effad14f5d58"; - sha256 = "07w1rp6jxn7q99p6gb28azgial71frjpx06ciz49yib8816rzim9"; + rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; + sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; }; }; @@ -666,12 +698,23 @@ let 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"; + }; + }; + + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2020-04-10"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "09853cf2808904ed6eb93b207b5cec8dd69bfa34"; + sha256 = "0i5jciwparwx1zgisa6l40xmamafl6syykb2hc953q1hfl24z9a5"; }; }; @@ -832,12 +875,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-03-07"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8"; - sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6"; + rev = "4375ab9cc1fe0077c36a9aba5dd7145ce4a2fa6f"; + sha256 = "03cl55s4f2qa8hwag2w38gfc7mpp6jhy0vx7qsmkn24cqk1jvv2k"; }; }; @@ -865,12 +908,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-02-27"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f962b9908f48f823b817b7fd61ce9d706bbb41fd"; - sha256 = "1sv2g6sx9ap71937ky8iysck9q32mracmanc0vnyvffvqy7jwksf"; + rev = "ceea32bb05ec33512c556054b91aff9c1d89f1cb"; + sha256 = "0jfp9xvsin2p9zdd5hsrhkm6rjwdmf130xmis3zpm3n53nh88xh8"; }; }; @@ -889,7 +932,7 @@ let pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-extra"; rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; @@ -900,7 +943,7 @@ let pname = "denite-git"; version = "2020-03-02"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-git"; rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; @@ -909,23 +952,23 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-03-08"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b6e2c7df9402f293bad1dc45f5d41b3dc5d8a9b1"; - sha256 = "1rnxaj1ah7k5l2bcc2x7pdlqjb9fki5r732yanp4r3c4mlx28rvp"; + rev = "7a71d54b725344dad92939901f319223411dc102"; + sha256 = "01wk4id1gffp7d88r5znwsay0wqkssdbw1rc3wjaax9a604j0v1j"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-03-08"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb"; - sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx"; + rev = "1c240e64703b67e0c7fcfb51b59d2bc276b668f5"; + sha256 = "049xx1al44yj3r3wsqwi4z861dkcw06cgfw1czaiiy696dah5fn2"; }; }; @@ -933,7 +976,7 @@ let pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-clang"; rev = "2ea262e98edcb66e828f9077fcc844100320eb63"; sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; @@ -965,12 +1008,12 @@ let deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; - version = "2020-01-02"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "ponko2"; repo = "deoplete-fish"; - rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969"; - sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1"; + rev = "c4cfb934bb6ec69d7f1aff9d376b7d436bba5c93"; + sha256 = "19a6j4qsqljz1pmrn4fx8v1bhlfpqdq821fc2ibjd9h98f6dzi5p"; }; }; @@ -989,7 +1032,7 @@ let pname = "deoplete-go"; version = "2020-01-01"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-go"; rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; @@ -1010,11 +1053,11 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-03-10"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f"; + rev = "34e48ef9569536bee335d4e36849e739e31b8aeb"; sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; fetchSubmodules = true; }; @@ -1088,12 +1131,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2019-10-16"; + version = "2020-03-29"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "a05c97b966b78a9d5cb97b9c2d7e1ec2d6962160"; - sha256 = "1ni16151rknkq66967bwy82xs4pr9xgl5zb7dv447lhl8m3f096g"; + rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4"; + sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7"; }; }; @@ -1121,12 +1164,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-03-11"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "494fcd8f311fb394d81921b63797e963c7d642a3"; - sha256 = "101y83y8gq81rijnsmx8z6aznxczjpm1k8iahix606jvsg7znxgf"; + rev = "eb2307cfa84280041bc294e2091cee40a9183db8"; + sha256 = "1zhz2d37gsbc2v2pz4k5m58r9d70x3ngbzcm6kxarm0farismxqg"; }; }; @@ -1165,23 +1208,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-03-06"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c"; - sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc"; + rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; + sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-01-31"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "21fbc2afe8f30e98b890fb42fc6bc18fc0c0380e"; - sha256 = "1za9q891bxc355qn7v0wasnvf2j6pvhizbp6ycj411hjcw90jwns"; + rev = "8aff78a03357bf573abcec407a543762f281b7d3"; + sha256 = "015sfz2j0mfnfpm6zf8jnh0lm8943cpccjlbj7ks1dsvs36m056i"; fetchSubmodules = true; }; }; @@ -1255,12 +1298,12 @@ let fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2020-02-02"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "4bc15cb4db274ed2b10bbdde414d2b2ab1f7cb00"; - sha256 = "1y4yfw15g1l7f1v3kynr7ynga8g30rvwmy80dnfpg7v4a5jaf4f1"; + rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; + sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; }; }; @@ -1344,12 +1387,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-03-15"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d16ddcf58dd5d99671474ab9a815c5599e377f4c"; - sha256 = "1ca0fpp55qa1gk6ljfm98042fyz9xpmk2dhqn0pd5iz93kfgn0gy"; + rev = "f86ef1bce602713fe0b5b68f4bdca8c6943ecb59"; + sha256 = "0h3mlc4lvnlzg7pfrr09vrfn93lglzfp5ca6bl4jhsi63xw7x3ad"; }; }; @@ -1377,12 +1420,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-03-15"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "67a947821e3742eb1b4a2267d4d59adbf74ecb02"; - sha256 = "05ch1mxwhjd9ln49sp8xp5f6fgc19i2a9262lfi1kny7i1zrxmg1"; + rev = "54553c5c915856d389a071aae5a2dba827727b7d"; + sha256 = "0dpwvyf3vrrdiy0w2hplf656c8b1yqlcv495r7bz9ksbyqhsp70f"; }; }; @@ -1397,17 +1440,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"; @@ -1452,6 +1484,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"; @@ -1816,14 +1859,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-04-06"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "e8577f3654cac97ee18faae28c80a2200aaaad5a"; - sha256 = "15jw9qvj1dqqfnf52yqvs11r9hzw42aviz89q1gx6yqmvjd5py4v"; + rev = "b8976d2e549b417e5d1c1594fb9034b749976cc0"; + sha256 = "1w86bg63qvigdva1g8w4lba63ghlsxfbjb0rqsxyxg6w7m9k6lhd"; }; }; @@ -1994,12 +2048,12 @@ let neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2019-11-18"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "5be295ef60f0e3234164ef822a7471389a7035c5"; - sha256 = "1y73hyb82vs3wcbv02k9n4krvmyn1yhp1mh88jslhcniql2nnj2a"; + rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; + sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; }; }; @@ -2027,12 +2081,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-03-03"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "69140aedb7da5a5a0b25b82e7f756f91d08170ea"; - sha256 = "132ksy20rb01xm18zwwl3lv5zapfhfvaf5zz6md8dnr5hvkvvrgx"; + rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; + sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; }; }; @@ -2049,12 +2103,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-03-08"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae"; - sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy"; + rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; + sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; }; }; @@ -2071,23 +2125,23 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-02-24"; + version = "2020-03-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "aed6074642363d0c97da5cd86e1b23027479df84"; - sha256 = "1smfyghn7sxdqx867145xyjranvrjaa8s9fp1wvyzb3s3jfwh3mk"; + rev = "2e72985f712f0d5cb707beba151555a1f0003630"; + sha256 = "1lvm37q9zq4a077f2zm9dfp8zfg5d3853bmlih6sc8d6i477kcmb"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-03-07"; + version = "2020-04-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54"; - sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a"; + rev = "3aaf5e763410f57916227da407fd90726e19a612"; + sha256 = "0zkw2q2s7756p4xgf49v4lj8lrzw35x81h1wzia7d9k92d7ivwca"; }; }; @@ -2104,12 +2158,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-02-15"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "dacbae9d844e678c785db7c9d7988df7a405e572"; - sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv"; + rev = "964745a9a8c2a61b876f3082fedcb321c415ab5e"; + sha256 = "0pmim51nj2c4njp5b9wihmg208chwc1vrq83ccff0hbmdc1djr60"; }; }; @@ -2150,7 +2204,7 @@ let pname = "nerdcommenter"; version = "2020-02-19"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdcommenter"; rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; @@ -2159,12 +2213,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-02-20"; + version = "2020-04-10"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdtree"; - rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; - sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; + rev = "f767dd34a0bda0a6db8efa43257c90981947f0ab"; + sha256 = "0m02yxs235jznf2y1hr6zj04fb3igra4lb8crgl3slsvdw3zndb1"; }; }; @@ -2203,12 +2257,12 @@ let NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2019-12-12"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "8a2930141ada6719aae6c53bf4e4a8dfc3f8dbed"; - sha256 = "0mns43i7jj0kragylfhpawbkd9wwky8fbyvwx33406193ymyn3y3"; + rev = "f8b5c3c649fc12dd1181564f29ebc6c51e231126"; + sha256 = "1xh2ds1y5gj07ycw3b5lw7av92q39wwrq13mz8j37jmnhw0ppbl4"; }; }; @@ -2236,12 +2290,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-03-12"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "2388fd4a673ac26608c5db570950f3e4edf71ad4"; - sha256 = "0a86l5yn120rn8kz6pfq4j9k9ix3cibysfp2d8rqjz6lndg56cmk"; + rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; + sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; }; }; @@ -2258,12 +2312,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-03-09"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "78b16eb3623c1c0d4433ca8e09c2cb661fa1a852"; - sha256 = "0fgj2yhfcdvpqs7012nwcinlndpfhzfzq9ac7kk0cib4m4vg1zxm"; + rev = "b6dc2ae6a95051e93486224481b80cb5b446dcc3"; + sha256 = "0nc47nig0bvbp3m246gjv06a32ysz20nmxs6pzga1klzm4mim5vl"; }; }; @@ -2280,12 +2334,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-11-25"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; - sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; + rev = "b710bf4daccb603a423754794fb446e5fbb59576"; + sha256 = "16ma42niwsc066s991idfbwvm0dvwqwdr2zfkc3av10hyimxnzbb"; }; }; @@ -2313,12 +2367,12 @@ 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"; }; }; @@ -2390,12 +2444,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-11-06"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "82ff416ce99cc9f69b1af54b8832eaf6cdbeaea6"; - sha256 = "1297h9jipfx2xw5dqh1286g2syv5c18g15644lqn11s62skqxd16"; + rev = "25070c47cae8c7a9d62c8c09a1339e761448fbc4"; + sha256 = "1x2a1wnxs2qmv2zqgq2bmwskdp1i4ga0yjxjyziyr96p48m7dcjp"; }; }; @@ -2447,7 +2501,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 +2521,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-03-09"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "2a12d429144cf083382a87743c1cb658cd314309"; - sha256 = "16cf9jdjkf7igqvf40snq71n52kpszdi76ijhxk03dxgycj0hfkb"; + rev = "ac80025b868bb6e52b9dda893246ee5f992612de"; + sha256 = "1pvw8d53dgm580r9n2qcx0w56g4kanvd00ny6c6l71hxw9lixnlb"; }; }; @@ -2588,12 +2642,12 @@ let riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2020-02-17"; + version = "2020-04-09"; src = fetchFromGitHub { - owner = "Rykka"; + owner = "gu-fan"; repo = "riv.vim"; - rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; - sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; + rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986"; + sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g"; }; }; @@ -2621,12 +2675,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-03-06"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "255a81f091a08786e004f215651227a2fef3a64c"; - sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g"; + rev = "ce5f2b1c881de1b2101924dc5a19046399d74db2"; + sha256 = "0zjzn091js0i76klk9al4gw1l2ads132mjl0nrdhbvl7ilypdajh"; }; }; @@ -2696,6 +2750,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 +2796,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-03-06"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5"; - sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d"; + rev = "58fc865f83b600ee8906fe35d02749dec6659607"; + sha256 = "0rv9a6gzn5q2ajsyfvsrybn7hyskckfa7wad4jr8xaylccn5r7x7"; }; }; @@ -2795,6 +2860,17 @@ let }; }; + splitjoin-vim = buildVimPluginFrom2Nix { + pname = "splitjoin-vim"; + version = "2020-04-08"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "splitjoin.vim"; + rev = "4aeb3b59c8a2d080960d17318498652e93e33776"; + sha256 = "0gvchss74q4z54008hs8nylsr8xgz02wqshh7fqx3jbyhwb0zzms"; + }; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -2821,7 +2897,7 @@ let pname = "sved"; version = "2019-01-25"; src = fetchFromGitHub { - owner = "peder2tm"; + owner = "peterbjorgensen"; repo = "sved"; rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; @@ -2843,7 +2919,7 @@ let pname = "syntastic"; version = "2020-01-29"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "vim-syntastic"; repo = "syntastic"; rev = "f3766538720116f099a8b1517f76ae2f094afd20"; sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; @@ -3051,12 +3127,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-03-02"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e910b4fb9e276d18ed140fc492f30967ef9ace59"; - sha256 = "0fbrwmk4plg1zyz5vyay7jsj240l9p2ksjlp7yjs1g3l7qf71xxz"; + rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; + sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; }; }; @@ -3073,12 +3149,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-02-27"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "582b715562c953ea9a1f043443f98793cfbc0d47"; - sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf"; + rev = "5a43fa177d6650cfb3224a3989f15e83999afa7f"; + sha256 = "187hznxcrvb1j8dj2rrdlk3f1cfx0d0l3fnfabh1da0m9cjg4xbh"; }; }; @@ -3128,12 +3204,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-10-27"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "22b3d81f9b7146ddf1bd05c1b2f9407af14d3ed7"; - sha256 = "12z5a4zkrajzdyf31a5l7hlyif5ywj8pab25x98hwqjs38x8lklf"; + rev = "c6f7ca14554196ae15a5fef9e568d69f04b9ff56"; + sha256 = "1hx9rgx44dhc449r0j6azkp1bm20n9c3fyb112w277a2jvf0a2c5"; }; }; @@ -3370,23 +3446,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-03-02"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4e2546a2098954b74cbc612f573826f13d6fb88e"; - sha256 = "1z1xnvkaz1yjjq87kdyplx0zh0il0qkmr5lzwfq33jcnwlafz6xw"; + rev = "a100e8967163d36ed624a71a313ce31cdd2b1151"; + sha256 = "0nissvkwxqncwaw73kwk4fjnr0l43c7vj98l398pn3bkj8kgpns9"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-02-17"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "9772475fcc24bee50c884aba20161465211520c8"; - sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp"; + rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; + sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; }; }; @@ -3436,12 +3512,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-03-02"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "b757f58c67908772a17300cf853ed0da653edeb2"; - sha256 = "0cl858hk7gaaxlj22d61mqiaypv76q85srskjay9s3px0mm5fanc"; + rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; + sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; }; }; @@ -3480,12 +3556,12 @@ let vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2020-02-09"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "4afbd45238da56898013546c609d72818fc97a1b"; - sha256 = "0gfqd927pxqszafbycns9f08sw6kl3z6xijvw2l0hgb5zrvfc5lg"; + rev = "8cf4b2175dd61416c2fe7d3234324a6c59d678de"; + sha256 = "1iga1xdzygnr9rhv0kw01nr3vahl2d486p06slmri2vy8ngzym0q"; }; }; @@ -3557,23 +3633,23 @@ let vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2019-02-14"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "9f13011738e11d6f926a641d774635fa415f1b6e"; - sha256 = "0fm9h1i5jfyq3hkl41jsr2hvcskwh7hhg5m0yxbl57bnigapcz3p"; + rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; + sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; }; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-02-26"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6d69f933f243ed3d7797641bd41c0e65d245c931"; - sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn"; + rev = "d3d8b8b6d73da3e1b19089f98a85901f0b652e2f"; + sha256 = "0r20cl6i4k7r2y5d8i3dbrxmn01mlnww2qgvjgmafa8nqd16gl57"; }; }; @@ -3700,12 +3776,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-03-10"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "8e859e4c54fda0728e8f0b5cc4f61c7ff193083f"; - sha256 = "0nq7x957xwz6fibb4m4daq2xp74n922lm46117lfhvpa0ii2rz0i"; + rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; + sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; }; }; @@ -3722,23 +3798,34 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2020-01-02"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "59cc0a16970b92afa1c99182c60e35e01cdaa409"; - sha256 = "0v3jhp33058cl7raqp59704m5ljsibpi9vs1hsiwwxf2pgdjii3f"; + rev = "62646c502fac1455318933b9ea13ec5899ba7c84"; + sha256 = "0qpgx81xpwr3ab3ardp820aqifvxh2jsk1qw94p26q6iiab7kdcv"; + }; + }; + + vim-dasht = buildVimPluginFrom2Nix { + pname = "vim-dasht"; + version = "2019-09-29"; + src = fetchFromGitHub { + owner = "sunaku"; + repo = "vim-dasht"; + rev = "9c7484eaea26b8dd1edd8af21a38cee6c4ef4f49"; + sha256 = "1rjckipy7b4ygwvc1hbc24da1x3pwklbkfljrz16znlcm2y5q72k"; }; }; vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-03-08"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d"; - sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl"; + rev = "58e57b6eeb407dba7ff6e607342c08c32b6fd398"; + sha256 = "0czkkhj2s9vjis5h4gajvnqc1nraxyqhyvzk2ndffhnzxvylhd5w"; }; }; @@ -3755,12 +3842,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-05-14"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; - sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; + rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; + sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; }; }; @@ -3865,12 +3952,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-03-11"; + version = "2020-03-27"; src = fetchFromGitHub { - owner = "elixir-lang"; + owner = "elixir-editors"; repo = "vim-elixir"; - rev = "088cfc407460dea7b81c10b29db23843f85e7919"; - sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; + rev = "47d05df7fb41493821b0b3e3db72d5faeae3aecd"; + sha256 = "10r9h359bla9gy48kvf2681r7gzk7klwrf488xc1rjzhgd41ila1"; }; }; @@ -3986,12 +4073,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2019-04-03"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ce9ac790430699d346aa074d7f339f2e738284e3"; - sha256 = "1dlpmsads32c8v49dqgnz1d06bh0aikgl1xq2whiimm2va9vfjng"; + rev = "0c7cf6dc038223b44e3c0a702fe2acf997768e8a"; + sha256 = "14k1b7gjj1sh40qsf4wxbn0dymmc4jvsrd9pacsr6li273aiy6gq"; }; }; @@ -4041,12 +4128,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-03-12"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9a4d730270882f9d39a411eb126143eda4d46963"; - sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b"; + rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb"; + sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x"; }; }; @@ -4061,6 +4148,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"; @@ -4085,12 +4183,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-03-12"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "0e509fb0ac56b24203800a1fab35162c8da9c9b4"; - sha256 = "0m1vqbgsch4vxs5y8kk03mys2qdzsfik5n0gxp1hl8a7fb3dlqsm"; + rev = "b7db78b258aa9925f3c86968b348413732964b3b"; + sha256 = "0933b60bma8xs7cmw1p2npfzyqmpww3frmcg51dsg2hsg9rq213q"; }; }; @@ -4118,12 +4216,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-03-15"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "14382b346ea03615bfb03115679c8a48bbf03af2"; - sha256 = "0ni9kjqb78jf98v1xwmg6r7inm7qifpf21hnp1n2i65mvnrc4afm"; + rev = "b995086646f29de25acbe7df2c08cc196c4641d7"; + sha256 = "12s04gnnkkmhlm36gxpy18ngxj88b9p5b6vzdq662gmwl3wk98nc"; }; }; @@ -4380,17 +4478,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"; @@ -4493,12 +4580,23 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-03-14"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "05f9953fcaccc18a8f5c1ee9db06ac2b26662347"; - sha256 = "1l9rpymz6xb9x0kd8p90hyl4yjn59sf590kmi18cvr4piaqa796y"; + rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; + sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; + }; + }; + + vim-kitty-navigator = buildVimPluginFrom2Nix { + pname = "vim-kitty-navigator"; + version = "2019-11-04"; + src = fetchFromGitHub { + owner = "knubie"; + repo = "vim-kitty-navigator"; + rev = "c32357892f10117291461631d51a6bfd20e72b9a"; + sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; }; }; @@ -4559,12 +4657,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-11-11"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "fba44d7bab381b2107f9c6db0322282910e98267"; - sha256 = "1scv9zscvywr40rw6z1v4vsgq8j8mfvp1hxs6ana22wbm0qdwkrf"; + rev = "47186eb47f543becc34a048a37298954d89bf7c8"; + sha256 = "0265614sa2d2s3xpzfliq159v7bmdvlc9yyw5c89pqv4b86gjxzf"; }; }; @@ -4614,23 +4712,23 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-02-11"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "62c6f6aa227b1b3ef5e7cf7df9f0a9c1d855d7fe"; - sha256 = "1qimz08rqm4ch6dr0znwxl328593kmz0yxdqq15g1yrw4ig0fi22"; + rev = "4da362f49254774fa5ad407ea3b2407db0147590"; + sha256 = "0wlgj485dy4sb3hbwi8kp69d8iw2zh5xny09xv2zk174dsvp7xxx"; }; }; 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"; }; }; @@ -4867,12 +4965,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-03-13"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "9c12affb112cf5bdbc74f6492f019dec539756ee"; - sha256 = "199mr1b740vd4rqjkpgwx539flyaqm7bi05fknzkyxizn8180xzw"; + rev = "c473c298d570622d520f455698a95356e55d6dcf"; + sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd"; }; }; @@ -4964,14 +5062,25 @@ let }; }; + vim-pico8-syntax = buildVimPluginFrom2Nix { + pname = "vim-pico8-syntax"; + version = "2016-10-30"; + src = fetchFromGitHub { + owner = "justinj"; + repo = "vim-pico8-syntax"; + rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7"; + sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s"; + }; + }; + vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-01-27"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "c3b6b7c2971da730d66f6955d5c467db8dae536b"; - sha256 = "088jyadfssgyyfb588vahskszbxm1vygp5dxkky7njs6v3g8lk5v"; + rev = "e718868e85e2a32410144dfcdc3ba1303719450d"; + sha256 = "1znaapjdz9nwgvr5il6rck82mz4dhj1nan87w2216xwpp53w61fb"; }; }; @@ -5043,12 +5152,23 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-12"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "2008b24c1d740543041d1de9fa4036a35cd21e16"; - sha256 = "0q5njcfc4zlb2z5bzr5jsmqfqnp96c83pwwayfcms8sqczj2w13v"; + rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; + sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; + }; + }; + + vim-pug = buildVimPluginFrom2Nix { + pname = "vim-pug"; + version = "2019-09-23"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-pug"; + rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; + sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; }; }; @@ -5063,6 +5183,17 @@ let }; }; + vim-python-pep8-indent = buildVimPluginFrom2Nix { + pname = "vim-python-pep8-indent"; + version = "2020-03-20"; + src = fetchFromGitHub { + owner = "Vimjas"; + repo = "vim-python-pep8-indent"; + rev = "60ba5e11a61618c0344e2db190210145083c91f8"; + sha256 = "1blyhkykfnf4pgfq9hn9l8pq0iqdvig9m4zd8qq9aa9rlm8f0kzh"; + }; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2019-12-20"; @@ -5142,12 +5273,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-02-13"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fbf85d106a2c3979ed43d6332b8c26a72542754d"; - sha256 = "02k6l6wykw7i26fz2avjrpgml79hy4rrr2x9106g84nc5vimswn0"; + rev = "3db19e235bff9e6f6e0941836f67416dc761be32"; + sha256 = "045b2gcmbm5kc4c3kalkjc36ck9llrbxjj2amga0041svgzb79sy"; }; }; @@ -5296,12 +5427,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-02-26"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "73449cc1bf3375ce6f92a1018821cdd0ae91959d"; - sha256 = "1wsrgchjxhircgdvwphvswnl7jq5b63l360wnjjlmcff6nvwhm77"; + rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; + sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; }; }; @@ -5340,23 +5471,23 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2019-01-11"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "17ac70ef00982b7b4865e2ff0efc34a4a5b59cab"; - sha256 = "1agfxwl3n8kz4zwqmsirwr1zzafi069xinv10q79jkczayfpcfq0"; + rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; + sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; }; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-03-11"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "8eafafe246152c94b64149dd04d9e03b87527eac"; - sha256 = "1mfw69283w3xk9kawn2ms160sjzmxpfdh4drdis27fg27i58yadd"; + rev = "b62dfce8449d8a8196720ddd3cfecbca8bb7fe45"; + sha256 = "1c8r8hw4yqdnmn4nx37vdrjwc725qqr5rbzzxq8wl0min5c4lq1c"; }; }; @@ -5428,23 +5559,23 @@ let vim-stylishask = buildVimPluginFrom2Nix { pname = "vim-stylishask"; - version = "2019-01-14"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "alx741"; repo = "vim-stylishask"; - rev = "cf7ca48708da6d1b18d98fa158f9571af05f6043"; - sha256 = "0wnjl74cf26p138nndj827149psddqins5wicqdzxi2lxijgxhny"; + rev = "dcc12c724cec7f8aee7ad197752710eaa3bfd12c"; + sha256 = "09k1n6r9gy3jikss84y141dqqsgc1a1ia89jj0367an53pfl6dn2"; }; }; vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-01-22"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "634791f5f61aaf49ce16df2698f99a2847f6318e"; - sha256 = "0hr794fn7b5zka3whk3hwh4hznv6y3a19ffsdbgdywr70wwb5grf"; + rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c"; + sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi"; }; }; @@ -5527,12 +5658,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-03-14"; + version = "2020-04-09"; src = fetchFromGitHub { - owner = "janko-m"; + owner = "janko"; repo = "vim-test"; - rev = "2e3516833137ffcf6f291854551cfe70c17b1752"; - sha256 = "1hfksbai45c5ql9gvm1fqdfhakm2fvas59jyf71iddsfiha5vv2k"; + rev = "692b4b879520299ceffeaebb9b28173b75bf48da"; + sha256 = "0lkng56y1wi29jp595jx5vib9zmnsagjczsdl434dn3hakm76plq"; }; }; @@ -5736,12 +5867,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-26"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "32fa278c458d8790a2604a71f3ac3d2500112040"; - sha256 = "0v7asrgbqz70jq4avpi72338fcrs81bgapyvar18l43k6vgb867a"; + rev = "4b8e769b52922a17de4ef0ddb7aeacc18386a246"; + sha256 = "1xjcz3dzwxlpaw8pz8mjn1cfp9822c8yvjwws6m4bzalqr0a14a4"; }; }; @@ -5789,6 +5920,17 @@ let }; }; + vim-which-key = buildVimPluginFrom2Nix { + pname = "vim-which-key"; + version = "2020-03-16"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "vim-which-key"; + rev = "4b70b443ba5838b165f90e26f9ed628d7d05e11d"; + sha256 = "197rp20hngrq7qdlii0ai4vb81dlilah0q1wlil8hv3qcf4az7qr"; + }; + }; + vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; version = "2019-11-22"; @@ -5855,6 +5997,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 +6098,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-03-15"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "51797cde25904e595da62513b818ab3abc9acd9e"; - sha256 = "0dpcxqrv9jn7d0f2wnnqyj3069wfqg4h70qqqnlq07n4p8yj2rw1"; + rev = "bd83ce759828c2bd0e210476717384002b9309ee"; + sha256 = "086j0grj6pqidcl3gaxqcc7njgnzv5z4gshrlisr996dfzyrab2v"; }; }; @@ -5989,21 +6142,21 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-03-15"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a1e19503ce2f27a98fd6c03202d0651891aadecf"; - sha256 = "19xy5qxizhpnyaqvjayxpmc5hdfixdf84g4ilhagq7isd5l4a1cs"; + rev = "5399f850c4c0a1224051e84f6a6cee93055e4e6a"; + sha256 = "13lh8wbyi9gwdn4mj5c88w4jp9jfi2zzxzdlccra67yrb1n3qymj"; }; }; - 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"; }; @@ -6099,24 +6252,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-03-02"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "68ef9623656fe9aaa53c1d9ab906f09c2c095f06"; - sha256 = "0cn1k8lda71vm4gx14ly9gdvk1j17jds0axx9jvjp4w9jid6ksqk"; + rev = "d5c60217a27bba799b0ed5a2f16c61ea0a9b314e"; + sha256 = "1km829m6aa3pfgq6p0p0gb102w1b5w454iy8smz1zwipsc84zgp7"; fetchSubmodules = true; }; }; - youcompleteme = buildVimPluginFrom2Nix { - pname = "youcompleteme"; - version = "2020-03-14"; + YouCompleteMe = buildVimPluginFrom2Nix { + pname = "YouCompleteMe"; + version = "2020-04-06"; src = fetchFromGitHub { - owner = "valloric"; - repo = "youcompleteme"; - rev = "3108b9bd4408b2af891eea179108bc9704e7263d"; - sha256 = "0913d0mixhm24mhqgf3cca3p4hglsj23f85m4n4npksiqw91swla"; + owner = "ycm-core"; + repo = "YouCompleteMe"; + rev = "97150c0b1fde6a7e3f3eea0abab7d114774dd1af"; + sha256 = "16lwi234cwnp8f5gr8cry40ak2y71f6a7rbqnkq92smmw38fycnq"; fetchSubmodules = true; }; }; @@ -6156,23 +6309,23 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-02-10"; + version = "2020-04-12"; src = fetchFromGitHub { - owner = "zig-lang"; + owner = "ziglang"; repo = "zig.vim"; - rev = "55b690029791022fd7818ebd0ee395e8976899fe"; - sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c"; + rev = "0e914f2ab5ab9a9554c31b90be189dca5c4ee3a8"; + sha256 = "1njf3flx5dcahvk92kaf879sd4a75yq4nnii4ljip7bvkyci8ipa"; }; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab-vim"; - version = "2018-04-14"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "5bbbd1f79e40839a34803627e11f9e662f639fe0"; - sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6"; + rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; + sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; }; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index a8bf2f56b2a..7333b61deae 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -11,6 +11,7 @@ , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix , nodePackages +, dasht # coc-go dependency , go @@ -112,21 +113,6 @@ self: super: { ''; }); - vim-pandoc = super.vim-pandoc.overrideAttrs(old: { - patches = (super.patches or []) ++ [ - # Fix a failure on startup, which breaks the rplugin manifest generation - # https://github.com/vim-pandoc/vim-pandoc/pull/363#issuecomment-599080366 - (fetchpatch { - name = "fix-fdetect.patch"; - url = "https://github.com/vim-pandoc/vim-pandoc/commit/da4c0b0325c1bfad20f7cfd15abb53943fe22fc4.patch"; - revert = true; - # For some reason that part was already reverted upstream. - excludes = ["ftdetect/pandoc.vim"]; - sha256 = "10nykgsqpxx5hlagk83khjl8p58zx7z3bcryzinv5vv52wlqkq5p"; - }) - ]; - }); - clighter8 = super.clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ @@ -213,19 +199,6 @@ self: super: { 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 { - pname = "coc-nvim"; - version = "2020-01-05"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc.nvim"; - rev = "984779f2f825626aa9d441746d8b4ee079137c65"; - sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg"; - }; - }; - coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; version = nodePackages.coc-pairs.version; @@ -408,22 +381,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"; @@ -475,6 +436,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 ]; @@ -542,11 +518,18 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-dasht = super.vim-dasht.overrideAttrs(old: { + preFixup = '' + substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ + --replace "['dasht']" "['${dasht}/bin/dasht']" + ''; + }); + vim-easytags = super.vim-easytags.overrideAttrs(old: { dependencies = with super; [ vim-misc ]; patches = [ (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags - url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch; + url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; }) ]; @@ -655,7 +638,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', '''" \ @@ -706,7 +689,7 @@ self: super: { unicode-vim = let unicode-data = fetchurl { - url = http://www.unicode.org/Public/UNIDATA/UnicodeData.txt; + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in super.unicode-vim.overrideAttrs(old: { diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index 0ef93ac569a..c6bf605ee47 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix-prefetch-git -p python3 nix -i python3 +#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3 # format: # $ nix run nixpkgs.python3Packages.black -c black update.py @@ -10,21 +10,27 @@ import argparse import functools +import http import json import os import subprocess import sys +import time import traceback import urllib.error +import urllib.parse import urllib.request import xml.etree.ElementTree as ET from datetime import datetime +from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile +import git + ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " @@ -32,18 +38,14 @@ 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") - -import time -from functools import wraps +DEPRECATED = ROOT.joinpath("deprecated.json") def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. - http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry (BSD licensed) - :param ExceptionToCheck: the exception on which to retry :param tries: number of times to try (not retry) before giving up :param delay: initial delay between retries in seconds @@ -71,9 +73,14 @@ 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, branch: str, alias: Optional[str] + ) -> None: self.owner = owner self.name = name + self.branch = branch + 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) @@ -85,7 +92,7 @@ class Repo: def has_submodules(self) -> bool: try: urllib.request.urlopen( - self.url("blob/master/.gitmodules"), timeout=10 + self.url(f"blob/{self.branch}/.gitmodules"), timeout=10 ).close() except urllib.error.HTTPError as e: if e.code == 404: @@ -96,7 +103,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(f"commits/{self.branch}.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 +120,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 +219,21 @@ 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, + branch: str, + alias: Optional[str], + cache: "Optional[Cache]" = None, +) -> Tuple[Plugin, Dict[str, str]]: + repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() - cached_plugin = cache[commit] + cached_plugin = cache[commit] if cache else None 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 +241,15 @@ 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 fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + return plugin def print_download_error(plugin: str, ex: Exception): @@ -227,20 +263,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") @@ -250,17 +288,20 @@ def check_results( sys.exit(1) -def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]: +def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: + branch = "master" + alias = None name, repo = line.split("/") - try: + if " as " in repo: repo, alias = repo.split(" as ") - return (name, repo, alias.strip()) - except ValueError: - # no alias defined - return (name, repo.strip(), None) + alias = alias.strip() + if "@" in repo: + repo, branch = repo.split("@") + + return (name.strip(), repo.strip(), branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]: +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: plugins = [] with open(plugin_file) as f: for line in f: @@ -327,16 +368,16 @@ class Cache: def prefetch( - args: Tuple[str, str, str], cache: Cache -) -> Tuple[str, str, Union[Exception, Plugin]]: - assert len(args) == 3 - owner, repo, alias = args + args: Tuple[str, str, str, Optional[str]], cache: Cache +) -> Tuple[str, str, Union[Exception, Plugin], dict]: + assert len(args) == 4 + owner, repo, branch, alias = args try: - plugin = prefetch_plugin(owner, repo, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, branch, 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 = ( @@ -352,7 +393,6 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str): f.write( """ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: {""" @@ -386,6 +426,37 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") +def rewrite_input( + input_file: Path, redirects: Dict[str, str] = None, append: Tuple = () +): + with open(input_file, "r") as f: + lines = f.readlines() + + lines.extend(append) + + 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_plugin = fetch_plugin_from_pluginline(old) + new_plugin = fetch_plugin_from_pluginline(new) + if old_plugin.normalized_name != new_plugin.normalized_name: + deprecations[old_plugin.normalized_name] = { + "new": new_plugin.normalized_name, + "date": cur_date_iso, + } + with open(DEPRECATED, "w") as f: + json.dump(deprecations, f, indent=4, sort_keys=True) + + lines = sorted(lines, key=str.casefold) + + with open(input_file, "w") as f: + f.writelines(lines) + + def parse_args(): parser = argparse.ArgumentParser( description=( @@ -394,6 +465,13 @@ def parse_args(): ) ) parser.add_argument( + "--add", + dest="add_plugins", + default=[], + action="append", + help="Plugin to add to vimPlugins from Github in the form owner/repo", + ) + parser.add_argument( "--input-names", "-i", dest="input_file", @@ -407,30 +485,77 @@ 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() -def main() -> None: +def commit(repo: git.Repo, message: str, files: List[Path]) -> None: + files_staged = repo.index.add([str(f.resolve()) for f in files]) - args = parse_args() - plugin_names = load_plugin_spec(args.input_file) - current_plugins = get_current_plugins() - cache = Cache(current_plugins) + if files_staged: + print(f'committing to nixpkgs "{message}"') + repo.index.commit(message) + else: + print("no changes in working tree to commit") - 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) - results = pool.map(prefetch_with_cache, plugin_names) - finally: - cache.store() +def get_update(input_file: str, outfile: str, proc: int): + cache: Cache = Cache(get_current_plugins()) + _prefetch = functools.partial(prefetch, cache=cache) - plugins = check_results(results) + def update() -> dict: + plugin_names = load_plugin_spec(input_file) - generate_nix(plugins, args.outfile) + try: + pool = Pool(processes=proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() + + plugins, redirects = check_results(results) + + generate_nix(plugins, outfile) + + return redirects + + return update + + +def main(): + args = parse_args() + nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True) + update = get_update(args.input_file, args.outfile, args.proc) + + redirects = update() + rewrite_input(args.input_file, redirects) + commit(nixpkgs_repo, "vimPlugins: update", [args.outfile]) + + if redirects: + update() + commit( + nixpkgs_repo, + "vimPlugins: resolve github repository redirects", + [args.outfile, args.input_file, DEPRECATED], + ) + + for plugin_line in args.add_plugins: + rewrite_input(args.input_file, append=(plugin_line + "\n",)) + update() + plugin = fetch_plugin_from_pluginline(plugin_line) + commit( + nixpkgs_repo, + "vimPlugins.{name}: init at {version}".format( + name=plugin.normalized_name, version=plugin.version + ), + [args.outfile, args.input_file], + ) if __name__ == "__main__": diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 874b2471d5c..9a854d58b08 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -9,10 +9,13 @@ 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 @@ -20,8 +23,8 @@ autozimu/LanguageClient-neovim ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 -benmills/vimux benizi/vim-automkdir +benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion @@ -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 @@ -147,7 +152,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 @@ -187,6 +192,7 @@ junegunn/vim-peekaboo junegunn/vim-plug junegunn/vim-slash justincampbell/vim-eighties +justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak KabbAmine/vCoolor.vim @@ -203,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 @@ -221,6 +228,7 @@ lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete lilydjwg/colorizer +liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix LucHermitte/lh-brackets @@ -259,7 +267,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 @@ -267,6 +275,7 @@ MaxMEllon/vim-jsx-pretty mbbill/undotree megaannum/forms megaannum/self +mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi mhinz/vim-grepper @@ -314,8 +323,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 @@ -329,12 +338,15 @@ neoclide/coc-vimtex neoclide/coc-wxml neoclide/coc-yaml neoclide/coc-yank +neoclide/coc.nvim@release +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 @@ -355,7 +367,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 @@ -363,7 +375,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 @@ -372,7 +387,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 +395,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 +404,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 @@ -434,6 +443,7 @@ solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim stephpy/vim-yaml +sunaku/vim-dasht svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls @@ -452,6 +462,7 @@ thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter tikhomirov/vim-glsl +tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events @@ -501,22 +512,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 +546,16 @@ vim-scripts/taglist.vim vim-scripts/utl.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim +vim-syntastic/syntastic vim-utils/vim-husk +Vimjas/vim-python-pep8-indent +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 +564,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/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index 81cd77f3edb..d745198e6a4 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/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, {}) ''); |