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

Fix vagrant 2.0.2 #36283

Merged
merged 2 commits into from Mar 5, 2018
Merged

Fix vagrant 2.0.2 #36283

merged 2 commits into from Mar 5, 2018

Conversation

aneeshusa
Copy link
Contributor

Motivation for this change

Fix #36227.

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.

@cstrahan @zimbatm could you please review the first commit?
@Krofek sorry Vagrant was broken, this should fix #36227. Can you please test this branch?
This was broken in #36081 (cc @ryantm); I've added an installCheckPhase to hopefully prevent future breakage.

@aneeshusa
buildRubyGem: Make testing easier
fced35f 
Don't default `doCheck` to false,
and use the default set of phases
so the phases list does not need to be overriden
in order to add checkPhase or installCheckPhase.
@aneeshusa
vagrant: Fix dependencies for version 2.0.2
89d0307 
The version was bumped in NixOS#36081,
but the dependencies were not updated,
causing Vagrant to fail at runtime.

Fix the dependencies (via bundix),
and add an `installCheckPhase` to the derviation
to catch this in the future.
@aneeshusa aneeshusa requested a review from zimbatm as a code owner March 4, 2018 07:35
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/x67rsi7x2hhj9jx7yji0w2jfxjrksjl3-ruby-2.4.3/bin/ruby"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/x67rsi7x2hhj9jx7yji0w2jfxjrksjl3-ruby-2.4.3/bin/ruby"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/sh -"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
running install tests
Vagrant smoke check passed
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh -"
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6hx1p4ci13bdg9ska62m1az888bz29sz-ruby-2.4.3/bin/ruby"
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6hx1p4ci13bdg9ska62m1az888bz29sz-ruby-2.4.3/bin/ruby"
checking for references to /build in /nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2...
running install tests
Vagrant smoke check passed
/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/dns77vf9frhd2s2xvcdd47rs2l08nqin-ruby-2.4.3/bin/ruby"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/dns77vf9frhd2s2xvcdd47rs2l08nqin-ruby-2.4.3/bin/ruby"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-vagrant-2.0.2.drv-0 in /nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2...
running install tests
Vagrant smoke check passed
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2

@aneeshusa
Copy link
Contributor Author

@GrahamcOfBorg build vagrant

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/m1l516c43x2a7ikhyl6abbcls4yzz18b-vagrant-2.0.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/dns77vf9frhd2s2xvcdd47rs2l08nqin-ruby-2.4.3/bin/ruby"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh -"
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-vagrant-2.0.2.drv-0 in /nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2...
running install tests
Vagrant smoke check passed
/nix/store/cny49ffnbm0in4i9iiav1wvfw2lzy391-vagrant-2.0.2

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/x67rsi7x2hhj9jx7yji0w2jfxjrksjl3-ruby-2.4.3/bin/ruby"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/x67rsi7x2hhj9jx7yji0w2jfxjrksjl3-ruby-2.4.3/bin/ruby"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/sh -"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2/lib/ruby/gems/2.4.0/gems/vagrant-2.0.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/pkjmwq7sqrvjg7cjiph6hq0khsmfl6p8-bash-4.4-p12/bin/bash"
running install tests
Vagrant smoke check passed
/nix/store/grpgksyvda12mr1hblfrf4s13kk2gv92-vagrant-2.0.2

@aneeshusa aneeshusa mentioned this pull request Mar 4, 2018
Merged
@zimbatm zimbatm merged commit 1bc5bf4 into NixOS:master Mar 5, 2018
@zimbatm
Copy link
Member

zimbatm commented Mar 5, 2018

thanks, look good!

@aneeshusa aneeshusa mentioned this pull request Mar 15, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: ruby 10.rebuild-darwin: 11-100 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

vagrant fails to run
7 participants
@aneeshusa @GrahamcOfBorg @zimbatm @the-kenny @peterhoeg @7c6f434c @bkchr