Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-24.05] nixos/ups: add envvars for interactive use #341235

Merged
merged 2 commits into from
Sep 14, 2024
Merged

[Backport release-24.05] nixos/ups: add envvars for interactive use #341235

merged 2 commits into from
Sep 14, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 11, 2024 •
edited by bjornfor
Loading

Bot-based backport to release-24.05, triggered by a label in #341080.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

@bjornfor @github-actions
nixos/ups: deduplicate environment variables
69c5ed7 
No functional change, but more DRY.

(cherry picked from commit 801388a)
@bjornfor @github-actions
nixos/ups: set env vars in the global environment
75c189d 
This allows using upsdrvctl interactively, which otherwise tries to use
a missing ups.conf in the Nix store, instead of the correct
/etc/nut/ups.conf.

(cherry picked from commit 1cb392f)
@github-actions github-actions bot mentioned this pull request Sep 11, 2024
Merged
13 tasks
@bjornfor bjornfor merged commit 6ecc647 into release-24.05 Sep 14, 2024
19 checks passed
@bjornfor bjornfor deleted the backport-341080-to-release-24.05 branch September 14, 2024 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12.approvals: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bjornfor @wegank