Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5cb6cbeeebef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f98c31d0f5dd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 17, 2018

  1. stress-ng: 0.06.14 -> 0.09.46

    @c0bw3b
    c0bw3b committed Nov 17, 2018
    Copy the full SHA
    e76c6e2 View commit details

  2. Merge pull request #50506 from c0bw3b/pkg/stressng 

    stress-ng: 0.06.14 -> 0.09.46
    @c0bw3b
    c0bw3b authored Nov 17, 2018
    Copy the full SHA
    f98c31d View commit details
Showing with 14 additions and 7 deletions.
  1. +14 −7 pkgs/tools/system/stress-ng/default.nix
21 changes: 14 additions & 7 deletions pkgs/tools/system/stress-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
};
}