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.20 -> 5.21 #110536

Merged
merged 14 commits into from Feb 26, 2021
Merged

plasma5: 5.20 -> 5.21 #110536

merged 14 commits into from Feb 26, 2021

Conversation

CertainLach
Copy link
Contributor

@CertainLach CertainLach commented Jan 22, 2021

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

@CertainLach
Copy link
Contributor Author

CertainLach commented Jan 22, 2021

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

@CertainLach CertainLach force-pushed the plasma-5.21 branch 2 times, most recently from 311bbb7 to 7989a6b Compare February 17, 2021 16:21
@CertainLach CertainLach marked this pull request as ready for review February 17, 2021 16:21
@CertainLach CertainLach marked this pull request as draft February 17, 2021 16:25
@CertainLach CertainLach marked this pull request as ready for review February 17, 2021 16:30
@eddyb
Copy link
Contributor

eddyb commented Feb 17, 2021

Can this wait for 5.21.1, or at least backport https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/353?
It's a fix for https://bugs.kde.org/show_bug.cgi?id=431923 (KeyboardRepeating migration to KeyRepeat incorrectly disabled key repeating when it was previously enabled).

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!

@ajs124 ajs124 mentioned this pull request Feb 17, 2021
@eliasp
Copy link
Member

eliasp commented Feb 19, 2021

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";
-    })
   ];
 }

@eliasp
Copy link
Member

eliasp commented Feb 20, 2021

Feel free to pull some updates for this PR from https://github.com/eliasp/nixpkgs/tree/plasma-5.21:

  • bc7aecb - kcompletion: drop obsolete patch 7acda936
  • 2d28e7d - kio: drop obsolete patch a183dd0d
  • ab2c021 - plasma-desktop: add patch for bug#431923

@ttuegel
Copy link
Member

ttuegel commented Feb 20, 2021

Can this wait for 5.21.1, or at least backport

I don't see any harm waiting until Tuesday (when 5.21.1 is released).

@CertainLach
Copy link
Contributor Author

CertainLach commented Feb 24, 2021

Rebuilding and testing 5.21.1

Something caused both firefox and qtwebkit rebuild, so it is taking more time than expected :D

@CertainLach
Copy link
Contributor Author

Rebuilt system, everything works as intended for me

@CertainLach CertainLach marked this pull request as ready for review February 25, 2021 03:36
@afontaine
Copy link
Contributor

My attempts to run nix-review on this PR have failed, all with errors roughly following the below:

error: --- Error ------------------------------------------------------------------------------------------------------------- nix
builder for '/nix/store/54qs81vr7q2nq18k8asv23yp1m279gr8-env.drv' failed with exit code 1; last 3 log lines:
  Error: detected mismatched Qt dependencies:
      /nix/store/jx9niyr7kv0yplsvc8iq43wbqnpcjnqw-qtbase-5.14.2-dev
      /nix/store/gwpcrjjrw7kk82hin81jhf7xv97qqh4m-qtbase-5.12.10-dev

Is there anything additional required here that I am missing?

@ttuegel
Copy link
Member

ttuegel commented Feb 25, 2021

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.

Copy link
Member

@ttuegel ttuegel left a 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.)

@CertainLach CertainLach changed the base branch from master to staging February 26, 2021 02:43
@CertainLach
Copy link
Contributor Author

I messed up. Can i revert all of those reviewers added? :D

@ofborg ofborg bot requested a review from ttuegel February 26, 2021 03:00
@mohe2015
Copy link
Contributor

mohe2015 commented Feb 26, 2021

@CertainLach How were you able to build this? I currently get a likely unrelated build error at libe-book-0.1.3.

@CertainLach CertainLach marked this pull request as ready for review February 26, 2021 15:22
@CertainLach
Copy link
Contributor Author

@mohe2015 i didn't ran review on latest commit and staging rebase, but i had some errors related to failing python packages tests before.
For latest commit after rebase i successfully ran plasma test, nothing more currently.

@mohe2015
Copy link
Contributor

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?

@CertainLach
Copy link
Contributor Author

I don't know, mine laptop is running latest commit rebased on master.
As i can see, unstable already includes needed kdeFrameworks version, so it should work.

Copy link
Contributor

@mohe2015 mohe2015 left a 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.

@ttuegel ttuegel merged commit 403c280 into NixOS:staging Feb 26, 2021
@ttuegel
Copy link
Member

ttuegel commented Feb 26, 2021

Thanks!

@CertainLach CertainLach deleted the plasma-5.21 branch February 27, 2021 08:13
@bhankas
Copy link
Contributor

bhankas commented Mar 20, 2021

Behaviour-wise LGTM! (rebased onto master).

Wayland had some issues with multiple screens but I'm pretty sure this is an upstream thing.

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.

@mohe2015
Copy link
Contributor

@payasrelekar I think I used #100057 but I'm not sure.

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

Successfully merging this pull request may close these issues.

None yet

8 participants