diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 25d651eabfd..5124ff5d6dd 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -4,20 +4,20 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "audacious-2.4.2";
+  name = "audacious-3.0";
   
   src = fetchurl {
-    url = "http://distfiles.atheme.org/${name}.tgz";
-    sha256 = "03dd0fn17znjbmnc7hiafsg1axiwysk9q4r21s6giy2yfwhi8b30";
+    url = "http://distfiles.atheme.org/${name}.tar.gz";
+    sha256 = "0kj78hgf73fmbm6y3idir2kavbnnlv0jb9ka0pcsb12sxb994s68";
   };
 
   pluginsSrc = fetchurl {
-    url = "http://distfiles.atheme.org/audacious-plugins-2.4.2.tgz";
-    sha256 = "1a2vbqyamlpvnhr3mm8b5i9304d16c796v2ycw3i396ppjvnhyxz";
+    url = "http://distfiles.atheme.org/audacious-plugins-3.0.tar.gz";
+    sha256 = "0hhxk1mxnnrb1shshpf1nf8mqpc9q1qpsljwn4jzylcnwy6pq4rw";
   };
   
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
-  configureFlags = "--enable-amidiplug";
+  configureFlags = "--enable-amidiplug --disable-oss";
   
   buildInputs =
     [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
       )
     '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
     homepage = http://audacious-media-player.org/;
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 6fa69beee20..6bd9e0b376e 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "cdparanoia-III-alpha9.8";
+stdenv.mkDerivation rec {
+  name = "cdparanoia-III-10.2";
+  
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz;
-    md5 = "7218e778b5970a86c958e597f952f193";
+    url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
+    sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
   
-  patches = [./fix.patch];
-
   meta = {
     homepage = http://xiph.org/paranoia;
+    description = "A tool and library for reading digital audio from CDs";
   };
 }
diff --git a/pkgs/applications/audio/cdparanoia/fix.patch b/pkgs/applications/audio/cdparanoia/fix.patch
deleted file mode 100644
index 4a1c526c7d8..00000000000
--- a/pkgs/applications/audio/cdparanoia/fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-*** cdparanoia-III-alpha9.8/interface/utils.h	Thu Apr 20 00:41:04 2000
---- cdparanoia-III-alpha9.8-old/interface/utils.h	Wed Jan 19 21:44:08 2005
-***************
-*** 110,117 ****
-      case CDDA_MESSAGE_LOGIT:
-        d->errorbuf=catstring(d->errorbuf,s);
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-  }
---- 110,115 ----
-***************
-*** 125,132 ****
-      case CDDA_MESSAGE_LOGIT:
-        d->messagebuf=catstring(d->messagebuf,s);
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-  }
---- 123,128 ----
-***************
-*** 167,174 ****
-  	}
-        }
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-    if(malloced)free(buffer);
---- 163,168 ----
-***************
-*** 203,210 ****
-  	if(!malloced)*messages=catstring(*messages,"\n");
-  	}
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-    if(malloced)free(buffer);
---- 197,202 ----
diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index ec8a4eaae91..7458626769a 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.12";
+  version = "5.14";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256="1knvxxr50iq3wrx1qsgg174gzv7xg8c74i1a66ff55f8flksa7di";
+    sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy";
   };
 
   buildInputs =
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 0826f7241c4..b1001976ea0 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
 , libungif, zlib, x11, libX11, mesa, qt3 }:
 
-stdenv.mkDerivation {
-  name = "djvulibre-3.5.22";
+stdenv.mkDerivation rec {
+  name = "djvulibre-3.5.24";
 
   src = fetchurl {
-    url = mirror://sourceforge/djvu/djvulibre-3.5.22.tar.gz;
-    sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
+    url = "mirror://sourceforge/djvu/${name}.tar.gz";
+    sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0";
   };
 
   buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 6c6b469f18d..2e58a028a30 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,27 +1,27 @@
 { stdenv, fetchurl, pkgconfig, gtk, poppler }:
+
 stdenv.mkDerivation rec {
-  name = "zathura-0.0.5";
+  name = "zathura-0.0.8.4";
+  
   src = fetchurl {
-    #url = "https://pwmt.org/zathura/download/{name}.tar.gz"
-    # Site's SSL cert is invalid, and I dunno how to pass --insecure to curl.
-    # Thanks Mark Weber for mirroring this tarball.
-    url = "http://mawercer.de/~nix/${name}.tar.gz";
-    sha256 = "e4dfbcceafc7bcb5c4e1ff349822c610db6378906ab65aabba8be246d7ee9b52";
+    url = "http://pwmt.org/download/${name}.tar.gz";
+    sha256 = "03iq6n7bpgrkq3l8b2ab3flcfxrqpxc1f3ycn31xr2b6bjwi72qn";
   };
+  
   buildInputs = [ pkgconfig gtk poppler ];
-  patchPhase = ''
-    substituteInPlace config.mk --replace 'PREFIX = /usr' "PREFIX = $out"
-  '';
+
+  makeFlags = "PREFIX=$(out)";
+  
   meta = {
     homepage = https://pwmt.org/zathura/;
     description = "A highly customizable and functional PDF viewer";
     longDescription = ''
-      zathura is a highly customizable and functional PDF viewer based on the
+      Zathura is a highly customizable and functional PDF viewer based on the
       poppler rendering library and the gtk+ toolkit. The idea behind zathura
       is an application that provides a minimalistic and space saving interface
       as well as an easy usage that mainly focuses on keyboard interaction.
     '';
     license = "free";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index e51e91478b7..348a5e7e323 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -61,11 +61,13 @@ let
       license = "unfree";
     };
   } else null;
+  
   ffmpegGit = fetchgit {
     url = "git://git.videolan.org/ffmpeg.git";
     rev = "80d156d";
     sha256 = "6d0124621491b8adc5f1bfb426ab137efc72dab99a89835aa3c30b970cb14004";
   };
+  
   mplayerRev = "33472";
 
 in
@@ -134,6 +136,7 @@ stdenv.mkDerivation rec {
     --disable-ivtv
     --enable-vidix
     --enable-fbdev
+    --disable-ossaudio
   '';
 
   NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c96dfeb013f..ce7b233fdd2 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, xlibs, libdvdnav
-, zlib, a52dec, libmad, faad2, ffmpeg, alsa
+, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
 , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
 , libvorbis, libtheora, speex, lua, libgcrypt, libupnp
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
@@ -10,17 +10,17 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "1.1.9";
+  version = "1.1.11";
 
   patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
 
   src = fetchurl {
     url = "mirror://sourceforge/vlc/${name}.tar.bz2";
-    sha256 = "02rdrfxh7d70yxz0qinmkw2jad2hxzfrw0r1hiyyxandrgg73ggh";
+    sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8";
   };
 
   buildInputs = [
-    perl zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread
+    perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
     pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt
     libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index b4713794a03..d86538b42d5 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -1,12 +1,15 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "shared-desktop-ontologies-0.5";
+  name = "shared-desktop-ontologies-0.7.1";
+  
   src = fetchurl {
-    url = "mirror://sf/oscaf/${name}.tar.bz2";
-    sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r";
+    url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
+    sha256 = "1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy";
   };
+  
   buildInputs = [ cmake ];
+  
   meta = with stdenv.lib; {
     description = "Ontologies necessary for the Nepomuk semantic desktop";
     longDescription = ''
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 61fc028f543..63357fb45a3 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
+{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool  }:
 
 stdenv.mkDerivation rec {
-  name = "xkeyboard-config-1.9";
+  name = "xkeyboard-config-2.1";
 
   src = fetchurl {
     url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
-    sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
+    sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr";
   };
 
-  buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
+  buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ];
 
   patches = [ ./eo.patch ];
 
diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index f7e35c5dba7..ec4c2ecc4cb 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -19,10 +19,10 @@ kde.package rec {
       -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
     )
   '';
-  
+
   # TODO: okular, qimageblitz, qwt5, qscintilla2, c#
   buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
-          kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ];
+          kdelibs kdepimlibs automoc4 soprano attica polkit_qt_1 ruby ];
 
   meta = {
     description = "KDE bindings";
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d09b4ae3f53..e8cb4ab56d3 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
+{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
 
 let
 
@@ -24,7 +24,9 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  phonon = null;
+  ffmpeg = ffmpeg_0_6_90;
+
+  shared_desktop_ontologies = callPackage ./support/shared-desktop-ontologies { };
 
   kde = callPackage ./kde-package { inherit release; };
 
@@ -125,7 +127,7 @@ recurseIntoAttrs rec {
     ktimer = callPackage ./utils/ktimer.nix { };
     kwallet = callPackage ./utils/kwallet.nix { };
     okteta = callPackage ./utils/okteta.nix { };
-    printer_applet = callPackage ./utils/printer-applet.nix { };
+    #printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
   };
@@ -142,7 +144,8 @@ recurseIntoAttrs rec {
 
 ### DEVELOPMENT
 
-  kdebindings = callPackage ./bindings { };
+  #kdebindings = callPackage ./bindings { };
+  kdebindings = null;
 
   l10n = callPackage ./l10n { inherit release; };
 
diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix
index a83b2a9494a..8a407b3f572 100644
--- a/pkgs/desktops/kde-4.5/games/default.nix
+++ b/pkgs/desktops/kde-4.5/games/default.nix
@@ -7,10 +7,6 @@ kde.package {
   buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
     kdebindings twisted python pyqt4 sip makeWrapper ];
 
-  postInstall = ''
-    wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
-    wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
-
   meta = {
     description = "KDE Games";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index 9e9ac65c016..c45b9ac98f8 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -2,7 +2,7 @@
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
 , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, phonon
 }:
 
 kde.package {
@@ -19,7 +19,7 @@ kde.package {
 # Split plugins from libs?
 
   propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
-    shared_desktop_ontologies ];
+    shared_desktop_ontologies phonon ];
 
   patches = [ ./polkit-install.patch ];
 
diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
index d92f1eecc73..6fb6a44d38d 100644
--- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
@@ -12,7 +12,7 @@ kde.package rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
+    sha256 = "0w99jv0lzajmz9gvgss8gkgffm0lpqv3r6pzfsnqhrdhcf6h853y";
   };
 
   meta = {
@@ -21,7 +21,7 @@ kde.package rec {
     license = "GPL";
     kde = {
       name = "kdepim-runtime";
-      version = "4.4.8";
+      version = "4.4.9";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix
index cdcc3dc023d..5f7d5e06c48 100644
--- a/pkgs/desktops/kde-4.5/pim/default.nix
+++ b/pkgs/desktops/kde-4.5/pim/default.nix
@@ -16,7 +16,7 @@ kde.package rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
+    sha256 = "0pr1n6k51aadi8fsk7rkv0vrfl4y6llywxjkzci6if7g300yd8r8";
   };
 
   meta = {
@@ -28,7 +28,7 @@ kde.package rec {
     homepage = http://pim.kde.org;
     kde = {
       name = "kdepim";
-      version = "4.4.8";
+      version = "4.4.9";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix b/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix
new file mode 100644
index 00000000000..b4713794a03
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, cmake}:
+
+stdenv.mkDerivation rec {
+  name = "shared-desktop-ontologies-0.5";
+  src = fetchurl {
+    url = "mirror://sf/oscaf/${name}.tar.bz2";
+    sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r";
+  };
+  buildInputs = [ cmake ];
+  meta = with stdenv.lib; {
+    description = "Ontologies necessary for the Nepomuk semantic desktop";
+    longDescription = ''
+      The shared-desktop-ontologies package brings the semantic web to the
+      desktop in terms of vocabulary. It contains the well known core
+      ontologies such as RDF and RDFS as well as the Nepomuk ontologies which
+      are used by projects like KDE or Strigi.
+    '';
+    platforms = platforms.all;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix
deleted file mode 100644
index 997ad8ff4f4..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE Accessibility color schemes";
-    kde = {
-      name = "ColorSchemes";
-      module = "kdeaccessibility";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix
deleted file mode 100644
index 2f18298f227..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE mono icon theme";
-    kde = {
-      name = "IconThemes";
-      module = "kdeaccessibility";
-      version = "4.5.90";
-    };
-  };
-}
-
diff --git a/pkgs/desktops/kde-4.6/admin/builder.sh b/pkgs/desktops/kde-4.6/admin/builder.sh
deleted file mode 100644
index 78e29543c1f..00000000000
--- a/pkgs/desktops/kde-4.6/admin/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
-    do
-	sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
-    done
-
-	sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/desktops/kde-4.6/admin/default.nix b/pkgs/desktops/kde-4.6/admin/default.nix
deleted file mode 100644
index 8b91430ddd9..00000000000
--- a/pkgs/desktops/kde-4.6/admin/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, cmake, qt4, pkgconfig, perl, python
-, sip, pyqt4, pycups, rhpl, system_config_printer
-, kdelibs, kdepimlibs, kdebindings, automoc4}:
-
-kde.package {
-
-  builder = ./builder.sh;
-
-  inherit system_config_printer;
-
-  # TODO: split, check which packages work on nixos
-
-  PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
-
-  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
-                  kdelibs kdepimlibs kdebindings automoc4 ];
-
-  meta = {
-    description = "KDE Administration Utilities";
-    license = "GPL";
-    kde.module = "kdeadmin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/artwork/aurorae.nix b/pkgs/desktops/kde-4.6/artwork/aurorae.nix
deleted file mode 100644
index 307cdf92ba0..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/aurorae.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "aurorae-themes-${meta.kde.version}";
-
-  buildInputs = [ cmake automoc4 kdelibs ];
-  meta = {
-    kde = {
-      name = "aurorae";
-      module = "kdeartwork";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix
deleted file mode 100644
index 9719fefc33f..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "nuvola-icon-theme-${meta.kde.version}";
-# Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ cmake automoc4 kdelibs ];
-  meta = {
-    description = "KDE nuvola icon theme";
-    kde = {
-      name = "IconThemes";
-      module = "kdeartwork";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/artwork/phase-style.nix b/pkgs/desktops/kde-4.6/artwork/phase-style.nix
deleted file mode 100644
index 068bc458a1a..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/phase-style.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-style-phase-${meta.kde.version}";
-
-  buildInputs = [ cmake automoc4 kdelibs ];
-  meta = {
-    description = "KDE phase style. Clean classical look";
-    kde = {
-      name = "styles";
-      module = "kdeartwork";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/base-runtime/default.nix b/pkgs/desktops/kde-4.6/base-runtime/default.nix
deleted file mode 100644
index 3bafa9a8cde..00000000000
--- a/pkgs/desktops/kde-4.6/base-runtime/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
-  shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
-  cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
-
-kde.package {
-
-  buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
-    exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
-    makeWrapper];
-
-# TODO: OpenSLP, OpenEXR
-  postInstall = ''
-    rm -v $out/share/icons/default.kde4
-    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
-        --prefix PATH : "${virtuoso}/bin"
-  '';
-
-  meta = {
-    description = "KDE runtime";
-    longDescription = "Libraries and tools which supports running KDE desktop applications";
-    license = "LGPL";
-    kde.module = "kdebase-runtime";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/base-workspace/default.nix b/pkgs/desktops/kde-4.6/base-workspace/default.nix
deleted file mode 100644
index 0d7de80085f..00000000000
--- a/pkgs/desktops/kde-4.6/base-workspace/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, cmake, perl, python, pam, consolekit
-, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
-, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
-, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
-, automoc4, strigi, soprano, qimageblitz, akonadi
-, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
-}:
-
-kde.package {
-
-# TODO: qedje, qzion, ggadgets, libgps
-  buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
-    kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394
-    libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
-    strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate
-    pciutils bluez ];
-
-  meta = {
-    description = "KDE base platform-specific components";
-    longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
-    license = "GPL";
-    kde.module = "kdebase-workspace";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/base/default.nix b/pkgs/desktops/kde-4.6/base/default.nix
deleted file mode 100644
index 58ec6948580..00000000000
--- a/pkgs/desktops/kde-4.6/base/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi
-, qimageblitz, soprano}:
-
-kde.package {
-  preConfigure = "cd apps";
-
-  buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
-    strigi qimageblitz ];
-
-  meta = {
-    description = "KDE Base components";
-    longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
-    license = "GPL";
-    kde.module = "kdebase";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/games/default.nix b/pkgs/desktops/kde-4.6/games/default.nix
deleted file mode 100644
index 74bb1c57ddd..00000000000
--- a/pkgs/desktops/kde-4.6/games/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
-, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
-
-kde.package {
-
-# TODO: ggz
-  buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
-    kdebindings twisted python pyqt4 sip makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
-    wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-    kde.module = "kdegames";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix b/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
deleted file mode 100644
index a3d83513bb8..00000000000
--- a/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  stable = true;
-  packages = builtins.listToAttrs [
-    {
-      name = "kdeaccessibility";
-      value = "06b1w7gnfga4nd0spx48s5cx5jfsc9mxzc5yncns0471ia98ww92";
-    }
-    {
-      name = "kdeadmin";
-      value = "0nl3smhlsa4f68qq6p1kjbai2v5lbji2v84k96jfqvpjbkygkq27";
-    }
-    {
-      name = "kdeartwork";
-      value = "1qy0qwl3p0k5myd2f2ky400r5wvaq8gbvgb7mq6093amq0fghxlx";
-    }
-    {
-      name = "kdebase";
-      value = "095k83i1wd3cpk1pyc451gc4fajjynfknf83jsb6vxqisvm2mjn2";
-    }
-    {
-      name = "kdebase-runtime";
-      value = "1vwjly7p28sbhkg1vvnm0l94l2kwcs64jfh9hxlrgfz2bqp48b87";
-    }
-    {
-      name = "kdebase-workspace";
-      value = "10jkv4si6v12m9gspb7yk6x34lanwrnwfdw68jr59wp1ibcpkzzl";
-    }
-    {
-      name = "kdebindings";
-      value = "1xggvgryadi93hn3223614z4qajvypllxjscixv5zc9mvyh9z3ng";
-    }
-    {
-      name = "kdeedu";
-      value = "1x3s0dz8kyd8x7parzks434ifr8mj3w3lwaw30np4khgva258r2n";
-    }
-    {
-      name = "kdegames";
-      value = "1p8d9sy9mafza428wkj5g8hnfl8d06wqf74pdd39yr1ilmw0w1rb";
-    }
-    {
-      name = "kdegraphics";
-      value = "0j28aa2bglhpi9ck6a7334q603k7lfmfsr47grab81ic9aw6x38n";
-    }
-    {
-      name = "kdelibs";
-      value = "1pfydrdi4zwyxpygfmvk2jnfjal747kpf1m2az4fhvv91kx4clpd";
-    }
-    {
-      name = "kdemultimedia";
-      value = "1dhi7m5f22pz7sdrcl9g8zwf0mqcxzcys8hgbxzjfwjkg6h8mz28";
-    }
-    {
-      name = "kdenetwork";
-      value = "0d37db21nz3kjrr1swqykdbzwq3x4kapy3b9pbjic38phfnxksrs";
-    }
-    {
-      name = "kdepimlibs";
-      value = "1377lhlkfadfsqylkjm8hs8csak2cr6lwgimv97wxmp3x8v3lddq";
-    }
-    {
-      name = "kdeplasma-addons";
-      value = "0p8vzvnf0alk9yfv2ynawfbb33h68yhgc3f2ibgm1sdyg4gqx615";
-    }
-    {
-      name = "kdesdk";
-      value = "12hm20pzxj1k42l52dvjl64xda2r2gnvzlmf9kx9c5ccc0p8ch9z";
-    }
-    {
-      name = "kdetoys";
-      value = "0qaxy74n9g0vd6vqqwj3avbi3zhxikxk5aghdy2ynininmwzvqd9";
-    }
-    {
-      name = "kdeutils";
-      value = "1nv2fk8i77vc4jz9cbg4hvw5azw7ncvs3ircj74xy3ndw5b3fhxa";
-    }
-    {
-      name = "kdewebdev";
-      value = "0yl21qixd2ch6jxxccy03qnwnrws4lhbzj5hiv9pkw8w6zm16503";
-    }
-    {
-      name = "oxygen-icons";
-      value = "0a56q2d6nz3nsh8l5cycjiw7dq6ffkgyg3gyqql5iszcp6hrif3b";
-    }
-  ];
-}
diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
deleted file mode 100644
index 6922427b502..00000000000
--- a/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1dadlmd3s3752hcssnpzagly18yx7bj3r9pkc5qcb8nn9h91a92x";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1nhqxdllfsljfnpw6ii78nfbv4rqncha1jjz9x9mz59qw4671a6n";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1siha5sihazjdp7r26isi2m1s6nhzg4f7z2qqghh64lj3pw4xbzc";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1d977lm78s1jq49ss5k6a6ixz1wiaq03i6pdjpl09jyirmlkg7dw";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "193xk5xsqq81xqcwmpix4dcz4l3qbwnvk1bc6awapcr8g56cgxbx";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1y3b36y6w3ca238bnyvfvbkvpadbyvch40p4g82fg16ifnqpxrc7";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1h38dxq6ggrvmc6b2w825xk7sf1032m9psfpg04gzarq6qicskdw";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0ngs7k9nd7vz54804jnbvm10d8iiajvkiz01g9pimkiwlid325d3";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "12fr4npqcrsnndlz8qvbca5v6r0da53phxa1mks8ka603gh76hg3";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1mf034ha0n27f82cx20cfr1jsbiapz4zs8bwwhjbdbiizsxivanj";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1x1b8kn8fnv6dvg6f2j6h8kg1g4z3j9zb16likiwb6rp7fy0a859";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1y2gwi2x5qx04yfqhn21asgsc67kn895l4npi8nhzv2pa0w8mif6";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0lfw1s7ryl5fmrj07390ldayxkfsrc3haxfi8987pg8vxwsicb7n";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "00i2ziid18c5hz468rv1mljzpyky84r03bmszy8hlakd2jmsbm9r";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0qg200sqbnq00qpcmgw10xl6hyjk50m1zks5nly5lxpfxqkmpqzh";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0mivdn6hq7icl41pkaim6rc4z3ilsiqlaj84s8q46f8dmh9hdvnv";
-}
-{
-  lang = "gu";
-  saneName = "gu";
-  sha256 = "1h2df76bqhnxmgwgbck69f58p616fra7jqwdi91n5zdga975y4ag";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1gfq82666x3rvrd84qfy51638gbi6r081fxd19av52k00npkrgi5";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "1k8916yv4bs5h40dvh9p4vgpyk1ylyckliazkwaldqdhghzfkzp3";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "011pkb42m0arlkkcmlj2r353k7ybglhfsb2hjh5b3bg2sq8cmpcm";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "124x73ag3nhs9ghfn4lpw29zjyycbj9zxin2d5rb2zdj8r9p2dcw";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1j592k8z7d08sngazjqv6fpym4863s0hg1swcvnmys5ighm69dvh";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "01h3ax0dqca05qn2vm9v12wd4iyhk2q69lwa6zic6maqnj47s50s";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0qgwfr9k2zqqcxwh82bf0x58h9wd03l9j87hz4xpw2k3jc82fpbk";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1rmqp0v018na4s60cq5j5nqpvz94fyvhklwb1zjhdlfd2lfwcjrc";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1qhibkrm2qmra6ib1973dqwz43w1sd87ys8hnnnjn52fwshpcm5z";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1si8kfsw0h1jr4grgy6b7q3gnlv6pxpr7rlgl3g9b2f62zc1xaxd";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1gs09hxd66qxl5kwg1rd9xfqvy8l1s49lc09971rr9qw9kxy43ks";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "13jgfbac3b5zsjgfw7zqk5l7wxnhsnf1kpa5ski002jcxb354n7q";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0k0jgf6w94fd21ah609axqdgwn8rmx3j09cn95i0g258f8mvibhg";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0nh57snn8ar077k6fj9j2fza9wpwc7j8lvwzfab7i5gka7js9vj5";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0a2w06gvgxzh312fqnagp7r8hcbry61mvy9d4lh3kvd13gkgzi9z";
-}
-{
-  lang = "mai";
-  saneName = "mai";
-  sha256 = "1l8y0ck50h4wmirk3vkmj5lbcv0h8pir1wlfs15mbsk93r89fyys";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1qw29p7w4ik8wnipsmiyfgp3k438ndr8c4m3c4p2gwx6v06vfynx";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1gp0bqmrzpi0fsp919sj057q8c4zzyi7hxanrns6kc4q42x17xd2";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1k6694lxp0szkqdb68zsvpq15zlvi51zxz9samgd7z4ng99hvv12";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "19sp5zaccvlkfjh29dz7i9d6whxa3ap6ji0g3dxkfix76xjchlir";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "09x53m297jiqv1qclp532c6g0d9d9z5k7kdaivhi69vj2bikf63p";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0ygajy6mmdkxidq72qhbacn8hfq8rjvc0frz0jrvv2s2ywawknpn";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1333564qpzvdx6qv9hs6n4yssh3lakskdr69hmbjyvnmjdx07f1y";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1p378b8nncr55vkk9sfry6zj1zhjrvswwsb5az9q1yk14wgc050a";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "15lpmdidf3as9pbw7qgryvwk26sjb9lw9v3bvxx34aq299ifb6hf";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1n8zwhlkn9sf256jdp7fh9qazwvn95qmr789ndg1xr7xm87y87fw";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1q3bg2kw5fghzjx6a9j0029f11w7hir67ll8pl8xi4dpw4fxdqy1";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "17xr2p3nwx3sswc3qq6qqh671h6i3rvvprhnv86axddj369dhaai";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0kflgcbw17flk9qyk631qqkw74v7k9cyrdag3v15rpcrmvvyzxmk";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "056i52sv5zml6c9wciqbh3v6ghgvmwq8s5wzpqx7nwnl5m9cb2x8";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0bk31gady68rp650a4d0w3zx0cz095sjqmg2j09pjsc0j29dfsf9";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0y3vk3csx3z54lqncpcyr31ivldbn6wkhsgycghrzg7yb3n6w5pa";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0jqsqakz2xniw9bh0dz7w1vslvkwgpibhny7yb01g604l1zz1znn";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0jbmgh1sbfkqxim7wkn29kl5m22k105daz2ypih4f31vzdsqzn9h";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1l4slrz0bhbhsarf4pcr86qph1ry1477y7w1956a22p8a4a4ywr3";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "11harkdwzl328b3m25l8fkc77g0mbpprgaw41bdq3pf0j6wjmd3m";
-}
-]
diff --git a/pkgs/desktops/kde-4.6/libs/default.nix b/pkgs/desktops/kde-4.6/libs/default.nix
deleted file mode 100644
index 698cbabe2b7..00000000000
--- a/pkgs/desktops/kde-4.6/libs/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ kde, gcc, cmake, perl
-, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
-, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee
-}:
-
-kde.package {
-
-  buildInputs = [
-    cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
-    giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
-    enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee
-  ];
-
-# TODO:
-#   * make sonnet plugins (dictionaries) really work.
-#      There are a few hardcoded paths.
-#   * Let kdelibs find openexr
-#   * Split plugins from libs?
-#   * herqq: kdelibs tries to include HDeviceProxy which was never released
-
-  propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
-    shared_desktop_ontologies ];
-
-  # cmake fails to find acl.h because of C++-style comment
-  # TODO: OpenEXR, hspell
-  cmakeFlags = ''
-    -DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON
-    -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
-    -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
-    '';
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-    homepage = http://www.kde.org;
-    kde.module = "kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/multimedia/default.nix b/pkgs/desktops/kde-4.6/multimedia/default.nix
deleted file mode 100644
index ca9c290f692..00000000000
--- a/pkgs/desktops/kde-4.6/multimedia/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
-cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }:
-
-kde.package {
-
-  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
-    cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ];
-
-  meta = {
-    description = "KDE Multimedia";
-    longDescription = ''
-      Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
-    '';
-    license = "GPL";
-    kde.module = "kdemultimedia";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/oxygen-icons/default.nix b/pkgs/desktops/kde-4.6/oxygen-icons/default.nix
deleted file mode 100644
index bed192f2609..00000000000
--- a/pkgs/desktops/kde-4.6/oxygen-icons/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{kde, cmake}:
-
-kde.package {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1qqdmg4q145gac23b0kyarslfwnlkngcxm6x37b03vr1srccycmx";
-
-  buildInputs = [ cmake ];
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
-    license = "GPL";
-    kde.module = "oxygen-icons";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/pim-runtime/default.nix b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
deleted file mode 100644
index ccdecd46f38..00000000000
--- a/pkgs/desktops/kde-4.6/pim-runtime/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs, gettext
-, automoc4, phonon, akonadi, soprano, strigi}:
-
-kde.package rec {
-  name = with meta.kde; "${module}-${release}";
-
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs
-    kdepimlibs automoc4 phonon akonadi soprano strigi gettext ];
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${name}.tar.bz2";
-    sha256 = "0gsp1yycjb7a3p285yqhs6v9rsrpbq0wfq3jhz7ky306692lrxig";
-  };
-
-  meta = {
-    description = "KDE PIM runtime";
-    homepage = http://www.kde.org;
-    license = "GPL";
-    kde = {
-      release = "4.5.94.1";
-      module = "kdepim-runtime";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/pim/default.nix b/pkgs/desktops/kde-4.6/pim/default.nix
deleted file mode 100644
index 72734ff9c34..00000000000
--- a/pkgs/desktops/kde-4.6/pim/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
-, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2, gettext, grantlee}:
-
-kde.package rec {
-
-  buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
-    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi gettext
-    grantlee ];
-  postInstall = ''
-      mkdir -p $out/nix-support/
-      echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
-  '';
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${meta.kde.module}-${meta.kde.release}.tar.bz2";
-    sha256 = "1bnlyrflcjy7lj4c2jag212ws2gzzpqyn5g2p97x8y936dza7ic3";
-  };
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-    kde = {
-      release = "4.5.94.1";
-      module = "kdepim";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/pimlibs/default.nix b/pkgs/desktops/kde-4.6/pimlibs/default.nix
deleted file mode 100644
index 4f58b04c68a..00000000000
--- a/pkgs/desktops/kde-4.6/pimlibs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, automoc4, akonadi, soprano, libxslt}:
-
-kde.package {
-
-  buildInputs = [ cmake automoc4 perl shared_mime_info libxslt ];
-  propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
-    akonadi soprano ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-    kde.module = "kdepimlibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix
deleted file mode 100644
index 023d36e47e3..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, kdebase }:
-
-kde.package {
-  # Needs kdebase for libkonq
-  buildInputs = [ cmake kdelibs automoc4 kdebase ];
-
-
-  meta = {
-    description = "Git and Svn plugins for dolphin";
-    kde = {
-      name = "dolphin-plugins";
-      module = "kdesdk";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/kate.nix b/pkgs/desktops/kde-4.6/sdk/kate.nix
deleted file mode 100644
index b588a0ea1bc..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kate.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, shared_mime_info }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 shared_mime_info ];
-
-
-  meta = {
-    description = "Kate - Advanced Text Editor";
-    kde = {
-      name = "kate";
-      module = "kdesdk";
-      version = "3.5.2"; # (release.major-1).(release.minor).(release.patch)
-      release = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix
deleted file mode 100644
index 5001ee944bb..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
-
-
-  meta = {
-    description = "KDE bugzilla client";
-    kde = {
-      name = "kbugbuster";
-      module = "kdesdk";
-      version = "3.80.3";
-      release = "4.5.90";
-      versionFile = "version.h";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix
deleted file mode 100644
index 1ca05eb5f42..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ];
-
-  patches = [ ./find-svn.patch ];
-  cmakeFlags = "-DBUILD_kioslave=ON";
-
-  meta = {
-    description = "svn:/ kioslave";
-    kde = {
-      name = "kioslave-svn";
-      module = "kdesdk";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/kmtrace.nix b/pkgs/desktops/kde-4.6/sdk/kmtrace.nix
deleted file mode 100644
index 2429a07f400..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kmtrace.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, gcc }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-  preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "KDE mtrace-based malloc debuger";
-    kde = {
-      name = "kmtrace";
-      module = "kdesdk";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix
deleted file mode 100644
index 360a71948ac..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "A macros for profiling using QTime";
-    longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories.";
-    kde = {
-      name = "kprofilemethod";
-      module = "kdesdk";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/support/akonadi/default.nix b/pkgs/desktops/kde-4.6/support/akonadi/default.nix
deleted file mode 100644
index e3a5b34a24c..00000000000
--- a/pkgs/desktops/kde-4.6/support/akonadi/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.5.0";
-  src = fetchurl {
-    url = "http://download.akonadi-project.org/${name}.tar.bz2";
-    sha256 = "1azk2g7vb2sampxlys1hkgf9jvzpv92afsjdl31ikqbckaqnbfqc";
-  };
-  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch b/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch
deleted file mode 100644
index f179c962a58..00000000000
--- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2791059a4c930c7eb5e4a3233ef997e69187c4d1 Mon Sep 17 00:00:00 2001
-From: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date: Fri, 24 Dec 2010 16:00:04 +0300
-Subject: [PATCH] Don't let packages install policy files outside of their installation prefix
-
----
- PolkitQt-1Config.cmake.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in
-index 1356de7..4c55719 100644
---- a/PolkitQt-1Config.cmake.in
-+++ b/PolkitQt-1Config.cmake.in
-@@ -15,7 +15,7 @@ endif(NOT POLKITQT-1_INSTALL_DIR)
- 
- set(POLKITQT-1_INCLUDE_DIR              "@INCLUDE_INSTALL_DIR@/polkit-qt-1")
- set(POLKITQT-1_LIB_DIR                  "@LIB_INSTALL_DIR@")
--set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
-+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "share/polkit-1/actions")
- 
- # Compatibility
- if(WIN32)
--- 
-1.7.3.2
-
diff --git a/pkgs/desktops/kde-4.6/utils/ark.nix b/pkgs/desktops/kde-4.6/utils/ark.nix
deleted file mode 100644
index eb78b2fe010..00000000000
--- a/pkgs/desktops/kde-4.6/utils/ark.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson,
-  kdebase }:
-
-kde.package {
-  patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules";
-
-  buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson
-    kdebase # for libkonq
-    ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-    kde = {
-      name = "ark";
-      module = "kdeutils";
-      version = "2.15";
-      release = "4.5.90";
-      versionFile = "app/main.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/kfloppy.nix b/pkgs/desktops/kde-4.6/utils/kfloppy.nix
deleted file mode 100644
index e4d32387a99..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kfloppy.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "Helps you format floppies with the filesystem of your choice";
-    kde = {
-      name = "kfloppy";
-      module = "kdeutils";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/kgpg.nix b/pkgs/desktops/kde-4.6/utils/kgpg.nix
deleted file mode 100644
index 317bc384723..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kgpg.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ];
-
-  meta = {
-    description = "Simple KDE GUI for gpg";
-    kde = {
-      name = "kgpg";
-      module = "kdeutils";
-      version = "2.4.1";
-      release = "4.5.90";
-      versionFile = "main.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix
deleted file mode 100644
index 9d6cd6ed61e..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ];
-
-  meta = {
-    description = "KDE remote control";
-    kde = {
-      name = "kremotecontrol";
-      module = "kdeutils";
-      version = "4.5.90";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/okteta.nix b/pkgs/desktops/kde-4.6/utils/okteta.nix
deleted file mode 100644
index 06343e7c0af..00000000000
--- a/pkgs/desktops/kde-4.6/utils/okteta.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ];
-
-  meta = {
-    description = "KDE byte editor";
-    kde = {
-      name = "okteta";
-      module = "kdeutils";
-      version = "0.5.2";
-      release = "4.5.90";
-      versionFile = "program/about.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/printer-applet.nix b/pkgs/desktops/kde-4.6/utils/printer-applet.nix
deleted file mode 100644
index 92f6308b623..00000000000
--- a/pkgs/desktops/kde-4.6/utils/printer-applet.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4
-, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings,
-  pythonDBus, makeWrapper }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl
-    system_config_printer kdebindings makeWrapper pythonDBus ];
-
-  postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $PYTHONPATH";
-
-  meta = {
-    description = "KDE printer applet";
-    longDescription = "Applet to view current print jobs and configure new printers";
-    kde = {
-      name = "printer-applet";
-      module = "kdeutils";
-      version = "1.5";
-      release = "4.5.90";
-      versionFile = "printer-applet.py";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/accessibility/jovie.nix b/pkgs/desktops/kde-4.7/accessibility/jovie.nix
similarity index 68%
rename from pkgs/desktops/kde-4.6/accessibility/jovie.nix
rename to pkgs/desktops/kde-4.7/accessibility/jovie.nix
index 9270d5fb177..6b270534e44 100644
--- a/pkgs/desktops/kde-4.6/accessibility/jovie.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/jovie.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
 #TODO: working backend: speechd or opentts
   meta = {
@@ -10,7 +10,6 @@ kde.package {
       name = "jovie";
       module = "kdeaccessibility";
       version = "0.6.0";
-      release = "4.5.90";
       versionFile = "jovie/jovie/main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix b/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix
new file mode 100644
index 00000000000..80878db4ecc
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+    kde = {
+      name = "kaccessible";
+      module = "kdeaccessibility";
+    };
+  };
+}
+  
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.6/accessibility/kmag.nix b/pkgs/desktops/kde-4.7/accessibility/kmag.nix
similarity index 63%
rename from pkgs/desktops/kde-4.6/accessibility/kmag.nix
rename to pkgs/desktops/kde-4.7/accessibility/kmag.nix
index 207f1d0b3cb..b8ddf55cea6 100644
--- a/pkgs/desktops/kde-4.6/accessibility/kmag.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmag.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "Screen magnifier for KDE";
@@ -9,7 +9,6 @@ kde.package {
       name = "kmag";
       module = "kdeaccessibility";
       version = "1.0";
-      release = "4.5.90";
       versionFile = "kmag/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
similarity index 64%
rename from pkgs/desktops/kde-4.6/accessibility/kmousetool.nix
rename to pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
index bb10de6e3ce..cbde5728ef7 100644
--- a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon, libXtst }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
 
   meta = {
     description = "A program that clicks the mouse for you";
@@ -9,9 +9,7 @@ kde.package {
       name = "kmousetool";
       module = "kdeaccessibility";
       version = "1.12";
-      release = "4.5.90";
       versionFile = "kmousetool/kmousetool/version.h";
     };
   };
 }
-
diff --git a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix b/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
similarity index 55%
rename from pkgs/desktops/kde-4.6/accessibility/kmouth.nix
rename to pkgs/desktops/kde-4.7/accessibility/kmouth.nix
index 6bbee6106fd..ad6a565e1b6 100644
--- a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "A type-and-say front end for speech synthesizers";
@@ -9,9 +9,6 @@ kde.package {
       name = "kmouth";
       module = "kdeaccessibility";
       version = "1.1.1";
-      release = "4.5.90";
-      versionFile = "kmouth/version.h";
     };
   };
 }
-
diff --git a/pkgs/desktops/kde-4.7/admin.nix b/pkgs/desktops/kde-4.7/admin.nix
new file mode 100644
index 00000000000..f6722da307e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/admin.nix
@@ -0,0 +1,48 @@
+{ kde, cmake, qt4, pkgconfig, perl, pythonPackages
+, sip, pycups, pygobject, system_config_printer
+, kdelibs, automoc4, phonon, kdepimlibs, pykde4
+, cups, nettools }:
+
+let
+
+in
+
+kde.package rec {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs
+      pythonPackages.python
+      pycups pykde4 sip pygobject system_config_printer
+    ];
+
+  passthru = { inherit system_config_printer; };
+
+  preConfigure =
+    ''
+      for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
+        substituteInPlace $i \
+          --replace /usr/share/system-config-printer ${system_config_printer}/share/system-config-printer \
+          --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
+          --replace /bin/hostname ${nettools}/bin/hostname
+      done
+    '';
+
+  postInstall =
+    ''
+      # Bake the required Python path into the printer configuration program.
+      res=
+      for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
+      
+      sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
+          -e "1 a import sys\nsys.path = [$res] + sys.path"
+      
+      mkdir -p $out/nix-support
+      echo ${pykde4} > $out/nix-support/propagated-user-env-packages
+    '';
+    
+  meta = {
+    description = "KDE Administration Utilities";
+    license = "GPL";
+    kde.name = "kdeadmin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.7/artwork/FindXscreensaver.cmake
similarity index 100%
rename from pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake
rename to pkgs/desktops/kde-4.7/artwork/FindXscreensaver.cmake
diff --git a/pkgs/desktops/kde-4.7/artwork/aurorae.nix b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
new file mode 100644
index 00000000000..c48cbad4e84
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
@@ -0,0 +1,14 @@
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
+
+kde.package rec {
+  name = "aurorae-themes-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
+  meta = {
+    kde = {
+      name = "aurorae";
+      module = "kdeartwork";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
similarity index 51%
rename from pkgs/desktops/kde-4.6/artwork/color-schemes.nix
rename to pkgs/desktops/kde-4.7/artwork/color-schemes.nix
index ddf1cb77657..ec0fabcea82 100644
--- a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-color-schemes-${meta.kde.version}";
+  name = "kde-color-schemes-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
   meta = {
     description = "Additional KDE color schemes";
     kde = {
       name = "ColorSchemes";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
similarity index 51%
rename from pkgs/desktops/kde-4.6/artwork/desktop-themes.nix
rename to pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
index 4bca474f254..6490e75aaa5 100644
--- a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-desktop-themes-${meta.kde.version}";
+  name = "kde-desktop-themes-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
 
-  buildInputs = [ cmake automoc4 kdelibs ];
   meta = {
     description = "Additional KDE desktop themes";
     kde = {
       name = "desktopthemes";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/emoticons.nix b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
similarity index 52%
rename from pkgs/desktops/kde-4.6/artwork/emoticons.nix
rename to pkgs/desktops/kde-4.7/artwork/emoticons.nix
index 5ec584d4d0c..b5086efa4ff 100644
--- a/pkgs/desktops/kde-4.6/artwork/emoticons.nix
+++ b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-emotion-icons-${meta.kde.version}";
+  name = "kde-emotion-icons-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
 
-  buildInputs = [ cmake automoc4 kdelibs ];
   meta = {
     description = "Additional KDE emotion icons (smiles)";
     kde = {
       name = "emoticons";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
similarity index 52%
rename from pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix
rename to pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
index 56202288659..07103168c0a 100644
--- a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-wallpapers-high-resolution-${meta.kde.version}";
+  name = "kde-wallpapers-high-resolution-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
   meta = {
     description = "KDE wallpapers in high resolution";
     kde = {
       name = "HighResolutionWallpapers";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
similarity index 54%
rename from pkgs/desktops/kde-4.6/artwork/kscreensaver.nix
rename to pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
index b7020c0e4f8..422eba781d5 100644
--- a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
@@ -1,15 +1,17 @@
-{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon, xscreensaver, kde_workspace, eigen, libkexiv2 }:
 
 kde.package rec {
-  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ];
+  buildInputs =
+    [ cmake automoc4 qt4 kdelibs phonon xscreensaver kde_workspace eigen libkexiv2 ];
+  
   preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+  
   meta = {
-    description = "KDE screen saver and savers";
+    description = "KDE screensavers";
     kde = {
       name = "kscreensaver";
       module = "kdeartwork";
       version = "1.0";
-      release = "4.5.90";
       versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix b/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
new file mode 100644
index 00000000000..ebec090ef9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
@@ -0,0 +1,13 @@
+{ cmake, kde, qt4, automoc4, kdelibs, phonon, kde_workspace }:
+
+kde.package rec {
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+    kde = {
+      name = "kwin-styles";
+      module = "kdeartwork";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
new file mode 100644
index 00000000000..fd084ebb692
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
@@ -0,0 +1,17 @@
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
+
+kde.package rec {
+  name = "nuvola-icon-theme-${kde.release}";
+  
+  # Sources contain primary and kdeclassic as well but they're not installed
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
+  meta = {
+    description = "KDE nuvola icon theme";
+    kde = {
+      name = "IconThemes";
+      module = "kdeartwork";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/artwork/phase-style.nix b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
new file mode 100644
index 00000000000..c2876f2df29
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
+
+kde.package rec {
+  name = "kde-style-phase-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
+  meta = {
+    description = "Phase, a widget style for KDE";
+    kde = {
+      name = "styles";
+      module = "kdeartwork";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/artwork/sounds.nix b/pkgs/desktops/kde-4.7/artwork/sounds.nix
similarity index 50%
rename from pkgs/desktops/kde-4.6/artwork/sounds.nix
rename to pkgs/desktops/kde-4.7/artwork/sounds.nix
index 612bf1613f9..7789c4f09c5 100644
--- a/pkgs/desktops/kde-4.6/artwork/sounds.nix
+++ b/pkgs/desktops/kde-4.7/artwork/sounds.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-sounds-${meta.kde.version}";
+  name = "kde-sounds-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
 
-  buildInputs = [ cmake automoc4 kdelibs ];
   meta = {
     description = "New login/logout sounds";
     kde = {
       name = "sounds";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
similarity index 51%
rename from pkgs/desktops/kde-4.6/artwork/wallpapers.nix
rename to pkgs/desktops/kde-4.7/artwork/wallpapers.nix
index b46d65aa550..0543813a0ef 100644
--- a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-wallpapers-${meta.kde.version}";
+  name = "kde-wallpapers-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
 
-  buildInputs = [ cmake automoc4 kdelibs ];
   meta = {
     description = "Additional KDE wallpapers";
     kde = {
       name = "wallpapers";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
similarity index 52%
rename from pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix
rename to pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
index d4f7d1d2a2f..9579ceca74c 100644
--- a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
@@ -1,15 +1,15 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
-  name = "kde-weather-wallpapers-${meta.kde.version}";
+  name = "kde-weather-wallpapers-${kde.release}";
+
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
 
-  buildInputs = [ cmake automoc4 kdelibs ];
   meta = {
     description = "Additional KDE wallpapers (weather)";
     kde = {
       name = "WeatherWallpapers";
       module = "kdeartwork";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.7/baseapps.nix b/pkgs/desktops/kde-4.7/baseapps.nix
new file mode 100644
index 00000000000..61f52cc7454
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/baseapps.nix
@@ -0,0 +1,17 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
+, shared_desktop_ontologies, glib, phonon
+}:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
+      glib phonon
+    ];
+
+  meta = {
+    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+    license = "GPLv2";
+    kde.name = "kde-baseapps";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/bindings/default.nix b/pkgs/desktops/kde-4.7/bindings/default.nix
similarity index 97%
rename from pkgs/desktops/kde-4.6/bindings/default.nix
rename to pkgs/desktops/kde-4.7/bindings/default.nix
index 8c615ac3a7b..f7e35c5dba7 100644
--- a/pkgs/desktops/kde-4.6/bindings/default.nix
+++ b/pkgs/desktops/kde-4.7/bindings/default.nix
@@ -28,7 +28,7 @@ kde.package rec {
     description = "KDE bindings";
     longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
     license = "LGPL";
-    kde.module = "kdebindings";
+    kde.name = "kdebindings";
   };
 }
 
diff --git a/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.7/bindings/python-site-packages-install-dir.diff
similarity index 100%
rename from pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff
rename to pkgs/desktops/kde-4.7/bindings/python-site-packages-install-dir.diff
diff --git a/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.7/bindings/sip-4.11.patch
similarity index 100%
rename from pkgs/desktops/kde-4.6/bindings/sip-4.11.patch
rename to pkgs/desktops/kde-4.7/bindings/sip-4.11.patch
diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.7/default.nix
similarity index 70%
rename from pkgs/desktops/kde-4.6/default.nix
rename to pkgs/desktops/kde-4.7/default.nix
index b117535494a..ccfcb61c71b 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,8 +1,8 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
+{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer } @ args:
 
 let
 
-  release = "4.6.0";
+  release = "4.7.0";
 
   # Various packages (e.g. kdesdk) have been split up into many
   # smaller packages.  Some people may want to install the entire
@@ -17,55 +17,93 @@ let
 
 in
 
-rec {
+recurseIntoAttrs rec {
   recurseForRelease = true;
+
   inherit callPackage stdenv;
 
   qt4 = qt47;
 
-  phonon = null;
-
-  kde = callPackage ./kde-package { inherit release; };
+  kde = callPackage ./kde-package { inherit release; stable = true; };
 
 ### SUPPORT
+
+  system_config_printer = args.system_config_printer.override { withGUI = false; };
+
   akonadi = callPackage ./support/akonadi { };
 
-  attica = callPackage ./support/attica { };
-
-  oxygen_icons = callPackage ./oxygen-icons { };
-
-  polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
+  oxygen_icons = callPackage ./support/oxygen-icons { };
 
   soprano = callPackage ./support/soprano { };
 
+  libkexiv2 = callPackage ./libkexiv2.nix { };
+
+  libkipi = callPackage ./libkipi.nix { };
+
+  libkdcraw = callPackage ./libkdcraw.nix { };
+
+  kipi_plugins = callPackage ./kipi-plugins.nix { };
+
 ### LIBS
+
   kdelibs = callPackage ./libs { };
 
-  kdepimlibs = callPackage ./pimlibs { };
+  kdepimlibs = callPackage ./pimlibs.nix { };
 
 ### BASE
-  kdebase = callPackage ./base { };
 
-  kdebase_workspace = callPackage ./base-workspace { };
+  kde_baseapps = callPackage ./baseapps.nix { };
 
-  kdebase_runtime = callPackage ./base-runtime { };
+  kde_workspace = callPackage ./workspace.nix { };
+
+  kde_runtime = callPackage ./runtime.nix { };
+
+  # Backwards compatibility.
+  kdebase_workspace = kde_workspace;
+
+### BINDINGS
+
+  pykde4 = callPackage ./pykde4.nix { };
 
 ### OTHER MODULES
 
+  gwenview = callPackage ./gwenview.nix { };
+
+  okular = callPackage ./okular.nix { };
+
+  konsole = callPackage ./konsole.nix { };
+
+  kcolorchooser = callPackage ./kcolorchooser.nix { };
+
+  kate = callPackage ./kate.nix { };
+
+  ksnapshot = callPackage ./ksnapshot.nix { };
+
+  kamera = callPackage ./kamera.nix { };
+
+  kde_wallpapers = callPackage ./wallpapers.nix { };
+
+  kdeadmin = callPackage ./admin.nix { };
+
+  kdegames = callPackage ./games.nix { };
+  
+  kdemultimedia = callPackage ./multimedia.nix { };
+
+  kolourpaint = callPackage ./kolourpaint.nix { };
+
+  kgamma = callPackage ./kgamma.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
-    colorSchemes = callPackage ./accessibility/color-schemes.nix { };
-    iconThemes = callPackage ./accessibility/icon-themes.nix { };
-    jovie = callPackage ./accessibility/jovie.nix { };
+    #jovie = callPackage ./accessibility/jovie.nix { };
     kmag = callPackage ./accessibility/kmag.nix { };
     kmousetool = callPackage ./accessibility/kmousetool.nix { };
     kmouth = callPackage ./accessibility/kmouth.nix { };
+    kaccessible = callPackage ./accessibility/kaccessible.nix { };
   };
 
-  kdeadmin = callPackage ./admin { };
-  
   kdeartwork = combinePkgs "kdeartwork" {
     aurorae = callPackage ./artwork/aurorae.nix { };
-    colorSchemes = callPackage ./artwork/color-schemes.nix { };
+    color_schemes = callPackage ./artwork/color-schemes.nix { };
     desktop_themes = callPackage ./artwork/desktop-themes.nix { };
     emoticons = callPackage ./artwork/emoticons.nix { };
     high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { };
@@ -75,26 +113,25 @@ rec {
     weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
     phase_style = callPackage ./artwork/phase-style.nix { };
     kscreensaver = callPackage ./artwork/kscreensaver.nix { };
+    kwin_styles = callPackage ./artwork/kwin-styles.nix { };
   };
   
+  /*
   kdeedu = callPackage ./edu { };
-  kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
-  kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
+  */
   
   kdesdk = combinePkgs "kdesdk" {
     cervisia = callPackage ./sdk/cervisia.nix { };
     kapptemplate = callPackage ./sdk/kapptemplate.nix { };
-    kate = callPackage ./sdk/kate.nix { };
     kcachegrind = callPackage ./sdk/kcachegrind.nix { };
     kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { };
     dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { };
     kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { };
     kioslave_svn = callPackage ./sdk/kioslave-svn.nix { };
     strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { };
-    kbugbuster = callPackage ./sdk/kbugbuster.nix { };
     kmtrace = callPackage ./sdk/kmtrace.nix { };
     kompare = callPackage ./sdk/kompare.nix { };
     kpartloader = callPackage ./sdk/kpartloader.nix { };
@@ -105,8 +142,9 @@ rec {
     poxml = callPackage ./sdk/poxml.nix { };
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
+    okteta = callPackage ./sdk/okteta.nix { };
   };
-  
+
   kdetoys = combinePkgs "kdetoys" {
     amor = callPackage ./toys/amor.nix { };
     kteatime = callPackage ./toys/kteatime.nix { };
@@ -123,10 +161,10 @@ rec {
     kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
     ktimer = callPackage ./utils/ktimer.nix { };
     kwallet = callPackage ./utils/kwallet.nix { };
-    okteta = callPackage ./utils/okteta.nix { };
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
+    filelight = callPackage ./utils/filelight.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
@@ -136,12 +174,15 @@ rec {
     kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
   };
 
-  kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ./pim { };
+  kdepim_runtime = callPackage ./pim-runtime.nix { };
+  
+  kdepim = callPackage ./pim.nix { };
 
 ### DEVELOPMENT
 
+  /*
   kdebindings = callPackage ./bindings { };
+  */
 
   l10n = callPackage ./l10n { inherit release; };
 
diff --git a/pkgs/desktops/kde-4.6/edu/default.nix b/pkgs/desktops/kde-4.7/edu/default.nix
similarity index 94%
rename from pkgs/desktops/kde-4.6/edu/default.nix
rename to pkgs/desktops/kde-4.7/edu/default.nix
index 2227975a955..f9132de8739 100644
--- a/pkgs/desktops/kde-4.6/edu/default.nix
+++ b/pkgs/desktops/kde-4.7/edu/default.nix
@@ -25,8 +25,8 @@ kde.package {
   cmakeFlags = '' -DBOOST_PYTHON_INCLUDES="${boost}/include" -DBOOST_PYTHON_LIBS="boost_python" -DKIG_ENABLE_PYTHON_SCRIPTING=1'';
 
   meta = {
-    description = "KDE Educative software";
+    description = "KDE educational software";
     license = "GPL";
-    kde.module = "kdeedu";
+    kde.name = "kdeedu";
   };
 }
diff --git a/pkgs/desktops/kde-4.7/games.nix b/pkgs/desktops/kde-4.7/games.nix
new file mode 100644
index 00000000000..c005e508868
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/games.nix
@@ -0,0 +1,23 @@
+{ kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
+, twisted, pythonPackages, pyqt4, sip, makeWrapper, phonon, pykde4 }:
+
+kde.package rec {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon shared_mime_info qca2
+      pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
+
+  pythonPath =
+    [ pythonPackages.twisted pyqt4 pykde4 ];
+    
+  # TODO: ggz
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = {
+    description = "KDE Games";
+    license = "GPL";
+    kde.name = "kdegames";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/graphics/default.nix b/pkgs/desktops/kde-4.7/graphics/default.nix
similarity index 95%
rename from pkgs/desktops/kde-4.6/graphics/default.nix
rename to pkgs/desktops/kde-4.7/graphics/default.nix
index ed6527373eb..36aeaf28019 100644
--- a/pkgs/desktops/kde-4.6/graphics/default.nix
+++ b/pkgs/desktops/kde-4.7/graphics/default.nix
@@ -15,6 +15,6 @@ kde.package {
       Okular  document reader.
     '';
     license = "GPL";
-    kde.module = "kdegraphics";
+    kde.name = "kdegraphics";
   };
 }
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix
new file mode 100644
index 00000000000..26687c709a1
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/gwenview.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
+, shared_desktop_ontologies, kde_baseapps, libkipi, phonon
+}:
+
+kde.package {
+
+  buildInputs =
+    [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
+      kde_baseapps libkipi phonon
+    ];
+
+  meta = {
+    description = "Gwenview, the KDE image viewer";
+    license = "GPLv2";
+    kde.name = "gwenview";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kamera.nix b/pkgs/desktops/kde-4.7/kamera.nix
new file mode 100644
index 00000000000..056136ecd12
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kamera.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libgphoto2 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libgphoto2 ];
+
+  meta = {
+    description = "KDE camera interface library";
+    license = "GPLv2";
+    kde.name = "kamera";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kate.nix b/pkgs/desktops/kde-4.7/kate.nix
new file mode 100644
index 00000000000..f5b445791b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kate.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
+
+  meta = {
+    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+    license = "GPLv2";
+    kde.name = "kate";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kcolorchooser.nix
new file mode 100644
index 00000000000..0b9f2dcba74
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kcolorchooser.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  meta = {
+    description = "KDE color chooser utility";
+    license = "GPLv2";
+    kde.name = "kcolorchooser";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
similarity index 56%
rename from pkgs/desktops/kde-4.6/kde-package/default.nix
rename to pkgs/desktops/kde-4.7/kde-package/default.nix
index de3cf05b70d..fe5e7a4a20d 100644
--- a/pkgs/desktops/kde-4.6/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/default.nix
@@ -1,25 +1,38 @@
-{ stdenv, fetchurl, release }:
+{ stdenv, fetchurl, release, stable ? true }:
 
 rec {
   inherit release;
+  
+  stable_ = stable;
 
-  manifest = import (./manifest + "-${release}.nix");
-
-  defaultArgs = { module, name ? module, ... }:
+  defaultArgs = { name, stable ? stable_, version ? release, module ? name, ... }:
 
     (
       {
-        name = "${name}-${release}";
+        name = "${name}-${version}";
 
         src = fetchurl {
-          url = "mirror://kde/" + (if manifest.stable then "" else "un")
+          url = "mirror://kde/" + (if stable then "" else "un")
             + "stable/${release}/src/${module}-${release}.tar.bz2";
-          sha256 = builtins.getAttr module manifest.packages;
+          sha256 = (stdenv.lib.findFirst
+              (x: x.module == module)
+              (throw "No module ${module} in release ${release}!")
+              (import (./manifest + "-${release}.nix"))
+            ).sha256;
         };
 
+        enableParallelBuilding = true;
+
         meta = {
           maintainers = with stdenv.lib.maintainers; [ sander urkud ];
           platforms = stdenv.lib.platforms.linux;
+          homepage = if name == module
+            then http://www.kde.org
+            else assert builtins.substring 0 3 module == "kde";
+              "http://"
+              + builtins.substring 3
+                (builtins.sub (builtins.stringLength module) 3) module
+              + ".kde.org/projects/${name}";
         };
       } // (if module == name then { } else {
         cmakeFlags = ''
diff --git a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
similarity index 65%
rename from pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh
rename to pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
index fbaf490e8be..3811769c57a 100755
--- a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
@@ -13,27 +13,18 @@ fi
 release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
 	sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
 
-if [[ ${release##*.} -gt 50 ]]; then
-	stable="false"
-else
-	stable="true"
-fi
-
 echo "Detected release ${release}" >&2
 
 exec > "manifest-${release}.nix"
-echo "{"
-echo "  stable = ${stable};"
-echo "  packages = builtins.listToAttrs ["
+echo "["
 for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
   module=${i%-${release}.tar.bz2}
   echo -n "${module}.. " >&2
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "    {"
-  echo "      name = \"${module}\";"
-  echo "      value = \"${hash}\";"
-  echo "    }"
+  echo "{"
+  echo "  module = \"${module}\";"
+  echo "  sha256 = \"${hash}\";"
+  echo "}"
   echo $hash >&2
 done
-echo "  ];"
-echo "}"
+echo "]"
diff --git a/pkgs/desktops/kde-4.7/kde-package/manifest-4.7.0.nix b/pkgs/desktops/kde-4.7/kde-package/manifest-4.7.0.nix
new file mode 100644
index 00000000000..82e1ead117c
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-package/manifest-4.7.0.nix
@@ -0,0 +1,286 @@
+[
+{
+  module = "blinken";
+  sha256 = "1g4vpwbal6d7ypmq6l8dh17gi249cd261hsa4bjkvb0wx88i66qr";
+}
+{
+  module = "cantor";
+  sha256 = "0xb4xja9ab4kzgzpikhlkrl68287lqdigvl6pzbh9m6g0ghlp697";
+}
+{
+  module = "gwenview";
+  sha256 = "14a1mjcfcw4nq2c5qkvca8mgdrr31gm24l9nlkcj7p8yrpkxfykh";
+}
+{
+  module = "kalgebra";
+  sha256 = "140528rn3zx489g1lawr1n19i3rrc58h2ii8gh46dnlfcgig13bb";
+}
+{
+  module = "kalzium";
+  sha256 = "1vfa9kdxrdfqqfad0dp2pwi919qs5pbgdk7jmi4dccwlhgmv3226";
+}
+{
+  module = "kamera";
+  sha256 = "02g3mh14rfyrmpa3r8m5pqzxhs4kdb3xvg34434g9r51v3am3ypk";
+}
+{
+  module = "kanagram";
+  sha256 = "04hv13mij4kg8bifs690q4qxr4qk7dnviihlc297x434l0iz2spd";
+}
+{
+  module = "kate";
+  sha256 = "0bd0b354a7cx8cmw2d5pbqn0an38xls86454gclyjd1ilr3l41m9";
+}
+{
+  module = "kbruch";
+  sha256 = "169c6xq0jvp9cv6p9ypk8sryxsh711xdgbs02yiqd476ykavj3jv";
+}
+{
+  module = "kcolorchooser";
+  sha256 = "1f7nj9ccvf1bg3nnm7xchaqvfnskkbnd1h2xd5fxmj9fz1195kqv";
+}
+{
+  module = "kdeaccessibility";
+  sha256 = "01qx0w5dylkbxchj5kg9iawdc0rjbxv1w1dg90ld98fn583g70ws";
+}
+{
+  module = "kdeadmin";
+  sha256 = "1zm6p65wgdn0rv9vzcm89vsiw1696g0bf7kshvwnjmsfc9whsgq3";
+}
+{
+  module = "kdeartwork";
+  sha256 = "12cqpam82k086088i2p1318y1vjr7c8iffppnm6mkbllg2g8ydip";
+}
+{
+  module = "kde-baseapps";
+  sha256 = "0jpi3fjsav52v6ziwdldy03akfpahaagjp3g3m015cmn9bhk2l71";
+}
+{
+  module = "kdegames";
+  sha256 = "1n98jiax7s4m8gb2jq5vdwsg6sfkls7m4mfm627dfsqmvpcgf9k0";
+}
+{
+  module = "kdegraphics-strigi-analyzer";
+  sha256 = "15p0wsiawhygdq9fwp451vcbxbf1sv9pvlwz3x4ma5mp8la7k4vd";
+}
+{
+  module = "kdegraphics-thumbnailers";
+  sha256 = "1gl08an6gzdxvam9fvq5c98zm8m95h6184y0hf0zlqjzkqgg312l";
+}
+{
+  module = "kdelibs";
+  sha256 = "1f0wmcsw0lkfaqdil2yxjfpldr0ckwy5iblkwwaad4n1b4hyssyv";
+}
+{
+  module = "kdemultimedia";
+  sha256 = "0b53vg6gp4qv92w7y721xwbv23bzzljvyl18j05z8ig2l6m57kf5";
+}
+{
+  module = "kdenetwork";
+  sha256 = "1ifg2hxbh80fpszm9r1jzamy65jlkqb6y8fcfa0sngwsklkxn5sh";
+}
+{
+  module = "kdepim";
+  sha256 = "140n4q1rf2jbxmqmkwzam1fipk4k30n3wn9ik8mlqfmxm06dhgqs";
+}
+{
+  module = "kdepimlibs";
+  sha256 = "020irkn43q999idk4kwfi9250fvk98ffi9m998ywgzfl9wps01g0";
+}
+{
+  module = "kdepim-runtime";
+  sha256 = "11ad82hisya8ysx6p1ik6nw1hbyqwksxhimlxcrjkkjh76nphs2g";
+}
+{
+  module = "kdeplasma-addons";
+  sha256 = "1bi7n6lav9z08pvarhsgx9wmm14mr34mvjm4vk9jszrdi7vl2ayj";
+}
+{
+  module = "kde-runtime";
+  sha256 = "1wm91hkj8h1rbavcxwgjfsfrzhr3rs1xd6zf2kxyh1hh9fkdrx3w";
+}
+{
+  module = "kdesdk";
+  sha256 = "04kx9srv8a4z9lic9v3f375rglpz87hhq6wppxksi9qgyc0vzqnv";
+}
+{
+  module = "kdetoys";
+  sha256 = "1ahsk0990a3zx665mjqaljb5w392qkk1pnla5srqg57g62yhig8f";
+}
+{
+  module = "kdeutils";
+  sha256 = "1n031c1i42bq08md156k7fhzw67b28b0a6168m9c9hnhh3483r7l";
+}
+{
+  module = "kde-wallpapers";
+  sha256 = "1xb9k9w479xcwa4caxqn4z1h942lvx7ahy0crxkk41ra3xgw7fg9";
+}
+{
+  module = "kdewebdev";
+  sha256 = "0v8v45rwfldk299ny0jhxqa7xsa1x0ywz7lbqc9i0m3g808ifa29";
+}
+{
+  module = "kde-workspace";
+  sha256 = "0s1l7airb92dd4vprry39nzikarv03qfsmd2j0brif5jjfjd2c3y";
+}
+{
+  module = "kgamma";
+  sha256 = "1xgxnb8x2iy1ikychs8bh5jplkdlk7br6yrmivzrz7s2337dlm35";
+}
+{
+  module = "kgeography";
+  sha256 = "1pm4y5d4d0cl36wgwrkm48yk60m73ljys2awahjsfdpwxs0x42ca";
+}
+{
+  module = "khangman";
+  sha256 = "0ccp1qsji6jjybcbc0rwkw78ypl5kwk1kb74vrnz2ss9anxky2c3";
+}
+{
+  module = "kig";
+  sha256 = "06nk38wg43rxxdzr535vrw4f3d1v9kym5bir6vfpyay8xdxqgf5f";
+}
+{
+  module = "kimono";
+  sha256 = "1p4scmzn0kbkpbrv27658bh56ll9zazaf3rk1p2c6lm6zglvm9gd";
+}
+{
+  module = "kiten";
+  sha256 = "119h7fslp975r0kd7i1zmvhrfrr19rlhm4ni99pd4jxnhz05n47k";
+}
+{
+  module = "klettres";
+  sha256 = "0znca4iqgxlmldyzmd5rf9z2c0jhmmijwxyxaqjffrphq407wms0";
+}
+{
+  module = "kmplot";
+  sha256 = "1zyk3701mhga9d53bm8xyzbw4zn6s9ijfnp0ww2hq9dcm81w12ga";
+}
+{
+  module = "kolourpaint";
+  sha256 = "0ckqz8fmaq92lkaxm87c2nfdjvwp4l310vnicqm2bkkmkma9p6cs";
+}
+{
+  module = "konsole";
+  sha256 = "1apchw8n1k2xyi3h0n3w4fxwy6vx6lxhx7ll3vhfmyl8wa0gzwf5";
+}
+{
+  module = "korundum";
+  sha256 = "1ndhbn6i5napfgp5czsbww1vknss49xhxlj6rn5ci1m5j2zfajic";
+}
+{
+  module = "kross-interpreters";
+  sha256 = "0hzx08r60z9pl7i1hnh6q1zq4s7wmny4015b55prllaa94yb1ya2";
+}
+{
+  module = "kruler";
+  sha256 = "1bydk587las6dx447mihkg7qmn0hn6iis20xfl4wygx7a81imnw3";
+}
+{
+  module = "ksaneplugin";
+  sha256 = "02g4vdgz4k7rahkwss5m1vfv22rzhr6gzmzf79vrbg15mci57jzz";
+}
+{
+  module = "ksnapshot";
+  sha256 = "1dllmx8v2qzkfhy9b3j87yjmkyl3fdkjbmdfqlk5kq2n40k3fha0";
+}
+{
+  module = "kstars";
+  sha256 = "0qgsphimg200kapnjwqh3186z27ypszmhr4knk46jyyczmj2k4nd";
+}
+{
+  module = "ktouch";
+  sha256 = "1w1ps11xazqvvh66v78r714283kd5icvz6dgbh7wfangpqya2g9i";
+}
+{
+  module = "kturtle";
+  sha256 = "0xiz13nb2wgajgm2z105pywi0fcw09appp4k4wbg6nykqdcql0n5";
+}
+{
+  module = "kwordquiz";
+  sha256 = "1rja09mvp7j264ap27m4413dy8l1867ds1w3yizlqlcrl92fby7b";
+}
+{
+  module = "libkdcraw";
+  sha256 = "0dcplib41s5cnv5jjnx2y7d9gd4vls6qlf1vpr1iqsbhrr0az50a";
+}
+{
+  module = "libkdeedu";
+  sha256 = "0nq2b4l5134lkyv0vzfqpp5w7vbr0b6lg88xyjlpih6n9bywiv16";
+}
+{
+  module = "libkexiv2";
+  sha256 = "1fgawizv09vv0almb05sf5f93iqsp3w8x9nx4p9hys66qiz8n467";
+}
+{
+  module = "libkipi";
+  sha256 = "09gpjx4vyncf6js79jf7w4w55lgnzawii40ar7ssrhnxspckbdn0";
+}
+{
+  module = "libksane";
+  sha256 = "1ffwz2g4y12fg8pckz1a0qizziljv17zbn7g1vjf30pw8dpk0x12";
+}
+{
+  module = "marble";
+  sha256 = "0x5yhs28g0z1s9qjmgkdidfp0hmy526l9cmqjccaqn7a61ziv0qz";
+}
+{
+  module = "mobipocket";
+  sha256 = "06qh1xdijc4fscpbxfc7f6mmy1dkxvhx7sb4fmhk2m3z569ir2jx";
+}
+{
+  module = "okular";
+  sha256 = "016xa6i0n1nyq1h9z8nhwc9br9k09l0c2gxhzfd9g6nf528zlbdf";
+}
+{
+  module = "oxygen-icons";
+  sha256 = "1a4dkhay0qrbz9gz2xx3d7vbk18qyjrx9hxgdazjxr35ba6xipgc";
+}
+{
+  module = "parley";
+  sha256 = "0zkj272wrih66mcpr27am9qnp3ab4275is06c8h6hzf5wmfq6sib";
+}
+{
+  module = "perlkde";
+  sha256 = "0pp8ljvck68b45yxhknmyn8z1a1xnq3ahcpz8m6pfch77hlg7fhj";
+}
+{
+  module = "perlqt";
+  sha256 = "0sw1dpxshmmdvp93x59wclslm5xza0yy0f8nmqgdns8c77g0b3k8";
+}
+{
+  module = "pykde4";
+  sha256 = "1mdq474f4jj637k0a9jpb2vcvq4f90vwrhgjs7mqqwmvkh6vv6h0";
+}
+{
+  module = "qtruby";
+  sha256 = "1h7m17d36y5vgaxcqwa814yxmsx19v0xh9m83cq1zznxl62sbmh1";
+}
+{
+  module = "qyoto";
+  sha256 = "1lbdv00hd0s0m5ywjnb52wgz3hb5nx45kwpjkjrjcj1jg76rvk72";
+}
+{
+  module = "rocs";
+  sha256 = "1ma5ylc4rvzjrn1l8rv8684map78zk73fa1a3iz996z1c5fg09wm";
+}
+{
+  module = "smokegen";
+  sha256 = "1g05if9k9ichxlrfly5lha6n2mcihbaz681yg14cjj806s0qs53l";
+}
+{
+  module = "smokekde";
+  sha256 = "0b8kx8a3990l6f7pf252diz7b50r81kxkhigkzkc9lzq833a2siq";
+}
+{
+  module = "smokeqt";
+  sha256 = "0cgjdh9dr4pn1yh423mhifv2yvd283k2mhwkmfn2i0398h71a252";
+}
+{
+  module = "step";
+  sha256 = "1pg7k60rbvr6nfq47xnj98w121703s79z8rap601xrmb8wyfhmyy";
+}
+{
+  module = "svgpart";
+  sha256 = "0xyp4sibcdjxq2ny348m4z95bh71r3q3pm8xfwb1j50my9g8ijir";
+}
+]
diff --git a/pkgs/desktops/kde-4.7/kgamma.nix b/pkgs/desktops/kde-4.7/kgamma.nix
new file mode 100644
index 00000000000..017f7f00c7b
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kgamma.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libXxf86vm }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libXxf86vm ];
+
+  meta = {
+    description = "KDE monitor calibration tool";
+    license = "GPLv2";
+    kde.name = "kgamma";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kipi-plugins.nix b/pkgs/desktops/kde-4.7/kipi-plugins.nix
new file mode 100644
index 00000000000..ea237a5d718
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kipi-plugins.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2
+, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2
+, kdepimlibs }:
+
+stdenv.mkDerivation rec {
+  name = "kipi-plugins-1.9.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
+    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+  };
+
+  buildInputs =
+    # Some dependencies are missing because they are very big (OpenCV,
+    # GTK).
+    [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi
+      gettext libxml2 libxslt qjson qca2 kdepimlibs
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.kipi-plugins.org;
+    inherit (kdelibs.meta) platforms;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kolourpaint.nix b/pkgs/desktops/kde-4.7/kolourpaint.nix
new file mode 100644
index 00000000000..54565f1d275
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kolourpaint.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, qimageblitz }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon qimageblitz ];
+
+  meta = {
+    description = "KDE paint program"; 
+    license = "GPLv2";
+    kde.name = "kolourpaint";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/konsole.nix b/pkgs/desktops/kde-4.7/konsole.nix
new file mode 100644
index 00000000000..4965921fcc6
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/konsole.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+    kde.name = "konsole";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/ksnapshot.nix b/pkgs/desktops/kde-4.7/ksnapshot.nix
new file mode 100644
index 00000000000..6eadbd88c65
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/ksnapshot.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
+
+  meta = {
+    description = "KDE screenshot utility";
+    license = "GPLv2";
+    kde.name = "ksnapshot";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix
similarity index 84%
rename from pkgs/desktops/kde-4.6/l10n/default.nix
rename to pkgs/desktops/kde-4.7/l10n/default.nix
index 22acca2d1cf..d737888ec14 100644
--- a/pkgs/desktops/kde-4.6/l10n/default.nix
+++ b/pkgs/desktops/kde-4.7/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }:
+{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, qt4, phonon, release }:
 
 let
 
@@ -6,17 +6,17 @@ let
 
   kdeL10nDerivation =
     { lang, saneName, sha256 }:
-
+    
     stdenv.mkDerivation rec {
       name = "kde-l10n-${saneName}-${release}";
-
+      
       src = fetchurl {
         url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
         name = "${name}.tar.bz2";
         inherit sha256;
       };
 
-      buildInputs = [ cmake perl gettext kdelibs automoc4 ];
+      buildInputs = [ cmake perl gettext kdelibs automoc4 qt4 phonon ];
 
       meta = {
         description = "KDE translation for ${lang}";
diff --git a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
similarity index 100%
rename from pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
rename to pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix
new file mode 100644
index 00000000000..d9eba519942
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix
@@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "16533377hxcb6xy92qw74yp2cvyrmi5bjxjh62xbqf7m3967nj56";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "06i189a8z0z7jv9mi1cvxc1k57gmfsf207m28rg30jhbd4gd5py7";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "1sqcd5jdl04ax6r615rqs4nlsc4xc1xsvc8cdi5pplwilsys0flm";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1ghhl6yxhcjakv41lznhdp1nx9jp7g75g305cz3n26nbpwaz4mkd";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "16sb3kcjc7s02sg9bi3678cdv7hqn3xlpcsa07iwgxdzgh6yp6x0";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1g52dbp4jwn67p90jkd209csn3nrc1aznpsay5i9919240wsb4mm";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "168hd69gznsarvxbzgs7hjmxjhhxsccwjfgvf328qbcb88n7570w";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "07a5f6k22pkps3a0n1ph80f1affmmrlxf1v6ywxdna64si97za43";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1kv1wx91mgsrkscx6jf9sjl2li5n8z39hnbiyl9zy2364ximjb3c";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "12y9m2c0kaigi0qdisw7w2dxf40xz3ihqkwk2x2vbivzsd91ai44";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0manicnw3l3kg6qmwq7894cjlwh8091nw6s1w31qvpx7grxznp4w";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "06xm411l20qqgfv12wxbz3x6daahwlzpp07n3ifi7jh6wzv1j0nh";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "08y65gkpq2ziylddzk44d2rp8mprr3bayxsgl4zw8plmyj6p79fs";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1xdgnn06psg84a60ssd85855jw93bi787aawyrh7n77q5za8rs83";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1l6ljqy5aa6wbvkywi47mvkw28whcdwcdd3hrqy8kyxf064d5lk6";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1nnh11hbqvb6gxgfp086algbjiw5j4rs5fxzl74i8935qhjz12pk";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0sqgcjrzr422iy9qmyyzhmwah696gkv810xh6hd71yv3416wpnjk";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1hid5izn5g63iaz634x2x7ahylf99ccjms21461lg4w72mb732f9";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "0kqk28rcdawdxz1h8dph1ik49ag2nxbbq3712fpjylswqa0dh4v3";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1gnsvyw412j2k9maac2sflvfnv1mf4lwaqcxrhyb5zfvz7pflfqh";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "03a89wb03yc57d5nxvawdzvc7qzzcwj5r1gri7p6khjbl6r5gx63";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "0r0c7yd3sq4bwqa9l3j8fc7bhdfnr14q1270l2vvn1r4r9y4myb7";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "00m3sfrcawqva93w90y29lf747b43pmcgd97n6iii2alk8z1xc6b";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1v6gl0bbml5ddz60sc7dk0pirnjdmpiqhksbyqbmx9d650x5jpm0";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0y0nwy805w0x90kfmpkldjllaq5qrs031kl2r2v67n0i2i0g48n3";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "06fmh05ccbx58vprw4h1f4hqsv2gjkm0y982lajgrwpswc09kdrj";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1l17xj681m29xladp8cb6vbwprvf7l5kj8iignyyziv7sw6v5fs9";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "0is1yarm4r5dcm424nha7p093rzndsqmkbgrj65q8szf8pdii3pz";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1fr2ln91k910qbpkxsqxaf05bdgf2mg4jj4chxygqhwv1ffxj4f0";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1m8iawglrznv1qsqsw2sns6fbbv52zs2wzmz793p4n1v67ly4n75";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "1p89fw17nfd77klr2dkrm98xahxqprq9a1906rl7m7jdrsh44zrd";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "082cjvczqlvzsgzwdlyqy8qvfdfcvxgj8fy4faxv5iaqdv4hzf1j";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "0vhg8hkg4iad0g0jmy9qb61z7bnyw9dmpnibwpn1sypq8cy1qgax";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1nvkspaycgkx639cmjp0cv81fb8fjqmfw6r7r6fhq4gjyk6awdbl";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "03y7c4vn9ihz65bylmabcjsjssb9wc4j4nb9slb98dm97cqn015b";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "0vhf2bb4ii737hmg639s0h7pl38dxrpncvgl6l2lzv2nb3g92ihk";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "116ii59z71v3wlp9xd5ni3zk140i4s461l1wpqxx2p8lrs6087m6";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "04mh52cdg63nacs5mydmx244ljq39495bai4zm7viz1b0lkwhfi8";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1fqsgxfxmsbadk32kgxskkjvbq4wb06gq26i4h41y3cbanw11r9v";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "04r6avdjd4pjnq6viprm5252jyqd73wiqc419y72vpxh39rri72k";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0gdy3yjczgjigr1pfmwsjscgh9q7mvz11m82axw0989kvq34ryx3";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0kgg6a0xy4cnij7g576rsixkn7b0c9l782zxn2brcnqlfqzyh3b7";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1yf15mcyi0k9vmrmd0fqz265dsy2xr6fhf1wl3lljb0mqsyf0a8a";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1cyw5kkpwq7yzhib6dlqln21fk3zfppalhw21rnfr0ih1znpaa1p";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1kaq1zlgxb5z9bpfpnpznnv3yhqjr4wgdm47b5fcg149ha6q43hp";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "1yzbxwzd624akmby1bhfm74fp6p41fq38jxs8qdsflav531nz47z";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1l1q154ib9wr8brp0pk6r0n7xz8kzdbhfb803kwg0ajhjddpihim";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "05zcz4rwvlc1gbcm7612rlvsbjnf293kiv902rms64smd3w8237r";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "04b5nj9q3x2cpc03awm09ijx0qzkvmxp9wb3cj3q4mhkd8n42k6i";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "10w1n2cni7mqf8fyy5gq699d9nw0fma1brq5a3wfwnxhlk7hxs6a";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "15xfbyf2m3lhd6q7imsmjxv81kw1ml286dh771gg4m668j7101pq";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0d9gw75qq37yq3icz4mjqnqqar0vrmc6aly8pybg4qw167jzzqn6";
+}
+]
diff --git a/pkgs/desktops/kde-4.7/libkdcraw.nix b/pkgs/desktops/kde-4.7/libkdcraw.nix
new file mode 100644
index 00000000000..82c4e75e482
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkdcraw.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  meta = {
+    description = "Library for decoding RAW images"; 
+    license = "GPLv2";
+    kde.name = "libkdcraw";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/libkexiv2.nix b/pkgs/desktops/kde-4.7/libkexiv2.nix
new file mode 100644
index 00000000000..0d740584570
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkexiv2.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, exiv2, perl, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 perl phonon ];
+
+  meta = {
+    description = "Exiv2 support library";
+    license = "GPLv2";
+    kde.name = "libkexiv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/libkipi.nix b/pkgs/desktops/kde-4.7/libkipi.nix
new file mode 100644
index 00000000000..bb80755f9f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkipi.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  meta = {
+    description = "Interface library to kipi-plugins";
+    license = "GPLv2";
+    kde.name = "libkipi";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
new file mode 100644
index 00000000000..7f246e61f97
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -0,0 +1,38 @@
+{ kde, gcc, cmake, perl
+, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
+, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
+, getopt, udev, herqq, phonon, gettext
+}:
+
+kde.package {
+
+  buildInputs =
+    [ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
+      giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
+      perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies
+      shared_mime_info soprano strigi udev xz phonon libxml2
+    ];
+    
+  # TODO: make sonnet plugins (dictionaries) really work.
+  # There are a few hardcoded paths.
+  # Let kdelibs find openexr
+  # Split plugins from libs?
+
+  patches = [ ./polkit-install.patch ];
+
+  # cmake fails to find acl.h because of C++-style comment
+  # TODO: OpenEXR
+  cmakeFlags =
+    ''
+      -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
+      -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
+    '';
+
+  meta = {
+    description = "KDE libraries";
+    license = "LGPL";
+    kde.name = "kdelibs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/libs/polkit-install.patch b/pkgs/desktops/kde-4.7/libs/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libs/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
++    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.7/multimedia.nix b/pkgs/desktops/kde-4.7/multimedia.nix
new file mode 100644
index 00000000000..f731808d21e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/multimedia.nix
@@ -0,0 +1,18 @@
+{ kde, cmake, perl, qt4, phonon, alsaLib, libvorbis, taglib, flac
+, cdparanoia, lame, kdelibs, automoc4, ffmpeg, libmusicbrainz3, libtunepimp }:
+
+kde.package {
+
+  buildInputs =
+    # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
+    # without the Phonon Xine backend.
+    [ cmake kdelibs qt4 automoc4 phonon cdparanoia taglib libvorbis
+      libmusicbrainz3 libtunepimp ffmpeg flac lame
+    ];
+
+  meta = {
+    description = "KDE multimedia programs such as a movie player and volume utility";
+    license = "GPL";
+    kde.name = "kdemultimedia";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/network/default.nix b/pkgs/desktops/kde-4.7/network/default.nix
similarity index 97%
rename from pkgs/desktops/kde-4.6/network/default.nix
rename to pkgs/desktops/kde-4.7/network/default.nix
index c7c38611731..af605f19127 100644
--- a/pkgs/desktops/kde-4.6/network/default.nix
+++ b/pkgs/desktops/kde-4.7/network/default.nix
@@ -28,6 +28,6 @@ kde.package {
     description = "KDE network utilities";
     longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
     license = "GPL";
-    kde.module = "kdenetwork";
+    kde.name = "kdenetwork";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/network/log-feature.diff b/pkgs/desktops/kde-4.7/network/log-feature.diff
similarity index 100%
rename from pkgs/desktops/kde-4.6/network/log-feature.diff
rename to pkgs/desktops/kde-4.7/network/log-feature.diff
diff --git a/pkgs/desktops/kde-4.7/okular.nix b/pkgs/desktops/kde-4.7/okular.nix
new file mode 100644
index 00000000000..1b9ab5f2706
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/okular.nix
@@ -0,0 +1,16 @@
+{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
+, popplerQt4, qca2, qimageblitz, qt4, phonon }:
+
+kde.package {
+
+  buildInputs =
+    [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
+      qca2 qimageblitz qt4 phonon
+    ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+    kde.name = "okular";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/pim-runtime.nix b/pkgs/desktops/kde-4.7/pim-runtime.nix
new file mode 100644
index 00000000000..155634aba1d
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pim-runtime.nix
@@ -0,0 +1,17 @@
+{ kde, fetchurl, cmake, kdelibs, qt4, phonon, libxml2, libxslt, boost
+, kdepimlibs, automoc4, akonadi, soprano, strigi, shared_mime_info
+, shared_desktop_ontologies }:
+
+kde.package rec {
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs akonadi strigi
+      soprano boost shared_mime_info shared_desktop_ontologies
+      libxml2 libxslt
+    ];
+
+  meta = {
+    description = "KDE PIM runtime";
+    license = "GPL";
+    kde.name = "kdepim-runtime";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/pim.nix b/pkgs/desktops/kde-4.7/pim.nix
new file mode 100644
index 00000000000..fe074200fe9
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pim.nix
@@ -0,0 +1,34 @@
+{ kde, fetchurl, cmake, boost, gpgme, libassuan, libxslt
+, kdelibs, kdepimlibs, kdepim_runtime
+, automoc4, akonadi, qt4, phonon, soprano, shared_desktop_ontologies
+, strigi, cyrus_sasl }:
+
+kde.package rec {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs boost soprano
+      akonadi strigi shared_desktop_ontologies libxslt cyrus_sasl
+      gpgme libassuan
+      #boost gpgme libassuan libgpgerror libxslt
+      #shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi
+    ];
+    
+  #prePatch = ''
+  #    find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
+  #'';
+  
+  postInstall = ''
+      mkdir -p $out/nix-support/
+      echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
+  '';
+
+  meta = {
+    description = "KDE PIM tools";
+    longDescription = ''
+      Contains various personal information management tools for KDE, such as an organizer.
+    '';
+    license = "GPL";
+    homepage = http://pim.kde.org;
+    kde.name = "kdepim";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/pimlibs.nix b/pkgs/desktops/kde-4.7/pimlibs.nix
new file mode 100644
index 00000000000..643569352cd
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pimlibs.nix
@@ -0,0 +1,17 @@
+{ stdenv, kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
+, kdelibs, automoc4, akonadi, soprano, phonon, shared_desktop_ontologies, libxslt }:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon boost gpgme shared_mime_info
+      shared_desktop_ontologies soprano libical libxslt openldap
+      cyrus_sasl akonadi perl
+    ];
+
+  meta = {
+    description = "KDE PIM libraries";
+    license = "LGPL";
+    kde.name = "kdepimlibs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/plasma-addons/default.nix b/pkgs/desktops/kde-4.7/plasma-addons/default.nix
similarity index 94%
rename from pkgs/desktops/kde-4.6/plasma-addons/default.nix
rename to pkgs/desktops/kde-4.7/plasma-addons/default.nix
index 65e4e3a9772..0a1b3aa6b1a 100644
--- a/pkgs/desktops/kde-4.6/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.7/plasma-addons/default.nix
@@ -15,6 +15,6 @@ kde.package {
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
-    kde.module = "kdeplasma-addons";
+    kde.name = "kdeplasma-addons";
   };
 }
diff --git a/pkgs/desktops/kde-4.7/pykde4.nix b/pkgs/desktops/kde-4.7/pykde4.nix
new file mode 100644
index 00000000000..d5424d08c1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pykde4.nix
@@ -0,0 +1,33 @@
+{ kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
+, soprano, kdepimlibs, shared_desktop_ontologies, boost, lndir }:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
+      kdepimlibs shared_desktop_ontologies boost lndir
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+
+      # Use an absolute path to open libpython.so.
+      substituteInPlace kpythonpluginfactory/kpythonpluginfactory.cpp \
+        --replace LIB_PYTHON \"$(echo ${python}/lib/libpython*.so.*)\"
+
+      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
+      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+      # needs to install a plugin.
+      mkdir -p $out/lib/python2.7
+      lndir ${pyqt4}/lib/python2.7 $out/lib/python2.7
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+    kde.name = "pykde4";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/runtime.nix b/pkgs/desktops/kde-4.7/runtime.nix
new file mode 100644
index 00000000000..6e6b9aa32a0
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/runtime.nix
@@ -0,0 +1,19 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano, shared_desktop_ontologies
+, bzip2, xz, shared_mime_info, libssh, exiv2, attica, phonon, libcanberra
+}:
+
+kde.package {
+
+  buildInputs =
+    [ phonon cmake kdelibs qt4 automoc4 strigi soprano
+      shared_desktop_ontologies bzip2 xz shared_mime_info libssh
+      exiv2 attica
+      (libcanberra.override { gtk = null; })
+    ];
+
+  meta = {
+    license = "LGPL";
+    kde.name = "kde-runtime";
+  };
+
+}
diff --git a/pkgs/desktops/kde-4.6/sdk/cervisia.nix b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
similarity index 56%
rename from pkgs/desktops/kde-4.6/sdk/cervisia.nix
rename to pkgs/desktops/kde-4.7/sdk/cervisia.nix
index e0ff5c30597..1fab0d56b5b 100644
--- a/pkgs/desktops/kde-4.6/sdk/cervisia.nix
+++ b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
@@ -1,15 +1,14 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A KDE CVS frontend";
     kde = {
       name = "cervisia";
       module = "kdesdk";
-      version = "3.5.0";
-      release = "4.5.90";
+      version = "3.7.0";
       versionFile = "cervisia/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..777581bca91
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kde_baseapps, kdepimlibs }:
+
+kde.package {
+  # Needs kdebase for libkonq
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kde_baseapps ];
+
+  cmakeFlags = "-DBUILD_dolphin-plugins/svn=TRUE -DBUILD_dolphin-plugins/git=TRUE";
+  
+  meta = {
+    description = "Git and Svn plugins for dolphin";
+    kde = {
+      name = "dolphin-plugins";
+      module = "kdesdk";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/sdk/find-svn.patch b/pkgs/desktops/kde-4.7/sdk/find-svn.patch
similarity index 100%
rename from pkgs/desktops/kde-4.6/sdk/find-svn.patch
rename to pkgs/desktops/kde-4.7/sdk/find-svn.patch
diff --git a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
similarity index 66%
rename from pkgs/desktops/kde-4.6/sdk/kapptemplate.nix
rename to pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
index daf75993bdb..e0069e5d7af 100644
--- a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A KDE 4 project template generator";
@@ -10,7 +9,6 @@ kde.package {
       name = "kapptemplate";
       module = "kdesdk";
       version = "0.1";
-      release = "4.5.90";
       versionFile = "kapptemplate/main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
similarity index 65%
rename from pkgs/desktops/kde-4.6/sdk/kcachegrind.nix
rename to pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
index 103e2dc071c..13c010fffb7 100644
--- a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "KDE Frontend for Callgrind/Cachegrind";
@@ -10,7 +9,6 @@ kde.package {
       name = "kcachegrind";
       module = "kdesdk";
       version = "0.6";
-      release = "4.5.90";
       versionFile = "CMakeLists.txt";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
similarity index 53%
rename from pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix
rename to pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
index 4cfa3eb2a0c..df5d45bc621 100644
--- a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
@@ -1,15 +1,13 @@
-{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kdepimlibs }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kdepimlibs ];
 
   meta = {
     description = "KDE accounts akonadi agent";
     kde = {
       name = "kdeaccounts-plugin";
       module = "kdesdk";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
similarity index 68%
rename from pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix
rename to pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
index c5a5f2b5b61..a490920561d 100644
--- a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, perl }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, perl }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 perl ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi perl ];
 
   cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON";
 
@@ -11,7 +11,6 @@ kde.package {
       name = "kioslave-perldoc";
       module = "kdesdk";
       version = "0.9.1";
-      release = "4.5.90";
       versionFile = "kioslave/perldoc/perldoc.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
new file mode 100644
index 00000000000..af6c98f9118
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, subversion, apr, aprutil }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi subversion apr aprutil ];
+
+  patches = [ ./find-svn.patch ];
+  cmakeFlags = "-DBUILD_kioslave=ON";
+
+  meta = {
+    description = "Subversion kioslave";
+    kde = {
+      name = "kioslave-svn";
+      module = "kdesdk";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/sdk/kmtrace.nix b/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
new file mode 100644
index 00000000000..e5a3392645e
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, gcc }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
+
+  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+
+  meta = {
+    description = "KDE mtrace-based malloc debugger";
+    kde = {
+      name = "kmtrace";
+      module = "kdesdk";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/sdk/kompare.nix b/pkgs/desktops/kde-4.7/sdk/kompare.nix
similarity index 68%
rename from pkgs/desktops/kde-4.6/sdk/kompare.nix
rename to pkgs/desktops/kde-4.7/sdk/kompare.nix
index 5366edfa855..aa07dbb1039 100644
--- a/pkgs/desktops/kde-4.6/sdk/kompare.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kompare.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A program to view the differences between files and optionally generate a diff";
@@ -10,7 +9,6 @@ kde.package {
       name = "kompare";
       module = "kdesdk";
       version = "4.0.0";
-      release = "4.5.90";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
similarity index 64%
rename from pkgs/desktops/kde-4.6/sdk/kpartloader.nix
rename to pkgs/desktops/kde-4.7/sdk/kpartloader.nix
index 8702a7f7328..6391ab145f5 100644
--- a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A test application for KParts";
@@ -10,7 +9,6 @@ kde.package {
       name = "kpartloader";
       module = "kdesdk";
       version = "1.0";
-      release = "4.5.90";
       versionFile = "kpartloader.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
new file mode 100644
index 00000000000..c87e0471457
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
@@ -0,0 +1,13 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
+
+  meta = {
+    description = "A macro for profiling using QTime";
+    kde = {
+      name = "kprofilemethod";
+      module = "kdesdk";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
similarity index 63%
rename from pkgs/desktops/kde-4.6/sdk/kstartperf.nix
rename to pkgs/desktops/kde-4.7/sdk/kstartperf.nix
index cd43be1cece..56d4c8bcb3f 100644
--- a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libtool }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libtool }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libtool ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libtool ];
 
   meta = {
     description = "Measures start up time of a KDE application";
@@ -10,7 +9,6 @@ kde.package {
       name = "kstartperf";
       module = "kdesdk";
       version = "1.0";
-      release = "4.5.90";
       versionFile = "kstartperf.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
similarity index 64%
rename from pkgs/desktops/kde-4.6/sdk/kuiviewer.nix
rename to pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
index e8ea5b5b36c..c1b4f6fe08c 100644
--- a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Displays Qt Designer's UI files";
@@ -10,7 +9,6 @@ kde.package {
       name = "kuiviewer";
       module = "kdesdk";
       version = "0.1";
-      release = "4.5.90";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/sdk/lokalize.nix b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
similarity index 54%
rename from pkgs/desktops/kde-4.6/sdk/lokalize.nix
rename to pkgs/desktops/kde-4.7/sdk/lokalize.nix
index 4911cb22ae4..f5d3aa0e0f9 100644
--- a/pkgs/desktops/kde-4.6/sdk/lokalize.nix
+++ b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
@@ -1,19 +1,18 @@
-{ kde, cmake, kdelibs, automoc4, hunspell }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, hunspell }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 hunspell ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi hunspell ];
 
   meta = {
     description = "KDE 4 Computer-aided translation system";
     longDescription = ''
       Computer-aided translation system.
-      Do not translate what had already been translated.'';
+      Do not translate what had already been translated.
+    '';
     kde = {
       name = "lokalize";
       module = "kdesdk";
-      version = "1.1";
-      release = "4.5.90";
+      version = "1.2";
       versionFile = "src/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/okteta.nix b/pkgs/desktops/kde-4.7/sdk/okteta.nix
new file mode 100644
index 00000000000..ef590ab50c4
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/okteta.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, shared_mime_info, qca2 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi shared_mime_info qca2 ];
+
+  meta = {
+    description = "KDE byte editor";
+    kde = {
+      name = "okteta";
+      module = "kdesdk";
+      version = "0.5.3";
+      versionFile = "program/about.cpp";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/sdk/optional-docs.diff b/pkgs/desktops/kde-4.7/sdk/optional-docs.diff
similarity index 100%
rename from pkgs/desktops/kde-4.6/sdk/optional-docs.diff
rename to pkgs/desktops/kde-4.7/sdk/optional-docs.diff
diff --git a/pkgs/desktops/kde-4.6/sdk/poxml.nix b/pkgs/desktops/kde-4.7/sdk/poxml.nix
similarity index 50%
rename from pkgs/desktops/kde-4.6/sdk/poxml.nix
rename to pkgs/desktops/kde-4.7/sdk/poxml.nix
index 652110b38ff..ae092170668 100644
--- a/pkgs/desktops/kde-4.6/sdk/poxml.nix
+++ b/pkgs/desktops/kde-4.7/sdk/poxml.nix
@@ -1,15 +1,13 @@
-{ kde, cmake, kdelibs, automoc4, antlr }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, antlr }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 antlr ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi antlr ];
 
   meta = {
     description = "Po<->xml tools";
     kde = {
       name = "poxml";
       module = "kdesdk";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/sdk/scripts.nix b/pkgs/desktops/kde-4.7/sdk/scripts.nix
similarity index 58%
rename from pkgs/desktops/kde-4.6/sdk/scripts.nix
rename to pkgs/desktops/kde-4.7/sdk/scripts.nix
index 204c24cfba5..70fdb8b606b 100644
--- a/pkgs/desktops/kde-4.6/sdk/scripts.nix
+++ b/pkgs/desktops/kde-4.7/sdk/scripts.nix
@@ -1,15 +1,13 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Various scripts to ease KDE development";
     kde = {
       name = "scripts";
       module = "kdesdk";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
similarity index 58%
rename from pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix
rename to pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
index 88c935ade4a..cacabdcb326 100644
--- a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
@@ -1,15 +1,13 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Strigi analyzers for diff, po and ts";
     kde = {
       name = "strigi-analyzer";
       module = "kdesdk";
-      version = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/sdk/umbrello.nix b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
similarity index 53%
rename from pkgs/desktops/kde-4.6/sdk/umbrello.nix
rename to pkgs/desktops/kde-4.7/sdk/umbrello.nix
index d465e97012b..9785d6c3146 100644
--- a/pkgs/desktops/kde-4.6/sdk/umbrello.nix
+++ b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libxml2, libxslt, boost }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libxml2 libxslt boost ];
 
   meta = {
     description = "Umbrello UML modeller";
@@ -10,7 +9,6 @@ kde.package {
       name = "umbrello";
       module = "kdesdk";
       version = "2.5.2"; # release - 200
-      release = "4.5.90";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
new file mode 100644
index 00000000000..486849b23aa
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
+
+stdenv.mkDerivation rec {
+  name = "akonadi-1.6.0";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+    sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f";
+  };
+  
+  buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ];
+
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    description = "KDE PIM Storage Service";
+    license = "LGPL";
+    homepage = http://pim.kde.org/akonadi;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
new file mode 100644
index 00000000000..5c4944f47c3
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
@@ -0,0 +1,16 @@
+{ kde, cmake }:
+
+kde.package {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96";
+
+  buildInputs = [ cmake ];
+  
+  meta = {
+    description = "KDE Oxygen theme icons";
+    longDescription = "Icons for KDE's default theme";
+    license = "GPL";
+    kde.name = "oxygen-icons";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix
similarity index 63%
rename from pkgs/desktops/kde-4.6/support/soprano/default.nix
rename to pkgs/desktops/kde-4.7/support/soprano/default.nix
index 101cbfbe60b..acd2b877019 100644
--- a/pkgs/desktops/kde-4.6/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@@ -1,16 +1,15 @@
-{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc, pkgconfig}:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.6.0";
+  name = "soprano-2.6.51";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "0dfdc4hcv25kwmv3wp13qjw2jg2fax4gcy79yia7sdgz5ik59xq2";
+    sha256 = "0sj0cklxahlhig29d0b1a3hr1p2z1xfar7j1slj2klbcy3qn47i0";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
-  buildInputs = [ qt4 cluceneCore redland libiodbc ];
-  buildNativeInputs = [ cmake pkgconfig ];
+  buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;
diff --git a/pkgs/desktops/kde-4.6/toys/amor.nix b/pkgs/desktops/kde-4.7/toys/amor.nix
similarity index 66%
rename from pkgs/desktops/kde-4.6/toys/amor.nix
rename to pkgs/desktops/kde-4.7/toys/amor.nix
index 2c68ffe6fa8..3ff0706b9ba 100644
--- a/pkgs/desktops/kde-4.6/toys/amor.nix
+++ b/pkgs/desktops/kde-4.7/toys/amor.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "KDE creature for your desktop";
@@ -9,7 +9,6 @@ kde.package {
       name = "amor";
       module = "kdetoys";
       version = "2.4.0";
-      release = "4.5.90";
       versionFile = "src/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/toys/kteatime.nix b/pkgs/desktops/kde-4.7/toys/kteatime.nix
similarity index 57%
rename from pkgs/desktops/kde-4.6/toys/kteatime.nix
rename to pkgs/desktops/kde-4.7/toys/kteatime.nix
index 14cfcd07f58..54550d8f270 100644
--- a/pkgs/desktops/kde-4.6/toys/kteatime.nix
+++ b/pkgs/desktops/kde-4.7/toys/kteatime.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "KDE utility for making a fine cup of tea";
@@ -9,8 +9,6 @@ kde.package {
       name = "kteatime";
       module = "kdetoys";
       version = "1.2.1";
-      release = "4.5.90";
-      versionFile = "src/main.cpp";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/toys/ktux.nix b/pkgs/desktops/kde-4.7/toys/ktux.nix
similarity index 58%
rename from pkgs/desktops/kde-4.6/toys/ktux.nix
rename to pkgs/desktops/kde-4.7/toys/ktux.nix
index af280761865..8f350f083ba 100644
--- a/pkgs/desktops/kde-4.6/toys/ktux.nix
+++ b/pkgs/desktops/kde-4.7/toys/ktux.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, kdebase_workspace }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, kde_workspace }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_workspace ];
 
   meta = {
     description = "Tux Screen Saver";
@@ -9,7 +9,6 @@ kde.package {
       name = "ktux";
       module = "kdetoys";
       version = "1.0.1";
-      release = "4.5.90";
       versionFile = "src/sprite.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/ark.nix b/pkgs/desktops/kde-4.7/utils/ark.nix
new file mode 100644
index 00000000000..d3766bfa313
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/ark.nix
@@ -0,0 +1,19 @@
+{ kde, cmake, kdelibs, qt4, libarchive, xz, automoc4
+, phonon, bzip2, kde_baseapps }:
+
+kde.package {
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kde_baseapps
+      libarchive xz bzip2
+    ];
+
+  meta = {
+    description = "KDE Archiving Tool";
+    kde = {
+      name = "ark";
+      module = "kdeutils";
+      version = "2.17";
+      versionFile = "app/main.cpp";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/utils/filelight.nix b/pkgs/desktops/kde-4.7/utils/filelight.nix
new file mode 100644
index 00000000000..6a61fa28816
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/filelight.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
+
+  meta = {
+    description = "Tool to visualise file and directory sizes";
+    kde = {
+      name = "filelight";
+      module = "kdeutils";
+      version = "1.10";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/utils/kcalc.nix b/pkgs/desktops/kde-4.7/utils/kcalc.nix
similarity index 52%
rename from pkgs/desktops/kde-4.6/utils/kcalc.nix
rename to pkgs/desktops/kde-4.7/utils/kcalc.nix
index dd8e6f47cdc..932fd296e56 100644
--- a/pkgs/desktops/kde-4.6/utils/kcalc.nix
+++ b/pkgs/desktops/kde-4.7/utils/kcalc.nix
@@ -1,15 +1,14 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, gmp }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon gmp ];
 
   meta = {
     description = "KDE Calculator";
     kde = {
       name = "kcalc";
       module = "kdeutils";
-      version = "2.7";
-      release = "4.5.90";
+      version = "2.9";
       versionFile = "version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/utils/kcharselect.nix b/pkgs/desktops/kde-4.7/utils/kcharselect.nix
similarity index 56%
rename from pkgs/desktops/kde-4.6/utils/kcharselect.nix
rename to pkgs/desktops/kde-4.7/utils/kcharselect.nix
index 9952a5fa018..563596a6de3 100644
--- a/pkgs/desktops/kde-4.6/utils/kcharselect.nix
+++ b/pkgs/desktops/kde-4.7/utils/kcharselect.nix
@@ -1,15 +1,14 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE character selection utility";
     kde = {
       name = "kcharselect";
       module = "kdeutils";
-      version = "1.7";
-      release = "4.5.90";
+      version = "1.9";
       versionFile = "main.cc";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/utils/kdf.nix b/pkgs/desktops/kde-4.7/utils/kdf.nix
similarity index 54%
rename from pkgs/desktops/kde-4.6/utils/kdf.nix
rename to pkgs/desktops/kde-4.7/utils/kdf.nix
index 9e07ac65a76..a7f18ae96c5 100644
--- a/pkgs/desktops/kde-4.6/utils/kdf.nix
+++ b/pkgs/desktops/kde-4.7/utils/kdf.nix
@@ -1,15 +1,14 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE free disk space utility";
     kde = {
       name = "kdf";
       module = "kdeutils";
-      version = "0.11";
-      release = "4.5.90";
+      version = "0.13";
       versionFile = "kdf.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/kfloppy.nix b/pkgs/desktops/kde-4.7/utils/kfloppy.nix
new file mode 100644
index 00000000000..9d8a8b2f99f
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/kfloppy.nix
@@ -0,0 +1,13 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
+
+  meta = {
+    description = "Floppy disk formatting utility";
+    kde = {
+      name = "kfloppy";
+      module = "kdeutils";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/utils/kgpg.nix b/pkgs/desktops/kde-4.7/utils/kgpg.nix
new file mode 100644
index 00000000000..415d3e47ce8
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/kgpg.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, kdepimlibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon kdepimlibs ];
+
+  meta = {
+    description = "Simple KDE GUI for GPG";
+    kde = {
+      name = "kgpg";
+      module = "kdeutils";
+      version = "2.4.1";
+      versionFile = "main.cpp";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix
new file mode 100644
index 00000000000..548e75f900d
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix
@@ -0,0 +1,13 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libXtst }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
+
+  meta = {
+    description = "KDE remote control";
+    kde = {
+      name = "kremotecontrol";
+      module = "kdeutils";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/utils/ktimer.nix b/pkgs/desktops/kde-4.7/utils/ktimer.nix
similarity index 60%
rename from pkgs/desktops/kde-4.6/utils/ktimer.nix
rename to pkgs/desktops/kde-4.7/utils/ktimer.nix
index 069985d7025..a343390ce50 100644
--- a/pkgs/desktops/kde-4.6/utils/ktimer.nix
+++ b/pkgs/desktops/kde-4.7/utils/ktimer.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE Timer";
@@ -9,7 +9,6 @@ kde.package {
       name = "ktimer";
       module = "kdeutils";
       version = "0.6";
-      release = "4.5.90";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/utils/kwallet.nix b/pkgs/desktops/kde-4.7/utils/kwallet.nix
similarity index 64%
rename from pkgs/desktops/kde-4.6/utils/kwallet.nix
rename to pkgs/desktops/kde-4.7/utils/kwallet.nix
index 395fe1da448..5f0edcaa8da 100644
--- a/pkgs/desktops/kde-4.6/utils/kwallet.nix
+++ b/pkgs/desktops/kde-4.7/utils/kwallet.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE Wallet (password storage) management tool";
@@ -9,7 +9,6 @@ kde.package {
       name = "kwallet";
       module = "kdeutils";
       version = "1.6";
-      release = "4.5.90";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/printer-applet.nix b/pkgs/desktops/kde-4.7/utils/printer-applet.nix
new file mode 100644
index 00000000000..12c7eb96d47
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/utils/printer-applet.nix
@@ -0,0 +1,32 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon
+, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
+, pythonDBus, makeWrapper }:
+
+kde.package rec {
+  buildInputs =
+    [ cmake qt4 kdelibs automoc4 phonon
+      pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
+
+  pythonPath = [ pyqt4 pykde4 pycups system_config_printer ];
+
+  postInstall =
+    ''
+      wrapPythonPrograms
+
+      # ‘system-config-printer’ supplies some D-Bus policy that we need.
+      mkdir -p $out/nix-support
+      echo ${system_config_printer} > $out/nix-support/propagated-user-env-packages
+    '';
+    
+  meta = {
+    description = "KDE printer applet";
+    longDescription = "Applet to view current print jobs and configure new printers";
+    kde = {
+      name = "printer-applet";
+      module = "kdeutils";
+      version = "1.7";
+      versionFile = "printer-applet.py";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/utils/superkaramba.nix b/pkgs/desktops/kde-4.7/utils/superkaramba.nix
similarity index 57%
rename from pkgs/desktops/kde-4.6/utils/superkaramba.nix
rename to pkgs/desktops/kde-4.7/utils/superkaramba.nix
index 75ed3bc0eed..f0e6d9511ba 100644
--- a/pkgs/desktops/kde-4.6/utils/superkaramba.nix
+++ b/pkgs/desktops/kde-4.7/utils/superkaramba.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, qimageblitz, python }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon qimageblitz ];
 
   cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE";
 
@@ -10,8 +10,7 @@ kde.package {
     kde = {
       name = "superkaramba";
       module = "kdeutils";
-      version = "0.55";
-      release = "4.5.90";
+      version = "0.57";
       versionFile = "src/main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/utils/sweeper.nix b/pkgs/desktops/kde-4.7/utils/sweeper.nix
similarity index 59%
rename from pkgs/desktops/kde-4.6/utils/sweeper.nix
rename to pkgs/desktops/kde-4.7/utils/sweeper.nix
index 9e702ff708c..1b4ca0ed7ee 100644
--- a/pkgs/desktops/kde-4.6/utils/sweeper.nix
+++ b/pkgs/desktops/kde-4.7/utils/sweeper.nix
@@ -1,15 +1,14 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "Helps clean unwanted traces the user leaves on the system";
     kde = {
       name = "sweeper";
       module = "kdeutils";
-      version = "1.5";
-      release = "4.5.90";
+      version = "1.7";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/wallpapers.nix b/pkgs/desktops/kde-4.7/wallpapers.nix
new file mode 100644
index 00000000000..9b83b4a9f08
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/wallpapers.nix
@@ -0,0 +1,15 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b";
+
+  meta = {
+    description = "Wallpapers for KDE";
+    kde.name = "kde-wallpapers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
similarity index 64%
rename from pkgs/desktops/kde-4.6/webdev/kfilereplace.nix
rename to pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
index e428f359783..5e05cfd3f52 100644
--- a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix
+++ b/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
 
   meta = {
     description = "Batch search and replace tool";
@@ -10,7 +10,6 @@ kde.package {
       name = "kfilereplace";
       module = "kdewebdev";
       version = "0.1";
-      release = "4.5.90";
       versionFile = "main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
similarity index 65%
rename from pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix
rename to pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
index a3ae85a8f16..1664ece34f0 100644
--- a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix
+++ b/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
 
   meta = {
     description = "An HTML imagemap editor";
@@ -10,7 +10,6 @@ kde.package {
       name = "kimagemapeditor";
       module = "kdewebdev";
       version = "3.9.0";
-      release = "4.5.90";
       versionFile = "version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
similarity index 55%
rename from pkgs/desktops/kde-4.6/webdev/klinkstatus.nix
rename to pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
index 7c419a572d3..aadcec7ec79 100644
--- a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
@@ -1,9 +1,9 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy,
-  ruby }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt, kdepimlibs
+, boost, htmlTidy }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost
-    htmlTidy ruby ];
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt kdepimlibs boost htmlTidy ];
 
   meta = {
     description = "A KDE link checker";
@@ -12,7 +12,6 @@ kde.package {
       name = "klinkstatus";
       module = "kdewebdev";
       version = "0.7.0";
-      release = "4.5.90";
       versionFile = "src/main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.6/webdev/kommander.nix b/pkgs/desktops/kde-4.7/webdev/kommander.nix
similarity index 56%
rename from pkgs/desktops/kde-4.6/webdev/kommander.nix
rename to pkgs/desktops/kde-4.7/webdev/kommander.nix
index c450e1d7810..43d9b0aeb65 100644
--- a/pkgs/desktops/kde-4.6/webdev/kommander.nix
+++ b/pkgs/desktops/kde-4.7/webdev/kommander.nix
@@ -1,15 +1,13 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
 
   meta = {
     description = "A graphical editor of scripted dialogs";
     kde = {
       name = "kommander";
       module = "kdewebdev";
-      version = "1.91";
-      release = "4.5.90";
       versionFile = "lib/kommanderversion.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
new file mode 100644
index 00000000000..9753a1a3eef
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -0,0 +1,34 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
+, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
+, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
+, phonon, xkeyboard_config, kdepimlibs, pam
+}:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 strigi qimageblitz libdbusmenu_qt
+      xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
+      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
+      xorg.libpthreadstubs
+      soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
+      libusb python libqalculate akonadi perl consolekit phonon
+      kdepimlibs pam
+    ];
+
+  preConfigure =
+   ''
+     # Fix incorrect path to kde4-config.
+     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+     # Fix the path to the keyboard configuration files.
+     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+   '';
+
+  meta = {
+    description = "KDE workspace components such as Plasma, Kwin and System Settings";
+    license = "GPLv2";
+    kde.name = "kde-workspace";
+  };
+}
diff --git a/pkgs/desktops/kde-4.6/support/attica/default.nix b/pkgs/development/libraries/attica/default.nix
similarity index 91%
rename from pkgs/desktops/kde-4.6/support/attica/default.nix
rename to pkgs/development/libraries/attica/default.nix
index 0eff2cbb4eb..95de0834f29 100644
--- a/pkgs/desktops/kde-4.6/support/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -1,12 +1,15 @@
-{stdenv, fetchurl, cmake, qt4}:
+{ stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "attica-0.2.0";
+  
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
     sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
   };
+  
   buildInputs = [ cmake qt4 ];
+  
   meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";
diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix
index 87f40d6e10b..1e8cf30a874 100644
--- a/pkgs/development/libraries/consolekit/default.nix
+++ b/pkgs/development/libraries/consolekit/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, 
-  libX11, polkit, expat }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib
+, libX11, polkit, expat }:
 
 stdenv.mkDerivation rec {
-  name = "ConsoleKit-0.4.4";
+  name = "ConsoleKit-0.4.5";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/ConsoleKit/dist/${name}.tar.bz2";
-    sha256 = "1bhnjwn7gakwfhqxrmwqwyjq46a11nn463qz0wlddrvgzdlhkh7h";
+    sha256 = "0f4wddl27cmi19mcw25l94z57hsd91z88gzczig153h7ac67iq23";
   };
   
   buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index fdbc27a5617..712ef36bdd7 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
 
 let
-  version = "1.4.6";
+  version = "1.4.14";
   
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "0rx5p1f0jg4ch4958qb3ld3w3cw57a0rmvmxjgn1ir9dvxj1wgkm";
+    sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
   };
 
   patches = [ ./ignore-missing-includedirs.patch ];
@@ -27,6 +27,11 @@ in rec {
         sed -i '/SUBDIRS/s/ tools//' Makefile.in
       '';
 
+    # Enable X11 autolaunch support in libdbus.  This doesn't actually
+    # depend on X11 (it just execs dbus-launch in dbus.tools),
+    # contrary to what the configure script demands.
+    NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+
     installFlags = "sysconfdir=$(out)/etc";
   };
 
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 9cf94ca359f..771ae0dff5e 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,16 +1,19 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  v = "2.0.15";
+  v = "2.0.16";
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
+  
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "0frgmkwsgmqaw88qpgvfalisq0wjpcbgqbj6jhpk39nbrs3zcq83";
+    sha256 = "04lzlhl7r1yqkpq9xabm1v5vgz0z9xqf1k7indgwdw8nfyma3qar";
   };
+  
   buildNativeInputs = [ cmake ];
+  
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 52de10148a4..b77b52a5e65 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, yasm
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
-, vorbisSupport ? true, libvorbis ? null
+, vorbisSupport ? false, libvorbis ? null
 , vpxSupport ? false, libvpx ? null
 , x264Support ? true, x264 ? null
-, xvidSupport ? true, xvidcore ? null
+, xvidSupport ? false, xvidcore ? null
 , faacSupport ? false, faac ? null
 }:
 
@@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.7-rc1";
+  name = "ffmpeg-0.8.1";
   
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
+    sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
 
-  buildInputs = [ pkgconfig lame yasm ]
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional faacSupport faac;
 
+  enableParallelBuilding = true;
+    
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 6c506df3f89..c72a619b66e 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "gamin-0.1.9";
+  name = "gamin-0.1.10";
 
   src = fetchurl {
     url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
-    sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr";
+    sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
   buildInputs = [ python pkgconfig glib ];
diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix
index a1ebaabbe06..bae405a2426 100644
--- a/pkgs/development/libraries/glib/2.28.x.nix
+++ b/pkgs/development/libraries/glib/2.28.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "glib-2.28.3";
+  name = "glib-2.28.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2";
-    sha256 = "7e1ab62d0f0cdc3f0ce8214b77d104b3abbd51185a9f3fc9b6a504cce26f6fab";
+    sha256 = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f";
   };
 
   # configure script looks for d-bus but it is only needed for tests
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 96629b25197..de9059dbd15 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "gobject-introspection";
-  v = "0.10.2";
+  v = "0.10.8";
 in
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2";
-    sha256 = "18di6v39hibb6j39vs0a5icaafihfryh8250kz7x1q1313pvm62v";
+    sha256 = "5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e";
   };
 
   postInstall = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 0e0bed42a9a..5f06c82c334 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan}:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.3.0";
+  
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
     sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
   };
-  propagatedBuildInputs = [libgpgerror glib pth libassuan];
+  
+  propagatedBuildInputs = [ libgpgerror glib pth libassuan ];
 
-  buildNativeInputs = [pkgconfig];
+  buildNativeInputs = [ pkgconfig ];
 
   configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
 }
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 723d4176e35..0394bb5fadb 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,14 +1,16 @@
-{ callPackage, pkgs }:
+{ callPackage }:
 
 rec {
-  gstreamer = callPackage ./gstreamer {
-    flex = pkgs.flex2535;
-  };
+  gstreamer = callPackage ./gstreamer { };
 
   gstPluginsBase = callPackage ./gst-plugins-base { };
 
   gstPluginsGood = callPackage ./gst-plugins-good { };
 
+  gstPluginsUgly = callPackage ./gst-plugins-ugly { };
+
+  gstPluginsBad = callPackage ./gst-plugins-bad { };
+
   gstFfmpeg = callPackage ./gst-ffmpeg { };
 
   gnonlin = callPackage ./gnonlin { };
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index 9132e6b0a8f..0287c5b9135 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -1,27 +1,29 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, liboil }:
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, yasm
+, useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.11";
+  name = "gst-ffmpeg-0.10.12";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0bk9k9sccx9nvhjakacvq8gd6vp63x9ddmjrqkfdhkmgwlwa2dpz";
+    sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
   };
 
-  propagatedBuildInputs = [ gstPluginsBase ];
-  
-  buildInputs = [ pkgconfig bzip2 liboil ];
+  # Upstream strongly recommends against using --with-system-ffmpeg,
+  # but we do it anyway because we're so hardcore (and we don't want
+  # multiple copies of ffmpeg).
+  configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
 
-  configureFlags = "--enable-ladspa";
+  buildInputs =
+    [ pkgconfig bzip2 gstPluginsBase ]
+    ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg";
-
     description = "GStreamer's plug-in using FFmpeg";
-
     license = "GPLv2+";
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
new file mode 100644
index 00000000000..4dec1a86ebf
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
+, libdvdnav, libdvdread }:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-bad-0.10.22";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2"
+      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      ];
+    sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq";
+  };
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gstPluginsBase libdvdnav libdvdread ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 4a1a2de4dac..47762660b29 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-0.10.30";
+  name = "gst-plugins-base-0.10.35";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1mw5n1w7l0hgyzf75srdxlh3knfgrmddbs2ah1f97s8b710qd4v3";
+    sha256 = "00vis5kg6km26zaq1ywz7ki9xvkwpc9c5wn41d01z2i5nldz096d";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 65f32e44cc2..e2eb25bfb89 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,26 +1,29 @@
 { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
-, flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
-, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
-, gnome, libcap, libtasn1, liboil
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
+, libiec61883, libavc1394, taglib, pulseaudio
+, glib, gstreamer, bzip2
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-0.10.25";
+  name = "gst-plugins-good-0.10.30";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1xlr8rzb6pxi91g6jxhqa7cwl0kg5y21qfd9bgc4fb212867bmdm";
+    sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i";
   };
 
-  propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
-    zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
-    taglib gdbm pulseaudio gnome.libsoup libcap libtasn1 liboil];
-  buildInputs = [pkgconfig];
+  configureFlags = "--disable-oss";
 
-  configureFlags = "--enable-ladspa";
+  buildInputs =
+    [ pkgconfig glib gstreamer gstPluginsBase libavc1394 libiec61883
+      aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
+      taglib bzip2
+    ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://gstreamer.freedesktop.org;
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
new file mode 100644
index 00000000000..153ab47fb92
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
+, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-ugly-0.10.18";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2"
+      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      ];
+    sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr";
+  };
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gstPluginsBase libmad libdvdread a52dec ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 7a5514a4608..01d5487302c 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-0.10.30";
+  name = "gstreamer-0.10.35";
 
   src = fetchurl {
-    urls = [
-      "${meta.homepage}/src/gstreamer/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
+    urls =
+      [ "${meta.homepage}/src/gstreamer/${name}.tar.bz2"
+        "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0ajkfkchwpk5zlcis19laqbv84mi61cn3cqbdbrpyy93whdk1vz8";
+    sha256 = "11lp13lig3c6qys80phyvsik56r9y0c95vg2jxxliqj6rnigwyw1";
   };
 
   buildInputs = [ perl bison flex pkgconfig ];
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix
index e0e04dbace1..e4a1f0969f9 100644
--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.3";
+  name = "gtk+-2.24.5";
   
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2";
-    sha256 = "336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7";
+    sha256 = "f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8";
   };
 
   patches =
diff --git a/pkgs/development/libraries/gtk+/old-icons.patch b/pkgs/development/libraries/gtk+/old-icons.patch
index 438ff244d07..e53d87474d0 100644
--- a/pkgs/development/libraries/gtk+/old-icons.patch
+++ b/pkgs/development/libraries/gtk+/old-icons.patch
@@ -1,7 +1,7 @@
-diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in
---- gtk+-2.24.0-orig//gtk/Makefile.in	2011-01-30 05:39:20.000000000 +0100
-+++ gtk+-2.24.0//gtk/Makefile.in	2011-02-14 00:06:56.000000000 +0100
-@@ -1601,7 +1601,173 @@
+diff -ru gtk+-2.24.5-orig/gtk/Makefile.in gtk+-2.24.5/gtk/Makefile.in
+--- gtk+-2.24.5-orig/gtk/Makefile.in	2011-06-16 01:56:37.000000000 +0200
++++ gtk+-2.24.5/gtk/Makefile.in	2011-07-07 15:38:06.000000000 +0200
+@@ -1616,7 +1616,173 @@
  	stock-icons/24/folder-remote.png 		\
  	stock-icons/24/user-home.png 			\
  	stock-icons/24/user-desktop.png 		\
@@ -176,10 +176,10 @@ diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in
  
  @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
  @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2873,7 +3039,91 @@
+@@ -2887,7 +3053,91 @@
  	   && $(LN_S) folder.png user-desktop.png 			\
- 	   && $(RM) text-x-generic.png 					\
- 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
+ 	   && $(RM) user-home.png 					\
+ 	   && $(LN_S) folder.png user-home.png 				\
 +	   && $(LN_S) application-exit.png gtk-quit.png			\
 +	   && $(LN_S) dialog-information.png gtk-info.png			\
 +	   && $(LN_S) document-new.png gtk-file.png			\
diff --git a/pkgs/development/libraries/herqq/0.8.0.nix b/pkgs/development/libraries/herqq/0.8.0.nix
deleted file mode 100644
index 29b76065918..00000000000
--- a/pkgs/development/libraries/herqq/0.8.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, qt4, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "herqq-0.8.0";
-
-
-  buildInputs = [ qt4 unzip ];
-
-  configurePhase = "qmake PREFIX=$out herqq.pro";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/hupnp/${name}.zip";
-    sha256 = "0z1z9f48fhdif3wd7gn2gj0yxk15f0lpm01q0igsccv8m1y3mphn";
-  };
-
-  meta = {
-    homepage = http://herqq.org;
-    description = "A software library for building UPnP devices and control points";
-    inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
diff --git a/pkgs/development/libraries/herqq/0.7.0.nix b/pkgs/development/libraries/herqq/default.nix
similarity index 82%
rename from pkgs/development/libraries/herqq/0.7.0.nix
rename to pkgs/development/libraries/herqq/default.nix
index 80bfaf638df..fee12592c63 100644
--- a/pkgs/development/libraries/herqq/0.7.0.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, qt4, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "herqq-0.7.0";
-
+  name = "herqq-1.0.0";
 
   buildInputs = [ qt4 unzip ];
 
@@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/hupnp/${name}.zip";
-    sha256 = "13z6wabakn2j57azhik9nvps50l85hrs028kkhn5cpd0pgcigmqz";
+    sha256 = "13klwszi7h7mvdz2ap0ac4dp7lc0gswp8lzzlwidhqfmf9pwgkyb";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/herqq/svn.nix b/pkgs/development/libraries/herqq/svn.nix
deleted file mode 100644
index c9f0f09d44a..00000000000
--- a/pkgs/development/libraries/herqq/svn.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchsvn, qt4 }:
-
-stdenv.mkDerivation {
-  name = "herqq-0.8.0-r91";
-
-
-  buildInputs = [ qt4 ];
-
-  configurePhase = "qmake PREFIX=$out herqq.pro";
-
-  src = fetchsvn {
-    url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq;
-    rev = 91;
-    sha256 = "122md1kn8b5a1vdpn5kisqi6xklwwa57r4lacm1rxlkq3rpca864";
-  };
-
-  meta = {
-    homepage = http://herqq.org;
-    description = "A software library for building UPnP devices and control points";
-    inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 07753c86403..73ca029a631 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libraw1394 }:
 
-stdenv.mkDerivation {
-  name = "libavc1394-0.5.3";
+stdenv.mkDerivation rec {
+  name = "libavc1394-0.5.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz;
-    sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
+    url = "mirror://sourceforge/libavc1394/${name}.tar.gz";
+    sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index db2feeecb12..691294d4a85 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk
-, alsaLib, pulseaudio, gstreamer, libvorbis, libcap }:
+{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
+, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "libcanberra-0.23";
+  name = "libcanberra-0.28";
 
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";
-    sha256 = "0q09gasvm5dc9d4640lzb5nnmy2cpyi74aq83kjd3j4z58lczl57";
+    sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb";
   };
 
   buildInputs =
-    [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap ];
-  propagatedBuildInputs = [ gtk ];
+    [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ];
 
-  configureFlags = "--disable-oss";
+  configureFlags = "--disable-oss --disable-schemas-install";
 
   meta = {
     description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index aed051a446b..3c138cca416 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ stdenv, fetchurl, qt4, cmake, doxygen }:
 
 let
   baseName = "libdbusmenu-qt";
-  v = "0.7.0";
+  v = "0.8.3";
 in
+
 stdenv.mkDerivation rec {
   name = "${baseName}-${v}";
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "0zn3w57xjk34j08fx4n757kakkd4y07halrnaj4a0x0c9dhyjf14";
+    sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka";
   };
 
-  buildInputs = [ cmake qt4 ];
+  buildInputs = [ cmake qt4 doxygen ];
   
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix
index b197d5dcd5d..5d13aa9a3cf 100644
--- a/pkgs/development/libraries/libmcs/default.nix
+++ b/pkgs/development/libraries/libmcs/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, libmowgli}:
+{ stdenv, fetchurl, pkgconfig, libmowgli }:
 
-stdenv.mkDerivation {
-  name = "libmcs-0.7.1";
+stdenv.mkDerivation rec {
+  name = "libmcs-0.7.2";
   
   src = fetchurl {
-    url = http://distfiles.atheme.org/libmcs-0.7.1.tbz2;
-    sha256 = "16ckfdprqyb9jhhnhvyhw2rkwadq1z6l3a00fvix16sjzh8dgcz0";
+    url = "http://distfiles.atheme.org/${name}.tbz2";
+    sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74";
   };
 
-  buildInputs = [pkgconfig libmowgli];
+  buildInputs = [ pkgconfig libmowgli ];
   
   meta = {
     description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications";
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index 4bc8bc19a12..71611e2ad5b 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libmowgli-0.7.0";
+stdenv.mkDerivation rec {
+  name = "libmowgli-0.9.50";
   
   src = fetchurl {
-    url = http://distfiles.atheme.org/libmowgli-0.7.0.tbz2;
-    sha256 = "1d6318zfr4khlq8j290wxn026gnwdd6p81klkh6h0fkdawpvplzx";
+    url = "http://distfiles.atheme.org/${name}.tar.bz2";
+    sha256 = "0wbnpd2rzk5jg6pghgxyx7brjrdmsyg4p0mm9blwmrdrj5ybxx9z";
   };
   
   meta = {
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
new file mode 100644
index 00000000000..1d04eea89f6
--- /dev/null
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libmpeg2-0.5.1";
+  
+  src = fetchurl {
+    url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
+    sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
+  };
+
+  meta = {
+    homepage = http://libmpeg2.sourceforge.net/;
+    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
+  };
+}
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index 08bcd2ff4b1..714870fab16 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, cmake, neon, libdiscid }:
 
 stdenv.mkDerivation rec {
-  name = "libmusicbrainz-3.0.2";
+  name = "libmusicbrainz-3.0.3";
 
   buildInputs = [ cmake neon libdiscid ];
 
-  patches = [ ./find-neon.patch ./missing-include.patch ];
-
   src = fetchurl {
     url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
-    sha256 = "1nhyl9kalvcn0r86y3kps6id84y3rc43226g67bssfb2h9b5x8xr";
+    md5 = "f4824d0a75bdeeef1e45cc88de7bb58a";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libmusicbrainz/find-neon.patch b/pkgs/development/libraries/libmusicbrainz/find-neon.patch
deleted file mode 100644
index 2230c46018e..00000000000
--- a/pkgs/development/libraries/libmusicbrainz/find-neon.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/cmake/modules/FindNeon.cmake b/cmake/modules/FindNeon.cmake
-index 0a6b300..dbd6194 100644
---- a/cmake/modules/FindNeon.cmake
-+++ b/cmake/modules/FindNeon.cmake
-@@ -1,10 +1,10 @@
- INCLUDE(UsePkgConfig)
- PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
- 
--FIND_PATH(NEON_INCLUDE_DIR ne_request.h
-+FIND_PATH(NEON_INCLUDE_DIR neon/ne_request.h
-     ${_NeonIncDir}
--    /usr/include/neon
--    /usr/local/include/neon
-+    /usr/include
-+    /usr/local/include
- )
- 
- FIND_LIBRARY(NEON_LIBRARIES neon
-diff --git a/src/utils_private.cpp b/src/utils_private.cpp
-index 751b4a7..5a06eca 100644
---- a/src/utils_private.cpp
-+++ b/src/utils_private.cpp
-@@ -26,7 +26,7 @@
- #include <cstdarg>
- #include <iostream>
- #include <map>
--#include <ne_uri.h> 
-+#include <neon/ne_uri.h> 
- #include "utils_private.h"
- 
- using namespace std;
-diff --git a/src/webservice.cpp b/src/webservice.cpp
-index cd483f9..483f486 100644
---- a/src/webservice.cpp
-+++ b/src/webservice.cpp
-@@ -26,11 +26,11 @@
- #include <iostream>
- #include <stdlib.h>
- #include <string.h>
--#include <ne_session.h>
--#include <ne_request.h>
--#include <ne_utils.h>
--#include <ne_auth.h>
--#include <ne_uri.h> 
-+#include <neon/ne_session.h>
-+#include <neon/ne_request.h>
-+#include <neon/ne_utils.h>
-+#include <neon/ne_auth.h>
-+#include <neon/ne_uri.h> 
- #include <musicbrainz3/webservice.h>
- #include <musicbrainz3/artist.h>
- #include "utils_private.h"
diff --git a/pkgs/development/libraries/libmusicbrainz/missing-include.patch b/pkgs/development/libraries/libmusicbrainz/missing-include.patch
deleted file mode 100644
index 2a1d2b38cae..00000000000
--- a/pkgs/development/libraries/libmusicbrainz/missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/utils_private.cpp b/src/utils_private.cpp
-index 2abe857..751b4a7 100644
---- a/src/utils_private.cpp
-+++ b/src/utils_private.cpp
-@@ -21,6 +21,7 @@
-  */
-  
- #include <cstdlib>
-+#include <cstdio>
- #include <cstring>
- #include <cstdarg>
- #include <iostream>
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 3ea201a7e50..aeb0792dacf 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, dbus, expat }:
 
-let version = "1.0.2"; in
+let version = "1.0.3"; in
 
 stdenv.mkDerivation rec {
   name = "libnih-${version}";
   
   src = fetchurl {
     url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
-    sha256 = "0zi5qacppsipc03gqdr0vpgfqk17kxxxnrqzb6md12kixfahl33v";
+    sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
   };
 
   buildInputs = [ pkgconfig dbus expat ];
-  
+
   meta = {
     description = "A small library for C application development";
     homepage = https://launchpad.net/libnih;
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index a910d11f410..4b1fbe269bd 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libraw1394-1.3.0";
+  name = "libraw1394-2.0.7";
 
   src = fetchurl {
-    url = "${meta.homepage}/dl/${name}.tar.gz";
-    sha256 = "035mrca9fhg4kq8r1s5yjgzg3vrn1nc3ndy13yg3chhqgx4dzzr0";
+    url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
+    sha256 = "1mq9yy73q85lzk288lbdzvzrs5ajh84pzfh7xdhd3d8dy9v53xca";
   };
 
   meta = { 
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
-    homepage = http://www.linux1394.org;
+    homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
     license = ["GPL" "LGPL"];
   };
 }
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
new file mode 100644
index 00000000000..dcb9b6d97d1
--- /dev/null
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libxml2, libxslt, curl }:
+
+stdenv.mkDerivation rec {
+  name = "raptor2-2.0.3";
+
+  src = fetchurl {
+    url = "http://download.librdf.org/source/${name}.tar.gz";
+    sha256 = "1icfg01zx3d3czqz774ar2mmnp8a9m248y5zvi5yn0fzs0nyc8g2";
+  };
+
+  buildInputs = [ libxml2 libxslt ];
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = { 
+    description = "The RDF Parser Toolkit";
+    homepage = "http://librdf.org/raptor";
+    license = "LGPL-2.1 Apache-2.0";
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 681453985b9..2506e6a308a 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -8,12 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
   };
 
-  buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
-
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
-  '';
+  buildInputs = [ pkgconfig librdf_raptor gmp pcre libxml2 ];
 
+  postInstall = "rm -rf $out/share/gtk-doc";
+  
   meta = { 
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
deleted file mode 100644
index 8b29deba56f..00000000000
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "mpeg2dec-0.4.1";
-  
-  src = fetchurl {
-    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.1.tar.gz;
-    sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
-  };
-
-  configureFlags = "--enable-shared --disable-static";
-
-  meta = {
-    homepage = http://libmpeg2.sourceforge.net/;
-    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
-  };
-}
diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix
index a5aa77b5a39..7488154373d 100644
--- a/pkgs/development/libraries/pango/1.28.x.nix
+++ b/pkgs/development/libraries/pango/1.28.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.28.3";
+  name = "pango-1.28.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2";
-    sha256 = "0ch640zmf159gr9qp3i4a5mh1ib2s9h3660g4w0bpiqc8g4qn9sy";
+    sha256 = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f";
   };
 
   buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext;
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
new file mode 100644
index 00000000000..17744bad32c
--- /dev/null
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
+
+let version = "4.5.1"; in
+
+stdenv.mkDerivation rec {
+  name = "phonon-backend-gstreamer-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
+    sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
+  };
+
+  buildInputs =
+    [ cmake pkgconfig phonon qt4 automoc4
+      gst_all.gstreamer gst_all.gstPluginsBase
+    ];
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = stdenv.lib.platforms.linux;
+  };  
+}
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
new file mode 100644
index 00000000000..6cf63aa757a
--- /dev/null
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "phonon-4.5.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
+    sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
+  };
+
+  buildInputs = [ cmake automoc4 qt4 ];
+
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
+      substituteInPlace designer/CMakeLists.txt \
+        --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
+    '';
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "Multimedia API for Qt";
+    license = "LGPLv2";
+    platforms = stdenv.lib.platforms.linux;
+  };  
+}
diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
index 87e06e9a57a..41b6839f0c2 100644
--- a/pkgs/development/libraries/policykit/default.nix
+++ b/pkgs/development/libraries/policykit/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
   
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
-    description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
+    description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix
similarity index 66%
rename from pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
rename to pkgs/development/libraries/polkit-qt-1/default.nix
index 88a63b3881c..008a75cff67 100644
--- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
+++ b/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -3,18 +3,18 @@
 stdenv.mkDerivation rec {
   name = "polkit-qt-1-0.99.0";
 
-  buildInputs = [ qt4 automoc4 ];
-  propagatedBuildInputs = [ polkit glib ];
-  buildNativeInputs = [ cmake pkgconfig ];
-
   src = fetchurl {
     url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
     sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
   };
 
-  patches = [ ./policy-files.patch ];
+  patches = [ ./polkit-install.patch ];
+
+  buildInputs = [ cmake qt4 automoc4 ];
+  
+  propagatedBuildInputs = [ polkit glib ];
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
+    description = "A Qt wrapper around PolKit";
   };
 }
diff --git a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch
new file mode 100644
index 00000000000..79beda2a318
--- /dev/null
+++ b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in
+--- polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in	2010-12-08 18:22:28.000000000 +0100
++++ polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in	2011-07-12 13:26:51.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ set(POLKITQT-1_INCLUDE_DIR              "@INCLUDE_INSTALL_DIR@/polkit-qt-1")
+ set(POLKITQT-1_LIB_DIR                  "@LIB_INSTALL_DIR@")
+-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ 
+ # Compatibility
+ if(WIN32)
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 35a1a37e39f..709b2a46ab0 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,38 +1,44 @@
-{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext,
-  gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
+, gobjectIntrospection }:
 
 let
-  system="/var/run/current-system/sw";
+
+  system = "/var/run/current-system/sw";
+  
   foolVars = {
     LOCALSTATE = "/var";
     SYSCONF = "/etc";
-    LIBEXEC = "${system}/libexec/polkit-1";
     LIB = "${system}/lib";
     DATA = "${system}/share";
   };
+  
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.99";
+  name = "polkit-0.101";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn";
+    sha256 = "06wz7zvmh89h2m4k8nik745fp1i9q92h5sgarpbj7kjg1rv6azwj";
   };
 
-  buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext
-    gobjectIntrospection ];
+  buildInputs =
+    [ pkgconfig glib expat pam intltool gobjectIntrospection ];
 
-  preConfigure=''
-    configureFlags="--libexecdir=$out/libexec/polkit-1"
-  '';
+  configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
 
   # Ugly hack to overwrite hardcoded directories
   # TODO: investigate a proper patch which will be accepted upstream
   CFLAGS = stdenv.lib.concatStringsSep " "
     ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
-    (builtins.attrNames foolVars) );
+        (builtins.attrNames foolVars) );
 
+  makeFlags =
+    ''
+      INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
+      INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
+    '';
+        
   postInstall =
     ''
       # Allow some files with paranoid permissions to be stripped in
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 918f84e3b74..3091c6497e5 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,18 +1,24 @@
-{ fetchurl, stdenv, qt4Support ? false, qt4, cairo, freetype, fontconfig, zlib,
-  libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg,
-  libxml2, pkgconfig, glib, gtk, cmake, lcms }:
+{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib
+, libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg
+, libxml2, pkgconfig, cmake, lcms
+, gtkSupport ? false, glib ? null, gtk ? null
+, qt4Support ? false, qt4 ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.14.5";
+  name = "poppler-0.16.7";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
-    sha256 = "0k41cj0yp3l7854y1hlghn2cgqmqq6hw5iz8i84q0w0s9iy321f8";
+    sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s";
   };
 
-  propagatedBuildInputs = [zlib glib cairo freetype fontconfig libjpeg gtk lcms
-    pixman curl libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc]
-    ++ (if qt4Support then [qt4] else []);
+  propagatedBuildInputs =
+    [ zlib cairo freetype fontconfig libjpeg lcms pixman curl
+      libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc
+    ]
+    ++ stdenv.lib.optionals gtkSupport [ glib gtk ]
+    ++ stdenv.lib.optional qt4Support qt4;
 
   buildInputs = [ pkgconfig cmake ];
 
@@ -20,9 +26,11 @@ stdenv.mkDerivation rec {
 
   # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
   # such as `../../../test/unittestcases/UseNone.pdf'.
-#doCheck = !qt4Support;
+  #doCheck = !qt4Support;
   checkTarget = "test";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://poppler.freedesktop.org/;
     description = "Poppler, a PDF rendering library";
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 46b7d26bdfc..6af622c0a15 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,22 +1,30 @@
-{stdenv, fetchurl, which, qt4}:
+{ stdenv, fetchurl, which, qt4 }:
 
-stdenv.mkDerivation {
-  name = "qca-2.0.2";
+stdenv.mkDerivation rec {
+  name = "qca-2.0.3";
+  
   src = fetchurl {
-    url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
-    sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
+    url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2";
+    sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
   };
+  
   buildInputs = [ qt4 ];
+  
   buildNativeInputs = [ which ];
-  preBuild = ''
-    sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
-            EMSA3_SHA224,     ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-            EMSA3_SHA256,     ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-            EMSA3_SHA384,     ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-            EMSA3_SHA512      ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
-  '';
+
+  preBuild =
+    ''
+      sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
+              EMSA3_SHA224,     ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+              EMSA3_SHA256,     ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+              EMSA3_SHA384,     ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
+              EMSA3_SHA512      ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
+    '';
 
   configureFlags = "--no-separate-debug-info";
+
+  enableParallelBuilding = true;
+  
   meta = with stdenv.lib; {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix
index bb3d0220b43..4aac06a5101 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/pkgs/development/libraries/qimageblitz/default.nix
@@ -7,10 +7,12 @@ in
 
 stdenv.mkDerivation {
   name = "${pn}-${v}";
+  
   src = fetchurl {
     url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
     sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
   };
+  
   buildInputs = [ cmake qt4 ];
 
   meta = {
diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index d6a4afc3fca..67725315aa5 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl
-, alsaLib, gstreamer, gstPluginsBase, pulseaudio
+, alsaLib, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
-, buildDemos ? false, buildExamples ? false, useDocs ? true}:
+, buildDemos ? false, buildExamples ? false, useDocs ? false
+}:
 
 let
-  v = "4.7.2";
+  v = "4.7.3";
 in
 
 stdenv.mkDerivation rec {
@@ -16,21 +17,39 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "0dlknhzcslymqbmlkpmmgv29c5mmbw6s7rznriqd5g4h9d93ny6l";
+    sha256 = "0zlk0lcrkhi8wdb5j2lqz3nclk07blbiial7lzs03708kpb6yayh";
   };
 
-  preConfigure = ''
-    export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
-    configureFlags+="
-      -docdir $out/share/doc/${name}
-      -plugindir $out/lib/qt4/plugins
-      -importdir $out/lib/qt4/imports
-      -examplesdir $out/share/doc/${name}/examples
-      -demosdir $out/share/doc/${name}/demos
-      -datadir $out/share/${name}
-      -translationdir $out/share/${name}/translations
-    "
-  '';
+  preConfigure =
+    ''
+      export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+      configureFlags+="
+        -docdir $out/share/doc/${name}
+        -plugindir $out/lib/qt4/plugins
+        -importdir $out/lib/qt4/imports
+        -examplesdir $out/share/doc/${name}/examples
+        -demosdir $out/share/doc/${name}/demos
+        -datadir $out/share/${name}
+        -translationdir $out/share/${name}/translations
+      "
+    '';
+
+  configureFlags =
+    ''
+      -v -no-separate-debug-info -release -fast -confirm-license -opensource
+      -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
+      -opengl -xrender -xrandr -xinerama -xcursor
+      -plugin-sql-mysql -system-sqlite
+      -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
+      -fontconfig -I${freetype}/include/freetype2
+      -exceptions -xmlpatterns
+      -multimedia -audio-backend -no-phonon
+      -webkit -javascript-jit
+      -make libs -make tools -make translations
+      ${if buildDemos == true then "-make demos" else "-nomake demos"}
+      ${if buildExamples == true then "-make examples" else "-nomake examples"}
+      ${if useDocs then "-make docs" else "-nomake docs"}
+    '';
 
   propagatedBuildInputs = [
     alsaLib
@@ -66,8 +85,6 @@ stdenv.mkDerivation rec {
     libXfixes
     glib
     libtiff
-    gstreamer
-    gstPluginsBase
     pulseaudio
   ];
 
@@ -75,21 +92,6 @@ stdenv.mkDerivation rec {
 
   prefixKey = "-prefix ";
 
-  configureFlags = ''
-    -v -no-separate-debug-info -release -fast -confirm-license -opensource
-    -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
-    -opengl -xrender -xrandr -xinerama -xcursor
-    -plugin-sql-mysql -system-sqlite
-    -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
-    -fontconfig -I${freetype}/include/freetype2
-    -exceptions -xmlpatterns
-    -multimedia -audio-backend -phonon -phonon-backend
-    -webkit -javascript-jit
-    -make libs -make tools -make translations
-    ${if buildDemos == true then "-make demos" else "-nomake demos"}
-    ${if buildExamples == true then "-make examples" else "-nomake examples"}
-    ${if useDocs then "-make docs" else "-nomake docs"}'';
-
   prePatch = ''
     substituteInPlace configure --replace /bin/pwd pwd
     substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
@@ -98,7 +100,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
-    ln -sv phonon $out/include/Phonon'';
+  '';
 
   enableParallelBuilding = true;
 
@@ -108,6 +110,5 @@ stdenv.mkDerivation rec {
     license = "GPL/LGPL";
     maintainers = with maintainers; [ urkud sander ];
     platforms = platforms.linux;
-    priority = 10;
   };
 }
diff --git a/pkgs/development/libraries/redland/1.0.10.nix b/pkgs/development/libraries/redland/1.0.10.nix
index 8d28ed9cd9f..9fb72fd0ac4 100644
--- a/pkgs/development/libraries/redland/1.0.10.nix
+++ b/pkgs/development/libraries/redland/1.0.10.nix
@@ -4,27 +4,32 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "redland-1.0.10";  
+  name = "redland-1.0.10";
 
   src = fetchurl {
-    url = "mirror://sf/librdf/${name}.tar.gz";
+    url = "http://download.librdf.org/source/${name}.tar.gz";
     sha256 = "05cq722qvw5sq08qbydzjv5snqk402cbdsy8s6qjzir7vq2hs1p3";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildInputs =
+    [ pkgconfig bdb openssl libxslt perl mysql postgresql sqlite curl
+      pcre libxml2
+    ];
 
-  propagatedBuildInputs = [
-    bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
-    librdf_raptor librdf_rasqal
-  ];
-
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
-  '';
+  propagatedBuildInputs = [ librdf_raptor librdf_rasqal ];
 
+  preConfigure =
+    ''
+      export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
+    '';
+  
+  postInstall = "rm -rf $out/share/gtk-doc";
+  
   configureFlags =
     [ "--with-threads" ]
     ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
-  
-  patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
+
+  meta = {
+    homepage = http://librdf.org/;
+  };
 }
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index eeed7b271cd..2f9007c1bb1 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
-, cluceneCore
+{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
+, clucene_core, fam, zlib, dbus
 }:
 
 stdenv.mkDerivation rec {
   name = "strigi-${version}";
-  version = "0.7.2";
+  version = "0.7.5";
 
   src = fetchurl {
     url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
-    sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w";
+    sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi";
   };
+  
   includeAllQtDirs=true;
 
-  CLUCENE_HOME = cluceneCore;
+  CLUCENE_HOME = clucene_core;
 
-  # Dependencies such as SQLite and FAM are unreliable in this release
-  buildInputs = [
-    cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
-  ];
+  buildInputs =
+    [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus.tools ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://strigi.sourceforge.net;
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 6576a0d75d7..0bba7af5c3d 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, yasm}:
 
 stdenv.mkDerivation rec {
-  version = "snapshot-20110416-2245-stable";
+  version = "snapshot-20110724-2245-stable";
   name = "x264-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
-    sha256 = "17bbczmsln6wmw7vwjmmr18bhngj1b2xfr9fq3a3n54706df9370";
+    sha256 = "07bylkh8cwcmj01sr41hhrvfbciyixhw1irdpj01kz9d0h8dhhpz";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 49d68f15267..130af1b95a1 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/xine/${name}.tar.bz2";
     sha256 = "0x47kmsaxx1bv8w2cacvzls3sjw9y4vk82rd94km1m1s6k2wcxv2";
   };
+
+  patches =
+    [ (fetchurl {
+        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
+        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
+      })
+    ];
   
   buildNativeInputs = [ pkgconfig perl ];
 
@@ -23,6 +30,8 @@ stdenv.mkDerivation rec {
   
   propagatedBuildInputs = [zlib];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.xine-project.org/;
     description = "A high-performance, portable and reusable multimedia playback engine";
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 35a0de8a5f2..e03773292bb 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -1,18 +1,22 @@
 {stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation rec {
-  name = "xvidcore-1.3.1";
+  name = "xvidcore-1.3.2";
   
   src = fetchurl {
     url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
-    sha256 = "0r1x00fgm7cbb7i9p17p9l0p4b82gig6sm0mbs6qrz84kd2fh6n5";
+    sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn";
   };
 
-  preConfigure = ''
-    cd build/generic
-  '';
+  preConfigure = "cd build/generic";
 
   buildInputs = [ nasm ];
+
+  postInstall =
+    ''
+      rm $out/lib/*.a
+      (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
+    '';
   
   meta = {
     description = "MPEG-4 video codec for PC";
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index eb523d69c12..0183944e201 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,28 +1,15 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "dbus-python-0.84.0";
 
-  version = a.lib.attrByPath ["version"] "0.83.1" a; 
-  buildInputs = with a; [
-    pkgconfig
-  ];
-  propagatedBuildInputs = with a; [
-    dbus python dbus_glib
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz";
-    sha256 = "168vrizxnszh16yk4acpfhy502w8i997d8l3w4i26kxgy433ha6f";
+    url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
+    sha256 = "01jrmj7ps79dkd6f8bzm17vxzpad1ixwmcb1liy64xm9y6mcfnxq";
   };
 
-  inherit buildInputs propagatedBuildInputs;
-  configureFlags = [];
+  buildInputs = [ python pkgconfig dbus dbus_glib ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "python-dbus-" + version;
   meta = {
     description = "Python DBus bindings";
   };
diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
index 18de5fbe7f1..a61106f476d 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, python, cups}:
+{ stdenv, fetchurl, python, cups }:
+
+let version = "1.9.57"; in
 
-let
-  version = "1.9.49";
-in
 stdenv.mkDerivation {
   name = "pycups-${version}";
+  
   src = fetchurl {
     url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
-    sha256 = "1gpp28sknjw5z4mzhaifc6hkfrlbm2y6w870q47ia8amnm05d3pk";
+    sha256 = "12m3lh4nmfp6yn6sqlskl9gb1mfiwx42m8dnms6j6xc2nimn5k14";
   };
-  buildPhase = "";
+
   installPhase = ''
     CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out
   '';
+  
   buildInputs = [ python cups ];
 }
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index b5ec01a52d5..988599a04da 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -1,39 +1,42 @@
-{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
+{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "PyQt-x11-gpl-4.8.1";
+  name = "PyQt-x11-gpl-4.8.4";
   
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.tar.gz";
-    sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
+    url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
+    sha256 = "161y1c39zr9dyl2nkllxw5711sl1dxmb6lbp4a9nvbag1g63xypw";
   };
   
-  preConfigure = ''
-    ensureDir $out
+  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)
-    '';
 
-  configureScript="./configure.py";
-
-  configurePhase = ''
-    runHook preConfigure
     python configure.py $configureFlags "''${configureFlagsArray[@]}"
-    runHook postConfigure'';
-  
-  propagatedBuildInputs = [ python sip qt4 ]
-    ++ pythonDBus.propagatedBuildNativeInputs;
-  buildInputs = [ pkgconfig makeWrapper lndir ];
+  '';
+
+  buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
+
+  propagatedBuildInputs = [ sip ];
 
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
-    done'';
+    done
+  ''; # */
+
+  enableParallelBuilding = true;
   
   meta = {
     description = "Python bindings for Qt";
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index 7f27400c04a..4d89f05911b 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.11.2";
+  name = "sip-4.12.3";
   
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.tar.gz";
-    sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
+    url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
+    sha256 = "0zmpq10f58hl0zy26p5s8flsbp6g0dsq8hvi4mlmqp60lhichlml";
   };
   
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index bc667749625..c7484ee6e84 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,14 +1,16 @@
-{fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
-, darwinInstallNameToolUtility}:
+, darwinInstallNameToolUtility }:
+
+with stdenv.lib;
 
 let
   os = stdenv.lib.optionalString;
-  inherit (stdenv.lib) optional;
   majorVersion = "2.8";
   minorVersion = "4";
   version = "${majorVersion}.${minorVersion}";
 in
+
 stdenv.mkDerivation rec {
   name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
 
@@ -19,23 +21,35 @@ stdenv.mkDerivation rec {
     sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
   };
 
+  patches =
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path.patch;
+
   buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional stdenv.isDarwin darwinInstallNameToolUtility
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
     + stdenv.lib.optionalString useQt4 " --qt-gui";
 
   setupHook = ./setup-hook.sh;
 
-  postUnpack = ''
-    dontUseCmakeConfigure=1
-    source $setupHook
-    fixCmakeFiles $sourceRoot
-  '';
+  postUnpack =
+    ''
+      dontUseCmakeConfigure=1
+      source $setupHook
+      fixCmakeFiles $sourceRoot
+    '';
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+    '';
 
   meta = {
     homepage = http://www.cmake.org/;
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
new file mode 100644
index 00000000000..ef8a9eef7c1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -0,0 +1,95 @@
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
+--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
+@@ -36,13 +36,13 @@
+   # checking the platform every time.  This option is advanced enough
+   # that only package maintainers should need to adjust it.  They are
+   # capable of providing a setting on the command line.
+-  IF(EXISTS "/etc/debian_version")
+-    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  ELSE(EXISTS "/etc/debian_version")
++  #IF(EXISTS "/etc/debian_version")
++  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #    "Install .so files without execute permission.")
++  #ELSE(EXISTS "/etc/debian_version")
+     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+       "Install .so files without execute permission.")
+-  ENDIF(EXISTS "/etc/debian_version")
++  #ENDIF(EXISTS "/etc/debian_version")
+ ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ 
+ # Match multiarch library directory names.
+@@ -52,6 +52,6 @@
+ 
+ # Debian has lib64 paths only for compatibility so they should not be
+ # searched.
+-IF(EXISTS "/etc/debian_version")
+-  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-ENDIF(EXISTS "/etc/debian_version")
++#IF(EXISTS "/etc/debian_version")
++#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#ENDIF(EXISTS "/etc/debian_version")
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
+@@ -33,55 +33,18 @@
+ # search types.
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
+-  /usr/local /usr /
+-
+-  # CMake install location
+-  "${_CMAKE_INSTALL_DIR}"
+-
+-  # Project install destination.
+-  "${CMAKE_INSTALL_PREFIX}"
+-  )
+-
+-# List common include file locations not under the common prefixes.
+-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include  
+-  /usr/openwin/include
+-  )
+-
+-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib 
+-  /usr/openwin/lib
+-  )
+-
+-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  "@glibc@"
+   )
+ 
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  "@glibc@/lib"
+   )
+ 
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ 
+ # Enable use of lib64 search path variants by default.
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index a9600f1d6dc..40e69147204 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}:
+{ stdenv, fetchurl, perl, flex, bison, qt }:
 
 stdenv.mkDerivation rec {
   name = "doxygen-1.7.4";
@@ -10,24 +10,26 @@ stdenv.mkDerivation rec {
 
   patches = [ ./tmake.patch ];
 
-  buildInputs = [ graphviz perl flex bison libX11 libXext ]
-    ++ (if (qt != null) then [ qt ] else []);
+  buildInputs =
+    [ perl flex bison ]
+    ++ stdenv.lib.optional (qt != null) qt;
 
   prefixKey = "--prefix ";
-  configureFlags = "--release"
-		 + (if qt == null then "" else " --with-doxywizard")
-		 ;
-  makeFlags = "MAN1DIR=share/man/man1";
-  preConfigure =
-   (if (qt == null)
-    then ""
-    else ''
+  
+  configureFlags =
+    [ "--dot dot" ]
+    ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
+
+  preConfigure = stdenv.lib.optionalString (qt != null)
+    ''
       echo "using QTDIR=${qt}..."
       export QTDIR=${qt}
-    '');
-      # export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH"
-      # export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH"
+    '';
 
+  makeFlags = "MAN1DIR=share/man/man1";
+
+  enableParallelBuilding = true;
+  
   meta = {
     license = "GPLv2+";
     homepage = "http://doxygen.org/";
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix
index f6c29e5d7a3..860ea220799 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/pkgs/development/tools/misc/automoc4/default.nix
@@ -1,12 +1,15 @@
-{stdenv, fetchurl, cmake, qt4}:
+{ stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "automoc4-0.9.88";
+  
   src = fetchurl {
     url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2";
     sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
   };
+  
   buildInputs = [ cmake qt4 ];
+  
   meta = with stdenv.lib; {
     homepage = http://techbase.kde.org/Development/Tools/Automoc4;
     description = "KDE Meta Object Compiler";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 52daa939c7b..5aaa2c4aa2a 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
 , dbus, libusb, acl }:
 
-let version = "1.4.6"; in
+let version = "1.4.7"; in
 
 stdenv.mkDerivation {
   name = "cups-${version}";
 
   src = fetchurl {
     url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "056mdbz0g1jjihk03xjyp4f1bxl2aksf2vzra1qjrdbp59q131zh";
+    sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ];
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index dc36757e020..2ae39d4cf16 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio, jackaudio}:
-stdenv.mkDerivation {
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
+
+stdenv.mkDerivation rec {
   name = "alsa-plugins-1.0.23";
 
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.23.tar.bz2;
+    url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
     sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
   };
 
-  # TODO make backends such as jack, pulseaudio optional
-  buildInputs = [pkgconfig alsaLib pulseaudio jackaudio];
+  buildInputs =
+    [ pkgconfig alsaLib ]
+    ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
+    ++ stdenv.lib.optional (jackaudio != null) jackaudio;
 
   meta = { 
-    description = "plugins for alsa eg conneckt jack, pluseaudio applications easily to the daemons using alsa devices";
-    longDescription = "
-      use it like this: export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib
-    ";
-    homepage = http://alsa-project.org;
+    description = "Various plugins for ALSA";
+    homepage = http://alsa-project.org/;
     license = "GPL2.1";
     maintainers = [lib.maintainers.marcweber];
     platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index be21c759e50..c0aec5a7b56 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -9,21 +9,30 @@ let
 in
    
 stdenv.mkDerivation rec {
-  name = "bluez-4.90";
+  name = "bluez-4.95";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
-    sha256 = "18wq75m45q00fvddzgfqy1d4368649r2jl3j4yvpijymalc4jra7";
+    sha256 = "1xi087x2ggdywq63qp55wvi1iclk50hc42fp40kcsazw23j9vsnn";
   };
 
-  buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
-    gst_all.gstreamer gst_all.gstPluginsBase readline libsndfile ];
+  buildInputs =
+    [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
+      readline libsndfile
+      # Disables GStreamer; not clear what it gains us other than a
+      # zillion extra dependencies.
+      # gst_all.gstreamer gst_all.gstPluginsBase 
+    ];
 
-  configureFlags = "--localstatedir=/var --enable-udevrules --enable-configrules --enable-cups";
+  configureFlags = "--localstatedir=/var --enable-cups";
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
 
+  makeFlags = "rulesdir=$(out)/lib/udev/rules.d";
+
+  /* !!! Move these into a separate package to prevent Bluez from
+    depending on Python etc. */
   postInstall = ''
     pushd test
     for a in simple-agent test-adapter test-device; do
diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix
new file mode 100644
index 00000000000..86dffde4b55
--- /dev/null
+++ b/pkgs/os-specific/linux/libatasmart/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libatasmart-0.17";
+
+  src = fetchurl {
+    url = "http://0pointer.de/public/${name}.tar.gz";
+    sha256 = "1zazxnqsirlv9gkzij6z31b21gv2nv7gkpja0wpxwb7kfh9a2qid";
+  };
+
+  buildInputs = [ pkgconfig udev ];
+
+  meta = {
+    homepage = http://0pointer.de/public/;
+    description = "Library for querying ATA SMART status";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 9a2dc2d28ac..ae4b962715c 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, udev }:
+{ stdenv, fetchurl, pkgconfig, udev }:
 
 let
-  v = "2.02.65";
+  v = "2.02.86";
 in
 
 stdenv.mkDerivation {
@@ -9,12 +9,13 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
-    sha256 = "1lbskrj4pxbipq8f0qhql3p1nqa796v4i1cy6n2fmmbs3fwmfh9a";
+    sha256 = "0bam8ampdqn4xx2agrvh5vn4xdi0gb9lmfsm31fm302y52jsyz2m";
   };
   
-  configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync";
+  configureFlags =
+    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
 
-  buildInputs = [ udev ];
+  buildInputs = [ pkgconfig udev ];
   
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index 134f7577c96..d3b0311b449 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }:
    
 stdenv.mkDerivation {
-  name = "mountall-2.15";
+  name = "mountall-2.31";
    
   src = fetchurl {
-    url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.15.tar.gz;
-    sha256 = "1ik9r1av0f17byfxr4l2w0qpaijxkfqvxws6gmc98liq6fyyzn4v";
+    url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.31.tar.gz;
+    sha256 = "09885v82kd8x7yf18vw7h6z4816jvn7gmjx5vicxlg4pqlzwqvhv";
   };
 
   patches = [ ./no-plymouth.patch ];
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ];
 
+  makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";
+  
   meta = {
     homepage = https://launchpad.net/ubuntu/+source/mountall;
     description = "Utility to mount all filesystems and emit Upstart events";
diff --git a/pkgs/os-specific/linux/mountall/no-plymouth.patch b/pkgs/os-specific/linux/mountall/no-plymouth.patch
index 6bf8c95276b..890dab9bc88 100644
--- a/pkgs/os-specific/linux/mountall/no-plymouth.patch
+++ b/pkgs/os-specific/linux/mountall/no-plymouth.patch
@@ -1,6 +1,6 @@
-diff -ru -x '*~' mountall-2.15-orig/configure.ac mountall-2.15/configure.ac
---- mountall-2.15-orig/configure.ac	2010-05-09 01:42:22.000000000 +0200
-+++ mountall-2.15/configure.ac	2010-06-03 13:46:09.000000000 +0200
+diff -ru -x '*~' mountall-2.31-orig/configure.ac mountall-2.31/configure.ac
+--- mountall-2.31-orig/configure.ac	2011-07-15 14:00:15.000000000 +0200
++++ mountall-2.31/configure.ac	2011-07-25 00:13:13.000000000 +0200
 @@ -29,7 +29,7 @@
  PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0])
  PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
@@ -10,9 +10,9 @@ diff -ru -x '*~' mountall-2.15-orig/configure.ac mountall-2.15/configure.ac
  
  # Checks for header files.
  
-diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
---- mountall-2.15-orig/src/mountall.c	2010-05-09 01:42:24.000000000 +0200
-+++ mountall-2.15/src/mountall.c	2010-07-07 14:40:47.000000000 +0200
+diff -ru -x '*~' mountall-2.31-orig/src/mountall.c mountall-2.31/src/mountall.c
+--- mountall-2.31-orig/src/mountall.c	2011-07-15 14:00:15.000000000 +0200
++++ mountall-2.31/src/mountall.c	2011-07-25 00:21:13.000000000 +0200
 @@ -64,8 +64,10 @@
  #include <nih-dbus/dbus_proxy.h>
  #include <nih-dbus/errors.h>
@@ -24,16 +24,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  #include "ioprio.h"
  
-@@ -75,7 +77,7 @@
- 
- #define BUILTIN_FSTAB   "/lib/init/fstab"
- 
--#define BOREDOM_TIMEOUT 3
-+#define BOREDOM_TIMEOUT 15
- 
- enum exit {
- 	EXIT_OK = 0,		/* Ok */
-@@ -214,15 +216,19 @@
+@@ -219,15 +221,19 @@
  void   boredom_timeout       (void *data, NihTimer *timer);
  
  int    plymouth_connect      (void);
@@ -52,8 +43,8 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
 +#endif
  
  void   usr1_handler          (void *data, NihSignal *signal);
- 
-@@ -241,8 +247,10 @@
+ int    set_dev_wait_time        (NihOption *option, const char *arg);
+@@ -247,8 +253,10 @@
   **/
  size_t num_local = 0;
  size_t num_local_mounted = 0;
@@ -64,7 +55,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  size_t num_virtual = 0;
  size_t num_virtual_mounted = 0;
  size_t num_swap = 0;
-@@ -310,6 +318,7 @@
+@@ -318,6 +326,7 @@
   **/
  static struct udev *udev = NULL;
  
@@ -72,7 +63,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  /**
   * ply_event_loop:
   *
-@@ -323,6 +332,7 @@
+@@ -331,6 +340,7 @@
   * Plymouth boot client.
   **/
  static ply_boot_client_t *ply_boot_client = NULL;
@@ -80,7 +71,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  /**
   * plymouth_error:
-@@ -1208,11 +1218,12 @@
+@@ -1253,11 +1263,12 @@
  			nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
  			tag = TAG_LOCAL;
  		} else if (is_remote (mnt)) {
@@ -95,7 +86,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  			{
  				tag = TAG_REMOTE;
  			} else {
-@@ -1475,7 +1486,8 @@
+@@ -1566,7 +1577,8 @@
  	/* Enforce local only after virtual filesystems triggered */
  	if ((! local_triggered)
  	    && virtual_triggered
@@ -105,7 +96,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("%s finished"), "local");
  		emit_event ("local-filesystems", NULL);
  		local_triggered = TRUE;
-@@ -1484,7 +1496,8 @@
+@@ -1575,7 +1587,8 @@
  	/* Enforce remote only after virtual filesystems triggrered */
  	if ((! remote_triggered)
  	    && virtual_triggered
@@ -115,7 +106,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("%s finished"), "remote");
  		emit_event ("remote-filesystems", NULL);
  		remote_triggered = TRUE;
-@@ -1494,7 +1507,9 @@
+@@ -1585,7 +1598,9 @@
  	if ((! filesystem_triggered)
  	    && virtual_triggered
  	    && local_triggered
@@ -126,7 +117,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("All filesystems mounted"));
  		emit_event ("filesystem", NULL);
  		filesystem_triggered = TRUE;
-@@ -1508,9 +1523,9 @@
+@@ -1599,9 +1614,9 @@
  		swap_triggered = TRUE;
  	}
  
@@ -139,7 +130,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		   num_virtual_mounted, num_virtual,
  		   num_swap_mounted, num_swap);
  }
-@@ -2203,12 +2218,14 @@
+@@ -2442,12 +2457,14 @@
  	if (no_events)
  		return;
  
@@ -155,7 +146,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	env = NIH_MUST (nih_str_array_new (NULL));
  
  	if (mnt) {
-@@ -2787,6 +2804,7 @@
+@@ -3026,6 +3043,7 @@
  int
  plymouth_connect (void)
  {
@@ -163,7 +154,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* If we were already connected, just re-use that connection */
  	if (ply_boot_client)
  		return TRUE;
-@@ -2813,8 +2831,13 @@
+@@ -3052,8 +3070,13 @@
  	nih_info (_("Connected to Plymouth"));
  
  	return TRUE;
@@ -177,7 +168,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  void
  plymouth_disconnected (void *             user_data,
  		       ply_boot_client_t *client)
-@@ -2827,6 +2850,7 @@
+@@ -3066,6 +3089,7 @@
  	ply_boot_client_free (ply_boot_client);
  	ply_boot_client = NULL;
  }
@@ -185,7 +176,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  
  void
-@@ -2837,6 +2861,7 @@
+@@ -3076,6 +3100,7 @@
  
  	nih_assert (mnt != NULL);
  
@@ -193,7 +184,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* No Plymouth => no progress information */
  	if (! plymouth_connect ())
  		return;
-@@ -2866,6 +2891,7 @@
+@@ -3105,6 +3130,7 @@
  				       plymouth_response,
  				       plymouth_failed,
  				       NULL);
@@ -201,7 +192,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  }
  
  void
-@@ -2881,20 +2907,31 @@
+@@ -3120,20 +3146,31 @@
  		NIH_LIST_FOREACH (mounts, iter) {
  			Mount *mnt = (Mount *)iter;
  
@@ -235,7 +226,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* If we're already displaying messages, don't change them unless
  	 * the message is no longer valid for that mount point; otherwise
  	 * clear the message.
-@@ -3005,8 +3042,10 @@
+@@ -3244,8 +3281,10 @@
  							   plymouth_answer,
  							   plymouth_failed,
  							   NULL);
@@ -246,16 +237,23 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  void
  plymouth_response (void *             user_data,
  		   ply_boot_client_t *client)
-@@ -3125,7 +3164,7 @@
+@@ -3364,6 +3403,7 @@
  		break;
  	}
  }
--
 +#endif
  
+ /*
+  * set_dev_wait_time:
+@@ -3399,7 +3439,6 @@
+         return err;
+ }
  
+-
  /**
-@@ -3211,6 +3250,7 @@
+  * stop_mountpoint_timer:
+  * @mountpoint: mountpoint whose timer you want to stop.
+@@ -3673,6 +3712,7 @@
  				    (NihIoWatcher)udev_monitor_watcher,
  				    udev_monitor));
  
@@ -263,7 +261,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* Initialise a Plymouth event loop; this is an epoll instance that
  	 * we can poll within our own main loop and call out to when needs
  	 * be.
-@@ -3224,6 +3264,7 @@
+@@ -3686,6 +3726,7 @@
  
  	/* Attempt an early connection to Plymouth */
  	plymouth_connect ();
@@ -271,7 +269,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  	mounts = NIH_MUST (nih_list_new (NULL));
  
-@@ -3236,7 +3277,9 @@
+@@ -3698,7 +3739,9 @@
  	 * from /etc/fstab and /proc/self/mountinfo to find out what else
  	 * we need to do.
  	 */
@@ -281,7 +279,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	parse_fstab (_PATH_MNTTAB);
  	parse_mountinfo ();
  
-@@ -3338,10 +3381,12 @@
+@@ -3822,10 +3865,12 @@
  	/* Flush the D-Bus connection to ensure all messages are sent */
  	dbus_connection_flush (connection);
  
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index b58555ba19f..56fa5eed195 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,11 +1,22 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools
+, procps, kbd }:
+
+let
+
+  binPath = stdenv.lib.makeSearchPath "bin"
+    [ coreutils gnugrep utillinux module_init_tools procps kbd ];
+
+  sbinPath = stdenv.lib.makeSearchPath "sbin"
+    [ procps ];
+    
+in 
 
 stdenv.mkDerivation rec {
-  name = "pm-utils-1.3.0";
+  name = "pm-utils-1.4.1";
 
   src = fetchurl {
     url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz";
-    md5 = "37d71f8adbb409442212a85a080d324d";
+    sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f";
   };
 
   configureFlags = "--sysconfdir=/etc";
@@ -15,9 +26,11 @@ stdenv.mkDerivation rec {
       # Install the manpages (xmlto isn't really needed).
       substituteInPlace man/Makefile.in --replace '@HAVE_XMLTO_TRUE@' ""
 
-      # Don't screw up the PATH.
-      substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH'
+      # Set the PATH properly.
+      substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH:${binPath}:${sbinPath}'
 
+      substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr '
+      
       substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)"
     '';
 
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 59056e2feed..dad02a9e699 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./smb-tmpdir.patch ];
 
+  configureFlags = "--audio-drv-list=alsa";
+
+  enableParallelBuilding = true;
+
   buildInputs =
     [ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
       ncurses
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
new file mode 100644
index 00000000000..05ebd0bf845
--- /dev/null
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, dbus, libcap }:
+
+stdenv.mkDerivation rec {
+  name = "rtkit-0.10";
+  
+  src = fetchurl {
+    url = "http://0pointer.de/public/${name}.tar.gz";
+    sha256 = "08118ya3pkxd6gbbshas23xwj483169fqmxzhp5sgmfr16n97skl";
+  };
+
+  buildInputs = [ pkgconfig dbus libcap ];
+  
+  meta = {
+    homepage = http://0pointer.de/blog/projects/rtkit;
+    descriptions = "A daemon that hands out real-time priority to processes";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/udev/166.nix b/pkgs/os-specific/linux/udev/172.nix
similarity index 86%
rename from pkgs/os-specific/linux/udev/166.nix
rename to pkgs/os-specific/linux/udev/172.nix
index 11e044244b5..f8d7e1288f4 100644
--- a/pkgs/os-specific/linux/udev/166.nix
+++ b/pkgs/os-specific/linux/udev/172.nix
@@ -4,11 +4,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "udev-166";
+  name = "udev-172";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1msl8cwf47shmz5lr2w9w3nzzxqnf5dc0bs7dvbnxmbal60p7lpm";
+    sha256 = "0smxggvhhilcqcsi98fmk0nngzy1x8v6ibas609zysgza74rr5dq";
   };
 
   buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
       --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware
     '';
 
+  # Workaround for the Linux kernel headers being too old.
+  NIX_CFLAGS_COMPILE = "-DBTN_TRIGGER_HAPPY=0x2c0";
+    
   postInstall =
     ''
       # The path to rule_generator.functions in write_cd_rules and
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
new file mode 100644
index 00000000000..79187752a6c
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
+, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
+, libxslt, docbook_xsl, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "udisks-1.0.3";
+
+  src = fetchurl {
+    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "0jwavs2ag0cv46517j17943s16a8fw2lqk4k3cljgivh5aswwnyr";
+  };
+
+  buildInputs =
+    [ pkgconfig sg3_utils udev glib dbus dbus_glib polkit parted
+      lvm2 libatasmart intltool libuuid libxslt docbook_xsl
+    ];
+
+  configureFlags = "--localstatedir=/var";
+
+  preConfigure =
+    ''
+      # Ensure that udisks can find the necessary programs.
+      substituteInPlace src/main.c --replace \
+        "/sbin:/bin:/usr/sbin:/usr/bin" \
+        "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
+    '';
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/udisks;
+    description = "A daemon and command-line utility for querying and manipulating storage devices";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
new file mode 100644
index 00000000000..441a1a06c40
--- /dev/null
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, xz, pkgconfig, glib, dbus, dbus_glib, polkit
+, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "upower-0.9.12";
+
+  src = fetchurl {
+    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
+  };
+
+  buildInputs =
+    [ xz pkgconfig glib dbus dbus_glib polkit intltool
+      libxslt docbook_xsl udev libusb1
+    ];
+
+  configureFlags = "--with-backend=linux --localstatedir=/var";
+
+  preConfigure =
+    ''
+      substituteInPlace src/linux/up-backend.c \
+        --replace /usr/bin/pm- ${pmutils}/bin/pm- \
+        --replace /usr/sbin/pm- ${pmutils}/sbin/pm-
+    '';
+
+  installFlags = "localstatedir=$(TMPDIR)/var";
+
+  meta = {
+    homepage = http://upower.freedesktop.org/;
+    description = "A D-Bus service for power management";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index aabb276523a..41c819cbe3f 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,27 +1,26 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
-, gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
-, jackaudioSupport ? false, jackaudio ? null
-, ...}:
+, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
+, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, jackaudioSupport ? false, jackaudio ? null }:
 
 assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-0.9.21";
+  name = "pulseaudio-0.9.23";
 
   src = fetchurl {
-    url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz";
-    sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
+    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
+    sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
   propagatedBuildInputs = [ gdbm ];
 
-  buildInputs = [
-    pkgconfig gnum4 libtool glib dbus avahi gconf liboil
-    libsamplerate libsndfile speex alsaLib libcap
-    gtk libX11 libICE libSM libXtst libXi
-    intltool gettext bluez udev]
+  buildInputs =
+    [ pkgconfig gnum4 libtool intltool glib dbus avahi
+      libsamplerate libsndfile speex alsaLib bluez udev
+      #gtk gconf libX11 libICE libSM libXtst libXi
+    ]
     ++ stdenv.lib.optional jackaudioSupport jackaudio;
 
   preConfigure = ''
@@ -36,11 +35,16 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-hal --localstatedir=/var
+    --disable-solaris --disable-hal --disable-jack
     --disable-oss-output --disable-oss-wrapper
-    ${if (!jackaudioSupport) then "--disable-jack" else ""}
+    --localstatedir=/var --sysconfdir=/etc
+    ${if jackaudioSupport then "--enable-jack" else ""}
   '';
 
+  installFlags = "sysconfdir=$(out)/etc";
+
+  enableParallelBuilding = true;
+
   meta = {
     description = "PulseAudio, a sound server for POSIX and Win32 systems";
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a768ea19244..c896062bcd7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -152,6 +152,10 @@ in
     buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
   };
 
+  xvinfo = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [xorg.libXext];
+  };
+
   xkbcomp = attrs: attrs // {
     NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
   };
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 99873766024..a7a08f29187 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,27 +1,40 @@
-{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
-  makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
-  pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
-  notify }:
+{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
+, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
+, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
+, xz, pythonPackages
+, withGUI ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "${meta.name}-${meta.version}";
 
   src = fetchurl {
-    url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2";
-    sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
+    url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz";
+    sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw";
   };
-  buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
-    libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
-    pygtk pythonDBus pycups notify ];
 
+  buildInputs =
+    [ xz intltool pkgconfig glib udev libusb cups xmlto
+      libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
+      pythonPackages.python pythonPackages.wrapPython
+    ];
+
+  pythonPath =
+    [ pythonDBus pycups pygobject ]
+    ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
+    
   configureFlags = "--with-udev-rules";
 
-  postInstall = ''
-    wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
-  '';
+  postInstall =
+    ''
+      wrapPythonPrograms
+      ( cd $out/share/system-config-printer/troubleshoot
+        mv .__init__.py-wrapped __init__.py
+      )
+    '';
 
   meta = {
     name = "system-config-printer";
-    version = "1.2.4";
+    version = "1.3.4";
   };
 }
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index a87ba0d0a07..e2fa8eacc91 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sg3_utils-1.29";
+  name = "sg3_utils-1.31";
 
   src = fetchurl {
     url = "http://sg.danny.cz/sg/p/${name}.tgz";
-    sha256 = "0d1vlijp9y4n3c0sm0zzba38ad87b5v6nh3prgd8sfwvy79720fi";
+    sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq";
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f18c7d2981..e3228ac57f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1182,10 +1182,7 @@ let
 
   pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
 
-  pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) {
-    inherit python pkgconfig dbus_glib;
-    dbus = dbus.libs;
-  };
+  pythonDBus = callPackage ../development/python-modules/dbus { };
 
   pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) {
     inherit python;
@@ -1336,7 +1333,6 @@ let
   svnfs = callPackage ../tools/filesystems/svnfs { };
 
   system_config_printer = callPackage ../tools/misc/system-config-printer {
-    inherit (pythonPackages) notify;
     libxml2 = libxml2Python;
    };
 
@@ -2688,7 +2684,11 @@ let
     inherit python pil makeWrapper;
   };
 
-  doxygen = callPackage ../development/tools/documentation/doxygen {
+  doxygen = lowPrio (callPackage ../development/tools/documentation/doxygen {
+    qt = null;
+  });
+
+  doxygen_gui = doxygen.override {
     qt = qt4;
   };
 
@@ -2935,6 +2935,8 @@ let
 
   aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
 
+  attica = callPackage ../development/libraries/attica { };
+
   attr = callPackage ../development/libraries/attr { };
 
   aubio = callPackage ../development/libraries/aubio { };
@@ -3018,7 +3020,9 @@ let
   clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) {
   };
 
-  cluceneCore = callPackage ../development/libraries/clucene-core { };
+  clucene_core = callPackage ../development/libraries/clucene-core { };
+
+  cluceneCore = clucene_core; # !!! remove this
 
   clutter = callPackage ../development/libraries/clutter {
     inherit (gnome) glib pango gtk;
@@ -3344,7 +3348,8 @@ let
 
   gst_all = recurseIntoAttrs
     (let callPackage = newScope pkgs.gst_all; in
-     import ../development/libraries/gstreamer { inherit callPackage pkgs; });
+     import ../development/libraries/gstreamer { inherit callPackage; }
+    );
 
   gnet = callPackage ../development/libraries/gnet { };
 
@@ -3477,11 +3482,7 @@ let
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
-  herqqSvn = callPackage ../development/libraries/herqq/svn.nix { };
-
-  herqq070 = callPackage ../development/libraries/herqq/0.7.0.nix { };
-
-  herqq080 = callPackage ../development/libraries/herqq/0.8.0.nix { };
+  herqq = callPackage ../development/libraries/herqq { };
 
   hspell = callPackage ../development/libraries/hspell { };
 
@@ -3592,13 +3593,7 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
-    /* Using GNU Make 3.82 leads to this:
-
-         Makefile:939: *** missing separator (did you mean TAB instead of 8 spaces?).  Stop.
-
-       So use 3.81.  */
-    stdenv = overrideInStdenv stdenv [gnumake381];
-    gstreamer = gst_all.gstreamer;
+    # gstreamer = gst_all.gstreamer;
   };
 
   libcdaudio = callPackage ../development/libraries/libcdaudio { };
@@ -3742,9 +3737,7 @@ let
 
   libsamplerate = callPackage ../development/libraries/libsamplerate { };
 
-  libspectre = callPackage ../development/libraries/libspectre {
-    ghostscript = ghostscriptX;
-  };
+  libspectre = callPackage ../development/libraries/libspectre { };
 
   libgsf = callPackage ../development/libraries/libgsf {
     inherit (gnome) glib gnomevfs libbonobo;
@@ -4027,7 +4020,9 @@ let
     qt = qt4;
   };
 
-  mpeg2dec = callPackage ../development/libraries/mpeg2dec { };
+  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
+
+  mpeg2dec = libmpeg2;
 
   msilbc = callPackage ../development/libraries/msilbc { };
 
@@ -4098,7 +4093,8 @@ let
   openct = callPackage ../development/libraries/openct { };
 
   opencv = callPackage ../development/libraries/opencv {
-      inherit (gst_all) gstreamer;
+    ffmpeg = ffmpeg_0_6_90;
+    inherit (gst_all) gstreamer;
   };
 
   # this ctl version is needed by openexr_viewers
@@ -4143,6 +4139,10 @@ let
 
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
+  phonon = callPackage ../development/libraries/phonon { };
+
+  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };
+
   phonon_backend_vlc = newScope pkgs.kde4 ../development/libraries/phonon-backend-vlc { };
 
   physfs = callPackage ../development/libraries/physfs { };
@@ -4155,14 +4155,17 @@ let
 
   polkit = callPackage ../development/libraries/polkit { };
 
+  polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
+
   policykit = callPackage ../development/libraries/policykit { };
 
   poppler = callPackage ../development/libraries/poppler {
+    gtkSupport = true;
     qt4Support = false;
   };
 
   popplerQt4 = poppler.override {
-    inherit qt4;
+    gtkSupport = false;
     qt4Support = true;
   };
 
@@ -4206,7 +4209,6 @@ let
   };
 
   qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
     inherit (pkgs.gnome) glib;
   };
 
@@ -4236,6 +4238,8 @@ let
 
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
+  librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
+
   librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
 
   librdf = callPackage ../development/libraries/librdf { };
@@ -4245,6 +4249,7 @@ let
   redland = callPackage ../development/libraries/redland/1.0.10.nix {
     bdb = db4;
     postgresql = null;
+    mysql = null;
   };
 
   rhino = callPackage ../development/libraries/java/rhino {
@@ -4724,7 +4729,9 @@ let
 
   lighttpd = callPackage ../servers/http/lighttpd { };
 
-  mediatomb = callPackage ../servers/mediatomb { };
+  mediatomb = callPackage ../servers/mediatomb {
+    ffmpeg = ffmpeg_0_6_90;
+  };
 
   mod_python = callPackage ../servers/http/apache-modules/mod_python { };
 
@@ -4744,6 +4751,11 @@ let
 
   pulseaudio = callPackage ../servers/pulseaudio {
     gconf = gnome.GConf;
+    # The following are disabled in the default build, because if this
+    # functionality is desired, they are only needed in the PulseAudio
+    # server.
+    bluez = null;
+    avahi = null;
   };
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
@@ -4867,7 +4879,10 @@ let
 
   alsaLib = callPackage ../os-specific/linux/alsa-lib { };
 
-  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
+  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
+    jackaudio = null;
+  };
+  
   alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
 
   alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
@@ -5054,6 +5069,8 @@ let
 
   libaio = callPackage ../os-specific/linux/libaio { };
 
+  libatasmart = callPackage ../os-specific/linux/libatasmart { };
+  
   libcgroup = callPackage ../os-specific/linux/libcg { };
 
   libnl = callPackage ../os-specific/linux/libnl { };
@@ -5666,6 +5683,8 @@ let
 
   rt73fw = callPackage ../os-specific/linux/firmware/rt73 { };
 
+  rtkit = callPackage ../os-specific/linux/rtkit { };
+
   rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
 
   sdparm = callPackage ../os-specific/linux/sdparm { };
@@ -5733,9 +5752,11 @@ let
   };
 
   udev145 = callPackage ../os-specific/linux/udev/145.nix { };
-  udev166 = callPackage ../os-specific/linux/udev/166.nix { };
-  udev = udev166;
+  udev172 = callPackage ../os-specific/linux/udev/172.nix { };
+  udev = udev172;
 
+  udisks = callPackage ../os-specific/linux/udisks { };
+  
   uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;
     userModeLinux = true;
@@ -5747,6 +5768,8 @@ let
 
   untie = callPackage ../os-specific/linux/untie {};
 
+  upower = callPackage ../os-specific/linux/upower { };
+  
   upstart = callPackage ../os-specific/linux/upstart { };
 
   usbutils = callPackage ../os-specific/linux/usbutils { };
@@ -5991,6 +6014,7 @@ let
 
   audacity = callPackage ../applications/audio/audacity {
     portaudio = portaudioSVN;
+    ffmpeg = ffmpeg_0_6_90;
   };
 
   aumix = callPackage ../applications/audio/aumix {
@@ -7200,8 +7224,6 @@ let
   };
 
   vlc = callPackage ../applications/video/vlc {
-    dbus = dbus.libs;
-    alsa = alsaLib;
     lua = lua5;
   };
 
@@ -7720,10 +7742,10 @@ let
     callPackage = newScope pkgs.kde45;
   };
 
-  kde46 = callPackage ../desktops/kde-4.6 {
-    callPackage = newScope pkgs.kde46;
+  kde47 = callPackage ../desktops/kde-4.7 {
+    callPackage = newScope pkgs.kde47;
   };
-
+    
   redshift = callPackage ../applications/misc/redshift {
     inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
       xf86vidmodeproto;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9489c0eb9e5..08b0281e66c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -947,6 +947,8 @@ let pythonPackages = python.modules // rec {
 
     buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ];
 
+    postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
+    
     meta = {
       description = "Python bindings for libnotify";
       homepage = http://www.galago-project.org/;