Merge master into x-updates

Llvm refactorings from ae0c9b626f5 included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix

2 files changed, 18 insertions, 22 deletions

diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 7d9679349e8e..ab870492da61 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/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 6d79cf53a6b5..72693a0b5d30 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,28 +1,27 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "sip-4.14.6";
-  
+  name = "sip-4.15.4";
+
   src = fetchurl {
-    urls = [
-      "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"
-      "http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/d6493b9f0a7911566545f694327314c4/${name}.tar.gz"
-    ];
-    sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa";
+    url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
+    sha256 = "0a12lmqkf342yg42ygnjm1fyldcx9pzhy7z68p4ms4ydfcl78jsr";
   };
 
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
     # prevent sip from complaining about python not being built as a framework
     sed -i -e 1564,1565d siputils.py
   '' + ''
-    python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \
+    ${python.executable} ./configure.py \
+      -d $out/lib/${python.libPrefix}/site-packages \
       -b $out/bin -e $out/include
   '';
-  
+
   buildInputs = [ python ];
-  
+
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
+    homepage    = "http://www.riverbankcomputing.co.uk/";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 sander urkud ];
     platforms   = platforms.all;