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/nix
base: 5e0a7206f59d
Choose a base ref
...
head repository: NixOS/nix
compare: e0ddabb0d674
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 5, 2018

  1. Get effective user in Nix commands 

    ‘geteuid’ gives us the user that the command is being run as,
including in setuid modes. By using geteuid to determind id, we can
avoid the ‘sudo -i’ hack when upgrading Nix. So now, upgrading Nix on
macOS is as simple as:

$ sudo nix-channel --update
$ sudo nix-env -u

$ sudo launchctl stop org.nixos.nix-daemon
$ sudo launchctl start org.nixos.nix-daemon
or
$ sudo systemctl restart nix-daemon
    @matthewbauer
    matthewbauer committed Sep 5, 2018
    Copy the full SHA
    74f6d87 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2400 from matthewbauer/patch-9 

    Get effective user in Nix commands
    @edolstra
    edolstra committed Sep 5, 2018
    Copy the full SHA
    e0ddabb View commit details
    Browse the repository at this point in the history