alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #158259 from Yarny0/hylafax

Browse source 
hylafaxplus: 7.0.4 -> 7.0.5
This commit is contained in:
Renaud 2022-02-18 22:17:08 +01:00 committed by GitHub
parent 61cf20929b e899b07fc0
commit a632c843a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 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 let
inherit (lib.options) literalExpression mkEnableOption mkOption; 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; inherit (lib.modules) mkDefault mkIf mkMerge;
commonDescr = '' commonDescr = ''
@ -17,8 +17,6 @@ let
configuration to yield an operational system. configuration to yield an operational system.
''; '';
str1 = lib.types.addCheck str (s: s!=""); # non-empty string
configAttrType = configAttrType =
# Options in HylaFAX configuration files can be # Options in HylaFAX configuration files can be
# booleans, strings, integers, or list thereof # booleans, strings, integers, or list thereof
@ -37,7 +35,7 @@ let
modemConfigOptions = { name, config, ... }: { modemConfigOptions = { name, config, ... }: {
options = { options = {
name = mkOption { name = mkOption {
type = str1; type = nonEmptyStr;
example = "ttyS1"; example = "ttyS1";
description = '' description = ''
Name of modem device, Name of modem device,
@ -45,7 +43,7 @@ let
''; '';
}; };
type = mkOption { type = mkOption {
type = str1; type = nonEmptyStr;
example = "cirrus"; example = "cirrus";
description = '' description = ''
Name of modem configuration file, Name of modem configuration file,
@ -135,14 +133,14 @@ in
}; };
countryCode = mkOption { countryCode = mkOption {
type = nullOr str1; type = nullOr nonEmptyStr;
default = null; default = null;
example = "49"; example = "49";
description = "Country code for server and all modems."; description = "Country code for server and all modems.";
}; };
areaCode = mkOption { areaCode = mkOption {
type = nullOr str1; type = nullOr nonEmptyStr;
default = null; default = null;
example = "30"; example = "30";
description = "Area code for server and all modems."; description = "Area code for server and all modems.";
@ -279,7 +277,7 @@ in
each time the spooling area is initialized. each time the spooling area is initialized.
''; '';
faxcron.enable.frequency = mkOption { faxcron.enable.frequency = mkOption {
type = nullOr str1; type = nullOr nonEmptyStr;
default = null; default = null;
example = "daily"; example = "daily";
description = '' description = ''
@ -319,7 +317,7 @@ in
each time the spooling area is initialized. each time the spooling area is initialized.
''; '';
faxqclean.enable.frequency = mkOption { faxqclean.enable.frequency = mkOption {
type = nullOr str1; type = nullOr nonEmptyStr;
default = null; default = null;
example = "daily"; example = "daily";
description = '' description = ''

5
pkgs/servers/hylafaxplus/default.nix
View file

@ -30,8 +30,8 @@
let let
pname = "hylafaxplus"; pname = "hylafaxplus";
version = "7.0.4"; version = "7.0.5";
sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5"; sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f";
configSite = substituteAll { configSite = substituteAll {
name = "${pname}-config.site"; name = "${pname}-config.site";
@ -96,6 +96,7 @@ stdenv.mkDerivation {
postInstall = ". ${postInstall}"; postInstall = ". ${postInstall}";
postInstallCheck = ". ${./post-install-check.sh}"; postInstallCheck = ". ${./post-install-check.sh}";
meta = { meta = {
changelog = "https://hylafax.sourceforge.io/news/${version}.php";
description = "enterprise-class system for sending and receiving facsimiles"; description = "enterprise-class system for sending and receiving facsimiles";
downloadPage = "https://hylafax.sourceforge.io/download.php"; downloadPage = "https://hylafax.sourceforge.io/download.php";
homepage = "https://hylafax.sourceforge.io"; homepage = "https://hylafax.sourceforge.io";