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: 6cd90cb0e189
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c5bb43188d66
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 25, 2018

  1. nixos: Fix eval error for documentation.nixos 

    Introduced by 0f3b89b.

If services.nixosManual.showManual is enabled and
documentation.nixos.enable is not, there is no
config.system.build.manual available, so evaluation fails. For example
this is the case for the installer tests.

There is however an assertion which should catch exactly this, but it
isn't thrown because the usage of config.system.build.manual is
evaluated earlier than the assertions.

So I split the assertion off into a separate mkIf to make sure it is
shown appropriately and also fixed the installation-device profile to
enable documentation.nixos.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @oxij
    @aszlig
    aszlig committed Sep 25, 2018
    9
    Copy the full SHA
    c5bb431 View commit details
    Browse the repository at this point in the history