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

nixos/systemd-lock-handler: init with corresponding package at 2.4.2 #259196

Merged
merged 2 commits into from
Jan 27, 2024
Merged

nixos/systemd-lock-handler: init with corresponding package at 2.4.2 #259196

merged 2 commits into from
Jan 27, 2024

Conversation

liff
Copy link
Contributor

@liff liff commented Oct 5, 2023

Description of changes

Adds a package and a module for systemd-lock-handler.

This is a possible future replacement for logind integration if swaywm/swayidle#133 moves forward.

There is another PR, #228063, for this package but it has not seen any updates in a while.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 5, 2023
@liff liff requested a review from MatthewCroughan October 5, 2023 15:02
@liff liff force-pushed the mod/systemd-lock-handler branch from a111199 to 05bedba Compare October 5, 2023 15:16
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Oct 5, 2023
@liff liff force-pushed the mod/systemd-lock-handler branch from 05bedba to ac2d74b Compare October 5, 2023 17:03
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Oct 5, 2023
@tomfitzhenry
Copy link
Contributor

Nice PR, mostly LGTM. Test looks great! Just a few comments.

@tomfitzhenry tomfitzhenry mentioned this pull request Oct 9, 2023
Merged
12 tasks
@liff liff requested a review from tomfitzhenry October 11, 2023 10:10
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 12, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1163

SuperSandro2000
SuperSandro2000 reviewed Oct 18, 2023
View reviewed changes
nixos/modules/module-list.nix Outdated Show resolved Hide resolved
nixos/modules/services/system/systemd-lock-handler/default.nix Outdated Show resolved Hide resolved
nixos/modules/services/system/systemd-lock-handler/default.nix Outdated Show resolved Hide resolved
nixos/modules/services/system/systemd-lock-handler/default.nix Outdated Show resolved Hide resolved
nixos/modules/services/system/systemd-lock-handler/default.md Outdated Show resolved Hide resolved
nixos/modules/services/system/systemd-lock-handler/default.md Outdated Show resolved Hide resolved
nixos/tests/systemd-lock-handler.nix Outdated Show resolved Hide resolved
pkgs/by-name/sy/systemd-lock-handler/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sy/systemd-lock-handler/package.nix Outdated Show resolved Hide resolved
@liff liff force-pushed the mod/systemd-lock-handler branch 2 times, most recently from 5a92682 to 361f5eb Compare October 18, 2023 18:32
@liff
Copy link
Contributor Author

liff commented Oct 18, 2023

Thanks for the review @SuperSandro2000, I’ve applied your suggestions.

@liff liff requested a review from SuperSandro2000 October 18, 2023 18:36
@h7x4 h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Oct 19, 2023
@liff liff force-pushed the mod/systemd-lock-handler branch 2 times, most recently from ced8362 to a3d3231 Compare November 3, 2023 07:02
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1228

@liff liff force-pushed the mod/systemd-lock-handler branch from a3d3231 to a59a7ac Compare November 27, 2023 09:08
@liff liff added the needs_merger (old Marvin label, do not use) label Nov 27, 2023
@SuperSandro2000 SuperSandro2000 removed the needs_merger (old Marvin label, do not use) label Dec 2, 2023
@SuperSandro2000
Copy link
Member

that label is unused

@liff liff force-pushed the mod/systemd-lock-handler branch 2 times, most recently from 1bc643e to 29b6811 Compare December 2, 2023 19:09
@liff
Copy link
Contributor Author

liff commented Dec 2, 2023

Rebased and moved the release note entry to 24.05.

@liff liff requested a review from SuperSandro2000 December 2, 2023 19:10
@liff liff force-pushed the mod/systemd-lock-handler branch from 29b6811 to 7180ee0 Compare December 18, 2023 12:48
@aacebedo
Copy link
Contributor

aacebedo commented Jan 6, 2024

can we merge this ?

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1361

MatthewCroughan
MatthewCroughan approved these changes Jan 6, 2024
View reviewed changes
Copy link
Contributor

@MatthewCroughan MatthewCroughan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@aacebedo
Copy link
Contributor

aacebedo commented Jan 6, 2024

@SuperSandro2000 ok to merge ?

@liff liff force-pushed the mod/systemd-lock-handler branch from 7180ee0 to fb9a034 Compare January 14, 2024 16:52
@ElvishJerricco
Copy link
Contributor

ElvishJerricco commented Jan 22, 2024 •
edited
Loading

Why aren't we just using the systemd unit files from the package source? Why are we duplicating them in nixos options?

@liff liff force-pushed the mod/systemd-lock-handler branch from fb9a034 to 12d9c60 Compare January 22, 2024 19:01
@liff
Copy link
Contributor Author

liff commented Jan 22, 2024

Why aren't we just using the systemd unit files from the package source? Why are we duplicating them in nixos options?

@ElvishJerricco changed to use upstream units.

@liff liff requested a review from h7x4 January 22, 2024 19:04
@liff liff force-pushed the mod/systemd-lock-handler branch from 12d9c60 to e103c5c Compare January 27, 2024 09:56
@ElvishJerricco ElvishJerricco merged commit 2af1ee5 into NixOS:master Jan 27, 2024
22 of 24 checks passed
@gepbird gepbird mentioned this pull request Oct 2, 2024
Closed
12 tasks
@liff liff deleted the mod/systemd-lock-handler branch November 14, 2024 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatthewCroughan MatthewCroughan MatthewCroughan approved these changes

@ElvishJerricco ElvishJerricco ElvishJerricco approved these changes

@tomfitzhenry tomfitzhenry tomfitzhenry approved these changes

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@h7x4 h7x4 Awaiting requested review from h7x4

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 8.has: tests This PR has tests 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@liff @tomfitzhenry @nixos-discourse @SuperSandro2000 @aacebedo @ElvishJerricco @h7x4 @MatthewCroughan @delroth