Commit ed1a16e8 authored by Midnight Veil's avatar Midnight Veil Committed by Bjørn Forsman
Browse files

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

Upstream change: https://github.com/munin-monitoring/munin/pull/1502
parent 12fdbb1c

nixos/tests/munin.nix

+2 −0
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { 
    with subtest("ensure munin-node starts and listens on 4949"):

        one.wait_for_unit("munin-node.service")

        one.wait_for_open_port(4949)



    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/www/munin/one/index.html")

        one.wait_for_file("/var/www/munin/one/one/diskstat_iops_vda-day.png", timeout=60)

  '';

})

pkgs/servers/monitoring/munin/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec { 
    perlPackages.Socket6

    perlPackages.URI

    perlPackages.DBFile

    perlPackages.DateManip

    perlPackages.TimeDate

    perlPackages.FileCopyRecursive

    perlPackages.FCGI

    perlPackages.NetSNMP
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec { 
        esac

        wrapProgram "$file" \

          --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

                ListMoreUtils DBDPg LWP rrdtool

                ]}"