colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/hylafax: use new type nonEmptyStr

Browse Source 
The module option type `nonEmptyStr` was introduced in commit

a3c5f0cba8

The hylafax module previously simply used
`addCheck str (s: s!="")` to prevent empty option strings,
but the new type is more thorough as
it also catches space-only strings.
This commit is contained in:
Yarny0 2022-02-05 11:30:50 +01:00
parent 554d2d8aa2
commit 21d6960e99
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/hylafax/options.nix
View File

@ -3,7 +3,7 @@
let
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule;
inherit (lib.types) bool enum ints lines attrsOf nonEmptyStr nullOr path str submodule;
inherit (lib.modules) mkDefault mkIf mkMerge;
commonDescr = ''
@ -17,8 +17,6 @@ let
configuration to yield an operational system.
'';
str1 = lib.types.addCheck str (s: s!=""); # non-empty string
configAttrType =
# Options in HylaFAX configuration files can be
# booleans, strings, integers, or list thereof
@ -37,7 +35,7 @@ let
modemConfigOptions = { name, config, ... }: {
options = {
name = mkOption {
type = str1;
type = nonEmptyStr;
example = "ttyS1";
description = ''
Name of modem device,
@ -45,7 +43,7 @@ let
'';
};
type = mkOption {
type = str1;
type = nonEmptyStr;
example = "cirrus";
description = ''
Name of modem configuration file,
@ -135,14 +133,14 @@ in
};
countryCode = mkOption {
type = nullOr str1;
type = nullOr nonEmptyStr;
default = null;
example = "49";
description = "Country code for server and all modems.";
};
areaCode = mkOption {
type = nullOr str1;
type = nullOr nonEmptyStr;
default = null;
example = "30";
description = "Area code for server and all modems.";
@ -279,7 +277,7 @@ in
each time the spooling area is initialized.
'';
faxcron.enable.frequency = mkOption {
type = nullOr str1;
type = nullOr nonEmptyStr;
default = null;
example = "daily";
description = ''
@ -319,7 +317,7 @@ in
each time the spooling area is initialized.
'';
faxqclean.enable.frequency = mkOption {
type = nullOr str1;
type = nullOr nonEmptyStr;
default = null;
example = "daily";
description = ''