From fd0c8d9fc9a7e231abff79ffadc801e9f1cf6c52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2007 13:39:50 +0000
Subject: [PATCH] * Latest Qt, kdelibs.

svn path=/nixpkgs/trunk/; revision=8415
---
 pkgs/desktops/kde/kdelibs/default.nix       | 10 ++++++----
 pkgs/development/libraries/qt-3/default.nix |  6 +++---
 pkgs/top-level/all-packages.nix             |  8 +-------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix
index d8f0107007e..fb2a6e6f86f 100644
--- a/pkgs/desktops/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde/kdelibs/default.nix
@@ -4,13 +4,15 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-3.5.0";
+  name = "kdelibs-3.5.6";
+  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.5.0.tar.bz2;
-    md5 = "2b11d654e2ea1a3cd16dcfdcbb7d1915";
+    url = http://ftp.scarlet.be/pub/kde/stable/3.5.6/src/kdelibs-3.5.6.tar.bz2;
+    sha256 = "0p0v4gr61qlvnpg9937chrjh3s7xi3nn7wvrg1xjf8dfqq164xh6";
   };
 
-  inherit openssl libX11 libjpeg;
+  passthru = {inherit openssl libX11 libjpeg;};
+  
   buildInputs = [
     libX11 libXt libXext zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index f0b8b85643f..9b4c25075e1 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -16,13 +16,13 @@ assert mysqlSupport -> mysql != null;
 assert openglSupport -> mesa != null && libXmu != null;
 
 stdenv.mkDerivation {
-  name = "qt-3.3.6";
+  name = "qt-3.3.8";
 
   builder = ./builder.sh;
   hook = ./setup-hook.sh;  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2;
-    md5 = "dc1384c03ac08af21f6fefab32d982cf";
+    url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;
+    sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
   };
 
   buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4903a8f0b..6bffc47bb13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -470,9 +470,8 @@ rec {
   };
 
   qtparted = import ../tools/misc/qtparted {
-    inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib;
+    inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3;
     inherit (xlibs) libX11 libXext;
-    qt3 = qt3NoMySQL;
   };
 
   realCurl = import ../tools/networking/curl {
@@ -1646,11 +1645,6 @@ rec {
     inherit (xlibs) libXft libXrender libXrandr randrproto
       libXmu libXinerama xineramaproto;
     openglSupport = true;
-  };
-
-  qt3NoMySQL = import ../development/libraries/qt-3 {
-    inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql;
-    inherit (xlibs) libXft libXrender;
     mysqlSupport = false;
   };