Merge pull request #29769 from womfoo/bump/facter-3.9.0
facter: 3.7.1 -> 3.9.0 and related deps
This commit is contained in:
commit
d1d4b7f500
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cpp-hocon-${version}";
|
name = "cpp-hocon-${version}";
|
||||||
version = "0.1.5";
|
version = "0.1.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7";
|
sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc";
|
||||||
rev = version;
|
rev = version;
|
||||||
repo = "cpp-hocon";
|
repo = "cpp-hocon";
|
||||||
owner = "puppetlabs";
|
owner = "puppetlabs";
|
||||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ boost curl leatherman ];
|
buildInputs = [ boost curl leatherman ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
description = " A C++ port of the Typesafe Config library";
|
description = " A C++ port of the Typesafe Config library";
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "leatherman-${version}";
|
name = "leatherman-${version}";
|
||||||
version = "1.0.0";
|
version = "1.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y";
|
sha256 = "1pcbfgq9khlcvxjsqpdshjskwljzawryzps0ickazwm7l3m7hrln";
|
||||||
rev = version;
|
rev = version;
|
||||||
repo = "leatherman";
|
repo = "leatherman";
|
||||||
owner = "puppetlabs";
|
owner = "puppetlabs";
|
||||||
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ boost cmake curl ruby ];
|
buildInputs = [ boost cmake curl ruby ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://github.com/puppetlabs/leatherman/;
|
homepage = https://github.com/puppetlabs/leatherman/;
|
||||||
description = "A collection of C++ and CMake utility libraries";
|
description = "A collection of C++ and CMake utility libraries";
|
||||||
|
28
pkgs/development/libraries/libwhereami/default.nix
Normal file
28
pkgs/development/libraries/libwhereami/default.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "libwhereami-${version}";
|
||||||
|
version = "0.1.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4";
|
||||||
|
rev = version;
|
||||||
|
repo = "libwhereami";
|
||||||
|
owner = "puppetlabs";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ boost curl leatherman ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
inherit (src.meta) homepage;
|
||||||
|
description = "Library to report hypervisor information from inside a VM";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = [ maintainers.womfoo ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
|
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "facter-${version}";
|
name = "facter-${version}";
|
||||||
version = "3.7.1";
|
version = "3.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a";
|
sha256 = "1picxrmvka57ph4zqgwqdsqvz3mqppg41wkj8dx37hscwwlbdw0s";
|
||||||
rev = version;
|
rev = version;
|
||||||
repo = "facter";
|
repo = "facter";
|
||||||
owner = "puppetlabs";
|
owner = "puppetlabs";
|
||||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||||||
# since we cant expand $out in cmakeFlags
|
# since we cant expand $out in cmakeFlags
|
||||||
preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
|
preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
|
||||||
|
|
||||||
buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ];
|
buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -9520,6 +9520,8 @@ with pkgs;
|
|||||||
|
|
||||||
libupnp = callPackage ../development/libraries/pupnp { };
|
libupnp = callPackage ../development/libraries/pupnp { };
|
||||||
|
|
||||||
|
libwhereami = callPackage ../development/libraries/libwhereami { };
|
||||||
|
|
||||||
giflib = giflib_5_1;
|
giflib = giflib_5_1;
|
||||||
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
|
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
|
||||||
giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { };
|
giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { };
|
||||||
|
Loading…
Reference in New Issue
Block a user