From 0bef709e874a1371928ee3a82ce3ce785b9de1aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 May 2024 16:32:30 +0000
Subject: [PATCH 1/2] glances: 4.0.6 -> 4.0.7

---
 pkgs/applications/system/glances/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index fb0ba1595526..7b2397d2ee3f 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "4.0.6";
+  version = "4.0.7";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FkAMsfr/bO7Chemw4hhVt2SKkSyPLECNVuOsOxKWsGE=";
+    hash = "sha256-Vfsco8Wno57aPM7PtwCc/gI+6FnAG3H/t5OAUngDU5o=";
   };
 
   # On Darwin this package segfaults due to mismatch of pure and impure

From 1c8e6101197b0e3895ebdb4fbd967ea18f3875c3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 May 2024 02:41:34 +0200
Subject: [PATCH 2/2] glances: reformat and update dependencies

---
 pkgs/applications/system/glances/default.nix | 53 +++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 7b2397d2ee3f..69a94efbbd8a 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -1,10 +1,27 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
-, defusedxml, future, ujson, packaging, psutil, setuptools
-# Optional dependencies:
-, bottle, pysnmp
-, hddtemp
-, netifaces # IP module
-, py-cpuinfo
+{
+  stdenv,
+  buildPythonApplication,
+  fetchFromGitHub,
+  isPyPy,
+  lib,
+  defusedxml,
+  future,
+  ujson,
+  packaging,
+  psutil,
+  setuptools,
+  pydantic,
+  # Optional dependencies:
+  fastapi,
+  jinja2,
+  orjson,
+  pysnmp,
+  hddtemp,
+  netifaces, # IP module
+  py-cpuinfo,
+  uvicorn,
+  requests,
+  prometheus-client,
 }:
 
 buildPythonApplication rec {
@@ -24,7 +41,9 @@ buildPythonApplication rec {
   # scripts a workaround below is still required.
   # Relevant: https://github.com/NixOS/nixpkgs/issues/24693
   makeWrapperArgs = lib.optionals stdenv.isDarwin [
-    "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks"
+    "--set"
+    "DYLD_FRAMEWORK_PATH"
+    "/System/Library/Frameworks"
   ];
 
   doCheck = true;
@@ -33,7 +52,6 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    bottle
     defusedxml
     future
     ujson
@@ -43,14 +61,25 @@ buildPythonApplication rec {
     pysnmp
     setuptools
     py-cpuinfo
+    pydantic
+    fastapi
+    uvicorn
+    requests
+    jinja2
+    orjson
+    prometheus-client
   ] ++ lib.optional stdenv.isLinux hddtemp;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://nicolargo.github.io/glances/";
     description = "Cross-platform curses-based monitoring tool";
     mainProgram = "glances";
     changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ jonringer primeos koral ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
+      jonringer
+      primeos
+      koral
+    ];
   };
 }