Merge pull request #22006 from womfoo/bump/facter-3.5.1

facter: 3.4.1 -> 3.5.1 and related deps
This commit is contained in:
Michael Raskin 2017-01-21 18:14:08 +00:00 committed by GitHub
commit 52103deef1
3 changed files with 11 additions and 9 deletions

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "cpp-hocon-${version}";
version = "0.1.2";
version = "0.1.4";
src = fetchFromGitHub {
sha256 = "0v2mnak6fh13dkl25lfvw1la2dfjqrh3lq1d40r3a52m56vwflrg";
sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87";
rev = version;
repo = "cpp-hocon";
owner = "puppetlabs";

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "leatherman-${version}";
version = "0.9.0";
version = "0.10.1";
src = fetchFromGitHub {
sha256 = "18nidasykbwdd9qzwc8pnzhczy6acr3rsxwvv2v3j5gq3nbsk2mc";
sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7";
rev = version;
repo = "leatherman";
owner = "puppetlabs";

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.4.1";
src = fetchurl {
url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj";
version = "3.5.1";
src = fetchFromGitHub {
sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
rev = version;
repo = "facter";
owner = "puppetlabs";
};
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];