From 5e17ee31b14b2ca1314ffb30c054fe53aaa24962 Mon Sep 17 00:00:00 2001
From: shadeyg56 <shadeyg56@gmail.com>
Date: Tue, 9 Apr 2024 23:57:05 -0500
Subject: [PATCH] update psutil to patched Git version Fixes #654

---
 nix/default.nix | 13 ++++++++++++-
 poetry.lock     | 32 ++++++++++++--------------------
 pyproject.toml  |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index df95ebda..562d67a2 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,7 +2,18 @@
   lib,
   python310Packages,
   pkgs,
+  fetchFromGitHub,
 }:
+let
+  psutilGit = python310Packages.psutil.overrideAttrs (oldAttrs: {
+    src = fetchFromGitHub {
+      owner = "giampaolo";
+      repo = "psutil";
+      rev = "4cf56e08c1bc883ec89758834b50954380759858";
+      sha256 = "61JwXP/cZrXqdBnb2J0kdDJoKpltO62KcpM0sYX6g1A=";
+    };
+  });
+in
 python310Packages.buildPythonPackage {
   # use pyproject.toml instead of setup.py
   format = "pyproject";
@@ -15,7 +26,7 @@ python310Packages.buildPythonPackage {
 
   buildInputs = with pkgs; [gtk3 python310Packages.poetry-core];
 
-  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutil setuptools poetry-dynamic-versioning];
+  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutilGit setuptools poetry-dynamic-versioning];
 
   doCheck = false;
   pythonImportsCheck = ["auto_cpufreq"];
diff --git a/poetry.lock b/poetry.lock
index 88629f3f..b3e8dc00 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "attrs"
@@ -796,30 +796,22 @@ poetry-core = ">=1.6.0,<2.0.0"
 
 [[package]]
 name = "psutil"
-version = "5.9.5"
+version = "5.9.8"
 description = "Cross-platform lib for process and system monitoring in Python."
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-files = [
-    {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"},
-    {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"},
-    {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"},
-    {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"},
-    {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"},
-    {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"},
-    {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"},
-    {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"},
-    {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"},
-    {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"},
-    {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"},
-    {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"},
-    {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"},
-    {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"},
-]
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = []
+develop = false
 
 [package.extras]
 test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
 
+[package.source]
+type = "git"
+url = "https://github.com/giampaolo/psutil.git"
+reference = "4cf56e08c1bc883ec89758834b50954380759858"
+resolved_reference = "4cf56e08c1bc883ec89758834b50954380759858"
+
 [[package]]
 name = "ptyprocess"
 version = "0.7.0"
@@ -1293,4 +1285,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "88a745c11c7890867d0cf645825882d41ba49f1819d490faf3e370590c7cf78a"
+content-hash = "e3f4ec63d598a563c21fca6d7c885183baf257663537ca010dec33674163b175"
diff --git a/pyproject.toml b/pyproject.toml
index 4800d55a..e7ffc29f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-psutil = "^5.9.5"
+psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"}
 click = "^8.1.0"
 distro = "^1.8.0"
 requests = "^2.31.0"