Merge pull request #30032 from dtzWill/update/pyqt-sip

pyqt,sip: 5.8.1 -> 5.9, 4.19.1 -> 4.19.3
This commit is contained in:
Frederik Rietdijk 2017-10-08 08:21:02 +02:00 committed by GitHub
commit eedc4e5203
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
, lndir, makeWrapper, qmake }: , lndir, makeWrapper, qmake }:
let let
version = "5.8.1"; version = "5.9";
inherit (pythonPackages) buildPythonPackage python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage { in buildPythonPackage {
name = "PyQt-${version}"; name = "PyQt-${version}";
@ -18,7 +18,7 @@ in buildPythonPackage {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy"; sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb";
}; };
nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; nativeBuildInputs = [ pkgconfig makeWrapper qmake ];

View File

@ -2,13 +2,13 @@
if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
pname = "sip"; pname = "sip";
version = "4.19.1"; version = "4.19.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e"; sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
}; };
configurePhase = '' configurePhase = ''