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: 6b4633884789
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cbc94a05ba43
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 31, 2019

  1. stress-ng: 0.10.05 -> 0.10.08 (#72333) 

    + fixes #72292
    @c0bw3b
    c0bw3b authored Oct 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cbc94a0 View commit details
Showing with 14 additions and 9 deletions.
  1. +14 −9 pkgs/tools/system/stress-ng/default.nix
23 changes: 14 additions & 9 deletions pkgs/tools/system/stress-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
{ stdenv, fetchurl
, attr, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib
, attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib
}:

stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.10.05";
version = "0.10.08";

src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "0hkghs99fl8kzg3lkkd4w6cj5133zr9a415py0ng60kzrfffmgdy";
sha256 = "1kkmznn0y5wxi7x9nlhzyfy933bv66113in4rf0raw6brymympaa";
};

postPatch = ''
sed -i '/\#include <bsd\/string.h>/i #undef HAVE_STRLCAT\n#undef HAVE_STRLCPY' stress-ng.h
''; # needed because of Darwin patch on libbsd

# All platforms inputs then Linux-only ones
buildInputs = [ libbsd libgcrypt zlib ]
buildInputs = [ judy libbsd libgcrypt zlib ]
++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [
attr keyutils libaio libapparmor libcap lksctp-tools
];

postPatch = ''
substituteInPlace Makefile --replace "/usr" ""
'';
makeFlags = [
"BINDIR=${placeholder "out"}/bin"
"MANDIR=${placeholder "out"}/share/man/man1"
"JOBDIR=${placeholder "out"}/share/stress-ng/example-jobs"
"BASHDIR=${placeholder "out"}/share/bash-completion/completions"
];

NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";

@@ -29,8 +36,6 @@ stdenv.mkDerivation rec {
# mystery, though. :-(
enableParallelBuilding = (!stdenv.isi686);

installFlags = [ "DESTDIR=${placeholder "out"}" ];

meta = with stdenv.lib; {
description = "Stress test a computer system";
longDescription = ''