From 36c93db4f1b1536c4cae70374cafe32caf5dcdbf Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 6 May 2025 22:27:27 +0000 Subject: [PATCH] auto-cpufreq: 2.5.0 -> 2.6.0 --- pkgs/by-name/au/auto-cpufreq/package.nix | 15 +++++-------- .../au/auto-cpufreq/prevent-update.patch | 22 ------------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index 595d5e34591d..71899abad4ed 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch, replaceVars, gobject-introspection, wrapGAppsHook3, @@ -12,14 +11,14 @@ }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = "auto-cpufreq"; tag = "v${version}"; - hash = "sha256-iDvgL5dQerQnu2ERKAWGvWppG7cQ/0uKEfVY93ItvO4="; + hash = "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA="; }; nativeBuildInputs = [ @@ -42,6 +41,9 @@ python3Packages.buildPythonPackage rec { poetry-dynamic-versioning setuptools pyinotify + urwid + pyasyncore + requests ] ++ [ getent ]; @@ -58,13 +60,6 @@ python3Packages.buildPythonPackage rec { ./prevent-install-and-copy.patch # patch to prevent update ./prevent-update.patch - - # ps-util python package bounds are too strict for version 2.5.0 - (fetchpatch { - name = "auto-cpufreq-2.5.0-ps-util-relax-constraints.patch"; - url = "https://github.com/AdnanHodzic/auto-cpufreq/commit/8f026ac6497050c0e07c55b751c4b80401e932ec.patch"; - sha256 = "sha256-hcEcuy7oW4fZgfOLSap3pnWk7H1Q757tgfl7HIUyWiM="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/au/auto-cpufreq/prevent-update.patch b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch index b9119540b80f..909724b83573 100644 --- a/pkgs/by-name/au/auto-cpufreq/prevent-update.patch +++ b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch @@ -111,25 +111,3 @@ index b51d55d..99eeed8 100755 def new_update(custom_dir): os.chdir(custom_dir) -diff --git c/poetry.lock i/poetry.lock -index 0e6da84..b4936fe 100644 ---- c/poetry.lock -+++ i/poetry.lock -@@ -1306,4 +1306,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it - [metadata] - lock-version = "2.0" - python-versions = "^3.8" --content-hash = "cad3783d04e35b66b241352e76631d0a83c8df3d286b113979ba34a65847f06c" -+content-hash = "b21af52156d2d624602fe6941cf001abd7f8cf5b70b22ebfd7b7ad0dece1e39f" -diff --git c/pyproject.toml i/pyproject.toml -index 562a94b..cc44d8d 100644 ---- c/pyproject.toml -+++ i/pyproject.toml -@@ -25,7 +25,6 @@ python = "^3.8" - psutil = "^6.0.0" - click = "^8.1.0" - distro = "^1.8.0" --requests = "^2.32.3" - PyGObject = "^3.46.0" - pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"} -