diff options
| -rw-r--r-- | pkgs/development/libraries/leatherman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/facter/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 60205d7a856..bfb091f424a 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 = "0.4.2"; + version = "0.7.0"; src = fetchFromGitHub { - sha256 = "07bgv99lzzhxy4l7mdyassxqy33zv7arvfw63bymsqavppphqlrr"; + sha256 = "1m37zcr11a2g08wbkpxgav97m2fr14in2zhdhhv5krci5i2grzd7"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index a90000dde87..9a95df94a1c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, utillinux }: +{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz"; - sha256 = "0k2k92y42zb6vf542zwkhvg15kv32yb4zvw6nlcqlgmyg19c5qmv"; + sha256 = "1kv4k9zqpsiw362kk1rw1a4sixd0pmnh57ghd4k4pffr2dkmdfsv"; }; + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; + + # since we cant expand $out in cmakeFlags + preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; + libyamlcpp_ = libyamlcpp.override { makePIC = true; }; - buildInputs = [ boost cmake curl leatherman libyamlcpp_ openssl utillinux ]; + buildInputs = [ boost cmake curl leatherman libyamlcpp_ openssl ruby utillinux ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc8f8cff352..2511df50387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -781,7 +781,9 @@ in ent = callPackage ../tools/misc/ent { }; - facter = callPackage ../tools/system/facter {}; + facter = callPackage ../tools/system/facter { + ruby = ruby_2_1; + }; fasd = callPackage ../tools/misc/fasd { }; |