Skip to content

Commit e4b6440

Browse files
authored
glances: 4.3.0.6 -> 4.2.1 (#379784)
2 parents 5cba040 + 3020116 commit e4b6440

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

pkgs/applications/system/glances/default.nix

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,36 @@
33
buildPythonApplication,
44
fetchFromGitHub,
55
isPyPy,
6-
pythonOlder,
76
lib,
87
defusedxml,
98
packaging,
109
psutil,
1110
setuptools,
11+
pydantic,
1212
nixosTests,
13-
pytestCheckHook,
14-
which,
15-
podman,
16-
selenium,
1713
# Optional dependencies:
1814
fastapi,
1915
jinja2,
2016
pysnmp,
2117
hddtemp,
22-
netifaces2, # IP module
18+
netifaces, # IP module
2319
uvicorn,
2420
requests,
2521
prometheus-client,
2622
}:
2723

2824
buildPythonApplication rec {
2925
pname = "glances";
30-
version = "4.3.0.6";
26+
version = "4.2.1";
3127
pyproject = true;
3228

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

3531
src = fetchFromGitHub {
3632
owner = "nicolargo";
3733
repo = "glances";
3834
tag = "v${version}";
39-
hash = "sha256-r4wDuV7WS3BQ5hidp2x6JqvHQLf6FchoHisMMEye1PM=";
35+
hash = "sha256-8Jm6DE3B7OQkaNwX/KwXMNZHUyvPtln8mJYaD6yzJRM=";
4036
};
4137

4238
build-system = [ setuptools ];
@@ -54,36 +50,31 @@ buildPythonApplication rec {
5450
# some tests fail in darwin sandbox
5551
doCheck = !stdenv.hostPlatform.isDarwin;
5652

53+
checkPhase = ''
54+
runHook preCheck
55+
56+
python unittest-core.py
57+
58+
runHook postCheck
59+
'';
60+
5761
dependencies = [
5862
defusedxml
59-
netifaces2
63+
netifaces
6064
packaging
6165
psutil
6266
pysnmp
6367
fastapi
6468
uvicorn
6569
requests
6670
jinja2
67-
which
6871
prometheus-client
6972
] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
7073

7174
passthru.tests = {
7275
service = nixosTests.glances;
7376
};
7477

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-
8778
meta = {
8879
homepage = "https://nicolargo.github.io/glances/";
8980
description = "Cross-platform curses-based monitoring tool";

0 commit comments

Comments
 (0)