diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-21 08:01:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-21 08:01:57 +0200 |
commit | ef1679a0384bdeafb8545e58c87b8ec78f5f6b08 (patch) | |
tree | 6c74ce257a782fd3d6d59d7486d71919614f6039 /pkgs/top-level/python-packages.nix | |
parent | c7d4882ab15f911258adf853785c904620159707 (diff) | |
parent | 9b83c440f67d1e77387a99577a845318756a23ff (diff) | |
download | nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar.gz nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar.bz2 nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar.lz nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar.xz nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.tar.zst nixlib-ef1679a0384bdeafb8545e58c87b8ec78f5f6b08.zip |
Merge pull request #85171 from bcdarwin/python3-mayavi
python3Packages.mayavi: update from Python 2 to Python 3 (and switch from wxPython to pyqt5)
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a8c5a3d56a8..cb5cbb5375a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4378,7 +4378,10 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = callPackage ../development/python-modules/mayavi { }; + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + inherit buildPythonPackage isPy27 fetchPypi; + inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; + }; mccabe = callPackage ../development/python-modules/mccabe { }; |