From 1c81794ebd04810568aa3fa81e1e5972ad67f4bb Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 25 Mar 2026 13:41:20 +0700 Subject: [PATCH 1/2] glances: use finalAttrs --- pkgs/applications/system/glances/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index bb99cc419eb7..91d300b13f91 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -26,7 +26,7 @@ shtab, }: -buildPythonApplication rec { +buildPythonApplication (finalAttrs: { pname = "glances"; version = "4.5.0.5"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IHgMZw+X7C/72w4vXaP37GgnhLVg7EF5/sd9QlmE0NM="; }; @@ -106,10 +106,10 @@ buildPythonApplication rec { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; mainProgram = "glances"; - changelog = "https://github.com/nicolargo/glances/blob/${src.tag}/NEWS.rst"; + changelog = "https://github.com/nicolargo/glances/blob/${finalAttrs.src.tag}/NEWS.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ koral ]; }; -} +}) From 5633be819b3662d500d7f1eb2e2b60df34f23f95 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 25 Mar 2026 14:03:56 +0700 Subject: [PATCH 2/2] glances: 4.5.0.5 -> 4.5.2 --- pkgs/applications/system/glances/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 91d300b13f91..3feb79caab1a 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, isPyPy, lib, + chevron, defusedxml, packaging, psutil, @@ -28,7 +29,7 @@ buildPythonApplication (finalAttrs: { pname = "glances"; - version = "4.5.0.5"; + version = "4.5.2"; pyproject = true; disabled = isPyPy; @@ -37,7 +38,7 @@ buildPythonApplication (finalAttrs: { owner = "nicolargo"; repo = "glances"; tag = "v${finalAttrs.version}"; - hash = "sha256-IHgMZw+X7C/72w4vXaP37GgnhLVg7EF5/sd9QlmE0NM="; + hash = "sha256-o/q/zW7lRKQg+u4XblwNIswCVIroMdeUaPTNkN8QKwo="; }; build-system = [ setuptools ]; @@ -77,6 +78,7 @@ buildPythonApplication (finalAttrs: { }; nativeCheckInputs = [ + chevron which pytestCheckHook selenium @@ -100,6 +102,8 @@ buildPythonApplication (finalAttrs: { # Test always returns 3 plugin updates, but needs >=5 to not fail # May be an upstream bug, see: https://github.com/nicolargo/glances/issues/3430 "test_perf_update" + # Upstream pipe handling currently fails under the new 4.5.2 sanitization coverage + "test_pipe" ]; meta = { @@ -110,6 +114,7 @@ buildPythonApplication (finalAttrs: { license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ koral + miniharinn ]; }; })