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: 5e8fd81959c6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 84201ff13104
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Feb 24, 2018

  1. nix-daemon.nix: Updates for Nix 2.0 

    * The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and
  NIX_REMOTE are no longer needed.

* A /bin/sh (from busybox) is provided by default in sandboxes.

* Various options were renamed.

(cherry picked from commit 700e21d)
    @edolstra @obadz
    edolstra authored and obadz committed Feb 24, 2018
    Copy the full SHA
    de02b5e View commit details
    Browse the repository at this point in the history

  2. nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 

    (cherry picked from commit 75a2028)
    @edolstra @obadz
    edolstra authored and obadz committed Feb 24, 2018
    Copy the full SHA
    fd16136 View commit details
    Browse the repository at this point in the history

  3. nix: add nixStable2

    @obadz
    obadz committed Feb 24, 2018
    Copy the full SHA
    0b2a32e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35468 from obadz/nix2-on-17.09 

    Nix2 on 17.09
    @zimbatm
    zimbatm committed Feb 24, 2018
    Copy the full SHA
    84201ff View commit details
    Browse the repository at this point in the history