nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

home-manager: present news even if assertion failed

Browse source
This commit is contained in:
Robert Helgesson 2017-09-09 17:14:07 +02:00
parent 07b4228988
commit cda222d2ec
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
2 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/default.nix
View file

@ -70,18 +70,17 @@ let
config._module.check = check;
};
rawModule = lib.evalModules {
modules = [ configuration ] ++ modules ++ [ pkgsModule ];
};
module = showWarnings (
let
mod = lib.evalModules {
modules = [ configuration ] ++ modules ++ [ pkgsModule ];
};
failed = collectFailed mod.config;
failed = collectFailed rawModule.config;
failedStr = concatStringsSep "\n" (map (x: "- ${x}") failed);
in
if failed == []
then mod
then rawModule
else throw "\nFailed assertions:\n${failedStr}"
);
@ -95,9 +94,9 @@ in
# For backwards compatibility. Please use activationPackage instead.
activation-script = module.config.home.activationPackage;
newsDisplay = module.config.news.display;
newsDisplay = rawModule.config.news.display;
newsEntries =
sort (a: b: a.time > b.time) (
filter (a: a.condition) module.config.news.entries
filter (a: a.condition) rawModule.config.news.entries
);
}