From 9be97b77e1b3ba0959a175af509d8d3f97643522 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 01:00:27 +0000 Subject: [PATCH 1/2] cpustat: 0.02.19 -> 0.02.20 --- pkgs/os-specific/linux/cpustat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix index 3fb0e8e123a9..b243a1d55f71 100644 --- a/pkgs/os-specific/linux/cpustat/default.nix +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpustat"; - version = "0.02.19"; + version = "0.02.20"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-MujdgA+rFLrRc/N9yN7udnarA1TCzX//95hoXTUHG8Q="; + hash = "sha256-cdHoo2esm772q782kb7mwRwlPXGDNNLHJRbd2si5g7k="; }; buildInputs = [ ncurses ]; From 6413c84519f4820ffd37b22cbe7421767f96d2db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Mar 2024 09:34:43 +0100 Subject: [PATCH 2/2] cpustat: refactor - specify license --- pkgs/os-specific/linux/cpustat/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix index b243a1d55f71..84a4fc53933e 100644 --- a/pkgs/os-specific/linux/cpustat/default.nix +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, ncurses }: +{ lib +, stdenv +, fetchFromGitHub +, ncurses +}: stdenv.mkDerivation rec { pname = "cpustat"; @@ -6,12 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ColinIanKing"; - repo = pname; - rev = "V${version}"; + repo ="cpustat"; + rev = "refs/tags/V${version}"; hash = "sha256-cdHoo2esm772q782kb7mwRwlPXGDNNLHJRbd2si5g7k="; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + ]; installFlags = [ "BINDIR=${placeholder "out"}/bin" @@ -21,10 +27,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CPU usage monitoring tool"; - mainProgram = "cpustat"; homepage = "https://github.com/ColinIanKing/cpustat"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "cpustat"; }; }