From a5460536647fdb421d89f87a23724893426004f6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Sep 2019 16:54:15 -0500 Subject: [PATCH 1/2] cpustat: init at 0.02.09 --- pkgs/os-specific/linux/cpustat/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/cpustat/default.nix diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix new file mode 100644 index 000000000000..8c0d206a8d1c --- /dev/null +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "cpustat"; + version = "0.02.09"; + src = fetchurl { + url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; + sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y"; + }; + buildInputs = [ ncurses ]; + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man/man8" + ]; + meta = with lib; { + description = "CPU usage monitoring tool"; + homepage = "https://kernel.ubuntu.com/~cking/cpustat/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7668880edbf2..5782a52f659d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15408,6 +15408,8 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ From d0c6414938ee183e5df0f5136a1e66da5b4b148e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Sep 2019 22:16:37 -0500 Subject: [PATCH 2/2] cpustat: newlines between (most) attributes Exception is made for pname/version as is convention. --- pkgs/os-specific/linux/cpustat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix index 8c0d206a8d1c..23ed2b07c966 100644 --- a/pkgs/os-specific/linux/cpustat/default.nix +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -3,15 +3,19 @@ stdenv.mkDerivation rec { pname = "cpustat"; version = "0.02.09"; + src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y"; }; + buildInputs = [ ncurses ]; + installFlags = [ "BINDIR=${placeholder "out"}/bin" "MANDIR=${placeholder "out"}/share/man/man8" ]; + meta = with lib; { description = "CPU usage monitoring tool"; homepage = "https://kernel.ubuntu.com/~cking/cpustat/";