auto-cpufreq: 1.9.9 -> 2.2.0 #258684

shadeyg56 · 2023-10-02T23:13:09Z

Description of changes

Closes #258208
Changelog
This update introduces a GTK gui, so several new build inputs were added to make this work, as well as copying the desktop entry file and polkit policy to the Nix store
Also adds small subtituteInPlace patches and fixed the prevent-update.patch file to work with this new update.

Things done

MikaelFangel · 2023-10-14T16:59:18Z

Closes #258208

FliegendeWurst

Running auto-cpufreq-gtk in a nix-shell results in an error:

Traceback (most recent call last):
  File "/nix/store/m6c995hay2sa1wh0yjsp3c6mmp7w0r2j-python3.10-auto-cpufreq-2.0.0/bin/..auto-cpufreq-gtk-wrapped-wrapped", line 15, in <module>
    win = ToolWindow()
  File "/nix/store/m6c995hay2sa1wh0yjsp3c6mmp7w0r2j-python3.10-auto-cpufreq-2.0.0/lib/python3.10/site-packages/auto_cpufreq/gui/app.py", line 30, in __init__
    self.load_css()
  File "/nix/store/m6c995hay2sa1wh0yjsp3c6mmp7w0r2j-python3.10-auto-cpufreq-2.0.0/lib/python3.10/site-packages/auto_cpufreq/gui/app.py", line 92, in load_css
    self.gtk_provider.load_from_file(Gio.File.new_for_path(CSS_FILE))
gi.repository.GLib.GError: gtk-css-provider-error-quark: <broken file>:1:0Failed to import: Error opening file /usr/local/share/auto-cpufreq/scripts/style.css: No such file or directory (2)

FliegendeWurst · 2023-10-18T11:04:23Z

pkgs/tools/system/auto-cpufreq/default.nix

+  postPatch = ''
+    substituteInPlace auto_cpufreq/core.py --replace '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle
+    substituteInPlace scripts/org.auto-cpufreq.pkexec.policy --replace "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq
+    '';


Suggested change

postPatch = ''

substituteInPlace auto_cpufreq/core.py --replace '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle

substituteInPlace scripts/org.auto-cpufreq.pkexec.policy --replace "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq

'';

postPatch = ''

substituteInPlace auto_cpufreq/core.py --replace '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle

substituteInPlace auto_cpufreq/gui/app.py --replace '/usr/local/share/auto-cpufreq/images/icon.png' $out/share/auto-cpufreq/images/icon.png

substituteInPlace auto_cpufreq/gui/app.py --replace '/usr/local/share/auto-cpufreq/scripts/style.css' $out/share/auto-cpufreq/scripts/style.css

substituteInPlace scripts/org.auto-cpufreq.pkexec.policy --replace "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq

'';

You can now use --replace-fail in case of unforeseen upstream changes.

pkgs/tools/system/auto-cpufreq/default.nix

+    # desktop icon
+    mkdir -p $out/share/applications
+    mkdir $out/share/pixmaps


shadeyg56 · 2023-10-18T20:41:37Z

Sorry about that. We actually identified the same issue on our repo and somebody ended up fixing it, but I forgot to include the same fix here. I just took it from the file I linked. You don't need to copy the image again since it is already copied into $out/share/pixmaps

pkgs/tools/system/auto-cpufreq/default.nix

shadeyg56 · 2023-11-14T14:47:09Z

is there any way we can get the attention of someone who can merge this?

FliegendeWurst · 2023-11-14T15:25:30Z

is there any way we can get the attention of someone who can merge this?

Yes, for example I just added the approvals label (forgot that after my last review...)

Other than that, the best place to ask for a merge would be one of the channels on Matrix.

nyabinary · 2023-11-25T17:52:49Z

Need to update this to 2.1.0 and also squash this into one commit with this message auto-cpufreq: 1.9.9 -> 2.1.0

EDIT: Also a way to disable AdnanHodzic/auto-cpufreq#587 would be very nice as well.

drupol

Hi !

Thanks for your first contribution! Welcome to the Nix family.

I've left some comments, let me know if this is clear enough.

pkgs/tools/system/auto-cpufreq/default.nix

drupol · 2023-12-03T11:54:36Z

pkgs/tools/system/auto-cpufreq/default.nix

+     # patch to prevent update
+    ./prevent-update.patch
+


This change was not necessary since the patch was already there, please revert.

What I mean is that there is no need to move this patch before ./prevent-install-and-copy.patch.
Please leave it where it was initially.
This PR should only contain the changes relevant for the update, nothing else.

shadeyg56 · 2023-12-17T23:13:09Z

Sorry for my absence. I have been quite busy with uni finals and whatnot and just got around to this.

Bumped to version 2.1.0 and fixed the patches to work with it.

@drupol I passed each dependency from pkgs, but didn't understand your second comment about the patch. All I did was move it up. I can't remember why I originally did that but I think it might be because of the order the patches needed to be applied in. I don't know, I'm not great at all the patch stuff haha.

drupol

No problem for the delay, thanks for letting us know.

I added a comment for the patch, hope it's ok.

drupol · 2023-12-18T07:28:52Z

pkgs/tools/system/auto-cpufreq/default.nix

+     # patch to prevent update
+    ./prevent-update.patch
+


What I mean is that there is no need to move this patch before ./prevent-install-and-copy.patch.
Please leave it where it was initially.
This PR should only contain the changes relevant for the update, nothing else.

drupol · 2023-12-18T09:36:04Z

pkgs/tools/system/auto-cpufreq/default.nix

+
+    # polkit policy
+    mkdir -p $out/share/polkit-1/actions
+    cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions


Do we need a specific NixOS module for this ? I guess just enabling auto-cpufreq (in environment.packages) is not enough?

Well, auto-cpufreq usually runs as a daemon/background process, so just installing the package should only provide the binaries etc. I like that it's a service.

Also, the autocpufreq-service clashes with gnome3's power management (even with the service, sadly), so automatically running the service after installing the package would maybe also not be super nice.

My question was merely how to make sure that the polkit policy is correctly used.

As an example using custom udev rules, is projecteur, as you can see, it provides an udev rule and services.udev.packages need to be enabled.

Do we need to do something similar with auto-cpufreq ?

Ah ok, sorry, then I got the question wrong, can't help in this case 🙈

LamprosPitsillos · 2024-01-01T15:58:36Z

Is there a reason sometimes ${src}/scripts is used and sometimes scripts/
The later is preferable imo

deviantsemicolon · 2024-02-16T03:15:16Z

auto-cpufreq 2.2.0 is out. Does a new request need to be opened?

nyabinary · 2024-02-16T03:21:03Z

auto-cpufreq 2.2.0 is out. Does a new request need to be opened?

I think someone should probably open a new pr seeing as this one is a bit stale.

drupol · 2024-02-16T03:23:11Z

auto-cpufreq 2.2.0 is out. Does a new request need to be opened?

No, you can update this one.

drupol

Hello, I made further comments, let me know if you plan continue working on this PR. Close it otherwise.

pkgs/tools/system/auto-cpufreq/default.nix

drupol · 2024-02-16T08:02:34Z

pkgs/tools/system/auto-cpufreq/default.nix

  pname = "auto-cpufreq";
-  version = "1.9.9";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "AdnanHodzic";
    repo = pname;


Please don't use this.

repo = pname; is nice for DRY but creates a binding that goes too far.

See further information about this here: nix-community/nixpkgs-lint#21

pkgs/tools/system/auto-cpufreq/default.nix

Co-authored-by: Pol Dellaiera <[email protected]>

shadeyg56 · 2024-02-23T23:56:50Z

Made requested changes and once again bumped versions.
Apologies again for this having been on the back burner

drupol

Looks like the build is broken now.

shadeyg56 · 2024-03-03T22:44:08Z

I see. It builds the package on my system, but I assume it can't be installed because in this Nix package, we have patched out the requests package which is expected in the projects pyproject.toml file.

drupol · 2024-03-04T07:46:05Z

I see. It builds the package on my system, but I assume it can't be installed because in this Nix package, we have patched out the requests package which is expected in the projects pyproject.toml file.

If I understand correctly, it doesn't build on the CI, but it builds on your machine, right ? How can such a thing could be possible?

marrobHD · 2024-04-03T12:03:13Z

I can can confirm this does not build.
It's due modification of the requirements.txt in the prevent-update.patch I created in PR #253595.
As we patch out the part which requires the python module requests, we also have to remove it in the requirements.txt.

Result of nixpkgs-review pr 258684 run on x86_64-linux 1

2 packages blacklisted:

nixos-install-tools
tests.nixos-functions.nixos-test

2 packages failed to build:

auto-cpufreq
auto-cpufreq.dist

JohnRTitor · 2024-06-01T04:12:15Z

Closed per #315383

auto-cpufreq: 1.9.9 -> 2.0.0

9596b22

ofborg bot requested a review from Technical27 October 2, 2023 23:52

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 2, 2023

FliegendeWurst requested changes Oct 18, 2023

View reviewed changes

FliegendeWurst reviewed Oct 18, 2023

View reviewed changes

FliegendeWurst added the 12. first-time contribution This PR is the author's first one; please be gentle! label Oct 18, 2023

auto-cpufreq: copy css file and add new substitutes

35b0fdc

shadeyg56 requested a review from FliegendeWurst October 18, 2023 20:41

FliegendeWurst reviewed Oct 19, 2023

View reviewed changes

pkgs/tools/system/auto-cpufreq/default.nix Outdated Show resolved Hide resolved

auto-cpufreq: revert Python to default version

a6e0095

FliegendeWurst approved these changes Oct 19, 2023

View reviewed changes

FliegendeWurst added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 14, 2023

FliegendeWurst added the 11.by: upstream-developer This issue or PR was created by the developer of packaged software label Nov 14, 2023

MikaelFangel mentioned this pull request Nov 24, 2023

auto-cpufreq: 1.9.9 > 2.1.0 #269712

Closed

13 tasks

drupol requested changes Dec 3, 2023

View reviewed changes

shadeyg56 added 2 commits December 17, 2023 17:07

auto-cpufreq: pass needed packages instead of 'pkgs'

35ea9e8

auto-cpufreq: 2.0.0 -> 2.1.0

b2077fb

shadeyg56 changed the title ~~auto-cpufreq: 1.9.9 -> 2.0.0~~ auto-cpufreq: 1.9.9 -> 2.1.0 Dec 17, 2023

drupol requested changes Dec 18, 2023

View reviewed changes

drupol reviewed Dec 18, 2023

View reviewed changes

LamprosPitsillos mentioned this pull request Jan 1, 2024

No such file or directory: '/opt/auto-cpufreq/override.pickle' AdnanHodzic/auto-cpufreq#620

Closed

drupol requested changes Feb 16, 2024

View reviewed changes

shadeyg56 changed the title ~~auto-cpufreq: 1.9.9 -> 2.1.0~~ auto-cpufreq: 1.9.9 -> 2.2.0 Feb 16, 2024

shadeyg56 and others added 5 commits February 23, 2024 17:23

Apply formatting from code review

d7e6e08

Co-authored-by: Pol Dellaiera <[email protected]>

auto-cpufreq: revert unnecessary move of code

95a3b0d

auto-cpufreq: 2.1.0->2.2.0

0177e72

auto-cpufreq: replace repo=pname

4d09b46

auto-cpufreq: remove trailing whitespace

c5751ac

shadeyg56 requested a review from drupol February 23, 2024 23:57

drupol requested changes Mar 2, 2024

View reviewed changes

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 8, 2024

drupol marked this pull request as draft April 3, 2024 12:14

isabelroses mentioned this pull request May 28, 2024

auto-cpufreq: 1.9.9 -> 2.3.0 #315383

Merged

13 tasks

JohnRTitor closed this Jun 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

auto-cpufreq: 1.9.9 -> 2.2.0 #258684

auto-cpufreq: 1.9.9 -> 2.2.0 #258684

shadeyg56 commented Oct 2, 2023 •

edited

Loading

MikaelFangel commented Oct 14, 2023

FliegendeWurst left a comment

FliegendeWurst Oct 18, 2023

drupol Feb 16, 2024

This comment was marked as resolved.

shadeyg56 commented Oct 18, 2023

shadeyg56 commented Nov 14, 2023

FliegendeWurst commented Nov 14, 2023 •

edited

Loading

nyabinary commented Nov 25, 2023 •

edited

Loading

drupol left a comment

drupol Dec 3, 2023

drupol Dec 18, 2023

shadeyg56 commented Dec 17, 2023

drupol left a comment

drupol Dec 18, 2023

drupol Dec 18, 2023

futile Dec 18, 2023

drupol Dec 18, 2023 •

edited

Loading

futile Dec 18, 2023

LamprosPitsillos commented Jan 1, 2024

deviantsemicolon commented Feb 16, 2024

nyabinary commented Feb 16, 2024

drupol commented Feb 16, 2024

drupol left a comment

drupol Feb 16, 2024

shadeyg56 commented Feb 23, 2024

drupol left a comment

shadeyg56 commented Mar 3, 2024

drupol commented Mar 4, 2024

marrobHD commented Apr 3, 2024

JohnRTitor commented Jun 1, 2024 •

edited

Loading

auto-cpufreq: 1.9.9 -> 2.2.0 #258684

auto-cpufreq: 1.9.9 -> 2.2.0 #258684

Conversation

shadeyg56 commented Oct 2, 2023 • edited Loading

Description of changes

Things done

MikaelFangel commented Oct 14, 2023

FliegendeWurst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

shadeyg56 commented Oct 18, 2023

shadeyg56 commented Nov 14, 2023

FliegendeWurst commented Nov 14, 2023 • edited Loading

nyabinary commented Nov 25, 2023 • edited Loading

drupol left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shadeyg56 commented Dec 17, 2023

drupol left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drupol Dec 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LamprosPitsillos commented Jan 1, 2024

deviantsemicolon commented Feb 16, 2024

nyabinary commented Feb 16, 2024

drupol commented Feb 16, 2024

drupol left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shadeyg56 commented Feb 23, 2024

drupol left a comment

Choose a reason for hiding this comment

shadeyg56 commented Mar 3, 2024

drupol commented Mar 4, 2024

marrobHD commented Apr 3, 2024

JohnRTitor commented Jun 1, 2024 • edited Loading

shadeyg56 commented Oct 2, 2023 •

edited

Loading

FliegendeWurst commented Nov 14, 2023 •

edited

Loading

nyabinary commented Nov 25, 2023 •

edited

Loading

drupol Dec 18, 2023 •

edited

Loading

JohnRTitor commented Jun 1, 2024 •

edited

Loading