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

vagrant: update deps for 2.1.2 #43620

Closed
wants to merge 1 commit into from
Closed

vagrant: update deps for 2.1.2 #43620

wants to merge 1 commit into from

Conversation

aneeshusa
Copy link
Contributor

The version was bumped but the dependencies were not updated.
Do so and add some instructions for future package updates.

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): decrease of -371624 (bytes?)
  • Fits CONTRIBUTING.md.

@aneeshusa
vagrant: update deps for 2.1.2
982f9d8 
The version was bumped but the dependencies were not updated.
Do so and add some instructions for future package updates.
@aneeshusa
Copy link
Contributor Author

Follow-up to #43416, cc @alyssais, @xeji.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: vagrant

Partial log (click to expand)

/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/i0kmp30s644ayglfzwchm2x1i5arwxjs-ruby-2.4.4/bin/ruby"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/i0kmp30s644ayglfzwchm2x1i5arwxjs-ruby-2.4.4/bin/ruby"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/sh -"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash"
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash"
running install tests
Vagrant smoke check passed
/nix/store/fw5yk3qgr2gr2n535lr6sixabrh8yg81-vagrant-2.1.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vagrant

Partial log (click to expand)

/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/bash"
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/sh -"
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/bash"
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/ra2wzisr8lkvgkkvlx4sfrd0q9dqn9k5-ruby-2.4.4/bin/ruby"
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/ra2wzisr8lkvgkkvlx4sfrd0q9dqn9k5-ruby-2.4.4/bin/ruby"
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/.runner.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2...
running install tests
Vagrant smoke check passed
/nix/store/f8b0i0ia3ak2f371mddx5vvg3gp76dc7-vagrant-2.1.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vagrant

Partial log (click to expand)

/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/f3svdpbdciz3c91nc8bj8qi0adc6p5zl-ruby-2.4.4/bin/ruby"
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/f3svdpbdciz3c91nc8bj8qi0adc6p5zl-ruby-2.4.4/bin/ruby"
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/.runner.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2/lib/ruby/gems/2.4.0/gems/vagrant-2.1.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2...
running install tests
Vagrant smoke check passed
/nix/store/n2wm3xm7nx6gp8h8d27r13fkfk0nmajs-vagrant-2.1.2

@xeji
Copy link
Contributor

xeji commented Jul 16, 2018

Thank you for fixing this and adding helpful instructions!

@xeji
Copy link
Contributor

xeji commented Jul 16, 2018

There seem to be some issues with GitHub ATM. I merged this and got a weird "oops, something went wrong" message. git shows that the PR was actually merged to the branch. But it was not closed on GitHub and ended up in an inconsistent state, hence the "merge conflict" here.

@xeji
Copy link
Contributor

xeji commented Jul 16, 2018

Closing becase this was merged in 8b0fea2

@xeji xeji closed this Jul 16, 2018
alyssais
alyssais reviewed Sep 21, 2018
View reviewed changes
pkgs/development/tools/vagrant/default.nix
# NOTE: bumping the version and updating the hash is insufficient;
# you must copy a fresh Gemfile.lock from the vagrant source,
# and use bundix to generate a new gemset.nix.
# Do not change the existing Gemfile.
Copy link
Member

Choose a reason for hiding this comment

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

@aneeshusa I was just looking into updating Vagrant again and saw this comment. What's the reason for not changing the existing Gemfile? It references an old version of Vagrant now, but presumably that was current at the time. Is there a reason that shouldn't be changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alyssais great question, I didn't realize this had changed! I made #47310 to change it back (and possibly find out why it was changed).

@aneeshusa aneeshusa mentioned this pull request Sep 25, 2018
Merged
9 tasks
@aneeshusa aneeshusa deleted the update-vagrant-to-2.1.2-properly branch January 7, 2022 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais alyssais left review comments

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
@aneeshusa @GrahamcOfBorg @xeji @alyssais