ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 21:32:23 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14780 from womfoo/update-facter

Browse Source 
Update facter: 3.1.3 -> 3.1.5 and add new library dependency leatherman 0.4.2
This commit is contained in:
Tuomas Tynkkynen 2016-04-18 05:42:56 +03:00
commit 00f5f08e05
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/leatherman/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, boost, cmake, curl }:
stdenv.mkDerivation rec {
name = "leatherman-${version}";
version = "0.4.2";
src = fetchFromGitHub {
sha256 = "07bgv99lzzhxy4l7mdyassxqy33zv7arvfw63bymsqavppphqlrr";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
};
buildInputs = [ boost cmake curl ];
meta = with stdenv.lib; {
homepage = https://github.com/puppetlabs/leatherman/;
description = "A collection of C++ and CMake utility libraries";
license = licenses.asl20;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
}

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

@ -1,16 +1,16 @@
{ stdenv, fetchurl, boost, cmake, curl, libyamlcpp, openssl, utillinux }:
{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, utillinux }:
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.1.3";
version = "3.1.5";
src = fetchurl {
url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
sha256 = "1ngp3xjdh6x1w7lsi4lji2xzqp0x950jngcdlq11lcr0wfnzwyxj";
sha256 = "0k2k92y42zb6vf542zwkhvg15kv32yb4zvw6nlcqlgmyg19c5qmv";
};
libyamlcpp_ = libyamlcpp.override { makePIC = true; };
buildInputs = [ boost cmake curl libyamlcpp_ openssl utillinux ];
buildInputs = [ boost cmake curl leatherman libyamlcpp_ openssl utillinux ];
meta = with stdenv.lib; {
homepage = https://github.com/puppetlabs/facter;

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

@ -2195,6 +2195,8 @@ in
leafpad = callPackage ../applications/editors/leafpad { };
leatherman = callPackage ../development/libraries/leatherman {};
leela = callPackage ../tools/graphics/leela { };
lftp = callPackage ../tools/networking/lftp { };