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

pythonPackages: set qt version by overriding pkgs

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-09-16 20:54:28 +02:00
parent a4e50bb197
commit c88f3adb17
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10158,7 +10158,13 @@ in
python2Packages = python2.pkgs; python2Packages = python2.pkgs;
python3Packages = python3.pkgs; python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python {}; pythonInterpreters = callPackage ./../development/interpreters/python {
# Overrides that apply to all Python interpreters
pkgs = pkgs // {
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
};
};
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
# Python package sets. # Python package sets.

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

@ -14,11 +14,6 @@
with pkgs.lib; with pkgs.lib;
let
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
in
let let
packages = ( self: packages = ( self:
@ -3598,7 +3593,7 @@ in {
maya = callPackage ../development/python-modules/maya { }; maya = callPackage ../development/python-modules/maya { };
mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
inherit buildPythonPackage isPy27 fetchPypi; inherit buildPythonPackage isPy27 fetchPypi;
inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
}; };
@ -4188,7 +4183,7 @@ in {
ovh = callPackage ../development/python-modules/ovh { }; ovh = callPackage ../development/python-modules/ovh { };
ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; });
owslib = callPackage ../development/python-modules/owslib { }; owslib = callPackage ../development/python-modules/owslib { };
@ -4440,8 +4435,8 @@ in {
pipx = callPackage ../development/python-modules/pipx { }; pipx = callPackage ../development/python-modules/pipx { };
pivy = callPackage ../development/python-modules/pivy { pivy = callPackage ../development/python-modules/pivy {
inherit (qt5) qtbase qmake; inherit (pkgs.qt5) qtbase qmake;
inherit (libsForQt5) soqt; inherit (pkgs.libsForQt5) soqt;
}; };
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; };
@ -4513,8 +4508,8 @@ in {
pooch = callPackage ../development/python-modules/pooch { }; pooch = callPackage ../development/python-modules/pooch { };
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
inherit (qt5) qtbase; inherit (pkgs.qt5) qtbase;
inherit (libsForQt5) poppler; inherit (pkgs.libsForQt5) poppler;
inherit (pkgs) pkgconfig; inherit (pkgs) pkgconfig;
}; };
@ -5219,7 +5214,7 @@ in {
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };
pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; };
pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };
@ -5232,7 +5227,7 @@ in {
pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; };
pyquery = callPackage ../development/python-modules/pyquery { }; pyquery = callPackage ../development/python-modules/pyquery { };
@ -5338,9 +5333,9 @@ in {
pyshp = callPackage ../development/python-modules/pyshp { }; pyshp = callPackage ../development/python-modules/pyshp { };
pyside2-tools = pyside2-tools =
toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; });
pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; });
pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; };
@ -5941,7 +5936,7 @@ in {
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; };
qscintilla = self.qscintilla-qt4; qscintilla = self.qscintilla-qt4;
@ -6122,7 +6117,7 @@ in {
roboschool = callPackage ../development/python-modules/roboschool { roboschool = callPackage ../development/python-modules/roboschool {
inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package
inherit (qt5) qtbase; inherit (pkgs.qt5) qtbase;
}; };
robot-detection = callPackage ../development/python-modules/robot-detection { }; robot-detection = callPackage ../development/python-modules/robot-detection { };
@ -6408,7 +6403,7 @@ in {
shellingham = callPackage ../development/python-modules/shellingham { }; shellingham = callPackage ../development/python-modules/shellingham { };
shiboken2 = shiboken2 =
toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; });
shippai = callPackage ../development/python-modules/shippai { }; shippai = callPackage ../development/python-modules/shippai { };