public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vimPlugins: Update redirects without flag.

Browse Source 
Per review, the input file will now be rewritten automatically if
redirects are found.
This commit is contained in:
ryneeverett 2020-03-24 14:46:07 +00:00
parent a9c9b0d40c
commit cffb6cb637
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/vim.section.md
View File

@ -263,7 +263,7 @@ Sometimes plugins require an override that must be changed when the plugin is up
To add a new plugin: To add a new plugin:
1. run `./update.py --update-redirects` and create a commit named "vimPlugins: Update", 1. run `./update.py` and create a commit named "vimPlugins: Update",
2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix), 2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix),
3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and 3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and
4. create a pull request. 4. create a pull request.

16
pkgs/misc/vim-plugins/update.py
View File

@ -433,7 +433,7 @@ following steps:
3. Make sure the updated {input_file} is still correctly sorted: 3. Make sure the updated {input_file} is still correctly sorted:
sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
4. Run this script again so these changes will be reflected in the 4. Run this script again so these changes will be reflected in the
generated expressions (no need to use the --update-redirects flag again): generated expressions:
./update.py ./update.py
5. Commit {input_file} along with aliases and generated expressions: 5. Commit {input_file} along with aliases and generated expressions:
git add {output_file} {input_file} aliases.nix git add {output_file} {input_file} aliases.nix
@ -463,12 +463,6 @@ def parse_args():
default=DEFAULT_OUT, default=DEFAULT_OUT,
help="Filename to save generated nix code", help="Filename to save generated nix code",
) )
parser.add_argument(
"--update-redirects",
dest="update_redirects",
action="store_true",
help="Update input file if repos have been redirected.",
)
return parser.parse_args() return parser.parse_args()
@ -495,13 +489,7 @@ def main() -> None:
generate_nix(plugins, args.outfile) generate_nix(plugins, args.outfile)
if redirects: if redirects:
if args.update_redirects: update_redirects(args.input_file, args.outfile, redirects)
update_redirects(args.input_file, args.outfile, redirects)
else:
print(
"Outdated vim-plugin-names found. Please run with "
"--update-redirects flag."
)
if __name__ == "__main__": if __name__ == "__main__":