pyrox.dev
Merge pull request #36241 from womfoo/bump/facter-3.10.0-and-deps
facter: 3.9.3 -> 3.10.0 and deps
authored by
Jörg Thalheim
and committed by
GitHub
691d1821
d586f5d9
+5
-2
pkgs/development/libraries/libwhereami/default.nix
+5
-2
pkgs/development/libraries/libwhereami/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "libwhereami-${version}";
5
-
version = "0.1.3";
5
+
version = "0.2.0";
6
6
7
7
src = fetchFromGitHub {
8
-
sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6";
8
+
sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr";
9
9
rev = version;
10
10
repo = "libwhereami";
11
11
owner = "puppetlabs";
12
12
};
13
+
14
+
# post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828
15
+
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated";
13
16
14
17
nativeBuildInputs = [ cmake ];
15
18
+2
-3
pkgs/tools/system/facter/default.nix
+2
-3
pkgs/tools/system/facter/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "facter-${version}";
5
-
version = "3.9.3";
5
+
version = "3.10.0";
6
6
7
7
src = fetchFromGitHub {
8
-
sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj";
8
+
sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792";
9
9
rev = version;
10
10
repo = "facter";
11
11
owner = "puppetlabs";
12
12
};
13
13
14
14
CXXFLAGS = "-fpermissive";
15
-
NIX_CFLAGS_COMPILE = "-Wno-error";
16
15
NIX_LDFLAGS = "-lblkid";
17
16
18
17
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];