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: d5e9e5fcf2bd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 68efd790b840
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 26, 2019

  1. nixos: Don't enable Docker by default 

    Regression introduced by c940053.

The commit introduced declarative docker containers and subsequently
enables docker whenever any declarative docker containers are defined.

This is done via an option with type "attrsOf somesubmodule" and a check
on whether the attribute set is empty.

Unfortunately, the check was whether a *list* is empty rather than
wether an attribute set is empty, so "mkIf (cfg != [])" *always*
evaluates to true and thus subsequently enables docker by default:

$ nix-instantiate --eval nixos --arg configuration {} \
    -A config.virtualisation.docker.enable
true

Fixing this is simply done by changing the check to "mkIf (cfg != {})".

Tested this by running the "docker-containers" NixOS test and it still
passes.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @benley, @danbst, @infinisil, @nlewo
    @aszlig
    aszlig committed Mar 26, 2019
    4
    Copy the full SHA
    68efd79 View commit details
    Browse the repository at this point in the history