Merge branch 'staging' into make-perl-pathd

2018-12-18 17:13:27 +00:00
parent bb9557eb7c 1148ce1b60
commit fed7914539
654 changed files with 15794 additions and 14062 deletions
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
    perlPackages.NetSNMP
    perlPackages.NetServer
    perlPackages.ListMoreUtils
-    perlPackages.TimeHiRes
    perlPackages.LWP
    perlPackages.DBDPg
    python
@@ -121,7 +120,7 @@ stdenv.mkDerivation rec {
          --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
                LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip
                HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
-                ListMoreUtils TimeHiRes DBDPg LWP rrdtool
+                ListMoreUtils DBDPg LWP rrdtool
                ]}"
    done
  '';