diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index deba647c662..ac7e3efcee4 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,17 @@ -{stdenv, fetchurl, python, sip, qt4}: +{stdenv, fetchurl, lib, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.4.4"; + name = "pyqt-x11-gpl-4.5.4"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.4.4.tar.gz; - md5 = "4bd346d56d10452e47ac71e2cbe04229"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.5.4.tar.gz; + sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/python2.5/site-packages -v $out/share/sip -p $out/plugins"; buildInputs = [ python sip qt4 ]; + meta = { + description = "Python bindings for Qt"; + license = "GPL"; + homepage = http://www.riverbankcomputing.co.uk; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index 4dca67cd3f7..5268dbb7a0c 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,16 @@ -{stdenv, fetchurl, python}: +{stdenv, fetchurl, lib, python}: stdenv.mkDerivation { - name = "sip-4.7.9"; + name = "sip-4.8.2"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.7.9.tar.gz; - md5 = "597d7ff7edb42a18421c806ffd18a136"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.8.2.tar.gz; + sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf"; }; configurePhase = "python ./configure.py -d $out/lib/python2.5/site-packages -b $out/bin -e $out/include"; buildInputs = [ python ]; + meta = { + description = "Creates C++ bindings for Python modules"; + license = "GPL"; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 466c002df8a..e4cd91067ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4475,7 +4475,7 @@ let }; sip = import ../development/python-modules/python-sip { - inherit stdenv fetchurl python; + inherit stdenv fetchurl lib python; }; pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") { @@ -4486,7 +4486,8 @@ let }; pyqt4 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl python sip qt4; + inherit stdenv fetchurl lib python sip; + qt4 = qt45; }; pyx = import ../development/python-modules/pyx {