git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #161562 from ambroisie/add-nvim-lightline-lsp
commitb3d6fd4a09265b6777f02ee06ed1763d67a970bb authorMatthieu Coudron <teto@users.noreply.github.com> dateFri 25 Feb 2022, 23:45 (5 years ago) parent2d085ca3917530
3 files changed+62−35
maintainers/scripts/pluginupdate.py+8−7 pkgs/applications/editors/vim/plugins/generated.nix+52−28 pkgs/applications/editors/vim/plugins/vim-plugin-names+2
maintainers/scripts/pluginupdate.py+8−7
@@ -454,8 +454,8 @@ def prefetch_plugin(
454454 )
455455
456456
457−def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
458− plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line))
457+def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
458+ plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
459459 return plugin
460460
461461
@@ -586,6 +586,7 @@ def prefetch(
586586
587587
588588def rewrite_input(
589+ config: FetchConfig,
589590 input_file: Path,
590591 deprecated: Path,
591592 redirects: Dict[str, str] = None,
@@ -603,8 +604,8 @@ def rewrite_input(
603604 with open(deprecated, "r") as f:
604605 deprecations = json.load(f)
605606 for old, new in redirects.items():
606− old_plugin = fetch_plugin_from_pluginline(old)
607− new_plugin = fetch_plugin_from_pluginline(new)
607+ old_plugin = fetch_plugin_from_pluginline(config, old)
608+ new_plugin = fetch_plugin_from_pluginline(config, new)
608609 if old_plugin.normalized_name != new_plugin.normalized_name:
609610 deprecations[old_plugin.normalized_name] = {
610611 "new": new_plugin.normalized_name,
@@ -640,7 +641,7 @@ def update_plugins(editor: Editor, args):
640641 update = editor.get_update(args.input_file, args.outfile, fetch_config)
641642
642643 redirects = update()
643− editor.rewrite_input(args.input_file, editor.deprecated, redirects)
644+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects)
644645
645646 autocommit = not args.no_commit
646647
@@ -659,9 +660,9 @@ def update_plugins(editor: Editor, args):
659660 )
660661
661662 for plugin_line in args.add_plugins:
662− editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
663+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
663664 update()
664− plugin = fetch_plugin_from_pluginline(plugin_line)
665+ plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
665666 if autocommit:
666667 commit(
667668 nixpkgs_repo,
pkgs/applications/editors/vim/plugins/generated.nix+52−28
@@ -41,12 +41,12 @@ final: prev:
4141
4242 aerial-nvim = buildVimPluginFrom2Nix {
4343 pname = "aerial.nvim";
44− version = "2022-02-22";
44+ version = "2022-02-25";
4545 src = fetchFromGitHub {
4646 owner = "stevearc";
4747 repo = "aerial.nvim";
48− rev = "37802e72263f1592575ec1133969890b703e70a7";
49− sha256 = "085ln5pv5yk9kxhnvizyy2rm67nlhkmw4m92pg3yakjhx8cxmh1w";
48+ rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2";
49+ sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr";
5050 };
5151 meta.homepage = "https://github.com/stevearc/aerial.nvim/";
5252 };
@@ -533,12 +533,12 @@ final: prev:
533533
534534 chadtree = buildVimPluginFrom2Nix {
535535 pname = "chadtree";
536− version = "2022-02-24";
536+ version = "2022-02-25";
537537 src = fetchFromGitHub {
538538 owner = "ms-jpq";
539539 repo = "chadtree";
540− rev = "169134de0d3919837a436cceb806ce8e29a239ea";
541− sha256 = "1qfg5k406qdxv534c3xbrhpjhigsxkgj9yqm0sx45z5l6f4cmih6";
540+ rev = "f932760f16368c5feeb079a878ed0ff8588aed29";
541+ sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4";
542542 };
543543 meta.homepage = "https://github.com/ms-jpq/chadtree/";
544544 };
@@ -1230,12 +1230,12 @@ final: prev:
12301230
12311231 coq_nvim = buildVimPluginFrom2Nix {
12321232 pname = "coq_nvim";
1233− version = "2022-02-24";
1233+ version = "2022-02-25";
12341234 src = fetchFromGitHub {
12351235 owner = "ms-jpq";
12361236 repo = "coq_nvim";
1237− rev = "6e2e12b2485a03a5f5a62319c6ae638b32a203d8";
1238− sha256 = "08bwgn1vvsr96p7ifzc6qxhjdldfgxcqjha7jljrpbqjwj9cfdij";
1237+ rev = "1792fee68dfba89632022e9524c2dcef10d399cd";
1238+ sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a";
12391239 };
12401240 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
12411241 };
@@ -3214,6 +3214,18 @@ final: prev:
32143214 meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
32153215 };
32163216
3217+ lightline-lsp = buildVimPluginFrom2Nix {
3218+ pname = "lightline-lsp";
3219+ version = "2022-01-09";
3220+ src = fetchFromGitHub {
3221+ owner = "spywhere";
3222+ repo = "lightline-lsp";
3223+ rev = "78a8f6880c1d979b7c682e1b37299d970506f480";
3224+ sha256 = "00zkpri1pi6r0m0v91361zixqsfrf05hyml61k4s0i3yabfv84w8";
3225+ };
3226+ meta.homepage = "https://github.com/spywhere/lightline-lsp/";
3227+ };
3228+
32173229 lightline-vim = buildVimPluginFrom2Nix {
32183230 pname = "lightline.vim";
32193231 version = "2021-11-21";
@@ -3228,12 +3240,12 @@ final: prev:
32283240
32293241 lightspeed-nvim = buildVimPluginFrom2Nix {
32303242 pname = "lightspeed.nvim";
3231− version = "2022-02-24";
3243+ version = "2022-02-25";
32323244 src = fetchFromGitHub {
32333245 owner = "ggandor";
32343246 repo = "lightspeed.nvim";
3235− rev = "8fd73360e89a219b5701339c08a469f5703cf163";
3236− sha256 = "0y43p3sv99rsbks9r67zjm7wp3j7xpdx6ql5n18371ys8wyyddpd";
3247+ rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a";
3248+ sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2";
32373249 };
32383250 meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
32393251 };
@@ -3471,8 +3483,8 @@ final: prev:
34713483 src = fetchFromGitHub {
34723484 owner = "l3mon4d3";
34733485 repo = "luasnip";
3474− rev = "e357328c02d1661ffa7ab0aba0d80b6770ca1c31";
3475− sha256 = "0w1fwzcv4ngpwa7dkq6vi9fxg7dski7sqv2k432h1ll6ibph8yid";
3486+ rev = "5addafcc2460c7b805f14f8a257b804527bb85d7";
3487+ sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1";
34763488 };
34773489 meta.homepage = "https://github.com/l3mon4d3/luasnip/";
34783490 };
@@ -3983,12 +3995,12 @@ final: prev:
39833995
39843996 neogit = buildVimPluginFrom2Nix {
39853997 pname = "neogit";
3986− version = "2022-02-18";
3998+ version = "2022-02-25";
39873999 src = fetchFromGitHub {
39884000 owner = "TimUntersberger";
39894001 repo = "neogit";
3990− rev = "e3339888ab2875f7535762a70c916b4986405b58";
3991− sha256 = "084lhaq3pi157dikhpys0ppg68fhdjkm8pbap55ajmkxh5vh7xlf";
4002+ rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0";
4003+ sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95";
39924004 };
39934005 meta.homepage = "https://github.com/TimUntersberger/neogit/";
39944006 };
@@ -4355,12 +4367,12 @@ final: prev:
43554367
43564368 null-ls-nvim = buildVimPluginFrom2Nix {
43574369 pname = "null-ls.nvim";
4358− version = "2022-02-24";
4370+ version = "2022-02-25";
43594371 src = fetchFromGitHub {
43604372 owner = "jose-elias-alvarez";
43614373 repo = "null-ls.nvim";
4362− rev = "ee6134db8f55ed2ef965fbc2d036de3f87a140d9";
4363− sha256 = "04dsmih3hmby3sa9w9n6cw2lzz69jmm6yd6nx70fg07730sg364x";
4374+ rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270";
4375+ sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap";
43644376 };
43654377 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
43664378 };
@@ -4713,6 +4725,18 @@ final: prev:
47134725 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
47144726 };
47154727
4728+ nvim-lightline-lsp = buildVimPluginFrom2Nix {
4729+ pname = "nvim-lightline-lsp";
4730+ version = "2022-01-06";
4731+ src = fetchFromGitHub {
4732+ owner = "josa42";
4733+ repo = "nvim-lightline-lsp";
4734+ rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8";
4735+ sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6";
4736+ };
4737+ meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
4738+ };
4739+
47164740 nvim-lint = buildVimPluginFrom2Nix {
47174741 pname = "nvim-lint";
47184742 version = "2022-02-23";
@@ -4883,12 +4907,12 @@ final: prev:
48834907
48844908 nvim-treesitter = buildVimPluginFrom2Nix {
48854909 pname = "nvim-treesitter";
4886− version = "2022-02-24";
4910+ version = "2022-02-25";
48874911 src = fetchFromGitHub {
48884912 owner = "nvim-treesitter";
48894913 repo = "nvim-treesitter";
4890− rev = "fb7a56548b89670e2147beb15e5bd2487fffc800";
4891− sha256 = "1ada3hzhya4qcqri63plbvvd7xf6gc7k9rr7v5z53lxj1l4s48v2";
4914+ rev = "18c558fd92b5ec800f976c447452ede4e96e9de9";
4915+ sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n";
48924916 };
48934917 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
48944918 };
@@ -5027,12 +5051,12 @@ final: prev:
50275051
50285052 nvimdev-nvim = buildVimPluginFrom2Nix {
50295053 pname = "nvimdev.nvim";
5030− version = "2022-02-19";
5054+ version = "2022-02-24";
50315055 src = fetchFromGitHub {
50325056 owner = "neovim";
50335057 repo = "nvimdev.nvim";
5034− rev = "db19db97a5039b8485a9768873e4afd3cd731625";
5035− sha256 = "0bkxjq3mm6v8h7zsv4mw92nnbj16cxmswdapn7zd2nld23ysyv0l";
5058+ rev = "9b819574b63bbf8883e32602915da22ead08bf9a";
5059+ sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw";
50365060 };
50375061 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
50385062 };
@@ -5801,8 +5825,8 @@ final: prev:
58015825 src = fetchFromGitHub {
58025826 owner = "b0o";
58035827 repo = "SchemaStore.nvim";
5804− rev = "90f1123c0d63f41627dca0c5258a4193274edba0";
5805− sha256 = "0f3jgj1bwvxzmvqf7nbbbwyav5wxmr9kyjw4j4fq7n3mrcapdjj0";
5828+ rev = "7cb75a0e0262244728079a5482f2208b742245f9";
5829+ sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih";
58065830 };
58075831 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
58085832 };
pkgs/applications/editors/vim/plugins/vim-plugin-names+2
@@ -314,6 +314,7 @@ joonty/vim-xdebug
314314joosepalviste/nvim-ts-context-commentstring
315315jordwalke/vim-reasonml
316316josa42/coc-lua
317+josa42/nvim-lightline-lsp
317318josa42/vim-lightline-coc
318319jose-elias-alvarez/minsnip.nvim
319320jose-elias-alvarez/null-ls.nvim
@@ -774,6 +775,7 @@ solarnz/arcanist.vim
774775sonph/onehalf
775776sotte/presenting.vim
776777SpaceVim/SpaceVim
778+spywhere/lightline-lsp
777779srcery-colors/srcery-vim
778780steelsojka/completion-buffers
779781steelsojka/pears.nvim