Handle config.system.build
type change from lazy attrset to submodule
#163
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picked from #155.
Don't use
lib.mkForce
on thesystem.build.kexec_tarball
definition when building on anixpkgs
version from before the commit that changedconfig.system.build
's type from a lazy attribute set to a submodule.Prior to this type change, there is no
system.build.kexec_tarball
option declared, so the NixOS module system does not resolve priorities/overrides in theconfig.build.kexec_tarball
definition.That is, with lib.mkForce, the
config.build.kexec_tarball
definition ends up being something like:Removing
lib.mkForce
permits sensibly interpolatingsystem.build.kexec_tarball
insystem.build.kexec_bundle
's builder script.Likewise, no
lib.mkOverride
forsystem.build.raw
.This PR introduces two shim functions defined in
./lib.nix
,maybe.mkForce
andmaybe.mkOverride
, that try to detect whetherconfig.system.build
is a submodule and:lib.mkForce
orlib.mkOverride
, and