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

Jump to bottom

Remove Qt 5.15 from the Plasma 5 closure #97456

Merged
merged 2 commits into from Sep 9, 2020
Merged

Remove Qt 5.15 from the Plasma 5 closure #97456

merged 2 commits into from Sep 9, 2020

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Sep 8, 2020 •
edited

Motivation for this change

Plasma 5 is using Qt 5.14, but Qt 5.15 was in the closure because:

  1. SDDM used Qt 5.15. This pins SDDM to Qt 5.14, which was necessary for the Plasma SDDM theme to work correctly, anyway.
  2. Some kdeFrameworks packages were picked from the wrong version.
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.

@mohe2015
Copy link
Contributor

mohe2015 commented Sep 8, 2020

Tested it and it worked. Would love to see this merged soon!

@jonringer
Copy link
Contributor

Feel like this should be backported

@jonringer jonringer added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 8, 2020
@ttuegel
Copy link
Member Author

ttuegel commented Sep 9, 2020

Feel like this should be backported

The stable branch actually needs something different, because we're going back to Qt 5.12.

@ttuegel ttuegel removed the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 9, 2020
@ttuegel ttuegel merged commit 959c0bf into NixOS:master Sep 9, 2020
orivej added a commit to orivej/nixpkgs that referenced this pull request Sep 11, 2020
@orivej
nixos/plasma5: fix build with hardware.bluetooth.enable = true after N…
21b2900 
…ixOS#97456
ttuegel added a commit that referenced this pull request Sep 11, 2020
@ttuegel
Merge pull request #97735 from orivej/plasma5-bluetooth
98754ab 
nixos/plasma5: fix build with hardware.bluetooth.enable after #97456
ttuegel pushed a commit to ttuegel/nixpkgs that referenced this pull request Sep 11, 2020
@orivej @ttuegel
nixos/plasma5: fix build with hardware.bluetooth.enable = true after N…
1f9f801 
…ixOS#97456

(cherry picked from commit 21b2900)
alapshin added a commit to alapshin/nixpkgs that referenced this pull request Sep 14, 2020
@alapshin
nixos/plasma5: Fix build with config.services.colord.enable = true
19b5ef4 
Fix build with enabled colord service after NixOS#97456
@alapshin alapshin mentioned this pull request Sep 14, 2020
Merged
10 tasks
worldofpeace pushed a commit that referenced this pull request Sep 17, 2020
@alapshin @worldofpeace
nixos/plasma5: Fix build with config.services.colord.enable = true
8e68ff6 
Fix build with enabled colord service after #97456

(cherry picked from commit 19b5ef4)
@avdv avdv mentioned this pull request May 26, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ttuegel @mohe2015 @jonringer