mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
munin: fix missing Date::Parse module error & make test fail w/o a fix
Upstream change: https://github.com/munin-monitoring/munin/pull/1502
This commit is contained in:
parent
12fdbb1c17
commit
ed1a16e886
|
@ -37,8 +37,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||||
with subtest("ensure munin-node starts and listens on 4949"):
|
with subtest("ensure munin-node starts and listens on 4949"):
|
||||||
one.wait_for_unit("munin-node.service")
|
one.wait_for_unit("munin-node.service")
|
||||||
one.wait_for_open_port(4949)
|
one.wait_for_open_port(4949)
|
||||||
|
|
||||||
with subtest("ensure munin-cron output is correct"):
|
with subtest("ensure munin-cron output is correct"):
|
||||||
one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
|
one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
|
||||||
one.wait_for_file("/var/www/munin/one/index.html")
|
one.wait_for_file("/var/www/munin/one/index.html")
|
||||||
|
one.wait_for_file("/var/www/munin/one/one/diskstat_iops_vda-day.png", timeout=60)
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
perlPackages.Socket6
|
perlPackages.Socket6
|
||||||
perlPackages.URI
|
perlPackages.URI
|
||||||
perlPackages.DBFile
|
perlPackages.DBFile
|
||||||
perlPackages.DateManip
|
perlPackages.TimeDate
|
||||||
perlPackages.FileCopyRecursive
|
perlPackages.FileCopyRecursive
|
||||||
perlPackages.FCGI
|
perlPackages.FCGI
|
||||||
perlPackages.NetSNMP
|
perlPackages.NetSNMP
|
||||||
|
@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||||
esac
|
esac
|
||||||
wrapProgram "$file" \
|
wrapProgram "$file" \
|
||||||
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
|
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
|
||||||
LogLog4perl IOSocketINET6 Socket6 URI DBFile DateManip
|
LogLog4perl IOSocketINET6 Socket6 URI DBFile TimeDate
|
||||||
HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
|
HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
|
||||||
ListMoreUtils DBDPg LWP rrdtool
|
ListMoreUtils DBDPg LWP rrdtool
|
||||||
]}"
|
]}"
|
||||||
|
|
Loading…
Reference in a new issue