diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
| commit | e9379f7416d04b6b7ff475816b0aa395c1e3f7f9 (patch) | |
| tree | a7da61f3fa5ed53454e210a59094a162711fcc3f /pkgs/top-level/python-packages.nix | |
| parent | 253b84a1eb2609ea7d71a236040515dc7c131b1b (diff) | |
| parent | 685c34555ccd3d0eb07501783b7ca9d67e03aa18 (diff) | |
| download | nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.gz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.bz2 nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.lz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.xz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.zst nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.zip | |
Merge branch 'staging'
This includes a fix to closure-size regression that moved share/doc/*/ to share/doc/
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77974dff752f..c59bec38d3b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -166,10 +166,9 @@ in modules // { pythonPackages = self; }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { sip = self.sip_4_16; pythonDBus = self.dbus; - inherit (pkgs.qt55) qtbase qtsvg qtwebkit; }; pyside = callPackage ../development/python-modules/pyside { }; |