mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
Upgraded PyQt and dependencies to 4.5.4
svn path=/nixpkgs/trunk/; revision=17031
This commit is contained in:
parent
09920037c0
commit
bb4a7c5299
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue