4 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
index 6e4fcbad25c..1b72f8f0b7f 100644
--- a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -2,11 +2,13 @@
   kdebase_workspace, gettext, perl }:
 
 stdenv.mkDerivation rec {
-  name = "kdevelop-4.0.0";
+  name = "${pname}-${version}";
+  version = "4.0.2";
+  pname = "kdevelop";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
-    sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc";
   };
 
   buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index bbd654f5da2..2c474df78d6 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -235,17 +235,6 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
 
-  kdevelop = import ./extragear/kdevelop {
-    inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl;
-    inherit kdevplatform automoc4 kdebase_workspace;
-  };
-
-  kdevplatform = import ./extragear/kdevplatform {
-    inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig
-      apr aprutil boost;
-    inherit kdelibs automoc4 phonon;
-  };
-
   kdesvn = import ./extragear/kdesvn {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
     inherit kdelibs;
@@ -277,7 +266,8 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
   
-  inherit (pkgs) konversation yakuake ktorrent koffice amarok;
+  inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform
+    kdevelop;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
diff --git a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 7be3c89319e..be0e9a44ae8 100644
--- a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -2,11 +2,11 @@
   gettext, pkgconfig, apr, aprutil, boost }:
 
 stdenv.mkDerivation rec {
-  name = "kdevplatform-1.0.0";
+  name = "kdevplatform-1.0.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2";
-    sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6";
+    url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2";
+    sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg";
   };
 
   propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4afc63e85bb..98411d086df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3118,6 +3118,8 @@ let
 
   judy = callPackage ../development/libraries/judy { };
 
+  kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { };
+
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
   lablgtk = callPackage ../development/libraries/lablgtk {
@@ -5797,6 +5799,8 @@ let
 
   kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
 
+  kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
+
   kermit = callPackage ../tools/misc/kermit { };
 
   kino = import ../applications/video/kino {