diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-07 14:00:12 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-07 14:00:12 -0600 |
| commit | f148e119fe963e4c25051f34dcc48d3469089dd9 (patch) | |
| tree | 89d50b94e379d4880c730b947f7ac3f65f23c781 | |
| parent | 57e0febda6ea93b226d1e8ac7dbd40f4f92e4980 (diff) | |
| parent | 7c2845128749d1f4a4bf5644695e876193c5932b (diff) | |
| download | nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar.gz nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar.bz2 nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar.lz nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar.xz nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.tar.zst nixpkgs-f148e119fe963e4c25051f34dcc48d3469089dd9.zip | |
Merge pull request #12213 from gebner/pyqt55
pyqt5: 5.4.2 -> 5.5.1
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index c2e5cb1a763..2cc1a82ca09 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -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 = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f2f6135997..662ff4d8386 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; |