Merge branch 'staging'

A security update of libxml2 is within.

pkgs/tools/system/facter/default.nix

@@ -2,9 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
+
   src = fetchFromGitHub {
-    sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
+    sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
@@ -24,5 +25,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.womfoo ];
     platforms = platforms.linux;
   };
-
 }

pkgs/tools/system/ipmitool/default.nix

@@ -2,14 +2,14 @@
 
 let
   pkgname = "ipmitool";
-  version = "1.8.15";
+  version = "1.8.17";
 in
 stdenv.mkDerivation {
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
-    sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph";
+    sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi";
   };
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''