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: bdbec903046b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7178637a89e3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2020

  1. vagrant: Resolve crash by replacing gem symlinks with directories 

    This workaround was discovered by painstakingly resolving the
differences between a working installation and a non-working
installation until a minimal change was found.  I have no idea why it
works.

Fixes #76629.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jan 1, 2020

    Unverified

    The signing certificate or its chain could not be verified.
    Certificate subject
    CN Seth Vargo
    emailAddress seth@sethvargo.com
    Certificate issuer
    CN SSL.com Client Certificate Intermediate CA RSA R2
    O SSL Corp
    Learn about vigilant mode
    Copy the full SHA
    5ddafad View commit details

  2. vagrant: Improve installCheckPhase to verify an actual operation 

    Just running `vagrant --version` was insufficient to catch #76629, but
this would have.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jan 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c70867 View commit details

Commits on Jan 6, 2020

  1. Merge pull request #76765 from andersk/vagrant-nameerror 

    vagrant: Resolve crash by replacing gem symlinks with directories
    @Mic92
    Mic92 authored Jan 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7178637 View commit details
Showing with 12 additions and 6 deletions.
  1. +12 −6 pkgs/development/tools/vagrant/default.nix
18 changes: 12 additions & 6 deletions pkgs/development/tools/vagrant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,17 @@ let
inherit version;
};
} // lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix));

# This replaces the gem symlinks with directories, resolving this
# error when running vagrant (I have no idea why):
# /nix/store/p4hrycs0zaa9x0gsqylbk577ppnryixr-vagrant-2.2.6/lib/ruby/gems/2.6.0/gems/i18n-1.1.1/lib/i18n/config.rb:6:in `<module:I18n>': uninitialized constant I18n::Config (NameError)
postBuild = ''
for gem in "$out"/lib/ruby/gems/*/gems/*; do
cp -a "$gem/" "$gem.new"
rm "$gem"
mv "$gem.new" "$gem"
done
'';
};

in buildRubyGem rec {
@@ -79,12 +90,7 @@ in buildRubyGem rec {
'';

installCheckPhase = ''
if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then
echo 'Vagrant smoke check passed'
else
echo 'Vagrant smoke check failed'
return 1
fi
HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null
'';

# `patchShebangsAuto` patches this one script which is intended to run