JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15613 from womfoo/facter

Browse Source 
facter: 3.1.5 -> 3.1.6 (add ruby support) and dependency leatherman: 0.4.2 -> 0.7.0
This commit is contained in:
Frederik Rietdijk 2016-05-28 15:29:31 +02:00
commit 373455e237
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/leatherman/default.nix
View File

@ -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";

13
pkgs/tools/system/facter/default.nix
View File

@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };