diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-18 11:23:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-18 11:23:04 +0200 |
commit | 821a3beb1048273bbba5e9636916281fce5dd577 (patch) | |
tree | 04bd7ec85b66e30e0c0a94b09aa416d4cec7cd74 /pkgs/servers/monitoring | |
parent | 5143e303619dd21e134d036667d4f2316b6e8a27 (diff) | |
parent | 18fcc337affa09238a42e9a0ca21e08363c65eeb (diff) | |
download | nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.gz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.bz2 nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.lz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.xz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.zst nixlib-821a3beb1048273bbba5e9636916281fce5dd577.zip |
Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 2fec42edff33..72d5f124c63d 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # needs to find a local perl module during build - PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + PERL_USE_UNSAFE_INC = "1"; # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass |