diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
| commit | 217cf982c754f1e8506e180551c73f57c04aed7f (patch) | |
| tree | b816e2671be3cc3d22f165cbf593bb5cce3c4173 /pkgs/tools/system | |
| parent | ab77ea0bf25dd1f193c8dd078ef7e90523366135 (diff) | |
| parent | f9021cc12980370f60cce54ec899b11aebb5ed0b (diff) | |
| download | nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.gz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.bz2 nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.lz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.xz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.zst nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/fio/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/stress-ng/default.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 5a690b288450..b6ad10ec6454 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9"; + sha256 = "10ygvmzsrqh2bs8v0a304gkl8h50437xfaz1ck7j2ymckipnbha0"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 9a9879d55641..7f7ce425fa77 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 @@ -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 |