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: df45c65aaea5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 700e21d6dac4
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 31, 2018

  1. Revert "Restore "nixUnstable: rename to nix-unstable"" 

    This reverts commit 695027f.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
    @edolstra
    edolstra committed Jan 31, 2018
    Copy the full SHA
    ef35164 View commit details
    Browse the repository at this point in the history

  2. nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731

    @edolstra
    edolstra committed Jan 31, 2018
    Copy the full SHA
    75a2028 View commit details
    Browse the repository at this point in the history

  3. 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.
    @edolstra
    edolstra committed Jan 31, 2018
    1
    Copy the full SHA
    700e21d View commit details
    Browse the repository at this point in the history