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: 14c877b4ab09
Choose a base ref
...
head repository: NixOS/nix
compare: cdcdf3e79837
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 16, 2019

  1. Sync NIX_PROFILES between single-user and multi-user modes 

    When we are in single user mode, we still want to have access to
profiles. This way things in Nixpkgs that rely on them getting set
accurately are done in both cases. The point where I hit this is with
using aspell which looks in NIX_PROFILES:

https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/aspell/default.nix

Before this patch, NIX_PROFILES was never set in single user mode!
This corrects that.
    @matthewbauer
    matthewbauer committed May 16, 2019
    Copy the full SHA
    7c20ee4 View commit details
    Browse the repository at this point in the history

  2. Don’t set NIX_REMOTE=daemon in daemon profile 

    This is now autodetected. There is no need to put it in the profile.
    @matthewbauer
    matthewbauer committed May 16, 2019
    Copy the full SHA
    92f461e View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Merge pull request #2812 from matthewbauer/fix-nix-scripts 

    Sync NIX_PROFILES between single-user and multi-user modes
    @edolstra
    edolstra committed May 21, 2019
    Copy the full SHA
    cdcdf3e View commit details
    Browse the repository at this point in the history