forked from mirrors/nixpkgs
Merge pull request #158259 from Yarny0/hylafax
hylafaxplus: 7.0.4 -> 7.0.5
This commit is contained in:
commit
a632c843a7
|
@ -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 = ''
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
let
|
||||
|
||||
pname = "hylafaxplus";
|
||||
version = "7.0.4";
|
||||
sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5";
|
||||
version = "7.0.5";
|
||||
sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f";
|
||||
|
||||
configSite = substituteAll {
|
||||
name = "${pname}-config.site";
|
||||
|
@ -96,6 +96,7 @@ stdenv.mkDerivation {
|
|||
postInstall = ". ${postInstall}";
|
||||
postInstallCheck = ". ${./post-install-check.sh}";
|
||||
meta = {
|
||||
changelog = "https://hylafax.sourceforge.io/news/${version}.php";
|
||||
description = "enterprise-class system for sending and receiving facsimiles";
|
||||
downloadPage = "https://hylafax.sourceforge.io/download.php";
|
||||
homepage = "https://hylafax.sourceforge.io";
|
||||
|
|
Loading…
Reference in a new issue