[staging] PyQt5, PyQt6: parallel build and fix of test #223817
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The module QtConnectivity does not exist. However, QtBluetooth and QtNfc do.
Port the workaround for parallel building from PyQt6 to PyQt5. The initial workaround has been added in commit 1824a12.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/2121 |
|
@ofborg build python310Packages.pyqt5 python310Packages.pyqt6 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
PyQt5 contains a check for QtConnectivity, but this module does not exist (the git history looks like it never existed). This causes builds with
withConnectivity = trueto always fail.withConnectivity = trueactually results in two specific modules being built: QtBluetooth and QtNfc. I changed the import check to the former.PyQt5 builds only with a single core, which can take a long time (e.g. Duration field > 1h). This is due to a limitation by which
enableParallelBuildingis not taken into account. PyQt6 can be compiled with multiple cores using a workaround.I copied the workaround over to PyQt5 and slightly modified it for consistency to respect
enableParallelBuilding. I added the consistency improvement to PyQt6, too.I target staging because nixpkgs-review told me that 234 packages were updated and I only built ~50 of them.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)