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

plasma-workspace: fix systemd unit detection and plasma5.runUsingSystemd #144098

Merged
merged 2 commits into from
Nov 2, 2021
Merged

plasma-workspace: fix systemd unit detection and plasma5.runUsingSystemd #144098

merged 2 commits into from
Nov 2, 2021

Conversation

oxalica
Copy link
Contributor

@oxalica oxalica commented Nov 1, 2021

Motivation for this change

Our units are links in systemd unit directory, which reports state linked or linked-runtime.
This fixes systemdBoot config and the option services.xserver.desktopManager.plasma5.runUsingSystemd for plasma 5.23.
I'll consider upstream the patch later.

The breakage is introduced in 5.23.1 #139657 (comment)

This can be an alternative fix for #143272, since plasmashell started by systemd will have TZDIR correctly set.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
      file))
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@oxalica
nixosTest/plasma5-systemd-start: init
bea3750
@oxalica
plasma-workspace: fix systemd unit detection
7fd4fc1 
Our units are links in systemd unit directory, which reports state `linked` or
`linked-runtime`. This fixes systemdBoot config and the option
`services.xserver.desktopManager.plasma5.runUsingSystemd` for plasma 5.23.
@oxalica oxalica requested a review from ttuegel as a code owner November 1, 2021 10:52
andrevmatos
andrevmatos approved these changes Nov 2, 2021
View reviewed changes
Copy link
Member

@andrevmatos andrevmatos left a comment

Choose a reason for hiding this comment

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

I'm running this on top of 5.23.2, and I can confirm it works: plasma services are back at their services in systemd-cgls and clock is back. Thank you. It'd be cool to have this upstreamed.

@peterhoeg peterhoeg merged commit 3572d2f into NixOS:master Nov 2, 2021
@oxalica oxalica deleted the fix/plasma-systemd branch November 2, 2021 06:24
@oxalica oxalica mentioned this pull request Nov 2, 2021
Closed
@SuperSandro2000 SuperSandro2000 mentioned this pull request Nov 3, 2021
Merged
11 tasks
@andrevmatos andrevmatos mentioned this pull request Nov 10, 2021
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrevmatos andrevmatos andrevmatos approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: qt/kde 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@oxalica @andrevmatos @peterhoeg