nixos/systemd-lib: fix assertRangeOrOneOf when value is not comparable

We cannot compare non-numerical values to a min or max value in a range.

Changed files
+2 -1
nixos
+2 -1
nixos/lib/systemd-lib.nix
···
flip
head
isInt
+
isFloat
isList
isPath
length
···
"Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]";
assertRangeOrOneOf = name: min: max: values: group: attr:
-
optional (attr ? ${name} && !((min <= attr.${name} && max >= attr.${name}) || elem attr.${name} values))
+
optional (attr ? ${name} && !(((isInt attr.${name} || isFloat attr.${name}) && min <= attr.${name} && max >= attr.${name}) || elem attr.${name} values))
"Systemd ${group} field `${name}' is not a value in range [${toString min},${toString max}], or one of ${toString values}";
assertMinimum = name: min: group: attr: