pluginupdate.py: fix bugs and add improvements; vimPlugins: sort properly (#353786)

authored by Matthieu Coudron and committed by GitHub a31f2a7b 2ef132b3

+542 -531
+52 -49
maintainers/scripts/pluginupdate-py/pluginupdate.py
··· 4 4 # - pkgs/development/lua-modules/updater/updater.py 5 5 6 6 # format: 7 - # $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py 7 + # $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py 8 8 # type-check: 9 9 # $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py 10 10 # linted: ··· 142 142 return loaded 143 143 144 144 def prefetch(self, ref: Optional[str]) -> str: 145 - print("Prefetching %s", self.uri) 145 + log.info("Prefetching %s", self.uri) 146 146 loaded = self._prefetch(ref) 147 147 return loaded["sha256"] 148 148 ··· 195 195 xml = req.read() 196 196 197 197 # Filter out illegal XML characters 198 - illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]") 198 + illegal_xml_regex = re.compile(b"[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]") 199 199 xml = illegal_xml_regex.sub(b"", xml) 200 200 201 201 root = ET.fromstring(xml) ··· 256 256 257 257 @property 258 258 def name(self): 259 - if self.alias is None: 260 - return self.repo.name 261 - else: 262 - return self.alias 263 - 264 - def __lt__(self, other): 265 - return self.repo.name < other.repo.name 259 + return self.alias or self.repo.name 266 260 267 261 @staticmethod 268 262 def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc": ··· 270 264 branch = row["branch"] 271 265 repo = make_repo(row["repo"], branch.strip()) 272 266 repo.token = config.github_token 273 - return PluginDesc(repo, branch.strip(), row["alias"]) 267 + return PluginDesc( 268 + repo, 269 + branch.strip(), 270 + # alias is usually an empty string 271 + row["alias"] if row["alias"] else None, 272 + ) 274 273 275 274 @staticmethod 276 275 def load_from_string(config: FetchConfig, line: str) -> "PluginDesc": ··· 328 327 return plugins 329 328 330 329 331 - 332 330 def run_nix_expr(expr, nixpkgs: str, **args): 333 - ''' 331 + """ 334 332 :param expr nix expression to fetch current plugins 335 333 :param nixpkgs Path towards a nixpkgs checkout 336 - ''' 334 + """ 337 335 with CleanEnvironment(nixpkgs) as nix_path: 338 336 cmd = [ 339 337 "nix", ··· 382 380 fetch_config = FetchConfig(args.proc, args.github_token) 383 381 editor = self 384 382 for plugin_line in args.add_plugins: 385 - log.debug("using plugin_line", plugin_line) 383 + log.debug("using plugin_line %s", plugin_line) 386 384 pdesc = PluginDesc.load_from_string(fetch_config, plugin_line) 387 - log.debug("loaded as pdesc", pdesc) 385 + log.debug("loaded as pdesc %s", pdesc) 388 386 append = [pdesc] 389 387 editor.rewrite_input( 390 388 fetch_config, args.input_file, editor.deprecated, append=append 391 389 ) 392 - plugin, _ = prefetch_plugin( 393 - pdesc, 394 - ) 390 + plugin, _ = prefetch_plugin(pdesc) 395 391 autocommit = not args.no_commit 396 392 if autocommit: 397 393 commit( ··· 406 402 # Expects arguments generated by 'update' subparser 407 403 def update(self, args): 408 404 """CSV spec""" 409 - print("the update member function should be overriden in subclasses") 405 + print("the update member function should be overridden in subclasses") 410 406 411 - def get_current_plugins(self, nixpkgs) -> List[Plugin]: 407 + def get_current_plugins(self, nixpkgs: str) -> List[Plugin]: 412 408 """To fill the cache""" 413 409 data = run_nix_expr(self.get_plugins, nixpkgs) 414 410 plugins = [] ··· 440 436 441 437 plugins, redirects = check_results(results) 442 438 439 + plugins = sorted(plugins, key=lambda v: v[1].normalized_name) 443 440 self.generate_nix(plugins, outfile) 444 441 445 442 return redirects ··· 559 556 parser = self.create_parser() 560 557 args = parser.parse_args() 561 558 command = args.command or "update" 559 + logging.basicConfig() 562 560 log.setLevel(LOG_LEVELS[args.debug]) 563 561 log.info("Chose to run command: %s", command) 564 562 self.nixpkgs = args.nixpkgs ··· 591 589 p: PluginDesc, 592 590 cache: "Optional[Cache]" = None, 593 591 ) -> Tuple[Plugin, Optional[Repo]]: 594 - repo, branch, alias = p.repo, p.branch, p.alias 595 - name = alias or p.repo.name 596 592 commit = None 597 - log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}") 598 - commit, date = repo.latest_commit() 593 + log.info(f"Fetching last commit for plugin {p.name} from {p.repo.uri}@{p.branch}") 594 + commit, date = p.repo.latest_commit() 595 + 599 596 cached_plugin = cache[commit] if cache else None 600 597 if cached_plugin is not None: 601 - log.debug("Cache hit !") 602 - cached_plugin.name = name 598 + log.debug(f"Cache hit for {p.name}!") 599 + cached_plugin.name = p.name 603 600 cached_plugin.date = date 604 - return cached_plugin, repo.redirect 601 + return cached_plugin, p.repo.redirect 605 602 606 - has_submodules = repo.has_submodules() 607 - log.debug(f"prefetch {name}") 608 - sha256 = repo.prefetch(commit) 603 + has_submodules = p.repo.has_submodules() 604 + log.debug(f"prefetch {p.name}") 605 + sha256 = p.repo.prefetch(commit) 609 606 610 607 return ( 611 - Plugin(name, commit, has_submodules, sha256, date=date), 612 - repo.redirect, 608 + Plugin(p.name, commit, has_submodules, sha256, date=date), 609 + p.repo.redirect, 613 610 ) 614 611 615 612 ··· 624 621 625 622 626 623 def check_results( 627 - results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]] 624 + results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]], 628 625 ) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]: 629 626 """ """ 630 627 failures: List[Tuple[PluginDesc, Exception]] = [] ··· 642 639 643 640 print(f"{len(results) - len(failures)} plugins were checked", end="") 644 641 if len(failures) == 0: 645 - print() 646 642 return plugins, redirects 647 643 else: 648 - print(f", {len(failures)} plugin(s) could not be downloaded:\n") 644 + log.error(f", {len(failures)} plugin(s) could not be downloaded:\n") 649 645 650 646 for plugin, exception in failures: 651 647 print_download_error(plugin, exception) ··· 738 734 append: List[PluginDesc] = [], 739 735 ): 740 736 log.info("Rewriting input file %s", input_file) 741 - plugins = load_plugins_from_csv( 742 - config, 743 - input_file, 744 - ) 737 + plugins = load_plugins_from_csv(config, input_file) 745 738 746 739 plugins.extend(append) 747 740 ··· 753 746 deprecations = json.load(f) 754 747 # TODO parallelize this step 755 748 for pdesc, new_repo in redirects.items(): 756 - log.info("Rewriting input file %s", input_file) 749 + log.info("Resolving deprecated plugin %s -> %s", pdesc.name, new_repo.name) 757 750 new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias) 751 + 758 752 old_plugin, _ = prefetch_plugin(pdesc) 759 753 new_plugin, _ = prefetch_plugin(new_pdesc) 754 + 760 755 if old_plugin.normalized_name != new_plugin.normalized_name: 761 756 deprecations[old_plugin.normalized_name] = { 762 757 "new": new_plugin.normalized_name, 763 758 "date": cur_date_iso, 764 759 } 760 + 761 + # remove plugin from index file, so we won't add it to deprecations again 762 + for i, plugin in enumerate(plugins): 763 + if plugin.name == pdesc.name: 764 + plugins.pop(i) 765 + break 766 + plugins.append(new_pdesc) 767 + 765 768 with open(deprecated, "w") as f: 766 769 json.dump(deprecations, f, indent=4, sort_keys=True) 767 770 f.write("\n") ··· 772 775 fieldnames = ["repo", "branch", "alias"] 773 776 writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE) 774 777 writer.writeheader() 775 - for plugin in sorted(plugins): 778 + for plugin in sorted(plugins, key=lambda x: x.name): 776 779 writer.writerow(asdict(plugin)) 777 780 778 781 ··· 792 795 793 796 log.info("Start updating plugins") 794 797 if args.proc > 1 and args.github_token == None: 795 - log.warning("You have enabled parallel updates but haven't set a github token.\n" 796 - "You may be hit with `HTTP Error 429: too many requests` as a consequence." 797 - "Either set --proc=1 or --github-token=YOUR_TOKEN. ") 798 + log.warning( 799 + "You have enabled parallel updates but haven't set a github token.\n" 800 + "You may be hit with `HTTP Error 429: too many requests` as a consequence." 801 + "Either set --proc=1 or --github-token=YOUR_TOKEN. " 802 + ) 798 803 799 804 fetch_config = FetchConfig(args.proc, args.github_token) 800 805 update = editor.get_update(args.input_file, args.outfile, fetch_config) ··· 810 815 if autocommit: 811 816 try: 812 817 repo = git.Repo(os.getcwd()) 813 - updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') 818 + updated = datetime.now(tz=UTC).strftime("%Y-%m-%d") 814 819 print(args.outfile) 815 - commit(repo, 816 - f"{editor.attr_path}: update on {updated}", [args.outfile] 817 - ) 820 + commit(repo, f"{editor.attr_path}: update on {updated}", [args.outfile]) 818 821 except git.InvalidGitRepositoryError as e: 819 822 print(f"Not in a git repository: {e}", file=sys.stderr) 820 823 sys.exit(1)
+36 -22
pkgs/applications/editors/kakoune/plugins/update.py
··· 2 2 #!nix-shell update-shell.nix -i python3 3 3 4 4 # format: 5 - # $ nix run nixpkgs.python3Packages.black -c black update.py 5 + # $ nix run nixpkgs#python3Packages.ruff -- update.py 6 6 # type-check: 7 - # $ nix run nixpkgs.python3Packages.mypy -c mypy update.py 7 + # $ nix run nixpkgs#python3Packages.mypy -- update.py 8 8 # linted: 9 - # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py 9 + # $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py 10 10 11 11 import inspect 12 12 import os 13 13 import sys 14 - from typing import List, Tuple 15 14 from pathlib import Path 15 + from typing import List, Tuple 16 16 17 17 # Import plugin update library from maintainers/scripts/pluginupdate.py 18 - ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore 18 + ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore 19 19 sys.path.insert( 20 20 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") 21 21 ) 22 22 import pluginupdate 23 23 24 - GET_PLUGINS = f"""(with import <localpkgs> {{}}; 24 + GET_PLUGINS = f"""( 25 + with import <localpkgs> {{ }}; 25 26 let 26 - inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix; 27 + inherit (kakouneUtils.override {{ }}) buildKakounePluginFrom2Nix; 27 28 generated = callPackage {ROOT}/generated.nix {{ 28 29 inherit buildKakounePluginFrom2Nix; 29 30 }}; 30 - hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; 31 - getChecksum = name: value: 32 - if hasChecksum value then {{ 33 - submodules = value.src.fetchSubmodules or false; 34 - sha256 = value.src.outputHash; 35 - rev = value.src.rev; 36 - }} else null; 31 + hasChecksum = 32 + value: 33 + lib.isAttrs value 34 + && lib.hasAttrByPath [ 35 + "src" 36 + "outputHash" 37 + ] value; 38 + getChecksum = 39 + name: value: 40 + if hasChecksum value then 41 + {{ 42 + submodules = value.src.fetchSubmodules or false; 43 + sha256 = value.src.outputHash; 44 + rev = value.src.rev; 45 + }} 46 + else 47 + null; 37 48 checksums = lib.mapAttrs getChecksum generated; 38 - in lib.filterAttrs (n: v: v != null) checksums)""" 49 + in 50 + lib.filterAttrs (n: v: v != null) checksums 51 + )""" 52 + 53 + HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" 39 54 40 - HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" 41 55 42 56 class KakouneEditor(pluginupdate.Editor): 43 - 44 - 45 - def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): 46 - sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) 47 - 57 + def generate_nix( 58 + self, 59 + plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], 60 + outfile: str, 61 + ): 48 62 with open(outfile, "w+") as f: 49 63 f.write(HEADER) 50 64 f.write( ··· 54 68 packages = ( self: 55 69 {""" 56 70 ) 57 - for pluginDesc, plugin in sorted_plugins: 71 + for pluginDesc, plugin in plugins: 58 72 f.write( 59 73 f""" 60 74 {plugin.normalized_name} = buildKakounePluginFrom2Nix {{
+396 -394
pkgs/applications/editors/vim/plugins/generated.nix
··· 1434 1434 meta.homepage = "https://github.com/bkad/camelcasemotion/"; 1435 1435 }; 1436 1436 1437 + catppuccin-nvim = buildVimPlugin { 1438 + pname = "catppuccin-nvim"; 1439 + version = "2024-11-03"; 1440 + src = fetchFromGitHub { 1441 + owner = "catppuccin"; 1442 + repo = "nvim"; 1443 + rev = "35d8057137af463c9f41f169539e9b190d57d269"; 1444 + sha256 = "1lra18arndkpd8k9pyh3qgykihqnvm8h6v0w0kjpf36ys9xgpz3r"; 1445 + }; 1446 + meta.homepage = "https://github.com/catppuccin/nvim/"; 1447 + }; 1448 + 1449 + catppuccin-vim = buildVimPlugin { 1450 + pname = "catppuccin-vim"; 1451 + version = "2024-08-14"; 1452 + src = fetchFromGitHub { 1453 + owner = "catppuccin"; 1454 + repo = "vim"; 1455 + rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; 1456 + sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; 1457 + }; 1458 + meta.homepage = "https://github.com/catppuccin/vim/"; 1459 + }; 1460 + 1437 1461 caw-vim = buildVimPlugin { 1438 1462 pname = "caw.vim"; 1439 1463 version = "2023-03-16"; ··· 2057 2081 meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; 2058 2082 }; 2059 2083 2060 - cmp-pandoc-references = buildVimPlugin { 2061 - pname = "cmp-pandoc-references"; 2062 - version = "2022-04-20"; 2063 - src = fetchFromGitHub { 2064 - owner = "jc-doyle"; 2065 - repo = "cmp-pandoc-references"; 2066 - rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; 2067 - sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; 2068 - }; 2069 - meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; 2070 - }; 2071 - 2072 2084 cmp-pandoc-nvim = buildVimPlugin { 2073 2085 pname = "cmp-pandoc.nvim"; 2074 2086 version = "2023-03-03"; ··· 2079 2091 sha256 = "0fl903hcy85f21xmgf1dx31lxjwgplkcg4m8i989yhqr6irwwi6f"; 2080 2092 }; 2081 2093 meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; 2094 + }; 2095 + 2096 + cmp-pandoc-references = buildVimPlugin { 2097 + pname = "cmp-pandoc-references"; 2098 + version = "2022-04-20"; 2099 + src = fetchFromGitHub { 2100 + owner = "jc-doyle"; 2101 + repo = "cmp-pandoc-references"; 2102 + rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; 2103 + sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; 2104 + }; 2105 + meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; 2082 2106 }; 2083 2107 2084 2108 cmp-path = buildVimPlugin { ··· 2345 2369 meta.homepage = "https://github.com/neoclide/coc-neco/"; 2346 2370 }; 2347 2371 2372 + coc-nvim = buildVimPlugin { 2373 + pname = "coc.nvim"; 2374 + version = "2024-10-12"; 2375 + src = fetchFromGitHub { 2376 + owner = "neoclide"; 2377 + repo = "coc.nvim"; 2378 + rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; 2379 + sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; 2380 + }; 2381 + meta.homepage = "https://github.com/neoclide/coc.nvim/"; 2382 + }; 2383 + 2348 2384 coc-svelte = buildVimPlugin { 2349 2385 pname = "coc-svelte"; 2350 2386 version = "2023-10-08"; ··· 2367 2403 sha256 = "189abl36aj862m5nz8jjdgdfc4s6xbag030hi9m13yd6fbg99f85"; 2368 2404 }; 2369 2405 meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; 2370 - }; 2371 - 2372 - coc-nvim = buildVimPlugin { 2373 - pname = "coc.nvim"; 2374 - version = "2024-10-12"; 2375 - src = fetchFromGitHub { 2376 - owner = "neoclide"; 2377 - repo = "coc.nvim"; 2378 - rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; 2379 - sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; 2380 - }; 2381 - meta.homepage = "https://github.com/neoclide/coc.nvim/"; 2382 2406 }; 2383 2407 2384 2408 coconut-vim = buildVimPlugin { ··· 2754 2778 meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; 2755 2779 }; 2756 2780 2757 - copilot-lualine = buildVimPlugin { 2758 - pname = "copilot-lualine"; 2759 - version = "2024-09-03"; 2760 - src = fetchFromGitHub { 2761 - owner = "AndreM222"; 2762 - repo = "copilot-lualine"; 2763 - rev = "f40450c3e138766026327e7807877ea860618258"; 2764 - sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; 2765 - }; 2766 - meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; 2767 - }; 2768 - 2769 2781 copilot-lua = buildVimPlugin { 2770 2782 pname = "copilot.lua"; 2771 2783 version = "2024-10-18"; ··· 2776 2788 sha256 = "1yzfkvqjcmnbkxsdjy81cjal8zqqs9x6ai44ky11z0ly1zcqv3ji"; 2777 2789 }; 2778 2790 meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; 2791 + }; 2792 + 2793 + copilot-lualine = buildVimPlugin { 2794 + pname = "copilot-lualine"; 2795 + version = "2024-09-03"; 2796 + src = fetchFromGitHub { 2797 + owner = "AndreM222"; 2798 + repo = "copilot-lualine"; 2799 + rev = "f40450c3e138766026327e7807877ea860618258"; 2800 + sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; 2801 + }; 2802 + meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; 2779 2803 }; 2780 2804 2781 2805 copilot-vim = buildVimPlugin { ··· 2946 2970 meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; 2947 2971 }; 2948 2972 2949 - ctrlp-z = buildVimPlugin { 2950 - pname = "ctrlp-z"; 2951 - version = "2015-10-17"; 2952 - src = fetchFromGitHub { 2953 - owner = "amiorin"; 2954 - repo = "ctrlp-z"; 2955 - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; 2956 - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; 2957 - }; 2958 - meta.homepage = "https://github.com/amiorin/ctrlp-z/"; 2959 - }; 2960 - 2961 2973 ctrlp-vim = buildVimPlugin { 2962 2974 pname = "ctrlp.vim"; 2963 2975 version = "2024-10-21"; ··· 2968 2980 sha256 = "1xakj4yqra10hws4jh0h3x68x74qs2khk1318ckfq11zgz6d877s"; 2969 2981 }; 2970 2982 meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; 2983 + }; 2984 + 2985 + ctrlp-z = buildVimPlugin { 2986 + pname = "ctrlp-z"; 2987 + version = "2015-10-17"; 2988 + src = fetchFromGitHub { 2989 + owner = "amiorin"; 2990 + repo = "ctrlp-z"; 2991 + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; 2992 + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; 2993 + }; 2994 + meta.homepage = "https://github.com/amiorin/ctrlp-z/"; 2971 2995 }; 2972 2996 2973 2997 cyberdream-nvim = buildVimPlugin { ··· 3368 3392 meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; 3369 3393 }; 3370 3394 3395 + deoplete-nvim = buildVimPlugin { 3396 + pname = "deoplete.nvim"; 3397 + version = "2024-06-05"; 3398 + src = fetchFromGitHub { 3399 + owner = "Shougo"; 3400 + repo = "deoplete.nvim"; 3401 + rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6"; 3402 + sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2"; 3403 + }; 3404 + meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; 3405 + }; 3406 + 3371 3407 deoplete-phpactor = buildVimPlugin { 3372 3408 pname = "deoplete-phpactor"; 3373 3409 version = "2020-09-12"; ··· 3438 3474 sha256 = "0zsbkl82kny1vmfv06iz576xsclbik0xr7ndzpb0ddhw5nfnicfx"; 3439 3475 }; 3440 3476 meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; 3441 - }; 3442 - 3443 - deoplete-nvim = buildVimPlugin { 3444 - pname = "deoplete.nvim"; 3445 - version = "2024-06-05"; 3446 - src = fetchFromGitHub { 3447 - owner = "Shougo"; 3448 - repo = "deoplete.nvim"; 3449 - rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6"; 3450 - sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2"; 3451 - }; 3452 - meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; 3453 3477 }; 3454 3478 3455 3479 devdocs-vim = buildVimPlugin { ··· 3608 3632 meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; 3609 3633 }; 3610 3634 3635 + dracula-vim = buildVimPlugin { 3636 + pname = "dracula-vim"; 3637 + version = "2024-07-26"; 3638 + src = fetchFromGitHub { 3639 + owner = "dracula"; 3640 + repo = "vim"; 3641 + rev = "65f4225e0526516a67d56c8ac09925a209138e53"; 3642 + sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; 3643 + }; 3644 + meta.homepage = "https://github.com/dracula/vim/"; 3645 + }; 3646 + 3611 3647 dressing-nvim = buildVimPlugin { 3612 3648 pname = "dressing.nvim"; 3613 3649 version = "2024-11-04"; ··· 3692 3728 meta.homepage = "https://github.com/folke/edgy.nvim/"; 3693 3729 }; 3694 3730 3731 + editorconfig-nvim = buildVimPlugin { 3732 + pname = "editorconfig.nvim"; 3733 + version = "2023-01-10"; 3734 + src = fetchFromGitHub { 3735 + owner = "gpanders"; 3736 + repo = "editorconfig.nvim"; 3737 + rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; 3738 + sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; 3739 + }; 3740 + meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; 3741 + }; 3742 + 3695 3743 editorconfig-vim = buildVimPlugin { 3696 3744 pname = "editorconfig-vim"; 3697 3745 version = "2024-10-14"; ··· 3705 3753 meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; 3706 3754 }; 3707 3755 3708 - editorconfig-nvim = buildVimPlugin { 3709 - pname = "editorconfig.nvim"; 3710 - version = "2023-01-10"; 3711 - src = fetchFromGitHub { 3712 - owner = "gpanders"; 3713 - repo = "editorconfig.nvim"; 3714 - rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; 3715 - sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; 3716 - }; 3717 - meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; 3718 - }; 3719 - 3720 3756 efmls-configs-nvim = buildVimPlugin { 3721 3757 pname = "efmls-configs-nvim"; 3722 3758 version = "2024-10-15"; ··· 3763 3799 sha256 = "1y1adg42iv0xhww2vxmxw3pky5syjc3djc1h2s7mm0bjg2marlha"; 3764 3800 }; 3765 3801 meta.homepage = "https://github.com/dmix/elvish.vim/"; 3802 + }; 3803 + 3804 + embark-vim = buildVimPlugin { 3805 + pname = "embark-vim"; 3806 + version = "2024-09-21"; 3807 + src = fetchFromGitHub { 3808 + owner = "embark-theme"; 3809 + repo = "vim"; 3810 + rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; 3811 + sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; 3812 + }; 3813 + meta.homepage = "https://github.com/embark-theme/vim/"; 3766 3814 }; 3767 3815 3768 3816 emmet-vim = buildVimPlugin { ··· 4343 4391 meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; 4344 4392 }; 4345 4393 4394 + gbprod-nord = buildVimPlugin { 4395 + pname = "gbprod-nord"; 4396 + version = "2024-10-10"; 4397 + src = fetchFromGitHub { 4398 + owner = "gbprod"; 4399 + repo = "nord.nvim"; 4400 + rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; 4401 + sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; 4402 + }; 4403 + meta.homepage = "https://github.com/gbprod/nord.nvim/"; 4404 + }; 4405 + 4346 4406 gen_tags-vim = buildVimPlugin { 4347 4407 pname = "gen_tags.vim"; 4348 4408 version = "2023-03-06"; ··· 4703 4763 meta.homepage = "https://github.com/luisiacc/gruvbox-baby/"; 4704 4764 }; 4705 4765 4766 + gruvbox-community = buildVimPlugin { 4767 + pname = "gruvbox-community"; 4768 + version = "2024-01-21"; 4769 + src = fetchFromGitHub { 4770 + owner = "gruvbox-community"; 4771 + repo = "gruvbox"; 4772 + rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; 4773 + sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; 4774 + }; 4775 + meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; 4776 + }; 4777 + 4706 4778 gruvbox-flat-nvim = buildVimPlugin { 4707 4779 pname = "gruvbox-flat.nvim"; 4708 4780 version = "2023-05-27"; ··· 4854 4926 repo = "harpoon"; 4855 4927 rev = "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3"; 4856 4928 sha256 = "0q7lcww2y1x8s6r5g6wbdlnv3dvc8pj1g7wq6yxvl5fsi40wvhwj"; 4929 + }; 4930 + meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; 4931 + }; 4932 + 4933 + harpoon2 = buildVimPlugin { 4934 + pname = "harpoon2"; 4935 + version = "2024-04-09"; 4936 + src = fetchFromGitHub { 4937 + owner = "ThePrimeagen"; 4938 + repo = "harpoon"; 4939 + rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; 4940 + sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; 4857 4941 }; 4858 4942 meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; 4859 4943 }; ··· 6026 6110 meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; 6027 6111 }; 6028 6112 6029 - litee-symboltree-nvim = buildVimPlugin { 6030 - pname = "litee-symboltree.nvim"; 6031 - version = "2022-09-28"; 6032 - src = fetchFromGitHub { 6033 - owner = "ldelossa"; 6034 - repo = "litee-symboltree.nvim"; 6035 - rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; 6036 - sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; 6037 - }; 6038 - meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; 6039 - }; 6040 - 6041 6113 litee-nvim = buildVimPlugin { 6042 6114 pname = "litee.nvim"; 6043 6115 version = "2024-06-06"; ··· 6048 6120 sha256 = "13ajn5xply01k4wpsl0v37igama8pgy0kz1lgvv7jn8b1m04yh9x"; 6049 6121 }; 6050 6122 meta.homepage = "https://github.com/ldelossa/litee.nvim/"; 6123 + }; 6124 + 6125 + litee-symboltree-nvim = buildVimPlugin { 6126 + pname = "litee-symboltree.nvim"; 6127 + version = "2022-09-28"; 6128 + src = fetchFromGitHub { 6129 + owner = "ldelossa"; 6130 + repo = "litee-symboltree.nvim"; 6131 + rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; 6132 + sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; 6133 + }; 6134 + meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; 6051 6135 }; 6052 6136 6053 6137 live-command-nvim = buildVimPlugin { ··· 6362 6446 meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; 6363 6447 }; 6364 6448 6365 - markdown-preview-nvim = buildVimPlugin { 6366 - pname = "markdown-preview.nvim"; 6367 - version = "2023-10-17"; 6368 - src = fetchFromGitHub { 6369 - owner = "iamcco"; 6370 - repo = "markdown-preview.nvim"; 6371 - rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; 6372 - sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; 6373 - }; 6374 - meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; 6375 - }; 6376 - 6377 6449 markdown-nvim = buildVimPlugin { 6378 6450 pname = "markdown.nvim"; 6379 6451 version = "2024-06-25"; ··· 6384 6456 sha256 = "0p454caxkd8chg0v1m085vlmrmhkvhfwq625wgy9s8bzinja5rb0"; 6385 6457 }; 6386 6458 meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/"; 6459 + }; 6460 + 6461 + markdown-preview-nvim = buildVimPlugin { 6462 + pname = "markdown-preview.nvim"; 6463 + version = "2023-10-17"; 6464 + src = fetchFromGitHub { 6465 + owner = "iamcco"; 6466 + repo = "markdown-preview.nvim"; 6467 + rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; 6468 + sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; 6469 + }; 6470 + meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; 6387 6471 }; 6388 6472 6389 6473 markid = buildVimPlugin { ··· 6435 6519 meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; 6436 6520 }; 6437 6521 6522 + mason-nvim = buildVimPlugin { 6523 + pname = "mason.nvim"; 6524 + version = "2024-07-16"; 6525 + src = fetchFromGitHub { 6526 + owner = "williamboman"; 6527 + repo = "mason.nvim"; 6528 + rev = "e2f7f9044ec30067bc11800a9e266664b88cda22"; 6529 + sha256 = "0rnscicsvlcxcp5i3pzym8wqg0qv664j15b4vnm1rlhbq2bsqjhp"; 6530 + }; 6531 + meta.homepage = "https://github.com/williamboman/mason.nvim/"; 6532 + }; 6533 + 6438 6534 mason-tool-installer-nvim = buildVimPlugin { 6439 6535 pname = "mason-tool-installer.nvim"; 6440 6536 version = "2024-06-03"; ··· 6447 6543 meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; 6448 6544 }; 6449 6545 6450 - mason-nvim = buildVimPlugin { 6451 - pname = "mason.nvim"; 6452 - version = "2024-07-16"; 6453 - src = fetchFromGitHub { 6454 - owner = "williamboman"; 6455 - repo = "mason.nvim"; 6456 - rev = "e2f7f9044ec30067bc11800a9e266664b88cda22"; 6457 - sha256 = "0rnscicsvlcxcp5i3pzym8wqg0qv664j15b4vnm1rlhbq2bsqjhp"; 6458 - }; 6459 - meta.homepage = "https://github.com/williamboman/mason.nvim/"; 6460 - }; 6461 - 6462 6546 matchit-zip = buildVimPlugin { 6463 6547 pname = "matchit.zip"; 6464 6548 version = "2010-10-18"; ··· 6493 6577 sha256 = "15yaahzva9vg87s2pbipwrkk2f0w7mjxwzmyrr8wb5f8rncxx01f"; 6494 6578 }; 6495 6579 meta.homepage = "https://github.com/kaicataldo/material.vim/"; 6580 + }; 6581 + 6582 + mattn-calendar-vim = buildVimPlugin { 6583 + pname = "mattn-calendar-vim"; 6584 + version = "2022-02-10"; 6585 + src = fetchFromGitHub { 6586 + owner = "mattn"; 6587 + repo = "calendar-vim"; 6588 + rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; 6589 + sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; 6590 + }; 6591 + meta.homepage = "https://github.com/mattn/calendar-vim/"; 6496 6592 }; 6497 6593 6498 6594 mayansmoke = buildVimPlugin { ··· 6577 6673 sha256 = "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"; 6578 6674 }; 6579 6675 meta.homepage = "https://github.com/hadronized/mind.nvim/"; 6580 - }; 6581 - 6582 - mini-git = buildVimPlugin { 6583 - pname = "mini-git"; 6584 - version = "2024-09-07"; 6585 - src = fetchFromGitHub { 6586 - owner = "echasnovski"; 6587 - repo = "mini-git"; 6588 - rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; 6589 - sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; 6590 - }; 6591 - meta.homepage = "https://github.com/echasnovski/mini-git/"; 6592 6676 }; 6593 6677 6594 6678 mini-ai = buildVimPlugin { ··· 6805 6889 sha256 = "03v6rp0j63a7clpp6ficq6ixwr55lvyz3ygc99r1qw0gzh6y9w2y"; 6806 6890 }; 6807 6891 meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; 6892 + }; 6893 + 6894 + mini-git = buildVimPlugin { 6895 + pname = "mini-git"; 6896 + version = "2024-09-07"; 6897 + src = fetchFromGitHub { 6898 + owner = "echasnovski"; 6899 + repo = "mini-git"; 6900 + rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; 6901 + sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; 6902 + }; 6903 + meta.homepage = "https://github.com/echasnovski/mini-git/"; 6808 6904 }; 6809 6905 6810 6906 mini-hipatterns = buildVimPlugin { ··· 8202 8298 meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; 8203 8299 }; 8204 8300 8301 + nightfly = buildVimPlugin { 8302 + pname = "nightfly"; 8303 + version = "2024-11-02"; 8304 + src = fetchFromGitHub { 8305 + owner = "bluz71"; 8306 + repo = "vim-nightfly-colors"; 8307 + rev = "fe3aaa329692e7a0820a65d32406ede3e3ab3c91"; 8308 + sha256 = "10rwsvzbagwrj39jzjg70wzsd21igcjvvsna4jzif5s1gc5jwbhb"; 8309 + }; 8310 + meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; 8311 + }; 8312 + 8205 8313 nightfox-nvim = buildVimPlugin { 8206 8314 pname = "nightfox.nvim"; 8207 8315 version = "2024-09-08"; ··· 8346 8454 meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; 8347 8455 }; 8348 8456 8457 + nord-vim = buildVimPlugin { 8458 + pname = "nord-vim"; 8459 + version = "2023-05-03"; 8460 + src = fetchFromGitHub { 8461 + owner = "nordtheme"; 8462 + repo = "vim"; 8463 + rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295"; 8464 + sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz"; 8465 + }; 8466 + meta.homepage = "https://github.com/nordtheme/vim/"; 8467 + }; 8468 + 8349 8469 nordic-nvim = buildVimPlugin { 8350 8470 pname = "nordic.nvim"; 8351 8471 version = "2024-06-16"; ··· 8428 8548 sha256 = "0ab9j96907wmlpwg60l0ga0vkvs8rydh1ml4pl30bv6aihkpjkks"; 8429 8549 }; 8430 8550 meta.homepage = "https://github.com/nvchad/nvchad/"; 8551 + }; 8552 + 8553 + nvchad-ui = buildVimPlugin { 8554 + pname = "nvchad-ui"; 8555 + version = "2024-11-04"; 8556 + src = fetchFromGitHub { 8557 + owner = "nvchad"; 8558 + repo = "ui"; 8559 + rev = "f2d4f351187439df6ba8637e06f60c308e3c12cf"; 8560 + sha256 = "1m4z6h4rk43h8yxd6qk9h6gifbk3mhhnb3qfkqpdx9c631vvrqf7"; 8561 + }; 8562 + meta.homepage = "https://github.com/nvchad/ui/"; 8431 8563 }; 8432 8564 8433 8565 nvcode-color-schemes-vim = buildVimPlugin { ··· 9822 9954 meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; 9823 9955 }; 9824 9956 9957 + one-small-step-for-vimkind = buildVimPlugin { 9958 + pname = "one-small-step-for-vimkind"; 9959 + version = "2024-10-15"; 9960 + src = fetchFromGitHub { 9961 + owner = "jbyuki"; 9962 + repo = "one-small-step-for-vimkind"; 9963 + rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; 9964 + sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; 9965 + }; 9966 + meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; 9967 + }; 9968 + 9825 9969 onedark-nvim = buildVimPlugin { 9826 9970 pname = "onedark.nvim"; 9827 9971 version = "2024-07-05"; ··· 9930 10074 meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; 9931 10075 }; 9932 10076 9933 - one-small-step-for-vimkind = buildVimPlugin { 9934 - pname = "one-small-step-for-vimkind"; 9935 - version = "2024-10-15"; 9936 - src = fetchFromGitHub { 9937 - owner = "jbyuki"; 9938 - repo = "one-small-step-for-vimkind"; 9939 - rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; 9940 - sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; 9941 - }; 9942 - meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; 9943 - }; 9944 - 9945 10077 openscad-nvim = buildVimPlugin { 9946 10078 pname = "openscad.nvim"; 9947 10079 version = "2024-04-13"; ··· 10183 10315 meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; 10184 10316 }; 10185 10317 10318 + phha-zenburn = buildVimPlugin { 10319 + pname = "phha-zenburn"; 10320 + version = "2024-01-31"; 10321 + src = fetchFromGitHub { 10322 + owner = "phha"; 10323 + repo = "zenburn.nvim"; 10324 + rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; 10325 + sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; 10326 + }; 10327 + meta.homepage = "https://github.com/phha/zenburn.nvim/"; 10328 + }; 10329 + 10186 10330 pig-vim = buildVimPlugin { 10187 10331 pname = "pig.vim"; 10188 10332 version = "2017-06-08"; ··· 10412 10556 meta.homepage = "https://github.com/Shougo/pum.vim/"; 10413 10557 }; 10414 10558 10559 + pure-lua = buildVimPlugin { 10560 + pname = "pure-lua"; 10561 + version = "2021-05-16"; 10562 + src = fetchFromGitHub { 10563 + owner = "shaunsingh"; 10564 + repo = "moonlight.nvim"; 10565 + rev = "e24e4218ec680b6396532808abf57ca0ada82e66"; 10566 + sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3"; 10567 + }; 10568 + meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; 10569 + }; 10570 + 10415 10571 purescript-vim = buildVimPlugin { 10416 10572 pname = "purescript-vim"; 10417 10573 version = "2023-02-06"; ··· 10737 10893 meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; 10738 10894 }; 10739 10895 10896 + restore-view-vim = buildVimPlugin { 10897 + pname = "restore-view-vim"; 10898 + version = "2014-11-21"; 10899 + src = fetchFromGitHub { 10900 + owner = "vim-scripts"; 10901 + repo = "restore_view.vim"; 10902 + rev = "8b933436e3ab8dec120841027183f0d72a4e2096"; 10903 + sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn"; 10904 + }; 10905 + meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; 10906 + }; 10907 + 10740 10908 riv-vim = buildVimPlugin { 10741 10909 pname = "riv.vim"; 10742 10910 version = "2024-03-19"; ··· 10785 10953 meta.homepage = "https://github.com/ron-rs/ron.vim/"; 10786 10954 }; 10787 10955 10956 + rose-pine = buildVimPlugin { 10957 + pname = "rose-pine"; 10958 + version = "2024-10-23"; 10959 + src = fetchFromGitHub { 10960 + owner = "rose-pine"; 10961 + repo = "neovim"; 10962 + rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; 10963 + sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; 10964 + }; 10965 + meta.homepage = "https://github.com/rose-pine/neovim/"; 10966 + }; 10967 + 10788 10968 roslyn-nvim = buildVimPlugin { 10789 10969 pname = "roslyn.nvim"; 10790 10970 version = "2024-10-13"; ··· 10867 11047 sha256 = "0r79bpl98xcsmkw6dg83cf1ghn89rzsr011zirk3v1wfxclri2c4"; 10868 11048 }; 10869 11049 meta.homepage = "https://github.com/vmware-archive/salt-vim/"; 11050 + }; 11051 + 11052 + samodostal-image-nvim = buildVimPlugin { 11053 + pname = "samodostal-image-nvim"; 11054 + version = "2024-01-07"; 11055 + src = fetchFromGitHub { 11056 + owner = "samodostal"; 11057 + repo = "image.nvim"; 11058 + rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0"; 11059 + sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56"; 11060 + }; 11061 + meta.homepage = "https://github.com/samodostal/image.nvim/"; 10870 11062 }; 10871 11063 10872 11064 satellite-nvim = buildVimPlugin { ··· 11146 11338 meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; 11147 11339 }; 11148 11340 11149 - snap = buildVimPlugin { 11150 - pname = "snap"; 11151 - version = "2024-06-05"; 11152 - src = fetchFromGitHub { 11153 - owner = "camspiers"; 11154 - repo = "snap"; 11155 - rev = "486a2ab714eee79c392abfb45bdb94398409ed34"; 11156 - sha256 = "1ghca3fjdd0v3s4jldilki7kzhz891qxkf1l0dzx4h4p420kc42d"; 11157 - }; 11158 - meta.homepage = "https://github.com/camspiers/snap/"; 11159 - }; 11160 - 11161 11341 snacks-nvim = buildVimPlugin { 11162 11342 pname = "snacks.nvim"; 11163 11343 version = "2024-11-07"; ··· 11168 11348 sha256 = "uKAdjRLUtKi6FlE0IHGlnW0Bv2hQhoTRiarvwyU0YaE="; 11169 11349 }; 11170 11350 meta.homepage = "https://github.com/folke/snacks.nvim/"; 11351 + }; 11352 + 11353 + snap = buildVimPlugin { 11354 + pname = "snap"; 11355 + version = "2024-06-05"; 11356 + src = fetchFromGitHub { 11357 + owner = "camspiers"; 11358 + repo = "snap"; 11359 + rev = "486a2ab714eee79c392abfb45bdb94398409ed34"; 11360 + sha256 = "1ghca3fjdd0v3s4jldilki7kzhz891qxkf1l0dzx4h4p420kc42d"; 11361 + }; 11362 + meta.homepage = "https://github.com/camspiers/snap/"; 11171 11363 }; 11172 11364 11173 11365 snippets-nvim = buildVimPlugin { ··· 12039 12231 meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; 12040 12232 }; 12041 12233 12234 + telescope-nvim = buildNeovimPlugin { 12235 + pname = "telescope.nvim"; 12236 + version = "2024-10-29"; 12237 + src = fetchFromGitHub { 12238 + owner = "nvim-telescope"; 12239 + repo = "telescope.nvim"; 12240 + rev = "85922dde3767e01d42a08e750a773effbffaea3e"; 12241 + sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1"; 12242 + }; 12243 + meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; 12244 + }; 12245 + 12042 12246 telescope-project-nvim = buildVimPlugin { 12043 12247 pname = "telescope-project.nvim"; 12044 12248 version = "2024-09-09"; ··· 12172 12376 meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; 12173 12377 }; 12174 12378 12175 - telescope-nvim = buildNeovimPlugin { 12176 - pname = "telescope.nvim"; 12177 - version = "2024-10-29"; 12178 - src = fetchFromGitHub { 12179 - owner = "nvim-telescope"; 12180 - repo = "telescope.nvim"; 12181 - rev = "85922dde3767e01d42a08e750a773effbffaea3e"; 12182 - sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1"; 12183 - }; 12184 - meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; 12185 - }; 12186 - 12187 12379 telescope_hoogle = buildVimPlugin { 12188 12380 pname = "telescope_hoogle"; 12189 12381 version = "2023-09-20"; ··· 12386 12578 sha256 = "0mnlsx00ypfly8jc4aw4df958jd035c6j33innh29xh4ywp3f7h7"; 12387 12579 }; 12388 12580 meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; 12581 + }; 12582 + 12583 + tinykeymap = buildVimPlugin { 12584 + pname = "tinykeymap"; 12585 + version = "2024-02-17"; 12586 + src = fetchFromGitHub { 12587 + owner = "tomtom"; 12588 + repo = "tinykeymap_vim"; 12589 + rev = "7217ce656069d82cd71872ede09152b232ecaf1b"; 12590 + sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w"; 12591 + }; 12592 + meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; 12389 12593 }; 12390 12594 12391 12595 tlib_vim = buildVimPlugin { ··· 12666 12870 meta.homepage = "https://github.com/folke/twilight.nvim/"; 12667 12871 }; 12668 12872 12873 + typescript-nvim = buildVimPlugin { 12874 + pname = "typescript.nvim"; 12875 + version = "2023-08-12"; 12876 + src = fetchFromGitHub { 12877 + owner = "jose-elias-alvarez"; 12878 + repo = "typescript.nvim"; 12879 + rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; 12880 + sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"; 12881 + }; 12882 + meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; 12883 + }; 12884 + 12669 12885 typescript-tools-nvim = buildVimPlugin { 12670 12886 pname = "typescript-tools.nvim"; 12671 12887 version = "2024-07-18"; ··· 12688 12904 sha256 = "042dnb5y8v3xb5nz564snicxkxalki1zm32y09imkskfkv588l52"; 12689 12905 }; 12690 12906 meta.homepage = "https://github.com/leafgarland/typescript-vim/"; 12691 - }; 12692 - 12693 - typescript-nvim = buildVimPlugin { 12694 - pname = "typescript.nvim"; 12695 - version = "2023-08-12"; 12696 - src = fetchFromGitHub { 12697 - owner = "jose-elias-alvarez"; 12698 - repo = "typescript.nvim"; 12699 - rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; 12700 - sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm"; 12701 - }; 12702 - meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; 12703 12907 }; 12704 12908 12705 12909 typst-conceal-vim = buildVimPlugin { ··· 13228 13432 sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; 13229 13433 }; 13230 13434 meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; 13435 + }; 13436 + 13437 + vim-advanced-sorters = buildVimPlugin { 13438 + pname = "vim-advanced-sorters"; 13439 + version = "2024-08-16"; 13440 + src = fetchFromGitHub { 13441 + owner = "inkarkat"; 13442 + repo = "vim-AdvancedSorters"; 13443 + rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; 13444 + sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; 13445 + }; 13446 + meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; 13231 13447 }; 13232 13448 13233 13449 vim-after-object = buildVimPlugin { ··· 14140 14356 sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; 14141 14357 }; 14142 14358 meta.homepage = "https://github.com/jhradilek/vim-docbk/"; 14359 + }; 14360 + 14361 + vim-docbk-snippets = buildVimPlugin { 14362 + pname = "vim-docbk-snippets"; 14363 + version = "2023-09-29"; 14364 + src = fetchFromGitHub { 14365 + owner = "jhradilek"; 14366 + repo = "vim-snippets"; 14367 + rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; 14368 + sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; 14369 + }; 14370 + meta.homepage = "https://github.com/jhradilek/vim-snippets/"; 14143 14371 }; 14144 14372 14145 14373 vim-dotenv = buildVimPlugin { ··· 18672 18900 meta.homepage = "https://github.com/nanotee/zoxide.vim/"; 18673 18901 }; 18674 18902 18675 - catppuccin-nvim = buildVimPlugin { 18676 - pname = "catppuccin-nvim"; 18677 - version = "2024-11-03"; 18678 - src = fetchFromGitHub { 18679 - owner = "catppuccin"; 18680 - repo = "nvim"; 18681 - rev = "35d8057137af463c9f41f169539e9b190d57d269"; 18682 - sha256 = "1lra18arndkpd8k9pyh3qgykihqnvm8h6v0w0kjpf36ys9xgpz3r"; 18683 - }; 18684 - meta.homepage = "https://github.com/catppuccin/nvim/"; 18685 - }; 18686 18903 18687 - catppuccin-vim = buildVimPlugin { 18688 - pname = "catppuccin-vim"; 18689 - version = "2024-08-14"; 18690 - src = fetchFromGitHub { 18691 - owner = "catppuccin"; 18692 - repo = "vim"; 18693 - rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; 18694 - sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; 18695 - }; 18696 - meta.homepage = "https://github.com/catppuccin/vim/"; 18697 - }; 18698 - 18699 - dracula-vim = buildVimPlugin { 18700 - pname = "dracula-vim"; 18701 - version = "2024-07-26"; 18702 - src = fetchFromGitHub { 18703 - owner = "dracula"; 18704 - repo = "vim"; 18705 - rev = "65f4225e0526516a67d56c8ac09925a209138e53"; 18706 - sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; 18707 - }; 18708 - meta.homepage = "https://github.com/dracula/vim/"; 18709 - }; 18710 - 18711 - embark-vim = buildVimPlugin { 18712 - pname = "embark-vim"; 18713 - version = "2024-09-21"; 18714 - src = fetchFromGitHub { 18715 - owner = "embark-theme"; 18716 - repo = "vim"; 18717 - rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; 18718 - sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; 18719 - }; 18720 - meta.homepage = "https://github.com/embark-theme/vim/"; 18721 - }; 18722 - 18723 - gbprod-nord = buildVimPlugin { 18724 - pname = "gbprod-nord"; 18725 - version = "2024-10-10"; 18726 - src = fetchFromGitHub { 18727 - owner = "gbprod"; 18728 - repo = "nord.nvim"; 18729 - rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; 18730 - sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; 18731 - }; 18732 - meta.homepage = "https://github.com/gbprod/nord.nvim/"; 18733 - }; 18734 - 18735 - gruvbox-community = buildVimPlugin { 18736 - pname = "gruvbox-community"; 18737 - version = "2024-01-21"; 18738 - src = fetchFromGitHub { 18739 - owner = "gruvbox-community"; 18740 - repo = "gruvbox"; 18741 - rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; 18742 - sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; 18743 - }; 18744 - meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; 18745 - }; 18746 - 18747 - harpoon2 = buildVimPlugin { 18748 - pname = "harpoon2"; 18749 - version = "2024-04-09"; 18750 - src = fetchFromGitHub { 18751 - owner = "ThePrimeagen"; 18752 - repo = "harpoon"; 18753 - rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; 18754 - sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; 18755 - }; 18756 - meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; 18757 - }; 18758 - 18759 - mattn-calendar-vim = buildVimPlugin { 18760 - pname = "mattn-calendar-vim"; 18761 - version = "2022-02-10"; 18762 - src = fetchFromGitHub { 18763 - owner = "mattn"; 18764 - repo = "calendar-vim"; 18765 - rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; 18766 - sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; 18767 - }; 18768 - meta.homepage = "https://github.com/mattn/calendar-vim/"; 18769 - }; 18770 - 18771 - nightfly = buildVimPlugin { 18772 - pname = "nightfly"; 18773 - version = "2024-11-02"; 18774 - src = fetchFromGitHub { 18775 - owner = "bluz71"; 18776 - repo = "vim-nightfly-colors"; 18777 - rev = "fe3aaa329692e7a0820a65d32406ede3e3ab3c91"; 18778 - sha256 = "10rwsvzbagwrj39jzjg70wzsd21igcjvvsna4jzif5s1gc5jwbhb"; 18779 - }; 18780 - meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; 18781 - }; 18782 - 18783 - nord-vim = buildVimPlugin { 18784 - pname = "nord-vim"; 18785 - version = "2023-05-03"; 18786 - src = fetchFromGitHub { 18787 - owner = "nordtheme"; 18788 - repo = "vim"; 18789 - rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295"; 18790 - sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz"; 18791 - }; 18792 - meta.homepage = "https://github.com/nordtheme/vim/"; 18793 - }; 18794 - 18795 - nvchad-ui = buildVimPlugin { 18796 - pname = "nvchad-ui"; 18797 - version = "2024-11-04"; 18798 - src = fetchFromGitHub { 18799 - owner = "nvchad"; 18800 - repo = "ui"; 18801 - rev = "f2d4f351187439df6ba8637e06f60c308e3c12cf"; 18802 - sha256 = "1m4z6h4rk43h8yxd6qk9h6gifbk3mhhnb3qfkqpdx9c631vvrqf7"; 18803 - }; 18804 - meta.homepage = "https://github.com/nvchad/ui/"; 18805 - }; 18806 - 18807 - phha-zenburn = buildVimPlugin { 18808 - pname = "phha-zenburn"; 18809 - version = "2024-01-31"; 18810 - src = fetchFromGitHub { 18811 - owner = "phha"; 18812 - repo = "zenburn.nvim"; 18813 - rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; 18814 - sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; 18815 - }; 18816 - meta.homepage = "https://github.com/phha/zenburn.nvim/"; 18817 - }; 18818 - 18819 - pure-lua = buildVimPlugin { 18820 - pname = "pure-lua"; 18821 - version = "2021-05-16"; 18822 - src = fetchFromGitHub { 18823 - owner = "shaunsingh"; 18824 - repo = "moonlight.nvim"; 18825 - rev = "e24e4218ec680b6396532808abf57ca0ada82e66"; 18826 - sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3"; 18827 - }; 18828 - meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; 18829 - }; 18830 - 18831 - restore-view-vim = buildVimPlugin { 18832 - pname = "restore-view-vim"; 18833 - version = "2014-11-21"; 18834 - src = fetchFromGitHub { 18835 - owner = "vim-scripts"; 18836 - repo = "restore_view.vim"; 18837 - rev = "8b933436e3ab8dec120841027183f0d72a4e2096"; 18838 - sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn"; 18839 - }; 18840 - meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; 18841 - }; 18842 - 18843 - rose-pine = buildVimPlugin { 18844 - pname = "rose-pine"; 18845 - version = "2024-10-23"; 18846 - src = fetchFromGitHub { 18847 - owner = "rose-pine"; 18848 - repo = "neovim"; 18849 - rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; 18850 - sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; 18851 - }; 18852 - meta.homepage = "https://github.com/rose-pine/neovim/"; 18853 - }; 18854 - 18855 - samodostal-image-nvim = buildVimPlugin { 18856 - pname = "samodostal-image-nvim"; 18857 - version = "2024-01-07"; 18858 - src = fetchFromGitHub { 18859 - owner = "samodostal"; 18860 - repo = "image.nvim"; 18861 - rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0"; 18862 - sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56"; 18863 - }; 18864 - meta.homepage = "https://github.com/samodostal/image.nvim/"; 18865 - }; 18866 - 18867 - tinykeymap = buildVimPlugin { 18868 - pname = "tinykeymap"; 18869 - version = "2024-02-17"; 18870 - src = fetchFromGitHub { 18871 - owner = "tomtom"; 18872 - repo = "tinykeymap_vim"; 18873 - rev = "7217ce656069d82cd71872ede09152b232ecaf1b"; 18874 - sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w"; 18875 - }; 18876 - meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; 18877 - }; 18878 - 18879 - vim-advanced-sorters = buildVimPlugin { 18880 - pname = "vim-advanced-sorters"; 18881 - version = "2024-08-16"; 18882 - src = fetchFromGitHub { 18883 - owner = "inkarkat"; 18884 - repo = "vim-AdvancedSorters"; 18885 - rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; 18886 - sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; 18887 - }; 18888 - meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; 18889 - }; 18890 - 18891 - vim-docbk-snippets = buildVimPlugin { 18892 - pname = "vim-docbk-snippets"; 18893 - version = "2023-09-29"; 18894 - src = fetchFromGitHub { 18895 - owner = "jhradilek"; 18896 - repo = "vim-snippets"; 18897 - rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; 18898 - sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; 18899 - }; 18900 - meta.homepage = "https://github.com/jhradilek/vim-snippets/"; 18901 - }; 18902 18904 }
+27 -29
pkgs/applications/editors/vim/plugins/update.py
··· 3 3 # run with: 4 4 # $ nix run .\#vimPluginsUpdater 5 5 # format: 6 - # $ nix run nixpkgs#python3Packages.black -- update.py 6 + # $ nix run nixpkgs#python3Packages.ruff -- update.py 7 7 # type-check: 8 8 # $ nix run nixpkgs#python3Packages.mypy -- update.py 9 9 # linted: ··· 19 19 # 20 20 21 21 import inspect 22 - import os 23 - import logging 24 - import textwrap 25 22 import json 23 + import logging 24 + import os 26 25 import subprocess 27 - from typing import List, Tuple 26 + import textwrap 28 27 from pathlib import Path 29 - 28 + from typing import List, Tuple 30 29 31 30 log = logging.getLogger("vim-updater") 32 31 33 - sh = logging.StreamHandler() 34 - formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") 35 - sh.setFormatter(formatter) 36 - log.addHandler(sh) 37 - 38 32 # Import plugin update library from maintainers/scripts/pluginupdate.py 39 33 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) 40 - import pluginupdate 41 34 import importlib 42 - from pluginupdate import run_nix_expr, PluginDesc 43 35 44 - treesitter = importlib.import_module('nvim-treesitter.update') 36 + import pluginupdate 37 + from pluginupdate import PluginDesc, run_nix_expr 45 38 39 + treesitter = importlib.import_module("nvim-treesitter.update") 46 40 47 41 48 42 HEADER = ( ··· 56 50 nvim_treesitter_updated = False 57 51 58 52 def generate_nix( 59 - self, 60 - plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], 61 - outfile: str 53 + self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str 62 54 ): 63 55 log.info("Generating nix code") 64 - sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) 65 56 log.debug("Loading nvim-treesitter revision from nix...") 66 57 nvim_treesitter_rev = pluginupdate.run_nix_expr( 67 58 "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev", 68 59 self.nixpkgs, 69 - timeout=10 60 + timeout=10, 70 61 ) 71 62 72 63 GET_PLUGINS_LUA = """ ··· 98 89 """ 99 90 ) 100 91 ) 101 - for pdesc, plugin in sorted_plugins: 92 + for pdesc, plugin in plugins: 102 93 content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin)) 103 94 f.write(content) 104 95 if ( ··· 109 100 f.write("\n}\n") 110 101 print(f"updated {outfile}") 111 102 112 - def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str: 113 - 103 + def plugin2nix( 104 + self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool 105 + ) -> str: 114 106 repo = pdesc.repo 115 107 116 108 content = f" {plugin.normalized_name} = " ··· 138 130 if self.nvim_treesitter_updated: 139 131 print("updating nvim-treesitter grammars") 140 132 cmd = [ 141 - "nix", "build", 142 - "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs 143 - , "--print-out-paths" 133 + "nix", 134 + "build", 135 + "vimPlugins.nvim-treesitter.src", 136 + "-f", 137 + self.nixpkgs, 138 + "--print-out-paths", 144 139 ] 145 140 log.debug("Running command: %s", " ".join(cmd)) 146 - nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip() 141 + nvim_treesitter_dir = subprocess.check_output( 142 + cmd, text=True, timeout=90 143 + ).strip() 147 144 148 145 generated = treesitter.update_grammars(nvim_treesitter_dir) 149 146 treesitter_generated_nix_path = os.path.join( 150 - NIXPKGS_NVIMTREESITTER_FOLDER, 151 - "generated.nix" 147 + NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix" 148 + ) 149 + open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write( 150 + generated 152 151 ) 153 - open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated) 154 152 155 153 if self.nixpkgs_repo: 156 154 index = self.nixpkgs_repo.index
+19 -19
pkgs/applications/editors/vim/plugins/vim-plugin-names
··· 116 116 https://github.com/akinsho/bufferline.nvim/,, 117 117 https://github.com/kwkarlwang/bufjump.nvim/,HEAD, 118 118 https://github.com/bullets-vim/bullets.vim/,, 119 - https://github.com/mattn/calendar-vim/,,mattn-calendar-vim 120 119 https://github.com/itchyny/calendar.vim/,, 121 120 https://github.com/bkad/camelcasemotion/,, 121 + https://github.com/catppuccin/nvim/,,catppuccin-nvim 122 + https://github.com/catppuccin/vim/,HEAD,catppuccin-vim 122 123 https://github.com/tyru/caw.vim/,, 123 124 https://github.com/uga-rosa/ccc.nvim/,HEAD, 124 125 https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, ··· 299 300 https://github.com/chipsenkbeil/distant.nvim/,HEAD, 300 301 https://github.com/doki-theme/doki-theme-vim/,, 301 302 https://github.com/NTBBloodbath/doom-one.nvim/,, 303 + https://github.com/dracula/vim/,,dracula-vim 302 304 https://github.com/Mofiqul/dracula.nvim/,HEAD, 303 305 https://github.com/stevearc/dressing.nvim/,, 304 306 https://github.com/Bekaboo/dropbar.nvim/,HEAD, ··· 313 315 https://github.com/elixir-tools/elixir-tools.nvim/,HEAD, 314 316 https://github.com/elmcast/elm-vim/,, 315 317 https://github.com/dmix/elvish.vim/,, 318 + https://github.com/embark-theme/vim/,,embark-vim 316 319 https://github.com/mattn/emmet-vim/,, 317 320 https://github.com/vim-scripts/emodeline/,, 318 321 https://github.com/vim-scripts/errormarker.vim/,, ··· 361 364 https://github.com/ibhagwan/fzf-lua/,HEAD, 362 365 https://github.com/junegunn/fzf.vim/,, 363 366 https://github.com/NTBBloodbath/galaxyline.nvim/,, 367 + https://github.com/gbprod/nord.nvim/,,gbprod-nord 364 368 https://github.com/jsfaint/gen_tags.vim/,, 365 369 https://github.com/gentoo/gentoo-syntax/,, 366 370 https://github.com/ndmitchell/ghcid/,, ··· 389 393 https://github.com/cbochs/grapple.nvim/,HEAD, 390 394 https://github.com/blazkowolf/gruber-darker.nvim/,, 391 395 https://github.com/MagicDuck/grug-far.nvim/,, 392 - https://github.com/gruvbox-community/gruvbox/,,gruvbox-community 393 396 https://github.com/morhetz/gruvbox/,, 394 397 https://github.com/luisiacc/gruvbox-baby/,HEAD, 398 + https://github.com/gruvbox-community/gruvbox/,,gruvbox-community 395 399 https://github.com/eddyekofo94/gruvbox-flat.nvim/,, 396 400 https://github.com/sainnhe/gruvbox-material/,, 397 401 https://github.com/f4z3r/gruvbox-material.nvim/,HEAD, ··· 404 408 https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, 405 409 https://github.com/m4xshen/hardtime.nvim/,HEAD, 406 410 https://git.sr.ht/~sircmpwn/hare.vim,HEAD, 407 - https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 408 411 https://github.com/ThePrimeagen/harpoon/,master, 412 + https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 409 413 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, 410 414 https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD, 411 415 https://github.com/neovimhaskell/haskell-vim/,, ··· 434 438 https://github.com/ShinKage/idris2-nvim/,, 435 439 https://github.com/edwinb/idris2-vim/,, 436 440 https://github.com/3rd/image.nvim/,HEAD, 437 - https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim 438 441 https://github.com/HakonHarnes/img-clip.nvim/,HEAD, 439 442 https://github.com/lewis6991/impatient.nvim/,, 440 443 https://github.com/backdround/improved-search.nvim/,HEAD, ··· 447 450 https://github.com/Yggdroot/indentLine/,, 448 451 https://github.com/ciaranm/inkpot/,, 449 452 https://github.com/jbyuki/instant.nvim/,HEAD, 450 - https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, 451 453 https://github.com/pta2002/intellitab.nvim/,HEAD, 452 454 https://github.com/parsonsmatt/intero-neovim/,, 453 455 https://github.com/keith/investigate.vim/,, ··· 544 546 https://github.com/vim-scripts/matchit.zip/,, 545 547 https://github.com/marko-cerovac/material.nvim/,, 546 548 https://github.com/kaicataldo/material.vim/,HEAD, 549 + https://github.com/mattn/calendar-vim/,,mattn-calendar-vim 547 550 https://github.com/vim-scripts/mayansmoke/,, 548 551 https://github.com/chikamichi/mediawiki.vim/,HEAD, 549 552 https://github.com/savq/melange-nvim/,, ··· 602 605 https://github.com/tomasr/molokai/,, 603 606 https://github.com/benlubas/molten-nvim/,HEAD, 604 607 https://github.com/loctvl842/monokai-pro.nvim/,HEAD, 605 - https://github.com/shaunsingh/moonlight.nvim/,,pure-lua 606 608 https://github.com/leafo/moonscript-vim/,HEAD, 607 609 https://github.com/yegappan/mru/,, 608 610 https://github.com/smoka7/multicursors.nvim/,HEAD, ··· 673 675 https://github.com/shunsambongi/neotest-testthat/,HEAD, 674 676 https://github.com/marilari88/neotest-vitest/,HEAD, 675 677 https://github.com/lawrence-laz/neotest-zig/,HEAD, 676 - https://github.com/rose-pine/neovim/,main,rose-pine 677 678 https://github.com/Shatur/neovim-ayu/,, 678 679 https://github.com/cloudhead/neovim-fuzzy/,, 679 680 https://github.com/jeffkreeftmeijer/neovim-sensible/,, ··· 688 689 https://github.com/Olical/nfnl/,main, 689 690 https://github.com/chr4/nginx.vim/,, 690 691 https://github.com/oxfist/night-owl.nvim/,, 692 + https://github.com/bluz71/vim-nightfly-colors/,,nightfly 691 693 https://github.com/EdenEast/nightfox.nvim/,, 692 694 https://github.com/Alexis12119/nightly.nvim/,, 693 695 https://github.com/zah/nim.vim/,, ··· 699 701 https://github.com/kartikp10/noctis.nvim/,, 700 702 https://github.com/folke/noice.nvim/,HEAD, 701 703 https://github.com/nvimtools/none-ls.nvim/,HEAD, 702 - https://github.com/gbprod/nord.nvim/,,gbprod-nord 704 + https://github.com/nordtheme/vim/,,nord-vim 703 705 https://github.com/shaunsingh/nord.nvim/,, 704 706 https://github.com/andersevenrud/nordic.nvim/,, 705 707 https://github.com/vigoux/notifier.nvim/,HEAD, ··· 708 710 https://github.com/jose-elias-alvarez/null-ls.nvim/,, 709 711 https://github.com/nacro90/numb.nvim/,, 710 712 https://github.com/nvchad/nvchad/,HEAD, 713 + https://github.com/nvchad/ui/,HEAD,nvchad-ui 711 714 https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, 712 - https://github.com/catppuccin/nvim/,,catppuccin-nvim 713 715 https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, 714 716 https://github.com/nathanmsmith/nvim-ale-diagnostic/,, 715 717 https://github.com/windwp/nvim-autopairs/,, ··· 825 827 https://github.com/yonlu/omni.vim/,, 826 828 https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, 827 829 https://github.com/Th3Whit3Wolf/one-nvim/,, 830 + https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, 828 831 https://github.com/navarasu/onedark.nvim/,, 829 832 https://github.com/joshdick/onedark.vim/,, 830 833 https://github.com/LunarVim/onedarker.nvim/,, ··· 854 857 https://github.com/folke/persistence.nvim/,, 855 858 https://github.com/pest-parser/pest.vim/,HEAD, 856 859 https://github.com/lifepillar/pgsql.vim/,, 860 + https://github.com/phha/zenburn.nvim/,,phha-zenburn 857 861 https://github.com/motus/pig.vim/,, 858 862 https://github.com/weirongxu/plantuml-previewer.vim/,HEAD, 859 863 https://github.com/aklt/plantuml-syntax/,, ··· 873 877 https://github.com/kevinhwang91/promise-async/,HEAD, 874 878 https://github.com/frigoeu/psc-ide-vim/,, 875 879 https://github.com/Shougo/pum.vim/,HEAD, 880 + https://github.com/shaunsingh/moonlight.nvim/,,pure-lua 876 881 https://github.com/purescript-contrib/purescript-vim/,, 877 882 https://github.com/python-mode/python-mode/,, 878 883 https://github.com/vim-python/python-syntax/,, ··· 905 910 https://github.com/kevinhwang91/rnvimr/,, 906 911 https://github.com/mfukar/robotframework-vim/,, 907 912 https://github.com/ron-rs/ron.vim/,, 913 + https://github.com/rose-pine/neovim/,main,rose-pine 908 914 https://github.com/jmederosalvarado/roslyn.nvim/,HEAD, 909 915 https://github.com/keith/rspec.vim/,, 910 916 https://github.com/ccarpita/rtorrent-syntax-file/,, ··· 912 918 https://github.com/rust-lang/rust.vim/,, 913 919 https://github.com/hauleth/sad.vim/,, 914 920 https://github.com/vmware-archive/salt-vim/,, 921 + https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim 915 922 https://github.com/lewis6991/satellite.nvim/,HEAD, 916 923 https://github.com/davidgranstrom/scnvim/,HEAD, 917 924 https://github.com/tiagovla/scope.nvim/,HEAD, ··· 935 942 https://github.com/m4xshen/smartcolumn.nvim/,, 936 943 https://github.com/gorkunov/smartpairs.vim/,, 937 944 https://github.com/ibhagwan/smartyank.nvim/,, 938 - https://github.com/camspiers/snap/,, 939 945 https://github.com/folke/snacks.nvim/,HEAD, 946 + https://github.com/camspiers/snap/,, 940 947 https://github.com/norcalli/snippets.nvim/,, 941 948 https://github.com/shaunsingh/solarized.nvim/,HEAD, 942 949 https://github.com/sainnhe/sonokai/,, ··· 1068 1075 https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD, 1069 1076 https://github.com/chomosuke/typst-preview.nvim/,HEAD, 1070 1077 https://github.com/kaarmu/typst.vim/,HEAD, 1071 - https://github.com/nvchad/ui/,HEAD,nvchad-ui 1072 1078 https://github.com/altermo/ultimate-autopair.nvim/,HEAD, 1073 1079 https://github.com/SirVer/ultisnips/,, 1074 1080 https://github.com/mbbill/undotree/,, ··· 1084 1090 https://github.com/jbyuki/venn.nvim/,, 1085 1091 https://github.com/vhda/verilog_systemverilog.vim/,, 1086 1092 https://github.com/vifm/vifm.vim/,, 1087 - https://github.com/catppuccin/vim/,HEAD,catppuccin-vim 1088 - https://github.com/dracula/vim/,,dracula-vim 1089 - https://github.com/embark-theme/vim/,,embark-vim 1090 - https://github.com/nordtheme/vim/,,nord-vim 1091 - https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters 1092 1093 https://github.com/Konfekt/vim-CtrlXA/,, 1093 1094 https://github.com/konfekt/vim-DetectSpellLang/,, 1094 1095 https://github.com/dpelle/vim-LanguageTool/,, ··· 1115 1116 https://github.com/MarcWeber/vim-addon-syntax-checker/,, 1116 1117 https://github.com/MarcWeber/vim-addon-toggle-buffer/,, 1117 1118 https://github.com/MarcWeber/vim-addon-xdebug/,, 1119 + https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters 1118 1120 https://github.com/junegunn/vim-after-object/,, 1119 1121 https://github.com/danilo-augusto/vim-afterglow/,HEAD, 1120 1122 https://github.com/msuperdock/vim-agda/,HEAD, ··· 1191 1193 https://github.com/tpope/vim-dispatch/,, 1192 1194 https://github.com/radenling/vim-dispatch-neovim/,, 1193 1195 https://github.com/jhradilek/vim-docbk/,, 1196 + https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets 1194 1197 https://github.com/tpope/vim-dotenv/,, 1195 1198 https://github.com/junegunn/vim-easy-align/,, 1196 1199 https://github.com/zhou13/vim-easyescape/,, ··· 1344 1347 https://github.com/nfnty/vim-nftables/,, 1345 1348 https://github.com/kana/vim-niceblock/,, 1346 1349 https://github.com/nickel-lang/vim-nickel/,main, 1347 - https://github.com/bluz71/vim-nightfly-colors/,,nightfly 1348 1350 https://github.com/tommcdo/vim-ninja-feet/,, 1349 1351 https://github.com/LnL7/vim-nix/,, 1350 1352 https://github.com/symphorien/vim-nixhash/,, ··· 1436 1438 https://github.com/justinmk/vim-sneak/,, 1437 1439 https://github.com/garbas/vim-snipmate/,, 1438 1440 https://github.com/honza/vim-snippets/,, 1439 - https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets 1440 1441 https://github.com/lifepillar/vim-solarized8/,HEAD, 1441 1442 https://github.com/tomlion/vim-solidity/,, 1442 1443 https://github.com/christoomey/vim-sort-motion/,, ··· 1565 1566 https://github.com/folke/zen-mode.nvim/,, 1566 1567 https://github.com/zenbones-theme/zenbones.nvim/,HEAD, 1567 1568 https://github.com/jnurmine/zenburn/,, 1568 - https://github.com/phha/zenburn.nvim/,,phha-zenburn 1569 1569 https://github.com/nvimdev/zephyr-nvim/,, 1570 1570 https://github.com/ziglang/zig.vim/,, 1571 1571 https://github.com/zk-org/zk-nvim/,HEAD,
+12 -18
pkgs/by-name/lu/luarocks-packages-updater/updater.py
··· 1 1 #!/usr/bin/env python 2 2 # format: 3 - # $ nix run nixpkgs#python3Packages.black -- update.py 3 + # $ nix run nixpkgs#python3Packages.ruff -- update.py 4 4 # type-check: 5 5 # $ nix run nixpkgs#python3Packages.mypy -- update.py 6 6 # linted: 7 7 # $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py 8 8 9 + import csv 9 10 import inspect 11 + import logging 10 12 import os 11 - import tempfile 12 13 import shutil 13 - from dataclasses import dataclass 14 14 import subprocess 15 - import csv 16 - import logging 15 + import tempfile 17 16 import textwrap 17 + from dataclasses import dataclass 18 18 from multiprocessing.dummy import Pool 19 - import pluginupdate 20 - from pluginupdate import update_plugins, FetchConfig 19 + from pathlib import Path 20 + from typing import List, Optional, Tuple 21 21 22 - from typing import List, Tuple, Optional 23 - from pathlib import Path 22 + import pluginupdate 23 + from pluginupdate import FetchConfig, update_plugins 24 24 25 25 log = logging.getLogger() 26 26 log.addHandler(logging.StreamHandler()) ··· 35 35 Regenerate it with: nix run nixpkgs#luarocks-packages-updater 36 36 You can customize the generated packages in pkgs/development/lua-modules/overrides.nix 37 37 */ 38 - """.format( 39 - GENERATED_NIXFILE=GENERATED_NIXFILE 40 - ) 38 + """.format(GENERATED_NIXFILE=GENERATED_NIXFILE) 41 39 42 40 FOOTER = """ 43 41 } ··· 71 69 72 70 # rename Editor to LangUpdate/ EcosystemUpdater 73 71 class LuaEditor(pluginupdate.Editor): 74 - 75 72 def create_parser(self): 76 73 parser = super().create_parser() 77 74 parser.set_defaults(proc=1) ··· 173 170 174 171 if plug.rockspec != "": 175 172 if plug.ref or plug.version: 176 - msg = ( 177 - "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" 178 - % plug.name 179 - ) 173 + msg = "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name 180 174 log.warning(msg) 181 175 182 176 log.debug("Updating from rockspec %s", plug.rockspec) ··· 193 187 194 188 if plug.luaversion: 195 189 cmd.append(f"--lua-version={plug.luaversion}") 196 - luaver = plug.luaversion.replace('.', '') 190 + luaver = plug.luaversion.replace(".", "") 197 191 if luaver := os.getenv(f"LUA_{luaver}"): 198 192 cmd.append(f"--lua-dir={luaver}") 199 193