diff options
author | Song Wenwu <iyzsong@gmail.com> | 2014-01-08 16:39:05 +0800 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2014-01-11 20:07:29 +0100 |
commit | 501008ad6f742c40888ef2b9ddf983373cd8d38a (patch) | |
tree | 9ece6f9d385d8e814e1ddaf9f17867eb47ac4744 /pkgs | |
parent | 98d2f7ea454fa09adfd16ac54bb90bd72eb9025c (diff) |
pyqt4: update to 4.10.3 and add python3 support
also add python3 support for dbus-python
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/pyqt/4.x.nix (renamed from pkgs/development/python-modules/pyqt/default.nix) | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 12 |
3 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 7d9679349e8e1..ab870492da611 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,32 +1,29 @@ { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: stdenv.mkDerivation rec { - name = "PyQt-x11-gpl-4.10.1"; - + name = "PyQt-x11-gpl-4.10.3"; + src = fetchurl { - urls = [ - "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" - "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.10.1.tar.gz/e5973c4ec0b0469f329bc00209d2ad9c/PyQt-x11-gpl-4.10.1.tar.gz" - ]; - sha256 = "05psk23x6bc83hrkw7h88a14jxhvfbxms0c8yrdar8xqvkv8cdb2"; + url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz"; + sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7"; }; - + configurePhase = '' mkdir -p $out lndir ${pythonDBus} $out export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages - + substituteInPlace configure.py \ --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" - + configureFlagsArray=( \ --confirm-license --bindir $out/bin \ --destdir $out/lib/${python.libPrefix}/site-packages \ --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \ --dbus=$out/include/dbus-1.0 --verbose) - python configure.py $configureFlags "''${configureFlagsArray[@]}" + ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; @@ -40,7 +37,7 @@ stdenv.mkDerivation rec { ''; # */ enableParallelBuilding = true; - + meta = { description = "Python bindings for Qt"; license = "GPL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c74a04f9b6d1..0501d18ebee47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6191,7 +6191,7 @@ let sip = callPackage ../development/python-modules/sip { }; - pyqt4 = callPackage ../development/python-modules/pyqt { + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { stdenv = if stdenv.isDarwin then clangStdenv else stdenv; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9c6784987629..60b7e00f019d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -57,6 +57,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { blivet = callPackage ../development/python-modules/blivet { }; + dbus = import ../development/python-modules/dbus { + inherit (pkgs) stdenv fetchurl pkgconfig dbus dbus_glib dbus_tools; + inherit python; + }; + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; @@ -121,6 +126,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage pygobject pycairo; }; + pyqt4 = import ../development/python-modules/pyqt/4.x.nix { + inherit (pkgs) stdenv fetchurl pkgconfig qt4 makeWrapper; + inherit (pkgs.xorg) lndir; + inherit python sip; + pythonDBus = dbus; + }; + sip = import ../development/python-modules/sip { inherit (pkgs) stdenv fetchurl; inherit python; |