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.

Sign up for GitHub

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

Jump to bottom

vim plugins: fix for multiple clang outputs, use clang 6.0 #47171

Merged
merged 3 commits into from Nov 25, 2018
Merged

vim plugins: fix for multiple clang outputs, use clang 6.0 #47171

merged 3 commits into from Nov 25, 2018

Conversation

pschuprikov
Copy link
Contributor

Motivation for this change

This PR fixes two plugins using llvmPackages, namely clang_complete and clighter8, to support multiple outputs in clang, and changes the version of llvmPackages to 6.0. The main reason for the latter change is that clighter uses python bindings that don't work with clang 5.0.

May be it was more appropriate to leave clang_complete with the default (clang 5.0) version.

This PR is created as a more complete replacement for #45954

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.

@pschuprikov pschuprikov changed the title Vim clang fix vim plugins: fix for multiple clang outputs and use clang 6.0 Sep 22, 2018
@pschuprikov pschuprikov changed the title vim plugins: fix for multiple clang outputs and use clang 6.0 vim plugins: fix for multiple clang outputs, use clang 6.0 Sep 22, 2018
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 25, 2018

@pschuprikov could you rebase this and solve the conflict, please?

@pschuprikov
vim plugins: use v6.0 of the Clang library
70f87e6 
  clighter8 plugin seems to be using python bindings for clang 6.0
  clang_complete, another plugin using clang, works ok with this version
@pschuprikov
clang_complete (vim): fix multiple clang outputs
71bf86d 
  Clang-specific headers and dynamic libraries now go to different outputs,
  and clang_complete must be able to find both
@pschuprikov
clighter8 (vim): set libclang path to lib output
41f0e93
@pschuprikov
Copy link
Contributor Author

@c0bw3b done

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 25, 2018

@GrahamcOfBorg build vimPlugins.clang_complete vimPlugins.clighter8 vimPlugins.haskell-vim

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vimPlugins.clang_complete, vimPlugins.clighter8, vimPlugins.haskell-vim

Partial log (click to expand)

building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g29pfjq2fih4ds4mh6gzpddlmyn107wk-vimplugin-clang_complete-2018-09-19
strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/g29pfjq2fih4ds4mh6gzpddlmyn107wk-vimplugin-clang_complete-2018-09-19
checking for references to /build in /nix/store/g29pfjq2fih4ds4mh6gzpddlmyn107wk-vimplugin-clang_complete-2018-09-19...
/nix/store/g29pfjq2fih4ds4mh6gzpddlmyn107wk-vimplugin-clang_complete-2018-09-19
/nix/store/qddjffhin1l51w5dm3k4ia13d8prqmgr-vimplugin-clighter8-2018-07-25
/nix/store/jb79grhzxg5v0569v7zjg7jrvccpfpb7-vimplugin-haskell-vim-2018-05-22

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vimPlugins.clang_complete, vimPlugins.clighter8, vimPlugins.haskell-vim

Partial log (click to expand)

building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/svh15r7wpxx7sfmzw86wj4sc3qn91phz-vimplugin-clighter8-2018-07-25
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/svh15r7wpxx7sfmzw86wj4sc3qn91phz-vimplugin-clighter8-2018-07-25
checking for references to /build in /nix/store/svh15r7wpxx7sfmzw86wj4sc3qn91phz-vimplugin-clighter8-2018-07-25...
/nix/store/jay4qy5fg7y78p8v5v8pf9dlbfvhzzlj-vimplugin-clang_complete-2018-09-19
/nix/store/svh15r7wpxx7sfmzw86wj4sc3qn91phz-vimplugin-clighter8-2018-07-25
/nix/store/azid8nhfvn2yap9r31hg16brj2l5bav3-vimplugin-haskell-vim-2018-05-22

@c0bw3b c0bw3b merged commit 18eb9e2 into NixOS:master Nov 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
6.topic: vim 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pschuprikov @c0bw3b @GrahamcOfBorg @Mic92