From 0d600ae89e61e726b04095a2a0f8ec45586b6b77 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Apr 2019 12:26:05 -0500 Subject: [PATCH 1/3] numatop: init at 2.1 --- pkgs/os-specific/linux/numatop/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/numatop/default.nix diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix new file mode 100644 index 00000000000..51d3e4c6d2e --- /dev/null +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: + +stdenv.mkDerivation rec { + pname = "numatop"; + version = "2.1"; + src = fetchurl { + url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; + sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ numactl ncurses ]; + checkInputs = [ check ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "observation tool for runtime memory locality characterization and analysis of processes and threads running on a NUMA system"; + homepage = https://01.org/numatop; + license = licenses.bsd3; + maintainers = with maintainers; [ dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e70651de84c..89e2232330b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1607,6 +1607,8 @@ in long-shebang = callPackage ../misc/long-shebang {}; + numatop = callPackage ../os-specific/linux/numatop { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; From 50fc2e7382ce8ff21a65a44806680d9ef3a2ac97 Mon Sep 17 00:00:00 2001 From: markuskowa Date: Sun, 14 Apr 2019 16:04:40 -0500 Subject: [PATCH 2/3] numatop: improve description, as suggested during review (ty!) Co-Authored-By: dtzWill --- pkgs/os-specific/linux/numatop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 51d3e4c6d2e..c41510f4f88 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "observation tool for runtime memory locality characterization and analysis of processes and threads running on a NUMA system"; + description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; homepage = https://01.org/numatop; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; From 49ed37b4f31e407804efe06a6d43bd1f9bcb8b85 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Apr 2019 08:01:36 -0500 Subject: [PATCH 3/3] numatop: platforms --- pkgs/os-specific/linux/numatop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index c41510f4f88..80f14b568ed 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { homepage = https://01.org/numatop; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; - platforms = stdenv.lib.platforms.all; + platforms = [ + { kernel.name = "linux"; cpu.family = "x86"; } + { kernel.name = "linux"; cpu.family = "power"; } + ]; }; }