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: 4e67f89f380d
Choose a base ref
...
head repository: NixOS/nix
compare: 7abe3bde8ade
Choose a head ref
  • 10 commits
  • 5 files changed
  • 5 contributors

Commits on Mar 20, 2020

  1. libstore: disable resolve-system-dependencies hook

    This is used to determine the dependency tree of impure libraries so nix
    knows what paths to open in the sandbox.  With the less restrictive
    defaults it isn't needed anymore.
    LnL7 committed Mar 20, 2020
    Copy the full SHA
    afb78eb View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7f2df90 View commit details
    Browse the repository at this point in the history
  3. sandbox: allow pty devices

    Nix now runs builds with a pseudo-terminal to enable colored build
    output.
    LnL7 committed Mar 20, 2020
    Copy the full SHA
    f6c122a View commit details
    Browse the repository at this point in the history
  4. sandbox: fix /bin/sh on catalina

    Sadly 10.15 changed /bin/sh to a shim which executes bash, this means it
    can't be used anymore without also opening up the sandbox to allow bash.
    
        Failed to exec /bin/bash as variant for /bin/sh (1: Operation not permitted).
    LnL7 committed Mar 20, 2020
    Copy the full SHA
    2e9bc12 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. installer: also test for xz to unpack

    Philipp Middendorf committed Mar 21, 2020
    Copy the full SHA
    9450dec View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3431 from pmiddend/install-script-test-for-xz

    installer: also test for xz to unpack
    domenkozar committed Mar 21, 2020
    Copy the full SHA
    7bc1961 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. installer: Set files read-only when copying into store

    After installing Nix, I found that all the files and directories
    initially copied into the store were writable, with mode 644 or 755:
    
      drwxr-xr-x 9 root root 4096 Dec 31  1969 /nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3
    
    The reason is that that's how they were in the unpacked tarball, and
    the install-multi-user script used `rsync -p` without doing anything
    else to affect the permissions.
    
    The plain `install` script for a single-user install takes care to
    do a `chmod -R a-w` on each store path copied.  We could do the same
    here with one more command; or we can pass `--chmod` to rsync, to
    have it write the files with the desired modes in the first place.
    
    Tested the new `rsync` command on both a Linux machine with a
    reasonably-modern rsync (3.1.3) and a Mac with its default, ancient,
    rsync 2.6.9, and it works as expected on both.  Thankfully the latter
    is just new enough to have `--chmod`, which dates to rsync 2.6.7.
    gnprice committed Mar 23, 2020
    Copy the full SHA
    26851dd View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3429 from LnL7/darwin-sandbox

    darwin sandbox
    edolstra committed Mar 23, 2020
    Copy the full SHA
    5885e20 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3440 from gnprice/pr-install-ro

    installer: Set files read-only when copying into store
    edolstra committed Mar 23, 2020
    Copy the full SHA
    160edd3 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    7abe3bd View commit details
    Browse the repository at this point in the history