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: e9be7fcb002c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fdc581d8c3f9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 24, 2018

  1. nixos/nix-daemon: optionally (on by default) check nix.conf can be read 

    * checks using package providing the nix-daemon that we'll be using
* made optional (unlike some other config checks) "just in case":
  since this requires running the new Nix on the builder, this
  won't work in a few (AFAIK very uncommon) situations such as
  cross-compiling NixOS or using `include` directives in nix.conf

This does rely on Nix2 but not by the builder.
Since we only offer Nix2+ in-tree this should be fine,
and may otherwise be required anyway.
    @dtzWill
    dtzWill committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    fa1d1ee View commit details
    Browse the repository at this point in the history

Commits on May 1, 2018

  1. Merge pull request #39407 from dtzWill/feature/check-nix.conf 

    nixos/nix-daemon: optionally (on by default) check nix.conf can be read
    @dtzWill
    dtzWill committed May 1, 2018
    Configuration menu
    Copy the full SHA
    fdc581d View commit details
    Browse the repository at this point in the history