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

pythonPackages.pyqt5: upgrade and solve qml issue #65836

Merged
merged 8 commits into from Aug 3, 2019

Conversation

@FRidh
Copy link
Member

commented Aug 3, 2019

Motivation for this change

This PR upgrades .pyqt5 and .pyqtwebengine and fixes their build. During build-time many Qt modules were not detected and thus not included in the build. Apparently they also need to be added to nativeBuildInputs. I suppose this is because of qmake?

Anyway, both packages work fine when using with python3.withPackages.

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 nix-review --run "nix-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.
Notify maintainers

cc @

@FRidh FRidh force-pushed the FRidh:pyqt branch from 113c99b to 1a12c78 Aug 3, 2019

@FRidh

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

Qutebrowser now runs without the error. However, there is a regression in PyQt5.sip for Python 2 it seems.

@FRidh

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

I can imagine we can have collisions with sip as well because for each variant we create sipconfig.py at the same location.

dotlambda and others added 6 commits Feb 25, 2019
python.pkgs.pyqt5: 5.11.3 -> 5.13.0
This upgrades pyqt5 and fixes the build. Note that the QtWebEngine
module is split into `pyqtwebengine` by upstream and us.

If your application gives an error that a Qt module is missing, then
that is most likely because it was not included when building pyqt5.
The solution is to simply add it here to the `(native)BuildInputs`.
Don't forget to add an import check. We should include all the modules
(except qtwebkit) that are needed.
python.pkgs.pyqtwebengine: init at 5.12.1
5.13.0 is available, however, it assumes qt 5.13 is used and fails
to build due to a missing QWebEngineNotification class.

@FRidh FRidh force-pushed the FRidh:pyqt branch from 1a12c78 to abfe7f0 Aug 3, 2019

@FRidh

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

qgis and calibre don't build yet, but I leave that for someone else (or at least another day).

@FRidh

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

@GrahamcOfBorg build picard qutebrowser anki python3Packages.spyder

@ofborg ofborg bot requested review from Profpatsch, gebner and the-kenny Aug 3, 2019

@petabyteboy

This comment has been minimized.

Copy link
Contributor

commented Aug 3, 2019

Great news that this is finally figured out 🎉
I built and ran qutebrowser successfully, so that's good
I am wondering if adding the target dependencies to nativeBuildInputs really is the right thing, it detected qml just fine before, so what broke it?

@FRidh

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

I am wondering if adding the target dependencies to nativeBuildInputs really is the right thing, it detected qml just fine before, so what broke it?

Yes, I don't like it either. Maybe strictDeps = true;? I have not checked it.

@FRidh FRidh merged commit 33a876e into NixOS:master Aug 3, 2019

14 of 16 checks passed

anki, picard, python3Packages.spyder, qutebrowser on aarch64-linux Failure
Details
anki, picard, python3Packages.spyder, qutebrowser on x86_64-darwin Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
anki, picard, python3Packages.spyder, qutebrowser on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@FRidh FRidh deleted the FRidh:pyqt branch Aug 3, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.