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

plasma5: 5.22.0 -> 5.23.1 #139657

Merged
merged 18 commits into from Oct 28, 2021
Merged

plasma5: 5.22.0 -> 5.23.1 #139657

merged 18 commits into from Oct 28, 2021

Conversation

CertainLach
Copy link
Contributor

@CertainLach CertainLach commented Sep 27, 2021

Motivation for this change
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 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.

@InternetUnexplorer
Copy link
Contributor

FYI: there's a patch to fix the "Other" option in sddm. It will be included in 5.23.1, but many distros are backporting it:

https://invent.kde.org/plasma/plasma-workspace/-/commit/d5a3e749a30613294f41386180aaf31dfb1a9bee

Not sure if it's worth backporting it here though since reviewing Plasma updates usually takes some time and so 5.23.1 might be out by the time this is ready to merge…

@CertainLach CertainLach force-pushed the plasma-5.23 branch 2 times, most recently from 10e6842 to 060d3ba Compare October 17, 2021 10:53
@CertainLach
Copy link
Contributor Author

@InternetUnexplorer included patch

@andrevmatos
Copy link
Member

This seems to have some intersection with #137669 / #141128 from staging, maybe basing it on top of that would be useful to ensure the kde-frameworks PRs are used as well?

file(GLOB_RECURSE GTK2_SOURCES "gtk2/*")

-configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh @ONLY)
+configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE @ONLY)
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: Wouldn't better to simply add a chmod +x on preBuild or something like that, instead of a full patch? Would be easier to overwrite/inspect and less prone to getting out of date.

@andrevmatos
Copy link
Member

This version with kf5.87 has the same bug I saw in #141670: clock is not shown, and clicking on its space shows calendar with some mock values and non-interpolated format strings:
Screenshot_20211017_202218

@mohe2015
Copy link
Contributor

mohe2015 commented Oct 19, 2021

This version with kf5.87 has the same bug I saw in #141670: clock is not shown, and clicking on its space shows calendar with some mock values and non-interpolated format strings: Screenshot_20211017_202218

For some unknown reason I just got this with nixos-unstable. Maybe it doesn't have a causality with this update? Or did something update in nixos-unstable. I don't have the time to further investigate right now.

good: e4ef597

bad: 9aeeb75

@mohe2015
Copy link
Contributor

@andrevmatos Could you please test with reverting 763a001 and 4832352
That fixed it for me on unstable where I also had that bug. Didn't test with this PR though.

@mohe2015
Copy link
Contributor

#100057 (comment) maybe also try deleting the cache first (I didn't have time yet to do that)

@SuperSandro2000
Copy link
Member

@andrevmatos Could you please test with reverting 763a001 and 4832352 That fixed it for me on unstable where I also had that bug. Didn't test with this PR though.

Didn't change anything for me.

@mohe2015
Copy link
Contributor

@andrevmatos Possibly you had the same problem that I had. The referenced commits reset my default to wayland. Check in your settings/on the login screen if that's the case. Otherwise this may be something different.

@oxalica
Copy link
Contributor

oxalica commented Oct 20, 2021

5.23.1 is already out.

Could you also include the patch for https://bugs.kde.org/show_bug.cgi?id=438839 ? Since we have plasma wayland now, this crash issue is quite easy to run into if you have only one monitor.

@mohe2015
Copy link
Contributor

@andrevmatos Possibly you had the same problem that I had. The referenced commits reset my default to wayland. Check in your settings/on the login screen if that's the case. Otherwise this may be something different.

For wayland #100057 (comment) worked for me.

@jonringer jonringer added this to In progress in 21.11 Blockers via automation Oct 21, 2021
@nrdxp
Copy link
Contributor

nrdxp commented Oct 22, 2021

Given that Plasma is an important part of the NixOS ISO, and the release feature freeze is looming, would you be willing to rebase on the latest Plasma as @oxalica has suggested? We really should have the latest version at release time if at all feasible.

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
@oxalica
Copy link
Contributor

oxalica commented Oct 24, 2021

I tried this PR and it works almost fine on X11 and no critical issues on wayland. Here are some issues I met,

  1. Both analog and digital clock widgets are broken under wayland, as mentioned in plasma5: 5.22.0 -> 5.23.1 #139657 (comment). But on X11, they are fine.
  2. Cannot use systemd boot anymore by setting systemdBoot=true or the option runUsingSystemd implemented in nixos/plasma5: make it run using systemd and wayland #117102 . It work before this PR for both X11 and wayland, but after this PR, neither of them works. You can check that plasma systemd user units are not even started and plasmashell is running out of control of systemd.
  3. The wayland crash issue I mentioned is still not resolved after the patch applied. This is an upstream bug and I already reported it in that bug tracking thread.

Note that (2) can be the cause of (1) since @mohe2015 in #100057 (comment) reported that without systemdBoot, clock widget is also broken under wayland on current plasma 5.22.0

@iam-cult
Copy link

The Wayland clock widget issue is resolved by not declaring any timezone in the system configuration, but it then defaults to UTC.

@FedX-sudo
Copy link

FedX-sudo commented Oct 25, 2021

The date bug has been ongoing, and is present in 5.22.5. It brakes timedatectl (it returns UTC only) as well, but date works fine.

@@ -24,10 +24,6 @@ mkDerivation {
mobile-broadband-provider-info openconnect
];
patches = [
(substituteAll {
Copy link
Member

Choose a reason for hiding this comment

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

Why is this patch no longer needed?

Copy link
Member

Choose a reason for hiding this comment

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

mobile-broadband path is now fetched from CMake, instead of being hardcoded; this makes it work ootb on nixos

@ttuegel
Copy link
Member

ttuegel commented Oct 25, 2021

SDDM defaulted to the Plasma Wayland session for me, which gives a bad experience because Wayland is so broken. Is that an intentional effect of this pull request, or is it just some bad state left over state from my testing something else?

@InternetUnexplorer
Copy link
Contributor

InternetUnexplorer commented Oct 25, 2021

SDDM defaulted to the Plasma Wayland session for me, which gives a bad experience because Wayland is so broken. Is that an intentional effect of this pull request, or is it just some bad state left over state from my testing something else?

This happened to me too. I think it's because the sessions are sorted alphabetically and it chooses the first one.

There seems to be sddm/sddm#326.

@ttuegel
Copy link
Member

ttuegel commented Oct 28, 2021

SDDM defaulted to the Plasma Wayland session for me, which gives a bad experience because Wayland is so broken. Is that an intentional effect of this pull request, or is it just some bad state left over state from my testing something else?

There is also discussion of this on #100057, so at least we know it's unrelated to this pull request.

@ttuegel ttuegel changed the title plasma5: 5.22.0 -> 5.23.0 plasma5: 5.22.0 -> 5.23.1 Oct 28, 2021
@ttuegel ttuegel merged commit 0867437 into NixOS:master Oct 28, 2021
21.11 Blockers automation moved this from In progress to Done Oct 28, 2021
@oxalica
Copy link
Contributor

oxalica commented Oct 28, 2021

🤔 Seems 5.23.2 is just released one day ago. https://invent.kde.org/plasma/plasma-workspace/-/tree/v5.23.2

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

Successfully merging this pull request may close these issues.

None yet

10 participants