alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #36241 from womfoo/bump/facter-3.10.0-and-deps

Browse source 
facter: 3.9.3 -> 3.10.0 and deps
This commit is contained in:
Jörg Thalheim 2018-03-03 17:33:14 +00:00 committed by GitHub
parent d586f5d97e abc93b0a2b
commit 691d18212b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/libwhereami/default.nix
View file

@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
name = "libwhereami-${version}";
version = "0.1.3";
version = "0.2.0";
src = fetchFromGitHub {
sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6";
sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr";
rev = version;
repo = "libwhereami";
owner = "puppetlabs";
};
# post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated";
nativeBuildInputs = [ cmake ];
buildInputs = [ boost curl leatherman ];

5
pkgs/tools/system/facter/default.nix
View file

@ -2,17 +2,16 @@
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.9.3";
version = "3.10.0";
src = fetchFromGitHub {
sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj";
sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792";
rev = version;
repo = "facter";
owner = "puppetlabs";
};
CXXFLAGS = "-fpermissive";
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = "-lblkid";
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];