Merge pull request #184196 from rhoriguchi/glances

glances: 3.2.6.4 -> 3.2.7
This commit is contained in:
superherointj
2022-08-03 05:01:42 -03:00
committed by GitHub
+2 -15
View File
@@ -9,29 +9,16 @@
buildPythonApplication rec {
pname = "glances";
version = "3.2.6.4";
version = "3.2.7";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "sha256-i88bz6AwfDbqC+7yvr7uDofAqBwQmnfoKbt3iJz4Ft8=";
sha256 = "sha256-WZDvC95Y6Xc7dOuPJJlJLI4PCZR76pYPl8NGtmxe91o=";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch
++ lib.optional (doCheck && stdenv.isDarwin)
[
# Fix "TypeError: unsupported operand type(s) for +=: 'int' and 'NoneType'" on darwin
# https://github.com/nicolargo/glances/pull/2082
(fetchpatch {
name = "fix-typeerror-when-testing-on-darwin.patch";
url = "https://patch-diff.githubusercontent.com/raw/nicolargo/glances/pull/2082.patch";
sha256 = "sha256-MIePPywZ2dTTqXjf7EJiHlQ7eltiHzgocqrnLeLJwZ4=";
})
];
# On Darwin this package segfaults due to mismatch of pure and impure
# CoreFoundation. This issues was solved for binaries but for interpreted
# scripts a workaround below is still required.