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
base: bdbec903046b
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Copy the full SHA
    5ddafad View commit details
    Browse the repository at this point in the history

  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
    Copy the full SHA
    2c70867 View commit details
    Browse the repository at this point in the history

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 committed Jan 6, 2020
    Copy the full SHA
    7178637 View commit details
    Browse the repository at this point in the history