From f245f537a8fcbf73ae959792a552b43fbc1c8d71 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Sat, 12 May 2018 12:51:28 -0400 Subject: [PATCH] netperf: cleanup * netperf: fix build * maintainers: add myself * netperf: add myself as maintainer * netperf: update to current git master to get bugfixes * netperf: enable-demo mode * fixup! netperf: fix build * fixup! netperf: update to current git master to get bugfixes --- maintainers/maintainer-list.nix | 5 +++++ .../networking/netperf/default.nix | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1960e3efc85..0ff1d9efb57 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2491,6 +2491,11 @@ github = "mmahut"; name = "Marek Mahut"; }; + mmlb = { + email = "me.mmlb@mmlb.me"; + github = "mmlb"; + name = "Manuel Mendez"; + }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index fe58b1d3e28..421a3cfbe3b 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-2.7.0"; + name = "netperf-20180504"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = name; - sha256 = "034indn3hicwbvyzgw9f32bv2i7c5iv8b4a11imyn03pw97jzh10"; + rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab"; + sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; }; + buildInputs = [ libsmbios ]; + nativeBuildInputs = [ autoreconfHook ]; + autoreconfPhase = '' + autoreconf -i -I src/missing/m4 + ''; + configureFlags = [ "--enable-demo" ]; + enableParallelBuilding = true; + meta = { description = "Benchmark to measure the performance of many different types of networking"; homepage = http://www.netperf.org/netperf/; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.mmlb ]; }; }