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

[RDY] neovim: init wrapper #33639

Merged
merged 1 commit into from Jan 15, 2018
Merged

[RDY] neovim: init wrapper #33639

merged 1 commit into from Jan 15, 2018

Conversation

teto
Copy link
Member

@teto teto commented Jan 9, 2018

I accidentally deleted the branch on #32657 so I reopen the PR.

Motivation for this change

Adding a python/ruby package to the neovim environment should not trigger a neovim recompilation.
This adds a wrapper to prevent that.

Things done

This moves the neovim configuration (python packages/ ruby etc) to a wrapper.

  • 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.

@teto
neovim: init wrapper
22df88a 
Adding a python package to the neovim environment should not trigger a recompilation.
This adds a wrapper to prevent that.
@teto teto mentioned this pull request Jan 9, 2018
Closed
8 tasks
@teto
Copy link
Member Author

teto commented Jan 11, 2018

@garbas any comment ? I hack a bit on neovim and between nixops/home-manager/nixos-rebuild, I ended up rebuilding quite often.

@Nadrieril
Copy link
Member

I would love to have this, since it also solves the problem of patching neovim when it is wrapped, which is currently impossible.

@garbas garbas self-requested a review January 15, 2018 22:24
garbas
garbas approved these changes Jan 15, 2018
View reviewed changes
Copy link
Member

@garbas garbas left a comment •
edited

Choose a reason for hiding this comment

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

👍 thank you @teto

@garbas garbas merged commit ab06f3e into NixOS:master Jan 15, 2018
@teto teto deleted the neovim branch January 16, 2018 02:31
@mnacamura
Copy link
Contributor

It fails on darwin because share/applications/nvim.desktop is not created on darwin:

post-installation fixup
gzipping man pages under /nix/store/1pyacq3ac3kgxrq8ad1zj2r1sp76qqfm-neovim-unwrapped-0.2.1/share/man/
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/1pyacq3ac3kgxrq8ad1zj2r1sp76qqfm-neovim-unwrapped-0.2.1/bin
patching script interpreter paths in /nix/store/1pyacq3ac3kgxrq8ad1zj2r1sp76qqfm-neovim-unwrapped-0.2.1
/nix/store/1pyacq3ac3kgxrq8ad1zj2r1sp76qqfm-neovim-unwrapped-0.2.1/share/nvim/runtime/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hgsbnqhg7zr5vbjazb250ac4wnj3cfhy-bash-4.4-p12/bin/sh"
building path(s) ‘/nix/store/yx3c7cvdllakxci8pn9dxhrm328rqi8r-neovim’
substitute(): ERROR: file '/nix/store/1pyacq3ac3kgxrq8ad1zj2r1sp76qqfm-neovim-unwrapped-0.2.1/share/applications/nvim.desktop' does not exist
builder for ‘/nix/store/2p9jsn7qrxhnlp35avbqdavdm0v3wg94-neovim.drv’ failed with exit code 1
error: build of ‘/nix/store/2p9jsn7qrxhnlp35avbqdavdm0v3wg94-neovim.drv’ failed

@teto Could you fix this?

@teto teto mentioned this pull request Jan 16, 2018
Merged
8 tasks
@teto
Copy link
Member Author

teto commented Jan 16, 2018

Thnaks for merging.

@mnacamura my apologies for the inconvenience, does
#33925 work for you ?

@mnacamura
Copy link
Contributor

@teto It works fine. Thanks!

@kamilchm kamilchm mentioned this pull request Jan 19, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garbas garbas garbas approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@teto @Nadrieril @mnacamura @garbas @GrahamcOfBorg