nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch
Maximilian Bosch a26ffb006b
vagrant: 2.2.9 -> 2.2.10
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.10/CHANGELOG.md#2210-august-24-2020

Apart from the usual `gemset`-update the following patches were altered:

* Deprecation fix on ruby 2.6.5: was removed since the underlying issue
  was fixed upstream.
* 0004-Support-system-installed-plugins.patch: re-downloaded the rebased
  version from `salsa.debian.org`[1] where we originally obtained the patch
  from.
* use-system-bundler-version: re-applied on top of Vagrant 2.2.10.

[1] https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch
2020-08-25 22:11:35 +02:00

14 lines
475 B
Diff

diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index 336ac1e05..1bfd84c0d 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -470,7 +470,7 @@ module Vagrant
source_list = {}
system_plugins = plugins.map do |plugin_name, plugin_info|
plugin_name if plugin_info["system"]
- end.compact
+ end.compact << "bundler"
installer_set = VagrantSet.new(:both)
installer_set.system_plugins = system_plugins