From 1438f7b66494e02588fc48759348099317353e6f Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 5 Apr 2019 16:05:20 +0200 Subject: [PATCH 1/3] nixos/hylafax: add 'yarny' (= myself) as maintainer I forgot to do this when I submitted this module with commit 12fa95f2d696b6babb365a27efef140e7113cc34. --- nixos/modules/services/networking/hylafax/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix index 4c63b822d165..d8ffa3fc04d2 100644 --- a/nixos/modules/services/networking/hylafax/default.nix +++ b/nixos/modules/services/networking/hylafax/default.nix @@ -26,4 +26,6 @@ }]; }; + meta.maintainers = [ lib.maintainers.yarny ]; + } From e57156bcaa07ba7862f105cd1eb0145ca17b2c50 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 6 Apr 2019 16:57:27 +0200 Subject: [PATCH 2/3] nixos/hylafax: fix faxq `ModemGroup` setting The manpage claims that the "limit" in the setting:: :[:] is optional and defaults to zero, implying no limit. However, tests confirmed that it actually isn't optional. Without limit, the setting ``any:.*`` places outbound jobs on infinite hold if no particular modem was specified on the sendfax command line. The new default value ``any:0:.*`` from this commit uses any available modem to send jobs if not modem was given to sendfax. --- nixos/modules/services/networking/hylafax/faxq-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixos/modules/services/networking/hylafax/faxq-default.nix index a2630ce66b71..9b634650cf79 100644 --- a/nixos/modules/services/networking/hylafax/faxq-default.nix +++ b/nixos/modules/services/networking/hylafax/faxq-default.nix @@ -4,7 +4,7 @@ { - ModemGroup = [ ''"any:.*"'' ]; + ModemGroup = [ ''"any:0:.*"'' ]; ServerTracing = "0x78701"; SessionTracing = "0x78701"; UUCPLockDir = "/var/lock"; From 729ce1cc58ce2c12e18860974ba5b80e386d8e1c Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 6 Apr 2019 19:04:44 +0200 Subject: [PATCH 3/3] hylafaxplus: update meta * move meta attrset into curly brackets * update homepage (finally supports https) * add downloadPage * add longDescription --- pkgs/servers/hylafaxplus/default.nix | 29 +++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index dc53ee36f702..f5876687f8e7 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -87,9 +87,28 @@ stdenv.mkDerivation { dontAddPrefix = true; postInstall = ''. ${postInstall}''; postInstallCheck = ''. ${./post-install-check.sh}''; - meta.description = "enterprise-class system for sending and receiving facsimiles"; - meta.homepage = http://hylafax.sourceforge.net; - meta.license = lib.licenses.bsd3; - meta.maintainers = [ lib.maintainers.yarny ]; - meta.platforms = lib.platforms.linux; + meta = { + description = "enterprise-class system for sending and receiving facsimiles"; + downloadPage = https://hylafax.sourceforge.io/download.php; + homepage = https://hylafax.sourceforge.io; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.yarny ]; + platforms = lib.platforms.linux; + longDescription = '' + HylaFAX is a scalable and time-proven solution + for sending and receiving facsimiles via modem(s). + It is based on a client-server architecture, + loosely comparable to CUPS: + A client connects to a server to issue outbound jobs, + the server then chooses a modem to + connect to the receiving fax machine. + The server notifies users about their + outbound jobs as well as about inbound jobs. + HylaFAX+ is a fork of HylaFAX that -- in general -- + contains a superset of the features of + HylaFAX and produces releases more often. + This package contains the client + and the server parts of HylaFAX+. + ''; + }; }