From 3eb894e55b194e925743b445bd3e932c57f4aa3f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Sep 2019 13:02:14 -0500 Subject: [PATCH 1/2] stress-ng: 0.10.02 -> 0.10.05 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 9a9879d5564..d5b9b0fb73a 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.02"; + version = "0.10.05"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim"; + sha256 = "0hkghs99fl8kzg3lkkd4w6cj5133zr9a415py0ng60kzrfffmgdy"; }; # All platforms inputs then Linux-only ones From 31be449657de67a4593c36ef416569d4c63f97a5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Sep 2019 18:12:36 -0500 Subject: [PATCH 2/2] stress-ng: workaround kernel header SNAFU re:sysinfo, fix w/musl --- pkgs/tools/system/stress-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index d5b9b0fb73a..7f7ce425fa7 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "/usr" "" ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent # triggering the rebuild. Why this only happens on i686 remains a