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.

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

keyd: 2.4.2 -> 2.4.3 #245327

Merged
merged 2 commits into from
Dec 17, 2023
Merged

keyd: 2.4.2 -> 2.4.3 #245327

merged 2 commits into from
Dec 17, 2023

Conversation

JohnAZoidberg
Copy link
Member

@JohnAZoidberg JohnAZoidberg commented Jul 25, 2023

Description of changes

https://github.com/rvaiya/keyd/releases/tag/v2.4.3

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.

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
@JohnAZoidberg
Copy link
Member Author

JohnAZoidberg commented Jul 26, 2023

Works fine when running from the commandline but seems to break the keyd service. I'm investigating.

@peterhoeg
Copy link
Member

peterhoeg commented Jul 26, 2023 via email

Otherwise it'll be killed by systemd with
Main process exited, code=killed, status=31/SYS

Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
@JohnAZoidberg
Copy link
Member Author

Works now. The program calls nice which was blocked by systemd.
cc module author @woojiq

@woojiq
Copy link
Contributor

woojiq commented Jul 26, 2023

@JohnAZoidberg haven't tested it manually, but if it passes the qemu test it's probably fine. Have you read this comment:

# this is configurable in 2.4.2, later versions seem to remove this option.
# post-2.4.2 may need to set makeFlags in the derivation:
#
# makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ];
environment.KEYD_SOCKET = "/run/keyd/keyd.sock";

See: #221321 (comment)
It's not mine, so does the new release affect it somehow?

@JohnAZoidberg
Copy link
Member Author

It's not mine, so does the new release affect it somehow?

Hmmm, if we change it at compile time it won't run from commandline anymore. Only in the service.
Since the keyd folder doesn't exit. I guess it's okay actually, since you'd not usually run it manually.

Copy link
Contributor

@woojiq woojiq Jul 27, 2023

Choose a reason for hiding this comment

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

I've tested manually too and it seems useless now. Though you are probably more experienced with nix so make final decision, xd.

- # this is configurable in 2.4.2, later versions seem to remove this option.
- # post-2.4.2 may need to set makeFlags in the derivation:
- #
- #     makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ];
- environment.KEYD_SOCKET = "/run/keyd/keyd.sock";
-

Everything else is LGTM

Copy link
Contributor

@maxammann maxammann left a comment

Choose a reason for hiding this comment

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

Looks good to me. Can we merge this?

keyd on 2.4.2 has a bug where it takes up 100% of the CPU. I believe this is fixed in the newer version.

@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/1291

@pbsds
Copy link
Member

pbsds commented Dec 17, 2023

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

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
1 package built:
  • keyd

nixosTests.keyd also passes. LGTM

@pbsds pbsds merged commit 80beaf2 into NixOS:master Dec 17, 2023
8 of 9 checks passed
Copy link
Contributor

Successfully created backport PR for release-23.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants