Merge pull request #62974 from peterhoeg/f/zmtrigger

zoneminder: add perlPackages.DeviceSerialPort for zmtrigger.pl
This commit is contained in:
Peter Hoeg 2019-08-26 14:47:32 +08:00 committed by GitHub
commit f729a79eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions

View File

@ -200,7 +200,10 @@ in {
"zoneminder/80-nixos.conf".source = configFile; "zoneminder/80-nixos.conf".source = configFile;
}; };
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
cfg.port
6802 # zmtrigger
];
services = { services = {
fcgiwrap = lib.mkIf useNginx { fcgiwrap = lib.mkIf useNginx {

View File

@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
# build-time dependencies # build-time dependencies
DateManip DBI DBDmysql LWP SysMmap DateManip DBI DBDmysql LWP SysMmap
# run-time dependencies not checked at build-time # run-time dependencies not checked at build-time
ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
]); ]);
nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; nativeBuildInputs = [ cmake makeWrapper pkgconfig ];

View File

@ -15004,6 +15004,18 @@ let
}; };
}; };
DeviceSerialPort = buildPerlPackage rec {
name = "Device-SerialPort-1.04";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CO/COOK/${name}.tar.gz";
sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
};
meta = with stdenv.lib; {
description = "Linux/POSIX emulation of Win32::SerialPort functions.";
license = with licenses; [ artistic1 gpl1Plus ];
};
};
ServerStarter = buildPerlModule { ServerStarter = buildPerlModule {
pname = "Server-Starter"; pname = "Server-Starter";
version = "0.34"; version = "0.34";