eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-30 06:59:45 +01: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

31
modules/misc/nix.nix
View file

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