qt5: use 1t5.15 LTS for certain packages

use qt5.15 LTS instead of 5.14 for packages currently
not building due to broken qtwebengine 5.14
(see https://github.com/NixOS/nixpkgs/issues/169996)

packages were checked on hydra and if broken, tried to build
with qt 5.15. If this succeeded, they were upgraded here.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
main
Florian Brandes 2 years ago
parent acf9b5a348
commit cc4300eccd
No known key found for this signature in database
GPG Key ID: 074048E893713170
  1. 19
      pkgs/top-level/all-packages.nix

@ -7725,7 +7725,7 @@ with pkgs;
ninka = callPackage ../development/tools/misc/ninka { };
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
nodenv = callPackage ../development/tools/nodenv { };
@ -8663,7 +8663,7 @@ with pkgs;
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { };
nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
nnn = callPackage ../applications/misc/nnn { };
@ -12186,7 +12186,7 @@ with pkgs;
colm = callPackage ../development/compilers/colm { };
colmap = libsForQt514.callPackage ../applications/science/misc/colmap { };
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { };
colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
@ -27552,7 +27552,7 @@ with pkgs;
libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
librecad = libsForQt514.callPackage ../applications/misc/librecad {
librecad = libsForQt5.callPackage ../applications/misc/librecad {
boost = boost175;
};
@ -27833,8 +27833,7 @@ with pkgs;
meme-suite = callPackage ../applications/science/biology/meme-suite { };
# Needs qtwebkit which is broken on qt5.15
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
mendeley = libsForQt5.callPackage ../applications/office/mendeley {
gconf = gnome2.GConf;
};
@ -28945,7 +28944,7 @@ with pkgs;
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {
qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {
gdal = gdal.override {
libgeotiff = libgeotiff.override { proj = proj_7; };
libspatialite = libspatialite.override { proj = proj_7; };
@ -30119,7 +30118,7 @@ with pkgs;
virtual-ans = callPackage ../applications/audio/virtual-ans {};
virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox {
virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit;
inherit (gnome2) libIDL;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@ -30402,7 +30401,7 @@ with pkgs;
worldengine-cli = python3Packages.worldengine;
wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {};
wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {};
wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
@ -34867,7 +34866,7 @@ with pkgs;
inherit pkgs lib stdenv;
};
golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {};
golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
linkchecker = callPackage ../tools/networking/linkchecker { };

Loading…
Cancel
Save