From e76c6e280cf106fe69388e919b7702d2a37f01d1 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 17 Nov 2018 16:21:00 +0100 Subject: [PATCH] stress-ng: 0.06.14 -> 0.09.46 --- pkgs/tools/system/stress-ng/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 22080db908c..57f2d60ddf5 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,15 +1,21 @@ -{ stdenv, fetchurl, attr, keyutils }: +{ stdenv, fetchurl +, attr, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib +}: stdenv.mkDerivation rec { name = "stress-ng-${version}"; - version = "0.06.14"; + version = "0.09.46"; src = fetchurl { - sha256 = "06kycxfwkdrm2vs9xk8cb6c1mki29ymrrqwwxxqx4icnwvq135hv"; - url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; + url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz"; + sha256 = "0m1f46vqixx2mgqdrjwkl8w9did7n99sy96rbcgkkn9g99y59qjm"; }; - buildInputs = [ attr keyutils ]; + # All platforms inputs then Linux-only ones + buildInputs = [ libbsd libgcrypt zlib ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ + attr keyutils libaio libapparmor libcap lksctp-tools + ]; patchPhase = '' substituteInPlace Makefile --replace "/usr" "" @@ -36,9 +42,10 @@ stdenv.mkDerivation rec { hardware issues such as thermal overruns as well as operating system bugs that only occur when a system is being thrashed hard. ''; - homepage = http://kernel.ubuntu.com/~cking/stress-ng; + homepage = http://kernel.ubuntu.com/~cking/stress-ng/; downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with maintainers; [ c0bw3b ]; + platforms = platforms.linux; # TODO: fix https://github.com/NixOS/nixpkgs/pull/50506#issuecomment-439635963 }; }