834d863dd2
This makes definitions like
home.activation.foo = mkIf false "bar"
work, where previously they would complain about
`home.activation.foobar.data` being used but not defined.
The crucial part is that we don't call `convertAllToDags` in
`dagOf.merge`, because we need to process `mkIf`/`mkMerge` properties
first. So we let `attrEquivalent.merge` do its job normally, but give
it a type `dagEntryOf` that does the conversion.
Ideally this shouldn't require so much boilerplate; I'd like to
implement something like
types.changeInto dagContentType elemType dagEntryAnywhere
in Nixpkgs.
(cherry picked from commit
|
||
---|---|---|
.. | ||
accounts | ||
config | ||
i18n/input-method | ||
lib | ||
lib-bash | ||
misc | ||
programs | ||
services | ||
targets | ||
default.nix | ||
files.nix | ||
home-environment.nix | ||
manual.nix | ||
modules.nix | ||
systemd-activate.rb | ||
systemd-activate.sh | ||
systemd.nix | ||
xcursor.nix | ||
xresources.nix | ||
xsession.nix |