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: a1cc741d9c66
Choose a base ref
...
head repository: NixOS/nix
compare: a198670ab296
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Mar 30, 2018

  1. Expand the multi-user installer to support Linuxes with systemd 

     - darwin installer: delete hardware report, not necessary
 - moves os-specific code from the darwin installer to to `poly_*`
   functions
 - adds profile.d support to the profile targets, which automatically
   handles many distros which don't have a /etc/bashrc but do have an
   /etc/profile.d
 - /bin/bash -> /usr/bin/env bash
 - document why each excluded shellcheck check is excluded
 - rename the multi-user to Daemon-based

(cherry picked from commit 2921165)
    @grahamc
    grahamc committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    fb6a41a View commit details
    Browse the repository at this point in the history

  2. Check for the existence of a profile target before seeing if it menti… 

    …ons Nix

Grep would ignore files that didn't exist, but would complain
about files in a directory if the directory didn't exist. Simply check
for the directory first, prior to grepping it.

(cherry picked from commit 4ba91f5)
    @grahamc
    grahamc committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    1b493df View commit details
    Browse the repository at this point in the history

  3. Use a looser comparison for the 'user note' check 

    We use grep instead of an equality check because it is difficult
to extract _just_ the user's note, instead it is prefixed with
some plist junk. This was causing the user note to always be set,
even if there was no reason for it.

(cherry picked from commit f06f810)
    @grahamc
    grahamc committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    985f0da View commit details
    Browse the repository at this point in the history

  4. macos: Handle when a build user doesn't have a user ID 

    (cherry picked from commit 4eb40c7)
    @grahamc
    grahamc committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    b037be7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2027 from grahamc/backport-linux-multi-user 

    Backport #2026: Expand the multi-user installer to support Linuxes with systemd
    @grahamc
    grahamc committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    a198670 View commit details
    Browse the repository at this point in the history