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

nixos/vimPlugins: add plugins + update #72241

Merged
merged 13 commits into from Nov 6, 2019
Merged

nixos/vimPlugins: add plugins + update #72241

merged 13 commits into from Nov 6, 2019

Conversation

gjabell
Copy link
Contributor

@gjabell gjabell commented Oct 29, 2019

Motivation for this change

Missing plugins in vimPlugins.

Things done

Update vimPlugins; add the following vimPlugins:

  • calendarVim
  • gv-vim
  • kotlin-vim
  • vim-salve
  • utl-vim
  • vim-clojure-highlight
  • vim-clojure-static
  • vim-sexp
  • vim-sexp-mappings-for-regular-people
  • VimOrganizer
  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

LGTM except the naming issue.

@@ -91,6 +91,18 @@ self: super: {
};
};

# do not auto-update this one, as the name clashes with calendar-vim
Copy link
Member

Choose a reason for hiding this comment

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

In that case we should have some way for the user to distinguish the two. Maybe it was a mistake to have the plugins in nixpkgs without namespaces.

Ideally you'd implement alias support in our plugin update infrastructure (calendar-vim as mattn-calendar-vim in plugin-list), but if you don't want to do that we should at least choose a more descriptive name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm fine with adding that as an alias in plugin-list; should the package definition stay where it is in overrides.nix? If it's added to vim-plugin-list I'm assuming it'll have a naming conflict with calendar-vim.

Copy link
Member

Choose a reason for hiding this comment

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

No I meant that if you want to go down that road, you'd have to adapt update.py to work with statements like calendar-vim as mattn-calendar-vim in plugin-list. That way no override would be necessary and auto updates would work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, gotcha. I can look into that, seems like it would be a useful feature to have. Would it be best to put this PR on hold and merge that in separately?

Copy link
Member

Choose a reason for hiding this comment

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

Whatever way you prefer. As long as the change to update.py is in a separate commit that is fine by me. If you want to do a manual override as a stopgap first that is also okay.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great, sounds good to me.

Copy link
Member

Choose a reason for hiding this comment

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

Okay, ping me if you do decide to open a different PR for it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@timokau Just pushed changes to update.py to add alias support; see the first commit in the PR. Also reupdated plugins in the update commit, and moved vim-docbk-snippets from overrides.nix into vim-plugin-names since it works with the alias support :)

Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Looks good to me, thank you!

I'd like at least one more person with some nix-vim experience to review this. @teto / @Ma27 ?

@jonringer
Copy link
Contributor

we should also update doc/languages-frameworks/vim.section.md to mention aliasing as construct. otherwise diff LGTM

@jonringer
Copy link
Contributor

but that can be done in another PR, I'll get this in as it's been a while

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS
diff LGTM
commits LGTM

[98 built, 33 copied (881.5 MiB), 204.9 MiB DL]
https://github.com/NixOS/nixpkgs/pull/72241
49 package were build:
vimPlugins.VimOrganizer vimPlugins.alchemist-vim vimPlugins.awesome-vim-colorschemes vimPlugins.calendar-vim vimPlugins.coc-eslint vimPlugins.coc-imselect vimPlugins.coc-java vimPlugins.coc-tsserver vimPlugins.editorconfig-vim vimPlugins.falcon vimPlugins.fzf-vim vimPlugins.ghcid vimPlugins.gv-vim vimPlugins.kotlin-vim vimPlugins.lightline-vim vimPlugins.mattn-calendar-vim vimPlugins.ncm2-ultisnips vimPlugins.neosnippet-vim vimPlugins.ultisnips vimPlugins.unicode-vim vimPlugins.utl-vim vimPlugins.vim-airline vimPlugins.vim-airline-themes vimPlugins.vim-android vimPlugins.vim-clojure-highlight vimPlugins.vim-clojure-static vimPlugins.vim-devicons vimPlugins.vim-dirvish vimPlugins.vim-docbk-snippets vimPlugins.vim-elixir vimPlugins.vim-glsl vimPlugins.vim-go vimPlugins.vim-jsx-pretty vimPlugins.vim-ledger vimPlugins.vim-plug vimPlugins.vim-polyglot vimPlugins.vim-projectionist vimPlugins.vim-salve vimPlugins.vim-sexp vimPlugins.vim-sexp-mappings-for-regular-people vimPlugins.vim-signify vimPlugins.vim-slime vimPlugins.vim-sneak vimPlugins.vim-snippets vimPlugins.vim-terraform vimPlugins.vim-test vimPlugins.vimtex vimPlugins.yats-vim vimPlugins.youcompleteme

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

4 participants