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: master
Choose a base ref
...
head repository: NixOS/nix
compare: 2.2-maintenance
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 16 files changed
  • 7 contributors

Commits on Jan 11, 2019

  1. install: Use base-16 hashes 

    Issue #2623.

(cherry picked from commit 4ae6e84)
    @edolstra
    edolstra committed Jan 11, 2019
    1
    Copy the full SHA
    d7eade3 View commit details
    Browse the repository at this point in the history

  2. Bump version

    @edolstra
    edolstra committed Jan 11, 2019
    Copy the full SHA
    ca4aec6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. docs: fix typo in AllowDirectReads 

    It was just missing an `l` but should be fixed anyway.

(cherry picked from commit 34fade4)
    @andir
    andir committed Mar 15, 2019
    Copy the full SHA
    10254f7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2726 from andir/2.2/docs/s3-typo 

    [2.2] docs: fix typo in AllowDirectReads
    @grahamc
    grahamc committed Mar 15, 2019
    Copy the full SHA
    03b4a4f View commit details
    Browse the repository at this point in the history

  3. nix-daemon: add variable to disable fork safety 

    Since macOS 10.14 this has become an error, causing problems if the
nix-daemon loads nix during substitution (this is a forked process).

Workaround for #2523.

(cherry picked from commit 8ac1130)
    @LnL7
    LnL7 committed Mar 15, 2019
    Copy the full SHA
    34d897e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. Merge pull request #2729 from LnL7/2.2-maintenance 

    backport nix-daemon fork safety to 2.2
    @edolstra
    edolstra committed Mar 18, 2019
    Copy the full SHA
    03aaabc View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. Revert "Restore parent mount namespace before executing a child process" 

    This reverts commit a0ef212. This
doesn't work in 'nix run' and nix-shell because setns() fails in
multithreaded programs, and Boehm GC mark threads are uncancellable.

Fixes #2646.

(cherry picked from commit 01d07b1)
    @edolstra
    edolstra committed Apr 15, 2019
    Copy the full SHA
    6609f75 View commit details
    Browse the repository at this point in the history

  2. manual: mention the "channel:" shorthand for NIX_PATH 

    Bumped to 15.09 because older channels, when downloaded from
nixos.org, require firefox to be accessed via `pkgs.firefox`

(cherry picked from commit 75ec68f)
    @veprbl @edolstra
    veprbl authored and edolstra committed Apr 15, 2019
    Copy the full SHA
    6b5c52b View commit details
    Browse the repository at this point in the history

  3. manual: include builtins.* for globally available builtins 

    This improves searchability.

(cherry picked from commit 6f09307)
    @lheckemann @edolstra
    lheckemann authored and edolstra committed Apr 15, 2019
    Copy the full SHA
    9b1b459 View commit details
    Browse the repository at this point in the history

  4. eval: improve type description for primops and applied primops 

    This can make type errors a little easier to understand.

(cherry picked from commit 2aa89da)
    @lheckemann @edolstra
    lheckemann authored and edolstra committed Apr 15, 2019
    Copy the full SHA
    79ff84e View commit details
    Browse the repository at this point in the history

  5. Bump version

    @edolstra
    edolstra committed Apr 15, 2019
    Copy the full SHA
    0baf7dc View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. docs: describe $IN_NIX_SHELL values (#2796) 

    See commit 1bffd83

(cherry picked from commit c0559a1)
    @vcunat
    vcunat committed May 17, 2019
    Copy the full SHA
    7d5716a View commit details
    Browse the repository at this point in the history