From 1d344d6d6477c906f926f0a1378c0ef8dc18278c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 6 Nov 2022 20:43:09 +0100 Subject: [PATCH 1/2] nvtop: 2.0.4 -> 3.0.1 --- pkgs/tools/system/nvtop/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 621d51a4a55c..97712207467b 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , cudatoolkit @@ -10,6 +9,7 @@ , addOpenGLRunpath , amd ? true , nvidia ? true +, udev }: let @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "nvtop" + pname-suffix; - version = "2.0.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "sha256-WOXVmKnVNRjWqShbOUZ0Z4hd0m9njLmCGLnV9FBS3Us="; + hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; }; cmakeFlags = with lib; [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; - buildInputs = with lib; [ ncurses ] + buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit ++ optional amd libdrm ; @@ -55,12 +55,13 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A (h)top like task monitor for AMD and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; - license = licenses.gpl3; + changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ willibutz gbtb ]; mainProgram = "nvtop"; From 22a77842fcb38137fdc16438df4d95712cb4705c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 6 Nov 2022 20:42:37 +0100 Subject: [PATCH 2/2] nvtop: add anthonyroussel to maintainers --- pkgs/tools/system/nvtop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 97712207467b..053437dc3e95 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ willibutz gbtb ]; + maintainers = with maintainers; [ willibutz gbtb anthonyroussel ]; mainProgram = "nvtop"; }; }