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

Merge pull request #28010 from womfoo/bump/facter-3.7.1

Browse Source 
facter: 3.6.6 -> 3.7.1 and related deps
This commit is contained in:
Wout Mertens 2017-08-07 18:32:03 +02:00 committed by GitHub
commit ba203e40a6
3 changed files with 7 additions and 10 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 { stdenv.mkDerivation rec {
name = "leatherman-${version}"; name = "leatherman-${version}";
version = "0.11.2"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y";
rev = version; rev = version;
repo = "leatherman"; repo = "leatherman";
owner = "puppetlabs"; owner = "puppetlabs";

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "facter-${version}"; name = "facter-${version}";
version = "3.6.6"; version = "3.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins"; sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a";
rev = version; rev = version;
repo = "facter"; repo = "facter";
owner = "puppetlabs"; owner = "puppetlabs";
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
CXXFLAGS = "-fpermissive"; CXXFLAGS = "-fpermissive";
NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = "-lblkid";
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];

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

@ -1001,9 +1001,7 @@ with pkgs;
facedetect = callPackage ../tools/graphics/facedetect { }; facedetect = callPackage ../tools/graphics/facedetect { };
facter = callPackage ../tools/system/facter { facter = callPackage ../tools/system/facter { };
boost = boost160;
};
fasd = callPackage ../tools/misc/fasd { }; fasd = callPackage ../tools/misc/fasd { };
@ -2942,9 +2940,7 @@ with pkgs;
leafpad = callPackage ../applications/editors/leafpad { }; leafpad = callPackage ../applications/editors/leafpad { };
leatherman = callPackage ../development/libraries/leatherman { leatherman = callPackage ../development/libraries/leatherman { };
boost = boost160;
};
leela = callPackage ../tools/graphics/leela { }; leela = callPackage ../tools/graphics/leela { };