gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'move-to-qt5.15' into current

Browse Source
This commit is contained in:
Florian Brandes
2022-04-25 09:34:46 +02:00
parent dcb64f2f7c cc4300eccd
commit 79c90fc7be
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/top-level/all-packages.nix
View File

@@ -7727,7 +7727,7 @@ with pkgs;
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
nodenv = callPackage ../development/tools/nodenv { }; nodenv = callPackage ../development/tools/nodenv { };
@@ -8670,7 +8670,7 @@ with pkgs;
nmap-formatter = callPackage ../tools/security/nmap-formatter { }; 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 { }; nnn = callPackage ../applications/misc/nnn { };
@@ -12195,7 +12195,7 @@ with pkgs;
colm = callPackage ../development/compilers/colm { }; 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; }; colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
@@ -27577,7 +27577,7 @@ with pkgs;
libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
librecad = libsForQt514.callPackage ../applications/misc/librecad { librecad = libsForQt5.callPackage ../applications/misc/librecad {
boost = boost175; boost = boost175;
}; };
@@ -27858,8 +27858,7 @@ with pkgs;
meme-suite = callPackage ../applications/science/biology/meme-suite { }; meme-suite = callPackage ../applications/science/biology/meme-suite { };
# Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt5.callPackage ../applications/office/mendeley {
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
gconf = gnome2.GConf; gconf = gnome2.GConf;
}; };
@@ -28968,7 +28967,7 @@ with pkgs;
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt { qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {
gdal = gdal.override { gdal = gdal.override {
libgeotiff = libgeotiff.override { proj = proj_7; }; libgeotiff = libgeotiff.override { proj = proj_7; };
libspatialite = libspatialite.override { proj = proj_7; }; libspatialite = libspatialite.override { proj = proj_7; };
@@ -30142,7 +30141,7 @@ with pkgs;
virtual-ans = callPackage ../applications/audio/virtual-ans {}; virtual-ans = callPackage ../applications/audio/virtual-ans {};
virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -30425,7 +30424,7 @@ with pkgs;
worldengine-cli = python3Packages.worldengine; worldengine-cli = python3Packages.worldengine;
wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {};
wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
@@ -34890,7 +34889,7 @@ with pkgs;
inherit pkgs lib stdenv; 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 { }; linkchecker = callPackage ../tools/networking/linkchecker { };