mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 02:46:28 +00:00
8c3553b88d
This is not quite as elegant as using `bundlerApp`, which I could not get working. However, this still uses most of the Ruby infrastructure, including stock bundix, and should be fairly reasonable to maintain. This means no more hacks to work around wrong embedded binaries, and no need for an old version of Ruby. Note that `vagrant share` is no longer included, as that functionality is closed-source and not present in the upstream source code. The Vagrant maintainers publish official Vagrant installers, which they prefer people use as most platforms don't have great support for pinning known-good dependencies. When run outside one of the offical installers, Vagrant normally prints a warning to that effect. However, Vagrant does run outside the installer environment (nominally to support Vagrant development), and this has the effect of functioning better by respecting OS certs and shared libraries, as opposed to trying to use bundled versions. To keep these postive side effects without having to see the warning on every Vagrant invocation, patch out the call to print the warning. Note that I have reset the maintainers since the implementation is totally redone; I'm happy to re-add any of the current maintainers.
17 lines
455 B
Diff
17 lines
455 B
Diff
diff --git i/bin/vagrant w/bin/vagrant
|
|
index 19df75033..682fae226 100755
|
|
--- i/bin/vagrant
|
|
+++ w/bin/vagrant
|
|
@@ -128,11 +128,6 @@ begin
|
|
end
|
|
end
|
|
|
|
- if !Vagrant.in_installer? && !Vagrant.very_quiet?
|
|
- # If we're not in the installer, warn.
|
|
- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
|
|
- end
|
|
-
|
|
begin
|
|
# Execute the CLI interface, and exit with the proper error code
|
|
exit_status = env.cli(argv)
|