Merge pull request #12213 from gebner/pyqt55

pyqt5: 5.4.2 -> 5.5.1
This commit is contained in:
Thomas Tuegel 2016-01-07 14:00:12 -06:00
commit f148e119fe
2 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
, lndir, makeWrapper }:
let
version = "5.4.2";
version = "5.5.1";
in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-${version}";
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz";
sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac";
sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a";
};
buildInputs = [

View File

@ -166,7 +166,7 @@ in modules // {
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
sip = self.sip_4_16;
pythonDBus = self.dbus;
inherit (pkgs.qt5) qtbase qtsvg qtwebkit;
inherit (pkgs.qt55) qtbase qtsvg qtwebkit;
};
pyside = callPackage ../development/python-modules/pyside { };