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: df117acab7bf
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0f5d5970b28c
Choose a head ref
  • 11 commits
  • 8 files changed
  • 1 contributor

Commits on Feb 7, 2018

  1. nixos-install: Don't require root 

    E.g.

  nixos-install --root /tmp/mnt/ --no-bootloader --no-root-passwd

now works for non-root users.
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    f0979ca View commit details
    Browse the repository at this point in the history

  2. nixos-enter: Check whether --root denotes a NixOS installation

    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    bb030ec View commit details
    Browse the repository at this point in the history

  3. Remove creation of /dev/{fd,stdin,stdout,stderr} 

    This is already provided by devtmpfs.
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    16bdaf3 View commit details
    Browse the repository at this point in the history

  4. nixos-enter: Don't require root 

    Of course, you'll get a bunch of warnings from the activation script:

  $ nixos-enter --root /tmp/mnt/
  setting up /etc...
  mount: /dev: permission denied.
  mount: /dev/pts: permission denied.
  mount: /dev/shm: permission denied.
  mount: /sys: permission denied.
  /nix/var/nix/profiles/system/activate: line 74: /proc/sys/kernel/modprobe: Permission denied
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/dbus-daemon-launch-helper': Invalid argument
  NOTE: Under Linux, effective file capabilities must either be empty, or
        exactly match the union of selected permitted and inheritable bits.
  Failed to set capabilities on file `/run/wrappers/wrappers.0pKlU8JsvV/ping' (Operation not permitted)
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/unix_chkpwd': Invalid argument

  [root@nixos:/]#
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    da702a4 View commit details
    Browse the repository at this point in the history

  5. nixos-install: Fix --closure

    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    6daad9b View commit details
    Browse the repository at this point in the history

  6. nixos-install: Create /etc

    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    598a3f5 View commit details
    Browse the repository at this point in the history

  7. nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca

    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    e76849d View commit details
    Browse the repository at this point in the history

  8. Fix comments

    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    f64a4af View commit details
    Browse the repository at this point in the history

  9. nixos-install: Accept --substituters 

    This is useful in tests where we don't have network access. Passing
--substituters "" prevents wasting time by checking cache.nixos.org.
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    5d8860b View commit details
    Browse the repository at this point in the history

  10. make-disk-image.nix: Use nixos-install again 

    Since nixos-install doesn't require any special privileges anymore,
this Just Works. No more need for fakeroot / nixos-prepare-root.
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    9802da5 View commit details
    Browse the repository at this point in the history

  11. nixos-prepare-root: Remove 

    This is no longer needed thanks to Nix 2.0 magic.
    @edolstra
    edolstra committed Feb 7, 2018
    Copy the full SHA
    0f5d597 View commit details
    Browse the repository at this point in the history