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.

Sign up for GitHub

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

20.09: pythonPackages: use latest qt version instead of 5.14 #100428

Merged
merged 44 commits into from
Oct 14, 2020
Merged

20.09: pythonPackages: use latest qt version instead of 5.14 #100428

merged 44 commits into from
Oct 14, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Oct 13, 2020 •
edited
Loading

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.

doronbehar and others added 30 commits October 13, 2020 18:56
@doronbehar @FRidh
python3.pkgs.pyqt5: 5.14.2 -> 5.15.1
dba7e99 
(cherry picked from commit 0331c39)
@FRidh
pythonPackages: use current qt5 instead of 5.14
3a733b6 
(cherry picked from commit edac19f)
@FRidh
qutebrowser: minor fixup regarding use of qt 514
8569001 
In NixOS@3fafb02
the Qt version used by Qutebrowser was downgraded from 5.15 to 5.14.
Let's be consistent by also setting qt514 and including a comment so one
can trace why it is used.

(Note that downgrade gave it the same Qt version as used by the Python
packages set at the time, so in principle the override could be
removed.)

(cherry picked from commit 4bccbd9)
@doronbehar @FRidh
pythonPackages.pyqtwebengine: Apply qt5.14 patch only if needed
224f675 
Since we now use qt5.15 in all python modules (defaulting to the same
qt5 used in all-packages.nix), That patch is not required, but it will
be needed if qt5.14 is used if pythonInterpreters is overridden, which
is likely to happen like it happend to qutebrowser for instance. See:
NixOS@2667af4

(cherry picked from commit 15bfdf8)
@FRidh
carla: 2.1.1 -> 2.2.0 and use the default qt515
bc4fd74 
(cherry picked from commit 1561163)
@doronbehar @FRidh
calibre-py{2,3}: Use libsForQt5 - same is used in python-packages.nix
be17f03 
(cherry picked from commit 2d238fc)
@doronbehar @FRidh
retext: Fix build by using default qt5.15.
f1cf9e1 
Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent
double wrapping.

(cherry picked from commit 198e025)
@doronbehar @FRidh
ffado: Use libsForQt5 (not 514)
8d4e21d 
(cherry picked from commit 5cbf0c1)
@doronbehar @FRidh
cura, curaLulzbot: Use qt5.15
cdf7e80 
Since now Python packages use qt5.15, this should too.

(cherry picked from commit f3e5c93)
@doronbehar @FRidh
electron-cash: 4.1.0 -> 4.1.1
fdb39df 
Remove included upstream patches. Use qt5.15 (NixOS#99956). Spare double
wrapping by using `makeWrapperArgs+=()`.

(cherry picked from commit 2edd4ed)
@doronbehar @FRidh
python3.pkgs.nose-timer: init at 1.0.0
61b17d4 
(cherry picked from commit cd5b560)
@doronbehar @FRidh
python3.pkgs.androguard: rewrite
9e49c84 
Add an optional withGui flag to turn off gui as most of the time it's
not needed since this is a python library.

Use a GitHub tarball to optionally enable tests, currently disabled by
default, but next release' tests should pass (tested the beta release
tag).

Wrap qt apps properly, without double wrapping, if gui is enabled.

(cherry picked from commit 36b7e89)
@doronbehar @FRidh
dupeguru: Don't override qt5 version.
8bcf0f2 
Since Python's pyqt5 is using qt5.15, it should use the same version as
well.

(cherry picked from commit 56d047f)
@doronbehar @FRidh
electrum-ltc: Use default qt5.15.
b8ba7b4 
The same as used by pyqt5 (NixOS#99956).

Also: Fix double wrapping.
(cherry picked from commit bc0113e)
@doronbehar @FRidh
cq-editor: Use qt5.15 completely.
c16a20f 
Don't mix qt5.14 and pyqt5 which uses qt5.15 (NixOS#99956).

(cherry picked from commit 16c2b3c)
@doronbehar @FRidh
flent: Use qt5.15 just like pyqt5 use in it (NixOS#99956)
f508825 
Bonus: Spare double wrapping.
(cherry picked from commit 3d8267e)
@doronbehar @FRidh
friture: Use qt5.15 just like pyqt5
df17b2d 
Don't double wrap executables.

(cherry picked from commit 62738d4)
@doronbehar @FRidh
git-annex-metadata-gui: fix qt wrapping
0fcb1f7 
Wrap application with wrapQtAppsHook and no double wrapping.

(cherry picked from commit f4b8c8f)
@doronbehar @FRidh
freecad: Use libsForQt5 and not qt5.14
7f8c646 
(NixOS#99956).

(cherry picked from commit 244ef6c)
@doronbehar @FRidh
libsForQt5.pulseaudio-qt: init at 1.2.0
4a87f32 
(cherry picked from commit faedc6a)
@doronbehar @FRidh
libsForQt5.kpeoplevcard: init at 0.1
a44e9a7 
(cherry picked from commit 8b16b8c)
@doronbehar @FRidh
vorta: Fix double wrapping
e5d127d 
(cherry picked from commit 883b21d)
@doronbehar @FRidh
krita: Use qt5.15 - same as pyqt5 in it (NixOS#99956)
2899286 
(cherry picked from commit 2aff7cf)
@doronbehar @FRidh
gmic-qt-krita: Use qt5.15 - as used by krita (NixOS#99956)
39fc728 
(cherry picked from commit 32a362b)
@doronbehar @FRidh
inkcut: Use qt5.15, as pyqt5 in it (NixOS#99956)
990a865 
(cherry picked from commit aa20203)
@doronbehar @FRidh
kcc: Use qt5.15, as pyqt5 in it (NixOS#99956)
023936e 
(cherry picked from commit 36caf7e)
@doronbehar @FRidh
leo-editor: Use qt5.15, as pyqt5 in it (NixOS#99956)
fe739f1 
(cherry picked from commit dfec61e)
@doronbehar @FRidh
manuskript: Use qt5.15, as pyqt5 in it (NixOS#99956)
a986ec6 
(cherry picked from commit a9a2cc9)
@doronbehar @FRidh
qarte: Use qt5.15, as pyqt5 in it (NixOS#99956)
560e5f9 
(cherry picked from commit 8b8febd)
@doronbehar @FRidh
qnotero: Use qt5.15, as pyqt5 in it (NixOS#99956)
0ee4d1e 
(cherry picked from commit 0cbd755)
FRidh and others added 6 commits October 13, 2020 18:56
@FRidh
dupeguru: mark as broken
bfb4a3e 
(cherry picked from commit b9af2d2)
@FRidh
qutebrowser: use current qt (5.15) again instead of 5.14
a0b965a 
For security reasons [1] we upgrade to the latest Qt, despite this
breaking a feature, which is why 5.14 was forced earlier.

[1] NixOS#99456 (comment)

(cherry picked from commit 902c567)
@FRidh
openshot-qt: consustently use qt 5.14
0a835dc 
(cherry picked from commit 5d4117b)
@FRidh
puddletag: mark broken
f66b472 
(cherry picked from commit c0d5cf4)
@doronbehar @FRidh
kdeconnect: 1.3.5 -> 20.08.1
f382a99 
Update many dependencies. Add a patch that fixes a build. Use
`libsForQt5` instead of `libsForQt514`.

(cherry picked from commit dfcde03)
@doronbehar @FRidh
python3.pkgs.sip: 4.19.22 -> 4.19.24
0a76980 
(cherry picked from commit 98e6fdd)
@FRidh FRidh requested a review from jonringer as a code owner October 13, 2020 16:59
@FRidh FRidh mentioned this pull request Oct 13, 2020
Merged
@doronbehar @FRidh
kdoctools, kapidox: Remove out of top-level scope
3234443 
They do depend on qt5, and putting them in top level scope could cause
qt5 incompatibilities errors.

(cherry picked from commit 6b6f680)
@FRidh FRidh requested a review from doronbehar October 13, 2020 17:06
@doronbehar
Copy link
Contributor

Did you exclude any commits?

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 13, 2020
@FRidh
Copy link
Member Author

FRidh commented Oct 13, 2020

Nope. The last two shown here needed some fixing, and the first one from the original PR is the third last here.

@FRidh
Copy link
Member Author

FRidh commented Oct 13, 2020

I have tested several applications, definitely not all of them. This at least fixes the ones that were failing for me.

@doronbehar
Copy link
Contributor

I too think no commits should be excluded.

@FRidh
Copy link
Member Author

FRidh commented Oct 13, 2020

attribute 'kidentitymanagement' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/packet-spot-eval-3/pkgs/top-level/all-packages.nix:21501:70

@jonringer
Copy link
Contributor

jonringer commented Oct 13, 2020 •
edited
Loading

@FRidh not all the applications are exposed correctly, since the 20.09 kde merge has to deviate from master

EDIT: example #99139

@jonringer
Copy link
Contributor

jonringer commented Oct 13, 2020 •
edited by FRidh
Loading

cc @ttuegel

@FRidh
Copy link
Member Author

FRidh commented Oct 14, 2020

Something is of here with ofborg/actions. Everything succeeded, but it hasn't received the signal to pass the "Wait for ofborg" job.

@doronbehar
Copy link
Contributor

Noticed that on other PRs. Could be fixed with #100269 ?

@FRidh
Copy link
Member Author

FRidh commented Oct 14, 2020

Thanks. Then this goes in.

@FRidh FRidh merged commit ad0d203 into NixOS:release-20.09 Oct 14, 2020
@FRidh FRidh deleted the qt branch October 14, 2020 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

@doronbehar doronbehar Awaiting requested review from doronbehar

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@FRidh @doronbehar @jonringer