-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
plasma5: 5.20 -> 5.21 #110536
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.20 -> 5.21 #110536
Conversation
d3299be
to
7244a3f
Compare
Plasma 5.21 is not released yet, but it improves wayland support, so i testing it on nixos and upgrading patches, to make it released on NixOS at same time as in other distros :D I am not sure if i should split kdeFrameworks upgrade to a different pull request, because plasma 5.20 seems to not support frameworks 5.76 |
15e4d7f
to
e64f961
Compare
311bbb7
to
7989a6b
Compare
7989a6b
to
bbbf920
Compare
Can this wait for 5.21.1, or at least backport https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/353? Arch users hit already*, and IIUC once the incorrect config upgrade runs, there's not enough information left around to undo it (so every user would have to go to System Settings manually and re-enable key repeating). I'm not aware of other bugs but it might be a good idea to do a quick check for anything recently reported for 5.21.0 * specifically heard about it from @DianaNites, thanks a lot for the tip! |
After resolving the conflicts, this should make the PR build again: diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index 26e5a83dc21..4813b06deb1 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -7,13 +7,6 @@
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- patches = [
- # https://mail.kde.org/pipermail/distributions/2021-January/000928.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch";
- sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 642151913db..4ecd3ffbec5 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -24,10 +24,5 @@ mkDerivation {
patches = [
./samba-search-path.patch
./kio-debug-module-loader.patch
- # https://mail.kde.org/pipermail/distributions/2021-February/000938.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch";
- sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd";
- })
];
} |
Feel free to pull some updates for this PR from https://github.com/eliasp/nixpkgs/tree/plasma-5.21: |
I don't see any harm waiting until Tuesday (when 5.21.1 is released). |
Rebuilding and testing 5.21.1 Something caused both firefox and qtwebkit rebuild, so it is taking more time than expected :D |
bbbf920
to
95e34dc
Compare
Rebuilt system, everything works as intended for me |
My attempts to run
Is there anything additional required here that I am missing? |
This means that there is a package outside Plasma, that depends on Plasma, that was horribly broken before this pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updating KDE Frameworks makes this a mass rebuild, so it must be rebased onto the staging branch. (I think that the update is already in that branch.)
I messed up. Can i revert all of those reviewers added? :D |
@CertainLach How were you able to build this? I currently get a likely unrelated build error at libe-book-0.1.3. |
@mohe2015 i didn't ran review on latest commit and staging rebase, but i had some errors related to failing python packages tests before. |
I rebased to nixos-unstable and it seems to be building (takes some time of course). Rebasing on top of nixos-unstable should be fine or is there something required from staging? |
I don't know, mine laptop is running latest commit rebased on master. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Behaviour-wise LGTM! (rebased onto master).
Wayland had some issues with multiple screens but I'm pretty sure this is an upstream thing.
Thanks! |
Can you please tell me how I can use wayland instead of X11? By default it started on X and there is no session option on login to select Wayland. |
@payasrelekar I think I used #100057 but I'm not sure. |
Motivation for this change
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)