Merge pull request #134200 from primeos/security-backports-for-21.05
[21.05] glances: 3.1.7 -> 3.2.3
This commit is contained in:
commit
543d4ecac2
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
|
||||
, future, psutil, setuptools
|
||||
, defusedxml, future, psutil, setuptools
|
||||
# Optional dependencies:
|
||||
, bottle, pysnmp
|
||||
, hddtemp
|
||||
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.1.7";
|
||||
version = "3.2.3";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-82ZD32dqRYGbGM/uyaJ5VqVZbhDZthiEcTihkV43JOU=";
|
||||
sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr";
|
||||
};
|
||||
|
||||
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
|
||||
|
@ -37,6 +37,7 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
bottle
|
||||
defusedxml
|
||||
future
|
||||
netifaces
|
||||
psutil
|
||||
|
@ -48,7 +49,7 @@ buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://nicolargo.github.io/glances/";
|
||||
description = "Cross-platform curses-based monitoring tool";
|
||||
changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}";
|
||||
changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ jonringer primeos koral ];
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue