summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-09-02 00:17:26 +0200
committerSilvan Mosberger <contact@infinisil.com>2020-11-30 23:51:22 +0100
commit9523df7eb600e7fc2a88bc5227d9dfe12055a9bd (patch)
tree64fb87e447b515e1b7ebbce0eeb32f3942d47947 /lib
parentdf5ba82f74df75e96390995472f3e1e5179da21c (diff)
nixos/assertions: Use module-builtin assertion implementation
Diffstat (limited to 'lib')
-rw-r--r--lib/modules.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/modules.nix b/lib/modules.nix
index 0d761c632d02..31200ae0b035 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -254,11 +254,11 @@ rec {
*/
injectAssertions = assertions: config: let
# Partition into assertions that are triggered on this level and ones that aren't
- parted = partition (a: length a.triggerPath == 0) assertions;
+ parted = lib.partition (a: length a.triggerPath == 0) assertions;
# From the ones that are triggered, filter out ones that aren't enabled
# and group into warnings/errors
- byType = groupBy (a: a.type) (filter (a: a.enable) parted.right);
+ byType = lib.groupBy (a: a.type) (filter (a: a.enable) parted.right);
# Triggers semantically are just lib.id, but they print warning cause errors in addition
warningTrigger = value: lib.foldr (w: warn w.show) value (byType.warning or []);
@@ -266,16 +266,16 @@ rec {
if byType.error or [] == [] then value else
throw ''
Failed assertions:
- ${concatMapStringsSep "\n" (a: "- ${a.show}") byType.error}
+ ${lib.concatMapStringsSep "\n" (a: "- ${a.show}") byType.error}
'';
# Trigger for both warnings and errors
trigger = value: warningTrigger (errorTrigger value);
# From the non-triggered assertions, split off the first element of triggerPath
# to get a mapping from nested attributes to a list of assertions for that attribute
- nested = zipAttrs (map (a: {
+ nested = lib.zipAttrs (map (a: {
${head a.triggerPath} = a // {
- triggerPath = tail a.triggerPath;
+ triggerPath = lib.tail a.triggerPath;
};
}) parted.wrong);
@@ -296,7 +296,7 @@ rec {
# has a `show` attribute for how to show it if triggered
assertions = mapAttrsToList (name: value:
let id =
- if hasPrefix "_" name then ""
+ if lib.hasPrefix "_" name then ""
else "[${showOption prefix}${optionalString (prefix != []) "/"}${name}] ";
in value // {
show = "${id}${value.message}";