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

Merge pull request #99956 from FRidh/qt

Browse Source
This commit is contained in:
Doron Behar
2020-10-08 22:49:35 +03:00
committed by GitHub
parent f849b13978 dfcde0341f
commit 7ebd42b87f
23 changed files with 325 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,7 @@ in
dispad = callPackage ../tools/X11/dispad { };
dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; };
dupeguru = callPackage ../applications/misc/dupeguru { };
dump1090 = callPackage ../applications/radio/dump1090 { };
@@ -2061,8 +2061,10 @@ in
gmic = callPackage ../tools/graphics/gmic { };
gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { };
gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { };
# NOTE: If overriding qt version, krita needs to use the same qt version as
# well.
gmic-qt-krita = gmic-qt.override {
variant = "krita";
};
@@ -3703,7 +3705,7 @@ in
flashrom = callPackage ../tools/misc/flashrom { };
flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; };
flent = python3Packages.callPackage ../applications/networking/flent { };
flpsed = callPackage ../applications/editors/flpsed { };
@@ -6491,7 +6493,7 @@ in
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
qarte = libsForQt514.callPackage ../applications/video/qarte { };
qarte = libsForQt5.callPackage ../applications/video/qarte { };
qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { };
@@ -6595,7 +6597,7 @@ in
reredirect = callPackage ../tools/misc/reredirect { };
retext = libsForQt514.callPackage ../applications/editors/retext { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
richgo = callPackage ../development/tools/richgo { };
@@ -9264,7 +9266,18 @@ in
graalvm8-ee
graalvm11-ee;
openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { };
openshot-qt = let
# Cannot use a newer Qt (5.15) version because it requires qtwebkit
# and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
pkgs_ = pkgs.extend(_: prev: {
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
pkgs = oldAttrs.pkgs.extend(_: _: {
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
});
});
});
in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { };
openspin = callPackage ../development/compilers/openspin { };
@@ -10217,10 +10230,9 @@ in
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python {
# Overrides that apply to all Python interpreters
# Overrides that apply to all Python interpreters and their packages
# Generally, this should be avoided.
pkgs = pkgs.extend (final: _: {
qt5 = final.qt514;
libsForQt5 = final.libsForQt514;
});
};
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
@@ -10822,7 +10834,7 @@ in
};
# Does not actually depend on Qt 5
inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
inherit (kdeFrameworks) extra-cmake-modules;
coccinelle = callPackage ../development/tools/misc/coccinelle {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
@@ -11217,7 +11229,7 @@ in
kati = callPackage ../development/tools/build-managers/kati { };
kcc = libsForQt514.callPackage ../applications/graphics/kcc { };
kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
gperf = gperf_3_0;
@@ -15033,7 +15045,7 @@ in
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
kcontacts kquickcharts;
kcontacts kquickcharts kdoctools kapidox;
### KDE PLASMA 5
@@ -15069,6 +15081,8 @@ in
kproperty = callPackage ../development/libraries/kproperty { };
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
kreport = callPackage ../development/libraries/kreport { };
libcommuni = callPackage ../development/libraries/libcommuni { };
@@ -15113,6 +15127,8 @@ in
suffix = "qt5";
};
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
@@ -16763,7 +16779,7 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { };
qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { };
pulseaudioFull = pulseaudio.override {
x11Support = true;
@@ -17515,7 +17531,7 @@ in
fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = libsForQt514.callPackage ../os-specific/linux/ffado {
ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
inherit (pkgs.linuxPackages) kernel;
};
libffado = ffado;
@@ -19738,7 +19754,17 @@ in
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
cadence = libsForQt514.callPackage ../applications/audio/cadence { };
cadence = let
# Use Qt 5.14 consistently
pkgs_ = pkgs.extend(_: prev: {
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
pkgs = oldAttrs.pkgs.extend(_: _: {
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
});
});
});
in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { };
cheesecutter = callPackage ../applications/audio/cheesecutter { };
@@ -19934,9 +19960,9 @@ in
calculix = callPackage ../applications/science/math/calculix {};
calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
calibre = calibre-py3;
@@ -19954,7 +19980,7 @@ in
carddav-util = callPackage ../tools/networking/carddav-util { };
carla = libsForQt514.callPackage ../applications/audio/carla { };
carla = libsForQt5.callPackage ../applications/audio/carla { };
castor = callPackage ../applications/networking/browsers/castor { };
@@ -20101,7 +20127,7 @@ in
coyim = callPackage ../applications/networking/instant-messengers/coyim {};
cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor {
cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor {
python3Packages = python37Packages;
};
@@ -20311,13 +20337,13 @@ in
ekho = callPackage ../applications/audio/ekho { };
electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { };
electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
electrum = libsForQt5.callPackage ../applications/misc/electrum { };
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { };
electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
elementary-planner = callPackage ../applications/office/elementary-planner { };
@@ -20805,10 +20831,10 @@ in
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
freecad = libsForQt514.callPackage ../applications/graphics/freecad {
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
mpi = openmpi;
};
freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix {
freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix {
mpi = openmpi;
opencascade-occt = opencascade-occt730;
python3Packages = python37Packages;
@@ -20839,7 +20865,7 @@ in
freerdpUnstable = freerdp;
friture = libsForQt514.callPackage ../applications/audio/friture { };
friture = libsForQt5.callPackage ../applications/audio/friture { };
fte = callPackage ../applications/editors/fte { };
@@ -20933,7 +20959,7 @@ in
opencv = python37Packages.opencv3;
};
manuskript = libsForQt514.callPackage ../applications/editors/manuskript { };
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
manul = callPackage ../development/tools/manul { };
@@ -21396,7 +21422,7 @@ in
# Impressive, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive { };
inkcut = libsForQt514.callPackage ../applications/misc/inkcut { };
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
inkscape = callPackage ../applications/graphics/inkscape {
lcms = lcms2;
@@ -21562,7 +21588,7 @@ in
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { };
kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
inherit (kdeFrameworks) kdesu;
@@ -21623,7 +21649,7 @@ in
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
kmymoney = libsForQt514.callPackage ../applications/office/kmymoney {
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {
inherit (kdeApplications) kidentitymanagement;
inherit (kdeFrameworks) kdewebkit;
};
@@ -21638,7 +21664,7 @@ in
kpt = callPackage ../applications/networking/cluster/kpt { };
krita = libsForQt514.callPackage ../applications/graphics/krita {
krita = libsForQt5.callPackage ../applications/graphics/krita {
openjpeg = openjpeg_1;
};
@@ -21720,7 +21746,7 @@ in
legit = gitAndTools.legit;
leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { };
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
libowfat = callPackage ../development/libraries/libowfat { };
@@ -22875,7 +22901,18 @@ in
qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix {
# Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit
# and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
qgis-unwrapped = let
pkgs_ = pkgs.extend(_: prev: {
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
pkgs = oldAttrs.pkgs.extend(_: _: {
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
});
});
});
in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix {
withGrass = false;
};
@@ -22907,7 +22944,7 @@ in
qmmp = libsForQt5.callPackage ../applications/audio/qmmp { };
qnotero = libsForQt514.callPackage ../applications/office/qnotero { };
qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
qrcode = callPackage ../tools/graphics/qrcode {};
@@ -23001,15 +23038,7 @@ in
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
qutebrowser = let
pkgs_ = pkgs.extend(_: prev: {
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
pkgs = oldAttrs.pkgs.extend(_: _: {
inherit (pkgs) qt5 libsForQt514;
});
});
});
in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { };
qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
qxw = callPackage ../applications/editors/qxw {};
@@ -23031,7 +23060,7 @@ in
rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { };
rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@@ -23326,11 +23355,11 @@ in
curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
cura = libsForQt514.callPackage ../applications/misc/cura { };
cura = libsForQt5.callPackage ../applications/misc/cura { };
curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { };
curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { };
curaByDagoma = callPackage ../applications/misc/curabydagoma { };
@@ -24050,7 +24079,7 @@ in
webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { };
webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {};
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};

2
pkgs/top-level/python-packages.nix
View File

@@ -4050,6 +4050,8 @@ in {
nose-focus = callPackage ../development/python-modules/nose-focus { };
nose-timer = callPackage ../development/python-modules/nose-timer { };
nosejs = callPackage ../development/python-modules/nosejs { };
nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };