upower: Upgrade to 1.90.6 and extend CriticalPowerActions #341086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: nixos
|
When I build locally, the compilation succeeds, but I run into test failures. |
jtojnar
reviewed
Sep 10, 2024
There was a problem hiding this comment.
Skimming the upstream diff, looks okay:
https://gitlab.freedesktop.org/upower/upower/-/compare/v1.90.4...v1.90.5
| @@ -218,6 +246,7 @@ in | |||
| TimeLow = cfg.timeLow; | |||
| TimeCritical = cfg.timeCritical; | |||
| TimeAction = cfg.timeAction; | |||
| AllowRiskyCriticalPowerAction = cfg.allowRiskyCriticalPowerAction; | |||
There was a problem hiding this comment.
Ugh, we should really switch to RFC 42-style settings so that we do not need to keep adding the options forever like this. Opened #341107 for now
There was a problem hiding this comment.
That does indeed seem like better way of doing things.
| @@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { | |||
| buildInputs = [ | |||
| libgudev | |||
| libusb1 | |||
| polkit | |||
There was a problem hiding this comment.
Looking at the diff, https://gitlab.freedesktop.org/upower/upower/-/commit/0c9ba8048fd38567aa1292f3760fbff48904c3ca sets POLKIT_ACTIONDIR define but it does not look like it is currently used? If not, that should not be an issue.
There was a problem hiding this comment.
Indeed, it doesn't look like it's used.
benjamb
force-pushed
the
upower-critical-actions
branch
2 times, most recently
from
8c1e1f5 to
ad1a29d
Compare
benjamb
force-pushed
the
upower-critical-actions
branch
3 times, most recently
from
9a67952 to
508db42
Compare
benjamb
changed the title
|
@jtojnar I've bumped up to 1.90.6, which avoids the need for patching the tests. |
This was referenced Sep 25, 2024
|
@jtojnar Don't suppose you have time for another review pass? |
jfly
approved these changes
Oct 9, 2024
benjamb
force-pushed
the
upower-critical-actions
branch
from
508db42 to
57077af
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-already-reviewed/2617/2062 |
|
I've been using this for a couple weeks and it's working great for me. I've added a link to this PR in https://discourse.nixos.org/t/prs-already-reviewed/2617/2062. |
wegank
added
12.approvals: 1
|
@benjamb, do you have time to rebase this branchb and address the conflicts? If it's helpful, I'm maintaining a branch here with your changes: https://github.com/jfly/nixpkgs/tree/upower-critical-actions |
benjamb
force-pushed
the
upower-critical-actions
branch
from
57077af to
789bb45
Compare
Done! |
ofborg
bot
removed
the
2.status: merge conflict
wegank
removed
the
12.approvals: 1
|
@jtojnar, any chance of getting this merged? |
|
@wegank, any chance of getting this merged? |
|
benjamb
force-pushed
the
upower-critical-actions
branch
from
789bb45 to
e811024
Compare
|
@gepbird I have bumped |
github-actions
bot
added
10.rebuild-darwin: 0
jtojnar
approved these changes
Jan 10, 2025
There was a problem hiding this comment.
Thanks, this bump looks good too https://gitlab.freedesktop.org/upower/upower/-/compare/v1.90.5...v1.90.6
|
wegank
added
the
12.approvals: 2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.