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: Clean up Gemfile #47310

Merged
merged 1 commit into from Sep 25, 2018
Merged

vagrant: Clean up Gemfile #47310

merged 1 commit into from Sep 25, 2018

Conversation

aneeshusa
Copy link
Contributor

Motivation for this change

@alyssais pointed out that @Mic92 changed this from the original.

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)
  • Fits CONTRIBUTING.md.

@aneeshusa
Copy link
Contributor Author

@Mic92 please let me know if there was a specific reason you made that change that I'm missing - I'm not super familiar with Ruby, but AFAIK it's not needed and is yet another place that would have to be kept updated during version bumps.

@aneeshusa aneeshusa mentioned this pull request Sep 25, 2018
Closed
9 tasks
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vagrant

Partial log (click to expand)

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

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: vagrant

Partial log (click to expand)

/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/7s5p6cwgz63pp1wgln9f7bg7sgy5jyrm-ruby-2.5.1/bin/ruby"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/plugins/provisioners/salt/bootstrap-salt.sh: interpreter directive changed from "/bin/sh -" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/sh -"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/plugins/hosts/darwin/scripts/install_virtualbox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/bash"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/bash"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/bash"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/bash"
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/.runner.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/z2pc6bbx9d1mwwahnds31a7nlvjbi9zr-bash-4.4-p23/bin/bash"
running install tests
Vagrant smoke check passed
/nix/store/5iv9w8qdp8x5rgf898q8gfgmqgzx1h15-vagrant-2.1.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vagrant

Partial log (click to expand)

/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/bin/vagrant.orig: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/42lf7caji1bykgrzmf22a58sqyb9knjj-ruby-2.5.1/bin/ruby"
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/bin/vagrant: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/42lf7caji1bykgrzmf22a58sqyb9knjj-ruby-2.5.1/bin/ruby"
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/.runner.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/website_push_docs.sh: interpreter directive changed from "/bin/bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/website_push_www.sh: interpreter directive changed from "/bin/bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2/lib/ruby/gems/2.5.0/gems/vagrant-2.1.2/scripts/sign.sh: interpreter directive changed from "/bin/bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2...
running install tests
Vagrant smoke check passed
/nix/store/3cla8xry1mwg8q1hyvygzi2iy44ryj4y-vagrant-2.1.2

@Mic92
Copy link
Member

Mic92 commented Sep 25, 2018

I think they did not have an update to date version of vagrant at the time on rubygems.

@Mic92 Mic92 merged commit 39f20a6 into NixOS:master Sep 25, 2018
@aneeshusa
Copy link
Contributor Author

@Mic92 Thanks for the review.
AFAIK they stopped publishing vagrant updates to rubygems a while ago, and if you try to install it from there it just prints out an error message about that not being supported.
We shouldn't be trying to get vagrant from rubygems at all, I believe.

@Mic92
Copy link
Member

Mic92 commented Sep 27, 2018

@aneeshusa but how does the Gemfile work then, if it does not get the information from rubygems? I think we should revert this in that case.

@Mic92
Copy link
Member

Mic92 commented Sep 27, 2018

Fetching from Github seems then the only viable option to me. We definitely don't want the omnibus version.

@alyssais
Copy link
Member

It seems to me like we should just be running bundix on the Vagrant source repo, then commiting the gemset.nix? I don't think there's any reason for having the Gemfile and Gemfile.lock in nixpkgs, is there?

@Mic92
Copy link
Member

Mic92 commented Sep 28, 2018

bundlerEnv actually need it. In earlier versions one had to specify file all three files separately. Later an gemdir variable was introduced.

@alyssais
Copy link
Member

Could we not give bundlerEnv the Gemfile and Gemfile.lock straight from the clone of the Vagrant repository?

@Mic92
Copy link
Member

Mic92 commented Sep 28, 2018

Should be possible: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/ruby-modules/bundled-common/default.nix#L82
The downside is that it make it easier to not keep bundix in sync with the Gemfile. There might be a way to check bundlerEnv though. Maybe this is already the case.

@Mic92
Copy link
Member

Mic92 commented Sep 28, 2018

https://bundler.io/v1.10/bundle_check.html

@aneeshusa aneeshusa mentioned this pull request Sep 29, 2018
Merged
9 tasks
@aneeshusa aneeshusa deleted the clean-up-vagrant-Gemfile branch January 7, 2022 02:53
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
@aneeshusa @GrahamcOfBorg @Mic92 @alyssais