colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

munin: fix missing Date::Parse module error & make test fail w/o a fix

Browse Source 
Upstream change: https://github.com/munin-monitoring/munin/pull/1502
This commit is contained in:
Midnight Veil 2023-12-25 16:15:27 +11:00 committed by Bjørn Forsman
parent 12fdbb1c17
commit ed1a16e886
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/munin.nix
View File

@ -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)
''; '';
}) })

4
pkgs/servers/monitoring/munin/default.nix
View File

@ -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
]}" ]}"