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: 5.14.5 -> 5.15.2 #55650

Merged
merged 5 commits into from Feb 27, 2019
Merged

plasma-5: 5.14.5 -> 5.15.2 #55650

merged 5 commits into from Feb 27, 2019

Conversation

@dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 12, 2019

Motivation for this change

https://www.kde.org/announcements/plasma-5.15.0.php

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member Author

@dtzWill dtzWill commented Feb 12, 2019

Marking WIP because I'm not confident in the patch changes and don't want to mislead-- leaving commit in case useful but until it's looked through more carefully I don't think it's ready. Don't want to break folks' sessions in a small way that causes pain later :).

@nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Feb 21, 2019

Hello, could you bump this to version 5.15.1 ?

https://kde.org/announcements/plasma-5.15.1.php

@dtzWill dtzWill changed the title plasma-5: 5.14.5 -> 5.15.0 plasma-5: 5.14.5 -> 5.15.1 Feb 21, 2019
@dtzWill
Copy link
Member Author

@dtzWill dtzWill commented Feb 21, 2019

Hello, could you bump this to version 5.15.1 ?

Thanks, updated!

@dtzWill dtzWill changed the title plasma-5: 5.14.5 -> 5.15.1 plasma-5: 5.14.5 -> 5.15.2 Feb 26, 2019
@dtzWill
Copy link
Member Author

@dtzWill dtzWill commented Feb 26, 2019

Now with 5.15.2

@bkchr
Copy link
Contributor

@bkchr bkchr commented Feb 27, 2019

As far as I can tell, 5.15.2 is working for me :) Maybe time to merge this?

@bkchr bkchr mentioned this pull request Feb 27, 2019
@dtzWill
Copy link
Member Author

@dtzWill dtzWill commented Feb 27, 2019

Been working for me as well, across updates tracked here. Going ahead, thanks for testing!

@dtzWill dtzWill merged commit e416d2f into NixOS:staging Feb 27, 2019
10 checks passed
@dtzWill dtzWill deleted the update/plasma-5-5.15.0 branch Feb 27, 2019
@vcunat
Copy link
Member

@vcunat vcunat commented Apr 7, 2019

This got to master now and the plasma test fails now. I suspect it's related to this update. In logs I newly see:

machine# [   38.594152] xsession[860]: /nix/store/mrwhgj95xjainwmp9dld9hzb1i8dm0jj-plasma-workspace-5.15.2-bin/bin/startkde: line 347: xmessage: command not found

but that one just disappeared when I added xorg.xmessage into test's systemPackages and did not fix the test, so these new lines seem closer to the cause

machine# [   38.561610] xsession[860]: /nix/store/mrwhgj95xjainwmp9dld9hzb1i8dm0jj-plasma-workspace-5.15.2-bin/bin/startkde: line 342: /nix/store/4p630wybyrzrggmjb5hm6c6nr19wq4g9-plasma-workspace-5.15.2/lib/libexec/kf5/start_kdeinit_wrapper: No such file or directory
machine# [   38.581609] xsession[860]: startkde: Could not start kdeinit5. Check your installation.

Any ideas?

@nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 7, 2019

relevant diff of startkde between 5.14.5 and 5.15.2 :

342c344
< LD_BIND_NOW=true /nix/store/4p630wybyrzrggmjb5hm6c6nr19wq4g9-plasma-workspace-5.15.2/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
---
> LD_BIND_NOW=true /nix/store/iy34pfyzm86g7wmw6pqd36zjc8z2h3vm-kinit-5.54.0/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup

Maybe overriding this variable to the proper path would solve the issue : https://github.com/KDE/plasma-workspace/blob/c69acc0973a5a58de5f9ea0a25fa183b09bfe6b8/startkde/startkde.cmake#L252

Relevant variable in plasma-workspace package :

"-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper"

@nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 7, 2019

Found the problem, this line of patch is no longer applied :

+LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup

Edit: testing a fix

@vcunat
Copy link
Member

@vcunat vcunat commented Apr 7, 2019

@nyanloutre: are you planning to prepare a PR/patch against nixpkgs master?

@nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 7, 2019

@vcunat yes but if you already have something ready go ahead (I am currently building the plasma5 test on my machine)

@vcunat
Copy link
Member

@vcunat vcunat commented Apr 7, 2019

No, on the contrary. I'm doing too many things already, so I'll be glad if someone else solves this one.

@nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 7, 2019

See #59112 for fix

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