From 864f9a8df5c52120b40ca9d3a797985ec75b849a Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 25 Sep 2017 20:59:17 +1000
Subject: [PATCH 1/4] libwhereami: init at 0.1.1

---
 .../libraries/libwhereami/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/libwhereami/default.nix

diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
new file mode 100644
index 00000000000..35e904989c4
--- /dev/null
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
+
+stdenv.mkDerivation rec {
+  name = "libwhereami-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4";
+    rev = version;
+    repo = "libwhereami";
+    owner = "puppetlabs";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ boost curl leatherman ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Library to report hypervisor information from inside a VM";
+    license = licenses.asl20;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5aadb559110..be2500331d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9520,6 +9520,8 @@ with pkgs;
 
   libupnp = callPackage ../development/libraries/pupnp { };
 
+  libwhereami = callPackage ../development/libraries/libwhereami { };
+
   giflib = giflib_5_1;
   giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
   giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { };

From c9be5ced8f92874eca7fce3a032c4b7d81142e36 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 25 Sep 2017 20:59:41 +1000
Subject: [PATCH 2/4] cpp-hocon: 0.1.5 -> 0.1.6

---
 pkgs/development/libraries/cpp-hocon/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 6014c9f4eaf..236d634a514 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-hocon-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
-    sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7";
+    sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc";
     rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost curl leatherman ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = " A C++ port of the Typesafe Config library";

From 09c2e243b492c1a8e8592941bdb12edd9b5d8611 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 25 Sep 2017 21:01:43 +1000
Subject: [PATCH 3/4] leatherman: 1.0.0 -> 1.3.0

---
 pkgs/development/libraries/leatherman/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a9c7a9b70bb..be033c3860c 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.0.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y";
+    sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost cmake curl ruby ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/puppetlabs/leatherman/;  
     description = "A collection of C++ and CMake utility libraries";

From 4f598b1b9ad43c665fa83823eb68fec60f5d4d58 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 25 Sep 2017 21:02:00 +1000
Subject: [PATCH 4/4] facter: 3.7.1 -> 3.9.0

---
 pkgs/tools/system/facter/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 56ac33ba23c..b74f9948418 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
+{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.7.1";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
-    sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a";
+    sha256 = "1picxrmvka57ph4zqgwqdsqvz3mqppg41wkj8dx37hscwwlbdw0s";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # since we cant expand $out in cmakeFlags
   preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
 
-  buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ];
+  buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
 
   enableParallelBuilding = true;