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

Commits on Jan 14, 2020

  1. vagrant: Unbreak replacing symlinks on macOS 

    On a local installation on macOS, "cp -a" creates a write-protected
directory, which can't be renamed.  Do a "chmod +w" to unbreak.

Fixes #77671.
    @mikesperber
    mikesperber committed Jan 14, 2020
    Copy the full SHA
    1bea1a3 View commit details

Commits on Jan 15, 2020

  1. Merge pull request #77672 from active-group/unbreak-vagrant-macos 

    vagrant: Unbreak replacing symlinks on macOS
    @marsam
    marsam authored Jan 15, 2020
    Copy the full SHA
    6f54541 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/tools/vagrant/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/tools/vagrant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,8 @@ let
for gem in "$out"/lib/ruby/gems/*/gems/*; do
cp -a "$gem/" "$gem.new"
rm "$gem"
# needed on macOS, otherwise the mv yields permission denied
chmod +w "$gem.new"
mv "$gem.new" "$gem"
done
'';