mirror of
https://github.com/nix-community/home-manager.git
synced 2025-03-06 16:57:03 +00:00
nixpkgs-disabled: warn instead of assert (#6466)
Temporarily fixes backwards compatibility as issued in #6172.
This commit is contained in:
parent
25870c6600
commit
662fa98bf4
1 changed files with 14 additions and 6 deletions
|
@ -63,11 +63,19 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
assertions = [{
|
assertions = [
|
||||||
assertion = cfg.config == null && cfg.overlays == null;
|
# TODO: Re-enable assertion after 25.05 (&&)
|
||||||
message = ''
|
{
|
||||||
`nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
|
assertion = cfg.config == null || cfg.overlays == null;
|
||||||
'';
|
message = ''
|
||||||
}];
|
`nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
warnings = optional ((cfg.config != null) || (cfg.overlays != null)) ''
|
||||||
|
You have set either `nixpkgs.config` or `nixpkgs.overlays` while using `home-manager.useGlobalPkgs`.
|
||||||
|
This will soon not be possible. Please remove all `nixpkgs` options when using `home-manager.useGlobalPkgs`.
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue