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_configurable: replace default ftNix patch with sources from vim-nix #39436

Merged
merged 1 commit into from Apr 25, 2018
Merged

vim_configurable: replace default ftNix patch with sources from vim-nix #39436

merged 1 commit into from Apr 25, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Apr 24, 2018 •
edited

Motivation for this change

Fixes

Error detected while processing /nix/store/hsl0shnwwrim8z7si295yp1dh5rx2sfl-vim_configurable-8.0.1655/share/vim/vim80/ftplugin/nix.vim:
line    3:
E171: Missing :endif
Press ENTER or type command to continue

#39260 (comment)

/cc @Mic92 @chreekat

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.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: vim_configurable

Partial log (click to expand)

patching script interpreter paths in /nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/share/vim/vim80/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/share/vim/vim80/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/share/vim/vim80/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/10f4qxb00wk9j6cicd9h1qzwqgnc36ji-python-2.7.14/bin/python"
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/share/vim/vim80/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655/share/vim/vim80/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/0kxj34b5ix1f5y264di4v2gy468fimlj-vim_configurable-8.0.1655

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/share/vim/vim80/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/share/vim/vim80/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/share/vim/vim80/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/share/vim/vim80/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655/bin/gvimtutor: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655...
/nix/store/dy2vlkvblmafdmfkh3qxw9s0iix919h0-vim_configurable-8.0.1655

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/share/vim/vim80/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/share/vim/vim80/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/share/vim/vim80/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/share/vim/vim80/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/pmsj5p5hj9ylj9lnpd0n1vr37m6kl4sa-python-2.7.14/bin/python"
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655/share/vim/vim80/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655...
/nix/store/vvx3ldfifxls94xd9s0z9s007gqvlqzb-vim_configurable-8.0.1655

@Mic92 Mic92 merged commit ab5e607 into NixOS:master Apr 25, 2018
@LnL7 LnL7 deleted the vim-ft-nix branch April 25, 2018 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: vim 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
3 participants
@LnL7 @GrahamcOfBorg @Mic92