Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
364 changed files with 8989 additions and 6877 deletions

View File

@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "glances";
version = "3.1.1";
version = "3.1.2";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "1x9gw7hzw3p8zki82wdf359yxj0ylfw2096a4y621kj0p4xqsr4q";
sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):