summary refs log tree commit diff
diff options
context:
space:
mode:
authorKranium Gikos Mendoza <kranium@gikos.net>2017-08-08 00:33:43 +1000
committerKranium Gikos Mendoza <kranium@gikos.net>2017-08-08 00:37:43 +1000
commitb99f162e40d9dfb3b8620da51d152add3ca3c644 (patch)
tree22e1a1d68453bbcd086af3ac1e73fa07b1977ec0
parentb416579af4f20e4d7431faf12d37239002f0faf4 (diff)
downloadnixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar.gz
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar.bz2
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar.lz
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar.xz
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.tar.zst
nixpkgs-b99f162e40d9dfb3b8620da51d152add3ca3c644.zip
facter: 3.6.6 -> 3.7.1
-rw-r--r--pkgs/tools/system/facter/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 55bf93608e8..56ac33ba23c 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.6.6";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
-    sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins";
+    sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   CXXFLAGS = "-fpermissive";
   NIX_CFLAGS_COMPILE = "-Wno-error";
+  NIX_LDFLAGS = "-lblkid";
 
   cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d75cf86744b..284d9901a4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,9 +1001,7 @@ with pkgs;
 
   facedetect = callPackage ../tools/graphics/facedetect { };
 
-  facter = callPackage ../tools/system/facter {
-    boost = boost160;
-  };
+  facter = callPackage ../tools/system/facter { };
 
   fasd = callPackage ../tools/misc/fasd { };