@@ -3,7 +3,7 @@
33let
44
55 inherit (lib.options) literalExample mkEnableOption mkOption;
6− inherit (lib.types) bool enum int lines attrsOf nullOr path str submodule;
6+ inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule;
77 inherit (lib.modules) mkDefault mkIf mkMerge;
88
99 commonDescr = ''
@@ -18,7 +18,6 @@ let
1818 '';
1919
2020 str1 = lib.types.addCheck str (s: s!=""); # non-empty string
21− int1 = lib.types.addCheck int (i: i>0); # positive integer
2221
2322 configAttrType =
2423 # Options in HylaFAX configuration files can be
@@ -27,7 +26,7 @@ let
2726 # This type definition resolves all
2827 # those types into a list of strings.
2928 let
30− inherit (lib.types) attrsOf coercedTo listOf;
29+ inherit (lib.types) attrsOf coercedTo int listOf;
3130 innerType = coercedTo bool (x: if x then "Yes" else "No")
3231 (coercedTo int (toString) str);
3332 in
@@ -290,7 +289,7 @@ in
290289 '';
291290 };
292291 faxcron.infoDays = mkOption {
293− type = int1;
292+ type = ints.positive;
294293 default = 30;
295294 description = ''
296295 Set the expiration time for data in the
@@ -298,7 +297,7 @@ in
298297 '';
299298 };
300299 faxcron.logDays = mkOption {
301− type = int1;
300+ type = ints.positive;
302301 default = 30;
303302 description = ''
304303 Set the expiration time for
@@ -306,7 +305,7 @@ in
306305 '';
307306 };
308307 faxcron.rcvDays = mkOption {
309− type = int1;
308+ type = ints.positive;
310309 default = 7;
311310 description = ''
312311 Set the expiration time for files in
@@ -343,7 +342,7 @@ in
343342 '';
344343 };
345344 faxqclean.doneqMinutes = mkOption {
346− type = int1;
345+ type = ints.positive;
347346 default = 15;
348347 example = literalExample "24*60";
349348 description = ''
@@ -353,7 +352,7 @@ in
353352 '';
354353 };
355354 faxqclean.docqMinutes = mkOption {
356− type = int1;
355+ type = ints.positive;
357356 default = 60;
358357 example = literalExample "24*60";
359358 description = ''