Skip to content

Commit 7346ad4

Browse files
authored
glances: 4.2.1 -> 4.3.0.6 (#369699)
2 parents cfb7f26 + 303b44d commit 7346ad4

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

pkgs/applications/system/glances/default.nix

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,40 @@
33
buildPythonApplication,
44
fetchFromGitHub,
55
isPyPy,
6+
pythonOlder,
67
lib,
78
defusedxml,
89
packaging,
910
psutil,
1011
setuptools,
11-
pydantic,
1212
nixosTests,
13+
pytestCheckHook,
14+
which,
15+
podman,
16+
selenium,
1317
# Optional dependencies:
1418
fastapi,
1519
jinja2,
1620
pysnmp,
1721
hddtemp,
18-
netifaces, # IP module
22+
netifaces2, # IP module
1923
uvicorn,
2024
requests,
2125
prometheus-client,
2226
}:
2327

2428
buildPythonApplication rec {
2529
pname = "glances";
26-
version = "4.2.1";
30+
version = "4.3.0.6";
2731
pyproject = true;
2832

29-
disabled = isPyPy;
33+
disabled = isPyPy || pythonOlder "3.9";
3034

3135
src = fetchFromGitHub {
3236
owner = "nicolargo";
3337
repo = "glances";
3438
tag = "v${version}";
35-
hash = "sha256-8Jm6DE3B7OQkaNwX/KwXMNZHUyvPtln8mJYaD6yzJRM=";
39+
hash = "sha256-r4wDuV7WS3BQ5hidp2x6JqvHQLf6FchoHisMMEye1PM=";
3640
};
3741

3842
build-system = [ setuptools ];
@@ -50,31 +54,36 @@ buildPythonApplication rec {
5054
# some tests fail in darwin sandbox
5155
doCheck = !stdenv.hostPlatform.isDarwin;
5256

53-
checkPhase = ''
54-
runHook preCheck
55-
56-
python unittest-core.py
57-
58-
runHook postCheck
59-
'';
60-
6157
dependencies = [
6258
defusedxml
63-
netifaces
59+
netifaces2
6460
packaging
6561
psutil
6662
pysnmp
6763
fastapi
6864
uvicorn
6965
requests
7066
jinja2
67+
which
7168
prometheus-client
7269
] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
7370

7471
passthru.tests = {
7572
service = nixosTests.glances;
7673
};
7774

75+
nativeCheckInputs = [
76+
which
77+
pytestCheckHook
78+
selenium
79+
podman
80+
];
81+
82+
disabledTestPaths = [
83+
# Message: Unable to obtain driver for chrome
84+
"tests/test_webui.py"
85+
];
86+
7887
meta = {
7988
homepage = "https://nicolargo.github.io/glances/";
8089
description = "Cross-platform curses-based monitoring tool";

0 commit comments

Comments
 (0)