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

Update vim plugins #36856

Merged
merged 2 commits into from Mar 12, 2018
Merged

Update vim plugins #36856

merged 2 commits into from Mar 12, 2018

Conversation

garbas
Copy link
Member

@garbas garbas commented Mar 12, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

John Children and others added 2 commits March 12, 2018 11:50
Following up from issue NixOS#33391, building LanguageClient-neovim now
requires some rust dependencies. This patch makes the plugin now longer
listed in vim-plugin-names file so that it will not be automatically
generated and instead lists it in non-generated plugins.

Also adds rustPlatform to arguments for vim plugins set.
@garbas
Copy link
Member Author

garbas commented Mar 12, 2018

@GrahamcOfBorg build vimPlugins

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux

The following builds were skipped because they don't evaluate on aarch64-linux: vimPlugins

No log is available.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin

The following builds were skipped because they don't evaluate on x86_64-darwin: vimPlugins

No log is available.

preFixup = ''
substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \
--replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']"
'';
Copy link
Member

Choose a reason for hiding this comment

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

This change was not possible with pkgs/misc/vim-plugins/vim2nix/additional-nix-code?

Copy link
Member Author

@garbas garbas Mar 12, 2018

Choose a reason for hiding this comment

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

@Mic92: @johnchildren tried to do it, but failed (here). But I'm sure any suggestion how to do it would be great.

Copy link
Member

Choose a reason for hiding this comment

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

@garbas ok. let's keep it this way. vimPlugins should get a refactoring anyway. It is pretty hacky.

Copy link
Member

Choose a reason for hiding this comment

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

Please also port it to 18.03.

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 i agree about the hacky way and the need to refractor it.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vimPlugins

Partial log (click to expand)

/nix/store/s4d4c9x2p56h7x1m3iny1wbh7ff0d0bv-vimplugin-vimtex-2018-03-10
/nix/store/9b18w3idh1w6j77qkkwzq2s5i1d8g9jn-vimplugin-vimwiki-2018-02-26
/nix/store/46kq8fd4kk677kmf8msa0q2w0wrjrq64-vimplugin-vinegar-2017-12-28
/nix/store/yprd1hl1db1mr9pcbwzb1w44d0q2chqk-vimplugin-vundle-2018-02-02
/nix/store/sdmc45r7gqjipik57vp7nwdbrpp4a7hz-vimplugin-wombat256-vim-2010-10-17
/nix/store/753w5qbpwb59c0md7fijbrh7h7brrfv8-vimplugin-xptemplate-2017-12-06
/nix/store/a9kzv55a89hqfy36krph8yzzcg7rggdk-vimplugin-xterm-color-table-2013-12-31
/nix/store/85fd486i5ssx0widc0h3762zdi5byk88-vimplugin-zeavim-2017-12-20
/nix/store/n51s55q09ij0sy9ynl3jg0qxlgygh2xc-vimplugin-zenburn-2015-09-18
/nix/store/ly1lj8czikyh1y78cy5mwclqhxdgdihp-vimplugin-zig-vim-2018-02-28

@Mic92 Mic92 added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 12, 2018
@garbas garbas merged commit bf25a02 into NixOS:master Mar 12, 2018
@garbas garbas deleted the update-vim-plugins branch March 12, 2018 12:43
@garbas
Copy link
Member Author

garbas commented Mar 12, 2018

porting to release-18.03 branch is happening here

@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
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