Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vimPlugins: Fix update.py, add/update plugins #46496

Merged
merged 1 commit into from Sep 10, 2018

Conversation

rvolosatovs
Copy link
Member

Motivation for this change

The update.py script in latest master was generating wrong generated.nix - the repo attr would have . replaced by -.(because plugin.name contains the name with . replaced by -). Refs #46394
Note, that easymotion vim plugin has been moved to easymotion/easymotion

cc @Mic92

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@@ -292,7 +292,7 @@ def generate_nix(plugins: List[Tuple[str, Plugin]]):
name = "{plugin.normalized_name}-{plugin.version}";
src = fetchFromGitHub {{
owner = "{owner}";
repo = "{plugin.name}";
repo = "{repo}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, snap. I wonder why I was able to build all plugins. I blame fixed-input derivations for that.

@Mic92 Mic92 merged commit e8e4e9c into NixOS:master Sep 10, 2018
@rvolosatovs rvolosatovs deleted the feature/vim-plugins branch September 11, 2018 06:06
@@ -2,16 +2,6 @@
{ buildVimPluginFrom2Nix, fetchFromGitHub }:

{
a-vim = buildVimPluginFrom2Nix {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you changed this manually?

@@ -182,8 +182,8 @@
};
};

Colour-Sampler-Pack = buildVimPluginFrom2Nix {
name = "Colour-Sampler-Pack-2012-11-30";
colorsamplerpack = buildVimPluginFrom2Nix {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this one.

@Mic92
Copy link
Member

Mic92 commented Sep 11, 2018

I would prefer if we do not manually have to change stuff in this file.

@rvolosatovs
Copy link
Member Author

After running the update.py script, names of these(and some others) changed in generated.nix. I did not change generated.nix manually, however I did change the aliases in default.nix in order to account for the renaming.

@Mic92
Copy link
Member

Mic92 commented Sep 12, 2018

Ah it get its name by a reverse lookup from the aliases.

@Mic92
Copy link
Member

Mic92 commented Sep 12, 2018

This pull request fixes that: #46561

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants