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

Plasma 5.17.5 #79011

Merged
merged 12 commits into from Feb 6, 2020
Merged

Plasma 5.17.5 #79011

merged 12 commits into from Feb 6, 2020

Conversation

@ttuegel
Copy link
Member

@ttuegel ttuegel commented Feb 1, 2020

Motivation for this change

Update Plasma from 5.16.5 to 5.17.5. Status: I can start a Plasma session in a QEMU virtual machine. There is one issue with the SDDM theme which I consider blocking, and one non-blocking annoyance with plasma-desktop.

TODO:

  • Fix the SDDM theme's background. At present, the background is blank (white).
  • Fix the default desktop cursor. The cursor is correctly themed in other applications, but the desktop displays the default X11 cursor.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
ttuegel added 8 commits Jan 27, 2020
ttuegel added 3 commits Feb 1, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 1, 2020

Hi @ttuegel, freeze is soon https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655.
I don't see too many blockers here, do you need this in 20.03?

@FRidh FRidh added this to the 20.03 milestone Feb 2, 2020
@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Feb 3, 2020

How about giving the 5.18 beta a try to see if that solves your problem? We could then skip straight to that when it's released in a weeks time.

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented Feb 3, 2020

How about giving the 5.18 beta a try to see if that solves your problem?

The problem is almost certainly a missing runtime dependency. Going up a version is likely to introduce more missing dependencies. 🙁

EDIT: Also, Plasma betas are closed, and I have neither the time nor the inclination to jump through the hoops necessary to get access.

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented Feb 3, 2020

I don't see too many blockers here, do you need this in 20.03?

Yes, I plan to get this merged before the feature freeze for NixOS 20.03.

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented Feb 3, 2020

Well, the plasma-workspace build system appears to assume it's running in a Wayland or X session, so I hope that's not critical for the build... 🤦‍♂️

@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Feb 3, 2020

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

https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655/22

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented Feb 6, 2020

The blocker is fixed. The non-blocking issue, I realized, is due to some changes not being ported from the start-up script to the new C++ executable. I think it is appropriate to move those to the NixOS Plasma 5 start-up script, instead of the plasma-workspace package, because they are NixOS-specific. Although these are non-blocking cosmetic issues, I would still like to deal with them before merging.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 6, 2020

The blocker is fixed. The non-blocking issue, I realized, is due to some changes not being ported from the start-up script to the new C++ executable. I think it is appropriate to move those to the NixOS Plasma 5 start-up script, instead of the plasma-workspace package, because they are NixOS-specific. Although these are non-blocking cosmetic issues, I would still like to deal with them before merging.

I believe such a change would qualify as a bugfix so you have during beta to produce such a change.

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented Feb 6, 2020

I believe such a change would qualify as a bugfix so you have during beta to produce such a change.

Yeah, you're right. I don't like merging something that I know is buggy, but at least merging this part reduces the bus factor.

@ttuegel ttuegel merged commit 1a903be into NixOS:master Feb 6, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
kscreen, kwayland-integration, kwin, milou, plasma-browser-integration, plasma-workspace, plasma5.plasma-workspace on aarch64-linux Success
Details
kscreen, kwayland-integration, kwin, milou, plasma-browser-integration, plasma-workspace, plasma5.plasma-workspace on x86_64-linux Success
Details
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 10, 2020

I believe such a change would qualify as a bugfix so you have during beta to produce such a change.

Yeah, you're right. I don't like merging something that I know is buggy, but at least merging this part reduces the bus factor.

I opened an issue in the tracker so it doesn't get lost.

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

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.