Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4c9f8d0358a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 849fb28cf350
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 28, 2018

  1. vagrant: mark bundler as system plugin 

    This will cause Vagrant to use the rubygems version of bundler
without complaint.
    @aneeshusa
    aneeshusa committed Aug 28, 2018
    Copy the full SHA
    2ed25d3 View commit details

  2. Merge pull request #45693 from aneeshusa/mark-bundler-as-system-plugi… 

    …n-for-vagrant

vagrant: mark bundler as system plugin
    @Mic92
    Mic92 authored Aug 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    849fb28 View commit details
Showing with 14 additions and 0 deletions.
  1. +1 −0 pkgs/development/tools/vagrant/default.nix
  2. +13 −0 pkgs/development/tools/vagrant/use-system-bundler-version.patch
1 change: 1 addition & 0 deletions pkgs/development/tools/vagrant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ in buildRubyGem rec {

patches = [
./unofficial-installation-nowarn.patch
./use-system-bundler-version.patch
];

# PATH additions:
13 changes: 13 additions & 0 deletions pkgs/development/tools/vagrant/use-system-bundler-version.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb
index 301e40e37..e361ab510 100644
--- i/lib/vagrant/bundler.rb
+++ w/lib/vagrant/bundler.rb
@@ -217,7 +217,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