eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-07-06 05:13:28 +02:00
Code Issues Releases Wiki Activity

nix: fix package assertion

Browse Source 
Sync it with the condition for generating nix.conf so that it triggers
if `extraOptions` is set but `package` isn't.
This commit is contained in:
Naïm Favier 2023-02-07 11:35:12 +01:00
parent c43d4a3d6d
commit b70362bf9b
No known key found for this signature in database
GPG Key ID: 95AFCE8211908325
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/misc/nix.nix
View File

@ -212,29 +212,28 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable (mkMerge [
assertions = [{ (mkIf (cfg.registry != { }) {
assertion = cfg.settings == { } || cfg.package != null; xdg.configFile."nix/registry.json".source =
message = '' jsonFormat.generate "registry.json" {
A corresponding Nix package must be specified via `nix.package` for generating
nix.conf.
'';
}];
xdg.configFile = {
"nix/registry.json" = mkIf (cfg.registry != { }) {
source = jsonFormat.generate "registry.json" {
version = cfg.registryVersion; version = cfg.registryVersion;
flakes = flakes =
mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry; mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry;
}; };
}; })
"nix/nix.conf" = mkIf (cfg.settings != { } || cfg.extraOptions != "") { (mkIf (cfg.settings != { } || cfg.extraOptions != "") {
source = nixConf; assertions = [{
}; assertion = cfg.package != null;
}; message = ''
}; A corresponding Nix package must be specified via `nix.package` for generating
nix.conf.
'';
}];
xdg.configFile."nix/nix.conf".source = nixConf;
})
]);
meta.maintainers = [ maintainers.polykernel ]; meta.maintainers = [ maintainers.polykernel ];
} }