diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-30 23:58:07 -0700 |
| commit | 612f0bdd679e16bd05397c85de9ea4b147cb45dc (patch) | |
| tree | 68f50e65ea610c52a60ab9bb3b6fe27006db368d /pkgs/development/python-modules | |
| parent | 857efa12fb54a05674406fafcdc43b0576d17eb2 (diff) | |
| parent | ddf15bc78a869ec61487aa20edd4e8d9ba044519 (diff) | |
| download | nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.gz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.bz2 nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.lz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.xz nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.tar.zst nixlib-612f0bdd679e16bd05397c85de9ea4b147cb45dc.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/python-modules/sip/4.16.nix | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 83dac459284c..b89052602d9a 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }: let - version = "5.3"; + version = "5.4.2"; in stdenv.mkDerivation { name = "PyQt-${version}"; @@ -15,10 +15,13 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; - sha256 = "0xc1cc68fi989rfybibimhhi3mqn3b93n0p3jdqznzabgilcb1m2"; + sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac"; }; - buildInputs = [ python pkgconfig makeWrapper lndir qt5 ]; + buildInputs = [ + python pkgconfig makeWrapper lndir + qt5.base qt5.svg qt5.webkit + ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index b10852d17f39..adb6c7ef80d6 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.4"; + name = "sip-4.16.6"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf"; + sha256 = "0lj5f581dkwswlwpg7lbicqf940dvrp8vjbkhmyywd99ynxb4zcc"; }; configurePhase = '' |