diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index fb0ba1595526..69a94efbbd8a 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,22 +1,39 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib -, defusedxml, future, ujson, packaging, psutil, setuptools -# Optional dependencies: -, bottle, pysnmp -, hddtemp -, netifaces # IP module -, py-cpuinfo +{ + stdenv, + buildPythonApplication, + fetchFromGitHub, + isPyPy, + lib, + defusedxml, + future, + ujson, + packaging, + psutil, + setuptools, + pydantic, + # Optional dependencies: + fastapi, + jinja2, + orjson, + pysnmp, + hddtemp, + netifaces, # IP module + py-cpuinfo, + uvicorn, + requests, + prometheus-client, }: buildPythonApplication rec { pname = "glances"; - version = "4.0.6"; + version = "4.0.7"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-FkAMsfr/bO7Chemw4hhVt2SKkSyPLECNVuOsOxKWsGE="; + hash = "sha256-Vfsco8Wno57aPM7PtwCc/gI+6FnAG3H/t5OAUngDU5o="; }; # On Darwin this package segfaults due to mismatch of pure and impure @@ -24,7 +41,9 @@ buildPythonApplication rec { # scripts a workaround below is still required. # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 makeWrapperArgs = lib.optionals stdenv.isDarwin [ - "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" + "--set" + "DYLD_FRAMEWORK_PATH" + "/System/Library/Frameworks" ]; doCheck = true; @@ -33,7 +52,6 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - bottle defusedxml future ujson @@ -43,14 +61,25 @@ buildPythonApplication rec { pysnmp setuptools py-cpuinfo + pydantic + fastapi + uvicorn + requests + jinja2 + orjson + prometheus-client ] ++ lib.optional stdenv.isLinux hddtemp; - meta = with lib; { + meta = { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; mainProgram = "glances"; changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ jonringer primeos koral ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ + jonringer + primeos + koral + ]; }; }