From 7c6f46511d310936f509535d59656fe47c88f18f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 09:47:44 -0700 Subject: [PATCH] facter: 3.13.2 -> 3.14.5 (#64019) * facter: 3.13.2 -> 3.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/facter/versions * facter: 3.14.0 -> 3.14.5 --- pkgs/tools/system/facter/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ee9cdf36129..ad90a52a5bd 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,29 +2,30 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.13.2"; + version = "3.14.5"; src = fetchFromGitHub { - sha256 = "1yaj1qlyzsaffzpm4zmzm53mc6bhpzka8wc3dfk909nzykxg34zf"; + sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5"; rev = version; - repo = "facter"; + repo = pname; owner = "puppetlabs"; }; CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; - cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; + cmakeFlags = [ + "-DFACTER_RUBY=${ruby}/lib/libruby.so" + "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" + ]; - # since we cant expand $out in cmakeFlags - preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; - - buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/facter; + homepage = "https://github.com/puppetlabs/facter"; description = "A system inventory tool"; license = licenses.asl20; maintainers = [ maintainers.womfoo ];