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: 415fc233e3f0
Choose a base ref
...
head repository: NixOS/nix
compare: d6c4fe55db57
Choose a head ref
  • 17 commits
  • 7 files changed
  • 5 contributors

Commits on Mar 27, 2019

  1. install-multi-user: reduce max-jobs from 32 to 1

    Having max-jobs = 32 ($NIX_USER_COUNT is hardcoded to that value) may
    severely overload the machine. The nix.conf(5) manual page says max-jobs
    defaults to 1, so let's use that value.
    
    NOTE: Both max-jobs and cores are now being set to their default value,
    so they can be removed alltogether.
    bjornfor committed Mar 27, 2019
    Copy the full SHA
    dbe4c04 View commit details
    Browse the repository at this point in the history
  2. install-multi-user: remove unneeded settings from nix.conf

    Hardcoding the "max-jobs" and "cores" settings in nix.conf at install
    time, to the same value as Nix' built-in default, makes little sense to
    me.
    bjornfor committed Mar 27, 2019
    Copy the full SHA
    07d9981 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Minor typo

    JorisE committed Jun 4, 2019
    Copy the full SHA
    4b0d613 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2918 from JorisE/patch-1

    Minor typo
    edolstra committed Jun 4, 2019
    Copy the full SHA
    fb0ad89 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2019

  1. Daemon: warn when an untrusted user cannot override a setting

    In a daemon-based Nix setup, some options cannot be overridden by a
    client unless the client's user is considered trusted.
    
    Currently, if an untrusted user tries to override one of those
    options, we are silently ignoring it.
    
    This can be pretty confusing in certain situations.
    
    e.g. a user thinks he disabled the sandbox when in reality he did not.
    
    We are now sending a warning message letting know the user some options
    have been ignored.
    
    Related to #1761.
    picnoir authored and grahamc committed Jun 15, 2019
    Copy the full SHA
    9e0f5f8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2931 from NinjaTrappeur/nin-add-warning-setting-u…

    …ntrusted
    
    Daemon: warn when an untrusted user cannot override a setting
    grahamc committed Jun 15, 2019
    Copy the full SHA
    7ce60a8 View commit details
    Browse the repository at this point in the history
  3. nix: Support -j flag

    edolstra committed Jun 15, 2019
    Copy the full SHA
    34fa8ce View commit details
    Browse the repository at this point in the history
  4. Fix test failures when $TMPDIR changes

    (cherry picked from commit c38c726)
    edolstra committed Jun 15, 2019
    Copy the full SHA
    5064971 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    26bc876 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2019

  1. Style fix

    edolstra committed Jun 16, 2019
    Copy the full SHA
    b693029 View commit details
    Browse the repository at this point in the history
  2. Run builds in a pseudo-terminal

    This allows many programs (e.g. gcc, clang, cmake) to print colorized
    log output (assuming $TERM is set to a value like "xterm").
    
    There are other ways to get colors, in particular setting
    CLICOLOR_FORCE, but they're less widely supported and can break
    programs that parse tool output.
    edolstra committed Jun 16, 2019
    Copy the full SHA
    e84c265 View commit details
    Browse the repository at this point in the history
  3. Set $TERM

    edolstra committed Jun 16, 2019
    Copy the full SHA
    82ca6ef View commit details
    Browse the repository at this point in the history
  4. Hopefully fix macOS tests

    edolstra committed Jun 16, 2019
    Copy the full SHA
    2743bf0 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Copy the full SHA
    3cc1125 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2746 from bjornfor/install-multi-user-defaults

    install-multi-user: reduce max-jobs from 32 to 1
    edolstra committed Jun 17, 2019
    Copy the full SHA
    38a4d38 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2878 from NixOS/run-in-pts

    Run builds in a pseudo-terminal
    edolstra committed Jun 17, 2019
    Copy the full SHA
    4b214e6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    d6c4fe5 View commit details
    Browse the repository at this point in the history