vimPlugins: warn if alias is used inside overrides #46638
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @Mic92 |
Mic92
reviewed
Sep 14, 2018
pkgs/misc/vim-plugins/default.nix
Outdated
| src = fzf.src; | ||
| dependencies = []; | ||
| }; | ||
| toFix = lib.foldl' (lib.flip lib.extends) (self: generated) ([ |
There was a problem hiding this comment.
I don't understand this code. Is it also overriding aliases?
There was a problem hiding this comment.
Yes, I think so. Seems excessive in this case. Though the way it is we could easily add a feature allowing people to add their own vimPlugins overlays.
Mic92
reviewed
Sep 14, 2018
ryantm
force-pushed
the
aliases
branch
3 times, most recently
from
49d4a63
to
32e572e
Compare
|
@Mic92 Okay, I simplified it. |
Mic92
reviewed
Sep 14, 2018
pkgs/misc/vim-plugins/default.nix
Outdated
| rm -r third_party/ycmd | ||
| ln -s ${ycmd}/lib/ycmd third_party | ||
| ''; | ||
| aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib overriden); |
There was a problem hiding this comment.
Thanks. Now it makes sense to me.
Mic92
reviewed
Sep 14, 2018
pkgs/misc/vim-plugins/default.nix
Outdated
|
|
||
| let | ||
|
|
||
| _skim = skim; | ||
| inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; |
There was a problem hiding this comment.
Do we care about indentation in this file?
There was a problem hiding this comment.
@Mic92 fixed the indentation
|
@Mic92 Do you approve of this as is? We should probably merge it quickly before someone wants to do something with vim plugins. |
Mic92
approved these changes
Sep 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the vimPlugins structure to be like stage.nix and top-level/aliases.nix.
vimPlugins was breaking evaluation if config.allowAliases was set to false, and we wanted to make sure it is harder to do that in the future.