From bf8e36dd4f4f24657ebd280c632efae0d1f5b894 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Mar 2011 19:57:52 +0000
Subject: [PATCH] * Revert PyQt and sip because the upgrade breaks KDE, but use
   tarballs on nixos.org.

svn path=/nixpkgs/trunk/; revision=26164
---
 pkgs/development/python-modules/pyqt/default.nix       | 6 +++---
 pkgs/development/python-modules/python-sip/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 2981d9bfdb66..b5ec01a52d5d 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "PyQt-x11-gpl-4.8.3";
+  name = "PyQt-x11-gpl-4.8.1";
   
   src = fetchurl {
-    url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
-    sha256 = "0r6nqdbr8hls8bywr9wahgda6sh1pzmhb51fz8fl8zsdpffzwnca";
+    url = "http://nixos.org/tarballs/${name}.tar.gz";
+    sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
   };
   
   preConfigure = ''
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index 9d7b44b96a04..7f27400c04a3 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "sip-4.12.1";
+  name = "sip-4.11.2";
   
   src = fetchurl {
-    url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
-    sha256 = "1dc16f8m52qc824ksvyfhkdmsjbxyq82g5dr2xn8x9f26246xmp9";
+    url = "http://nixos.org/tarballs/${name}.tar.gz";
+    sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
   };
   
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";