From 00b4c08d77129aa91bf05ca23fbbd689079d3705 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 3 Nov 2025 20:33:22 +0000 Subject: [PATCH] gnu: glances: Move to monitoring. * gnu/packages/python-xyz.scm (glances): Move from here ... * gnu/packages/monitoring.scm: ... to here. Change-Id: Ifa7c9e448c914fed63533db7cdfe2236c6315553 --- gnu/packages/monitoring.scm | 57 +++++++++++++++++++++++++++++++++++-- gnu/packages/python-xyz.scm | 43 ---------------------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 8ddbdc255f6..3a112e529de 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2021, 2021 Ludovic Courtès +;;; Copyright © 2016, 2021 Stefan Reichör ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice @@ -8,14 +9,16 @@ ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2021, 2022 Marius Bakke -;;; Copyright © 2021 Stefan Reichör -;;; Copyright © 2021 Raphaël Mélotte +;;; Copyright © 2021, 2023 Raphaël Mélotte +;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Hartmut Goebel ;;; Copyright © 2022 ( ;;; Copyright © 2022 Mathieu Laparie +;;; Copyright © 2024 Ada Stevenson ;;; Copyright © 2025 Nicolas Graves ;;; Copyright © 2025 Giacomo Leidi +;;; Copyright © 2025 Christian Birk Sørensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,7 +82,55 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages time) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) + +(define-public glances + (package + (name "glances") + (version "4.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicolargo/glances") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v2rsffy99ilarl5vnsz4zwb0wp3s3jnsbcbiqx53qxv88whfz71")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "unittest-core.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-update-checks + (lambda _ + ;; Glances phones PyPI for weekly update checks by default. + ;; Disable these. The user can re-enable them if desired. + (substitute* "glances/outdated.py" + (("^(.*)self\\.load_config\\(config\\)\n" line indentation) + (string-append indentation + "self.args.disable_check_update = True\n" line)))))))) + (native-inputs + (list python-pytest + python-setuptools)) + (propagated-inputs + (list python-defusedxml + python-jinja2 + python-orjson + python-packaging + python-psutil + python-shtab)) + (home-page "https://github.com/nicolargo/glances") + (synopsis "Cross-platform curses-based monitoring tool") + (description + "Glances is a curses-based monitoring tool for a wide variety of +platforms. Glances uses the PsUtil library to get information from your +system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, +and more.") + (license license:lgpl3+))) (define-public nagios (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a58df67a5f9..29d9c9b4b39 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23640,49 +23640,6 @@ numbers, real numbers, mixed types and more, and comes with a shell command @command{natsort} that exposes this functionality in the command line.") (license license:expat))) -(define-public glances - (package - (name "glances") - (version "4.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nicolargo/glances") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1v2rsffy99ilarl5vnsz4zwb0wp3s3jnsbcbiqx53qxv88whfz71")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-backend #~'custom - #:test-flags #~(list "unittest-core.py") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-update-checks - (lambda _ - ;; Glances phones PyPI for weekly update checks by default. - ;; Disable these. The user can re-enable them if desired. - (substitute* "glances/outdated.py" - (("^(.*)self\\.load_config\\(config\\)\n" line indentation) - (string-append indentation - "self.args.disable_check_update = True\n" line)))))))) - (native-inputs (list python-pytest python-setuptools)) - (propagated-inputs (list python-defusedxml - python-jinja2 - python-orjson - python-packaging - python-psutil - python-shtab)) - (home-page "https://github.com/nicolargo/glances") - (synopsis "Cross-platform curses-based monitoring tool") - (description - "Glances is a curses-based monitoring tool for a wide variety of platforms. - Glances uses the PsUtil library to get information from your system. It - monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") - (license license:lgpl3+))) - (define-public python-graphql-core (package (name "python-graphql-core")