Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

glances: 3.1.3 -> 3.1.4

authored by Michael Weiss and committed by Alyssa Ross 152dddaa 2f41d464

+4 -24
+4 -16
pkgs/applications/system/glances/default.nix
··· 8 8 9 9 buildPythonApplication rec { 10 10 pname = "glances"; 11 - version = "3.1.3"; 11 + version = "3.1.4"; 12 12 disabled = isPyPy; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "nicolargo"; 16 16 repo = "glances"; 17 17 rev = "v${version}"; 18 - sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp"; 18 + sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi"; 19 19 }; 20 20 21 21 # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): 22 - patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch 23 - ++ [ 24 - (fetchpatch { 25 - # Correct unitest 26 - url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; 27 - sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; 28 - }) 29 - 30 - (fetchpatch { 31 - # Fix IP plugin initialization issue 32 - url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch"; 33 - sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9"; 34 - }) 35 - ]; 22 + patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch; 36 23 37 24 # On Darwin this package segfaults due to mismatch of pure and impure 38 25 # CoreFoundation. This issues was solved for binaries but for interpreted ··· 64 51 meta = with lib; { 65 52 homepage = "https://nicolargo.github.io/glances/"; 66 53 description = "Cross-platform curses-based monitoring tool"; 54 + changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}"; 67 55 license = licenses.lgpl3; 68 56 maintainers = with maintainers; [ jonringer primeos koral ]; 69 57 };
-8
pkgs/applications/system/glances/skip-failing-tests.patch
··· 50 50 def test_006_swap(self): 51 51 """Check MEMSWAP plugin.""" 52 52 stats_to_check = ['used', 'free', 'total'] 53 - @@ -191,6 +196,7 @@ class TestGlances(unittest.TestCase): 54 - self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list') 55 - print('INFO: Folders stats: %s' % stats_grab) 56 - 57 - + @unittest.skip("Fails on NixOS (TODO)") 58 - def test_012_ip(self): 59 - """Check IP plugin.""" 60 - print('INFO: [TEST_012] Check IP stats')