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: 72804dc0bdc5
Choose a base ref
...
head repository: NixOS/nix
compare: 4eb9e20028c4
Choose a head ref
  • 7 commits
  • 19 files changed
  • 1 contributor

Commits on Nov 20, 2017

  1. install-darwin-multi-user.sh: Remove superfluous nix.conf settings

    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    ea94a87 View commit details
    Browse the repository at this point in the history

  2. binary-cache-public-keys -> trusted-public-keys 

    The name had become a misnomer since it's not only for substitution
from binary caches, but when adding/copying any
(non-content-addressed) path to a store.
    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    7a2b64e View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    d0b88db View commit details
    Browse the repository at this point in the history

  4. signed-binary-caches -> require-sigs 

    Unlike signed-binary-caches (which could only be '*' or ''),
require-sigs is a proper Boolean option. The default is true.
    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    91a1987 View commit details
    Browse the repository at this point in the history

  5. Test: Replace --option with the corresponding flag

    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    193330d View commit details
    Browse the repository at this point in the history

  6. nix run: Ignore non-directories while setting up the chroot 

    Fixes #1686.
    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    a3aa850 View commit details
    Browse the repository at this point in the history

  7. nix run: Fix accidental removal of /nix/store existence check 

    Parenthetical to #1686, we don't need to create a new root if we can
just bind-mount on top of the existing /nix/store.
    @edolstra
    edolstra committed Nov 20, 2017
    Copy the full SHA
    4eb9e20 View commit details
    Browse the repository at this point in the history