From 152dddaa8f3e63fc70eeef078d8aa24e39bd3c10 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 11 Mar 2020 16:20:27 +0100
Subject: [PATCH] glances: 3.1.3 -> 3.1.4

---
 pkgs/applications/system/glances/default.nix  | 20 ++++---------------
 .../system/glances/skip-failing-tests.patch   |  8 --------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 946cc1125863..a7dffd0bfab6 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -8,31 +8,18 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.1.3";
+  version = "3.1.4";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp";
+    sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi";
   };
 
   # 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
-    ++ [
-      (fetchpatch {
-        # Correct unitest
-        url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch";
-        sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1";
-      })
-
-      (fetchpatch {
-        # Fix IP plugin initialization issue
-        url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch";
-        sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9";
-      })
-    ];
+  patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch;
 
   # On Darwin this package segfaults due to mismatch of pure and impure
   # CoreFoundation. This issues was solved for binaries but for interpreted
@@ -64,6 +51,7 @@ buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://nicolargo.github.io/glances/";
     description = "Cross-platform curses-based monitoring tool";
+    changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jonringer primeos koral ];
   };
diff --git a/pkgs/applications/system/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch
index e3116af6a2c2..f47f1218aea5 100644
--- a/pkgs/applications/system/glances/skip-failing-tests.patch
+++ b/pkgs/applications/system/glances/skip-failing-tests.patch
@@ -50,11 +50,3 @@ diff --git a/unitest.py b/unitest.py
      def test_006_swap(self):
          """Check MEMSWAP plugin."""
          stats_to_check = ['used', 'free', 'total']
-@@ -191,6 +196,7 @@ class TestGlances(unittest.TestCase):
-         self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list')
-         print('INFO: Folders stats: %s' % stats_grab)
- 
-+    @unittest.skip("Fails on NixOS (TODO)")
-     def test_012_ip(self):
-         """Check IP plugin."""
-         print('INFO: [TEST_012] Check IP stats')