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: default to qt514 #98115

Closed
wants to merge 1 commit into from

Conversation

Galagora
Copy link
Contributor

@Galagora Galagora commented Sep 16, 2020

Motivation for this change

Essentially a partial revert of the changes made #97586, which fixes Python QT packages that aren't wrapped well and leaves the version configurability for those that are. This should sort out the likes of #98067 and #98069.

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.

@gebner gebner added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 16, 2020
@gebner
Copy link
Member

gebner commented Sep 16, 2020

FreeCAD is also broken for this reason. It currently uses libsForQt514, but this breaks when using pyside2 built with Qt 5.15. Upgrading to Qt 5.15 isn't straightforward either, because qtwebkit doesn't build.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 16, 2020
@Galagora Galagora force-pushed the pythonPackages-qt-514 branch from e1e8dd8 to 4e8ac88 Compare September 16, 2020 18:16
@gebner
Copy link
Member

gebner commented Sep 16, 2020

cc @petabyteboy @ttuegel @raboof

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 16, 2020
@Galagora Galagora closed this Sep 16, 2020
@Galagora
Copy link
Contributor Author

Galagora commented Sep 16, 2020

Fixed (a4e50bb).

@FRidh
Copy link
Member

FRidh commented Sep 16, 2020

a4e50bb reverted the use of 5.15 everywhere. qt version can now be set per application by overriding pkgs c88f3ad. See qutebrowser as example 2daf570.

@gebner
Copy link
Member

gebner commented Sep 18, 2020

@FRidh The override doesn't seem to work for me at all (this is on current master):

$ nix repl .
nix-repl> python38Packages.pyqt5.buildInputs
[ «derivation /nix/store/sgkk9zpr8ans81f0g5wpi5y6yy0inq1s-dbus-1.12.20.drv»
  «derivation /nix/store/2i6wvm2jqw83qq7rcsh7acdkyisdc3bw-qtbase-5.15.0.drv»
  «derivation /nix/store/q0fg5km866036a1y86rw4bp572v7pwyx-qtsvg-5.15.0.drv»
  «derivation /nix/store/wa02900pzn8q4ylkpkzyh1bsbzgfbv6r-qtdeclarative-5.15.0.drv» ]

nix-repl> python38Packages.shiboken2.buildInputs
[ «derivation /nix/store/qfkak7qkx2cgwqrs9qy275dxfd501c5z-clang-7.1.0.drv»
  «derivation /nix/store/xy9dx0qx4gcnph7bz0g6d616ls5vm0j6-python3-3.8.5.drv»
  «derivation /nix/store/2i6wvm2jqw83qq7rcsh7acdkyisdc3bw-qtbase-5.15.0.drv»
  «derivation /nix/store/2kdzq789vahilya85jbwd1dipazvnx9g-qtxmlpatterns-5.15.0.drv» ]

@FRidh
Copy link
Member

FRidh commented Sep 18, 2020

Yes, I did not test it correctly. See the discussion in #98197.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: python 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants