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: unpin from old lua 5.1 #40749

Merged
merged 1 commit into from May 20, 2018
Merged

vim_configurable: unpin from old lua 5.1 #40749

merged 1 commit into from May 20, 2018

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented May 19, 2018 •
edited

This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the lua package.

Motivation for this change

Noticed while building that lua 5.1 is broken (#40748) so I tried just using lua. Seems to work fine.

Things done

I'm not sure why callPackage wasn't sufficient to pass this a lua, but with the inherit it's clearly picking up the unpinned lua package as intended

...
configure flags: --prefix=/nix/store/xpafpgylq737q5rrz16zsycq1k3r71r1-vim_configurable-8.0.1655 --with-lua-prefix=/nix/store/8v6cpmd211q4z0maxna8fqykfxpfaar5-lua-5.2.3 --enable-luainterp ...
  • 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 aarch64-linux (full log)

Attempted: vim

Partial log (click to expand)

these paths will be fetched (6.16 MiB download, 29.63 MiB unpacked):
  /nix/store/c6v5p3ids1jxpnm8lv4k5w259ikrrz0q-vim-8.0.1655
copying path '/nix/store/c6v5p3ids1jxpnm8lv4k5w259ikrrz0q-vim-8.0.1655' from 'https://cache.nixos.org'...
/nix/store/c6v5p3ids1jxpnm8lv4k5w259ikrrz0q-vim-8.0.1655

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim

Partial log (click to expand)

/nix/store/0160rh26xg2fl2vc8af5shq198a2gkgc-vim-8.0.1655

@bhipple
vim_configurable: unpin from old lua 5.1
eefef5d 
This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the `lua` package.
@bhipple bhipple changed the title vim: unpin from old lua 5.1 vim_configurable: unpin from old lua 5.1 May 19, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-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/xpafpgylq737q5rrz16zsycq1k3r71r1-vim_configurable-8.0.1655...
/nix/store/xpafpgylq737q5rrz16zsycq1k3r71r1-vim_configurable-8.0.1655

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

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

@xeji
Copy link
Contributor

xeji commented May 20, 2018

let's check the Darwin build
@GrahamcOfBorg build vim_configurable

@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/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/share/vim/vim81/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/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/10f4qxb00wk9j6cicd9h1qzwqgnc36ji-python-2.7.14/bin/python"
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/qyxnvzj369jjg52si560qpr1la65j27s-vim_configurable-8.1.0001

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/share/vim/vim81/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/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001/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/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001...
/nix/store/fvp39r3dk1b0574b2kxfzglxrp9yvdjn-vim_configurable-8.1.0001

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

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

@xeji xeji merged commit 65f58cf into NixOS:master May 20, 2018
@orivej
Copy link
Contributor

orivej commented May 21, 2018

This broke vimNox: https://hydra.nixos.org/build/74478042

@xeji
Copy link
Contributor

xeji commented May 21, 2018

Thanks @orivej for catching this. The cause seems to be that vimNox is built from a patched source tree for vim 7.3 from 2012 which was never updated and seems to require lua 5.1.
(the resulting package's name is vim_configurable-8.1.0001 but it actually contains vim 7.3.315).
Unfortuately there's no newer version for the source at the listed URL.

I'll pin vimNox to old lua for now but we should either update it or drop from nixpkgs. And apparently no one has been interested in this package enough to update it since 2012...

@xeji
Copy link
Contributor

xeji commented May 21, 2018

pinned vimNox to lua5_1 in d9bdd77.

xeji added a commit that referenced this pull request May 21, 2018
@xeji
vimNox: pin to lua 5.1
d9bdd77 
vimNox is currently built from a patched vim 7.3 source from 2012
that requires lua 5.1. Temporary fix, see discussion in #40749.
@xeji xeji mentioned this pull request May 21, 2018
Closed
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
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
4 participants
@bhipple @GrahamcOfBorg @xeji @orivej