From f62335822ccf4a4d124229066cf784a21ea7ac40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 12:13:16 +0000
Subject: [PATCH 001/116] * Qt 4.7.3.

svn path=/nixpkgs/branches/kde-4.7/; revision=27619
---
 .../libraries/qt-4.x/4.7/default.nix          | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

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..98e460c65ef 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -5,10 +5,11 @@
 , 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,12 +17,29 @@ 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+="
+  preConfigure =
+    ''
+      export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+    '';
+
+  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"}
       -docdir $out/share/doc/${name}
       -plugindir $out/lib/qt4/plugins
       -importdir $out/lib/qt4/imports
@@ -29,8 +47,7 @@ stdenv.mkDerivation rec {
       -demosdir $out/share/doc/${name}/demos
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
-    "
-  '';
+    '';
 
   propagatedBuildInputs = [
     alsaLib
@@ -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,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
-    ln -sv phonon $out/include/Phonon'';
+    ln -sv phonon $out/include/Phonon
+  '';
 
   enableParallelBuilding = true;
 
@@ -108,6 +111,5 @@ stdenv.mkDerivation rec {
     license = "GPL/LGPL";
     maintainers = with maintainers; [ urkud sander ];
     platforms = platforms.linux;
-    priority = 10;
   };
 }

From 5caed864e5df084ece260bccfd3450d5325e06f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 13:11:51 +0000
Subject: [PATCH 002/116] * CUPS updated to 1.4.7.

svn path=/nixpkgs/branches/kde-4.7/; revision=27620
---
 pkgs/misc/cups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ];

From 230f2a61d08f9cbfa97008f733e848fe9a5f2815 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 15:43:14 +0000
Subject: [PATCH 003/116] * glib updated to 2.28.8.

svn path=/nixpkgs/branches/kde-4.7/; revision=27623
---
 pkgs/development/libraries/glib/2.28.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 36c7d88de834db3941a9cfe9bbd4423a106832b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 15:43:26 +0000
Subject: [PATCH 004/116] * Pango updated to 1.28.4.

svn path=/nixpkgs/branches/kde-4.7/; revision=27624
---
 pkgs/development/libraries/pango/1.28.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;

From 049191511c0da8ad0e8fc74bc9e34bbd59cb6c9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 15:43:48 +0000
Subject: [PATCH 005/116] * GTK+ updated to 2.24.5.

svn path=/nixpkgs/branches/kde-4.7/; revision=27625
---
 pkgs/development/libraries/gtk+/2.24.x.nix      |  4 ++--
 pkgs/development/libraries/gtk+/old-icons.patch | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

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			\

From c8fbe3a724c8c8f47310b5ebfb3b57000b37f245 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 15:44:12 +0000
Subject: [PATCH 006/116] * DBus updated to 1.4.10.

svn path=/nixpkgs/branches/kde-4.7/; revision=27626
---
 pkgs/development/libraries/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index fdbc27a5617..f6cf76a379d 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.10";
   
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "0rx5p1f0jg4ch4958qb3ld3w3cw57a0rmvmxjgn1ir9dvxj1wgkm";
+    sha256 = "05wmvfvsbqjsy2mwawjdqw4v3jii3f79hp1bldflhpaj448v9d7w";
   };
 
   patches = [ ./ignore-missing-includedirs.patch ];

From feb13bc97ddd01932a9c6647b6cb9f319841a2b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:14:58 +0000
Subject: [PATCH 007/116] * udev updated to 171.

svn path=/nixpkgs/branches/kde-4.7/; revision=27627
---
 pkgs/os-specific/linux/udev/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index 11e044244b5..6a1ba55ff79 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -4,11 +4,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "udev-166";
+  name = "udev-171";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1msl8cwf47shmz5lr2w9w3nzzxqnf5dc0bs7dvbnxmbal60p7lpm";
+    sha256 = "0pk921963m10qyrv1bnwqxf91ds074xxgswkh616r8f1fihf9lgy";
   };
 
   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

From 9c8205b7c8380c3e4a562aa25a53de289c093199 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:23:05 +0000
Subject: [PATCH 008/116] * Bluez updated to 4.95.

svn path=/nixpkgs/branches/kde-4.7/; revision=27628
---
 pkgs/os-specific/linux/bluez/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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

From 4b19a1980fee17065c732488a36a3db9d9447f1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:24:31 +0000
Subject: [PATCH 009/116] * Pulseaudio: disable the dependencies on GTK+, GConf
 and X11.  It's   not clear what they're good for, and we don't want other
 packages   depending on GTK+ or Gnome if it's not necessary.  Also, updated
 to   0.9.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27629
---
 pkgs/servers/pulseaudio/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 40af6207243..6a525fd2a1b 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,25 +1,23 @@
 { 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
-, ...}:
+, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
+, alsaLib, libsamplerate, libsndfile, speex, bluez, udev }:
 
 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";
+    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
     sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
   };
 
   # 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
+    ];
 
   preConfigure = ''
     # Change the `padsp' script so that it contains the full path to
@@ -37,6 +35,8 @@ stdenv.mkDerivation rec {
     --disable-oss-output --disable-oss-wrapper
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "PulseAudio, a sound server for POSIX and Win32 systems";
 

From eedbc3ce5a6bfe3b39726942db056afc7a20b877 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:24:53 +0000
Subject: [PATCH 010/116] * Whitepace.

svn path=/nixpkgs/branches/kde-4.7/; revision=27630
---
 pkgs/development/tools/misc/automoc4/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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";

From fdf7a586a54459ee81e8bde357d0ecf23875ee9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:25:31 +0000
Subject: [PATCH 011/116] * gstreamer updated to 0.10.35.

svn path=/nixpkgs/branches/kde-4.7/; revision=27631
---
 pkgs/development/libraries/gstreamer/default.nix       |  6 ++----
 .../libraries/gstreamer/gst-plugins-good/default.nix   |  2 +-
 .../libraries/gstreamer/gstreamer/default.nix          | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 723d4176e35..32fbec844ce 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,9 +1,7 @@
-{ callPackage, pkgs }:
+{ callPackage }:
 
 rec {
-  gstreamer = callPackage ./gstreamer {
-    flex = pkgs.flex2535;
-  };
+  gstreamer = callPackage ./gstreamer { };
 
   gstPluginsBase = callPackage ./gst-plugins-base { };
 
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 65f32e44cc2..18aea3761aa 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
-, flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
+, flac, hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
 , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
 , gnome, libcap, libtasn1, liboil
 }:
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 ];

From d53d9617b733bdbf84d9e2d51e00dd5f171f33ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:25:47 +0000
Subject: [PATCH 012/116] * Gamin updated to 0.1.10.

svn path=/nixpkgs/branches/kde-4.7/; revision=27632
---
 pkgs/development/libraries/gamin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ];

From 6708bfd15a0b0d4fb355d714d5d1700d462efdf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:26:31 +0000
Subject: [PATCH 013/116] svn path=/nixpkgs/branches/kde-4.7/; revision=27633

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 083066dcf83..50781156346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3306,7 +3306,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 { };
 

From f61230a97c490cb8ce43b04b72f3cf93235af5af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 17:33:45 +0000
Subject: [PATCH 014/116] * gst-plugins-base updated to 0.10.35.

svn path=/nixpkgs/branches/kde-4.7/; revision=27634
---
 .../libraries/gstreamer/gst-plugins-base/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 = ''

From e59ef4302a760379c35d2c9dcc672538949014f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 18:15:34 +0000
Subject: [PATCH 015/116] * gobject-introspection updated to 0.10.8.

svn path=/nixpkgs/branches/kde-4.7/; revision=27635
---
 pkgs/development/libraries/gobject-introspection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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";

From 6ce3b9a8068dc8ec83a580168e3690bd15c92145 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 18:16:03 +0000
Subject: [PATCH 016/116] * PolKit updated to 0.101.

svn path=/nixpkgs/branches/kde-4.7/; revision=27636
---
 .../libraries/policykit/default.nix           |  2 +-
 pkgs/development/libraries/polkit/default.nix | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

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/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

From e5f1247dd16c69d5f202d5c1fd1588545107c938 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 18:23:38 +0000
Subject: [PATCH 017/116] * Strigi updated to 0.7.5.

svn path=/nixpkgs/branches/kde-4.7/; revision=27637
---
 pkgs/development/libraries/strigi/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index eeed7b271cd..b9cc3f1f00a 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,23 +1,22 @@
-{ 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 ];
 
   meta = {
     homepage = http://strigi.sourceforge.net;

From 3049b6788b2c59bfc150c7cec9033d15a98139b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 19:56:01 +0000
Subject: [PATCH 018/116] * Doh, cmake doesn't extrapolate $(out).

svn path=/nixpkgs/branches/kde-4.7/; revision=27640
---
 .../development/libraries/qt-4.x/4.7/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 98e460c65ef..e84c57501dc 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -23,6 +23,15 @@ stdenv.mkDerivation rec {
   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 =
@@ -40,13 +49,6 @@ stdenv.mkDerivation rec {
       ${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"}
-      -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
     '';
 
   propagatedBuildInputs = [

From 32abd0987de478a5ff1015104f54f03f825389cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 20:02:59 +0000
Subject: [PATCH 019/116] * doxygen: only build the Qt GUI in doxygen_gui.

svn path=/nixpkgs/branches/kde-4.7/; revision=27641
---
 .../tools/documentation/doxygen/default.nix   | 30 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  8 +++--
 2 files changed, 22 insertions(+), 16 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50781156346..1f5c8bf90b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2654,7 +2654,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;
   };
 
@@ -2984,7 +2988,7 @@ let
   clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) {
   };
 
-  cluceneCore = callPackage ../development/libraries/clucene-core { };
+  clucene_core = callPackage ../development/libraries/clucene-core { };
 
   clutter = callPackage ../development/libraries/clutter {
     inherit (gnome) glib pango gtk;

From 389fc6e32a1f87a517ebd4d22bb399df885d8cce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 20:03:36 +0000
Subject: [PATCH 020/116] * libdbusmenu-qt updated to 0.8.2.

svn path=/nixpkgs/branches/kde-4.7/; revision=27642
---
 pkgs/development/libraries/libdbusmenu-qt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index aed051a446b..f21a1f9ab79 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.2";
 in
+
 stdenv.mkDerivation rec {
   name = "${baseName}-${v}";
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "0zn3w57xjk34j08fx4n757kakkd4y07halrnaj4a0x0c9dhyjf14";
+    sha256 = "0fazwj4nhh9lr7zwz9ih20i6w60zlni3hcdwj6kz6521bkr8zg2s";
   };
 
-  buildInputs = [ cmake qt4 ];
+  buildInputs = [ cmake qt4 doxygen ];
   
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";

From a0b48e6caefafab60904261fd0c3edb87780c51e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 20:48:06 +0000
Subject: [PATCH 021/116] * Enable parallel building.

svn path=/nixpkgs/branches/kde-4.7/; revision=27644
---
 pkgs/development/libraries/strigi/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index b9cc3f1f00a..2f9007c1bb1 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus.tools ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://strigi.sourceforge.net;
     description = "A very fast and efficient crawler to index data on your harddrive";

From 76ec0dd430e80e396ec80560997d8492a0422b20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 10:49:21 +0000
Subject: [PATCH 022/116] * Update a bunch of dependencies of kdelibs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27702
---
 .../shared-desktop-ontologies/default.nix     | 11 ++++---
 pkgs/desktops/kde-4.7/libs/default.nix        | 16 +++-------
 .../kde-4.7/support/soprano/default.nix       |  8 ++---
 pkgs/development/libraries/herqq/0.8.0.nix    | 22 -------------
 .../herqq/{0.7.0.nix => default.nix}          |  5 ++-
 pkgs/development/libraries/herqq/svn.nix      | 23 -------------
 pkgs/development/libraries/librdf/raptor2.nix | 22 +++++++++++++
 pkgs/development/libraries/librdf/rasqal.nix  |  8 ++---
 pkgs/development/libraries/qca2/default.nix   | 32 ++++++++++++-------
 pkgs/development/libraries/redland/1.0.10.nix | 31 ++++++++++--------
 pkgs/top-level/all-packages.nix               |  9 +++---
 11 files changed, 85 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/development/libraries/herqq/0.8.0.nix
 rename pkgs/development/libraries/herqq/{0.7.0.nix => default.nix} (82%)
 delete mode 100644 pkgs/development/libraries/herqq/svn.nix
 create mode 100644 pkgs/development/libraries/librdf/raptor2.nix

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/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
index e032ec75af5..c36303a187f 100644
--- a/pkgs/desktops/kde-4.7/libs/default.nix
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -3,24 +3,18 @@
 , 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
+, getopt, udev, herqq
 }:
 
 kde.package {
 
   buildInputs =
-    [ acl attr attica automoc4 avahi bzip2 cmake
-      enchant fam getopt giflib jasper libdbusmenu_qt libXScrnSaver libxslt pcre perl perl polkit_qt_1
-      qt4 shared_mime_info strigi udev
-      xz 
+    [ 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 
     ];
     
-  #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
-  #];
-
   # TODO: make sonnet plugins (dictionaries) really work.
   # There are a few hardcoded paths.
   # Let kdelibs find openexr
diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix
index 073ea87e972..acd2b877019 100644
--- a/pkgs/desktops/kde-4.7/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.5.3";
+  name = "soprano-2.6.51";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "0hxc6jnbh0529jsc0ixvy8pshnffrpgsadinhk9navkpyn5xg4l9";
+    sha256 = "0sj0cklxahlhig29d0b1a3hr1p2z1xfar7j1slj2klbcy3qn47i0";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
-  buildInputs = [ cmake qt4 cluceneCore redland libiodbc ];
+  buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;
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/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/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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 231499393d6..12b1cd4a6eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3446,11 +3446,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 { };
 
@@ -4205,6 +4201,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 { };
@@ -4214,6 +4212,7 @@ let
   redland = callPackage ../development/libraries/redland/1.0.10.nix {
     bdb = db4;
     postgresql = null;
+    mysql = null;
   };
 
   rhino = callPackage ../development/libraries/java/rhino {

From a7b9ef8f4b77e9d7199f07b4adc59db843604c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 13:04:38 +0000
Subject: [PATCH 023/116] * Update Poppler to 0.16.7.

svn path=/nixpkgs/branches/kde-4.7/; revision=27703
---
 .../development/libraries/poppler/default.nix | 26 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 19 insertions(+), 10 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b1cd4a6eb..824c7268132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4123,11 +4123,12 @@ let
   policykit = callPackage ../development/libraries/policykit { };
 
   poppler = callPackage ../development/libraries/poppler {
+    gtkSupport = true;
     qt4Support = false;
   };
 
   popplerQt4 = poppler.override {
-    inherit qt4;
+    gtkSupport = false;
     qt4Support = true;
   };
 

From dce69134d07b48bb8578a5ef57f2f7af72a33d01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 14:29:27 +0000
Subject: [PATCH 024/116] * Added Okular (which is a separate package now).

svn path=/nixpkgs/branches/kde-4.7/; revision=27723
---
 pkgs/applications/misc/djvulibre/default.nix     |  8 ++++----
 pkgs/desktops/kde-4.7/default.nix                |  2 ++
 pkgs/desktops/kde-4.7/okular.nix                 | 16 ++++++++++++++++
 .../libraries/qimageblitz/default.nix            |  2 ++
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/okular.nix

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/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index c979153cbe0..0c355ade14d 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -49,6 +49,8 @@ recurseIntoAttrs rec {
 
 ### OTHER MODULES
 
+  okular = callPackage ./okular.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
diff --git a/pkgs/desktops/kde-4.7/okular.nix b/pkgs/desktops/kde-4.7/okular.nix
new file mode 100644
index 00000000000..ef5069cd68c
--- /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 }:
+
+kde.package {
+
+  buildInputs =
+    [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
+      qca2 qimageblitz qt4
+    ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+    kde.name = "okular";
+  };
+}
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 = {

From 4743ba9e46c3b0df43aaf918f8705d0e8f697817 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 14:47:15 +0000
Subject: [PATCH 025/116] * libspectre seems to work with the default
 ghostscript.

svn path=/nixpkgs/branches/kde-4.7/; revision=27724
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 824c7268132..934dba886ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3705,9 +3705,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;

From 4b028550658fa4cdd9d2a4111ae17c9fa253f402 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 14:47:39 +0000
Subject: [PATCH 026/116] * Added Konsole.

svn path=/nixpkgs/branches/kde-4.7/; revision=27725
---
 pkgs/desktops/kde-4.7/default.nix |  2 ++
 pkgs/desktops/kde-4.7/konsole.nix | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.7/konsole.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 0c355ade14d..1014bb8f1ab 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -51,6 +51,8 @@ recurseIntoAttrs rec {
 
   okular = callPackage ./okular.nix { };
 
+  konsole = callPackage ./konsole.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
diff --git a/pkgs/desktops/kde-4.7/konsole.nix b/pkgs/desktops/kde-4.7/konsole.nix
new file mode 100644
index 00000000000..4b07cf1e0e7
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/konsole.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+    kde.name = "konsole";
+  };
+}

From 9bf61690e8b0d14a9185b1ce8b046cafd2ae6749 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 15:33:41 +0000
Subject: [PATCH 027/116] * Added kde-baseapps and Gwenview.

svn path=/nixpkgs/branches/kde-4.7/; revision=27726
---
 pkgs/desktops/kde-4.7/baseapps.nix | 17 +++++++++++++++++
 pkgs/desktops/kde-4.7/default.nix  |  4 ++++
 pkgs/desktops/kde-4.7/gwenview.nix | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.7/baseapps.nix
 create mode 100644 pkgs/desktops/kde-4.7/gwenview.nix

diff --git a/pkgs/desktops/kde-4.7/baseapps.nix b/pkgs/desktops/kde-4.7/baseapps.nix
new file mode 100644
index 00000000000..e32b1f6fcc2
--- /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
+}:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
+      glib
+    ];
+
+  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.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 1014bb8f1ab..3f8e3ac50eb 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -47,8 +47,12 @@ recurseIntoAttrs rec {
 
   kdebase_runtime = callPackage ./base-runtime { };
 
+  kde_baseapps = callPackage ./baseapps.nix { };
+
 ### OTHER MODULES
 
+  gwenview = callPackage ./gwenview.nix { };
+
   okular = callPackage ./okular.nix { };
 
   konsole = callPackage ./konsole.nix { };
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix
new file mode 100644
index 00000000000..a1cab46f798
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/gwenview.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
+, shared_desktop_ontologies, kde_baseapps }:
+
+kde.package {
+
+  buildInputs =
+    [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
+      kde_baseapps
+    ];
+
+  meta = {
+    description = "Gwenview, the KDE image viewer";
+    license = "GPLv2";
+    kde.name = "gwenview";
+  };
+}

From 8cb2e1860fdb1f7afb59430aa7bd4a6874a056e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 16:13:40 +0000
Subject: [PATCH 028/116] * Add libkipi and libkexiv2.

svn path=/nixpkgs/branches/kde-4.7/; revision=27727
---
 pkgs/desktops/kde-4.7/default.nix   |  6 ++++++
 pkgs/desktops/kde-4.7/gwenview.nix  |  4 ++--
 pkgs/desktops/kde-4.7/libkexiv2.nix | 12 ++++++++++++
 pkgs/desktops/kde-4.7/libkipi.nix   | 12 ++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/libkexiv2.nix
 create mode 100644 pkgs/desktops/kde-4.7/libkipi.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 3f8e3ac50eb..58216ecfd13 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -35,6 +35,12 @@ recurseIntoAttrs rec {
 
   soprano = callPackage ./support/soprano { };
 
+  libkexiv2 = callPackage ./libkexiv2.nix { };
+
+  libkipi = callPackage ./libkipi.nix { };
+
+  kipi_plugins = callPackage ./kipi-plugins { };
+
 ### LIBS
   kdelibs = callPackage ./libs { };
 
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix
index a1cab46f798..f349b2f7920 100644
--- a/pkgs/desktops/kde-4.7/gwenview.nix
+++ b/pkgs/desktops/kde-4.7/gwenview.nix
@@ -1,11 +1,11 @@
 { kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
-, shared_desktop_ontologies, kde_baseapps }:
+, shared_desktop_ontologies, kde_baseapps, libkipi }:
 
 kde.package {
 
   buildInputs =
     [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
-      kde_baseapps
+      kde_baseapps libkipi
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/libkexiv2.nix b/pkgs/desktops/kde-4.7/libkexiv2.nix
new file mode 100644
index 00000000000..6719caef899
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkexiv2.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, exiv2 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 ];
+
+  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..cb1e556af98
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkipi.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+  meta = {
+    description = "Interface library to kipi-plugins";
+    license = "GPLv2";
+    kde.name = "libkipi";
+  };
+}

From 2c35988c77a6b0b9ef085038f94bf2ed4d5d89cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 16:26:17 +0000
Subject: [PATCH 029/116] * More KDE apps.

svn path=/nixpkgs/branches/kde-4.7/; revision=27728
---
 pkgs/desktops/kde-4.7/default.nix       |  8 +++++++-
 pkgs/desktops/kde-4.7/kate.nix          | 12 ++++++++++++
 pkgs/desktops/kde-4.7/kcolorchooser.nix | 12 ++++++++++++
 pkgs/desktops/kde-4.7/ksnapshot.nix     | 12 ++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.7/kate.nix
 create mode 100644 pkgs/desktops/kde-4.7/kcolorchooser.nix
 create mode 100644 pkgs/desktops/kde-4.7/ksnapshot.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 58216ecfd13..8b21ff7a396 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -39,7 +39,7 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
-  kipi_plugins = callPackage ./kipi-plugins { };
+  #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
   kdelibs = callPackage ./libs { };
@@ -63,6 +63,12 @@ recurseIntoAttrs rec {
 
   konsole = callPackage ./konsole.nix { };
 
+  kcolorchooser = callPackage ./kcolorchooser.nix { };
+
+  kate = callPackage ./kate.nix { };
+
+  ksnapshot = callPackage ./ksnapshot.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
diff --git a/pkgs/desktops/kde-4.7/kate.nix b/pkgs/desktops/kde-4.7/kate.nix
new file mode 100644
index 00000000000..6dfde7f76e1
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kate.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl ];
+
+  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..929d0f09de6
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kcolorchooser.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+  meta = {
+    description = "KDE color chooser utility";
+    license = "GPLv2";
+    kde.name = "kcolorchooser";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/ksnapshot.nix b/pkgs/desktops/kde-4.7/ksnapshot.nix
new file mode 100644
index 00000000000..1f5af060ba4
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/ksnapshot.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, libkipi }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi ];
+
+  meta = {
+    description = "KDE screenshot utility";
+    license = "GPLv2";
+    kde.name = "ksnapshot";
+  };
+}

From b39f08ea8e7fc6e5499097798308c653b812ff2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 13:14:23 +0000
Subject: [PATCH 030/116] * Added Kamera.

svn path=/nixpkgs/branches/kde-4.7/; revision=27736
---
 pkgs/desktops/kde-4.7/default.nix |  2 ++
 pkgs/desktops/kde-4.7/kamera.nix  | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.7/kamera.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 8b21ff7a396..62c555e443f 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -69,6 +69,8 @@ recurseIntoAttrs rec {
 
   ksnapshot = callPackage ./ksnapshot.nix { };
 
+  kamera = callPackage ./kamera.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
diff --git a/pkgs/desktops/kde-4.7/kamera.nix b/pkgs/desktops/kde-4.7/kamera.nix
new file mode 100644
index 00000000000..aa3446c7558
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kamera.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, libgphoto2 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 libgphoto2 ];
+
+  meta = {
+    description = "KDE camera interface library";
+    license = "GPLv2";
+    kde.name = "kamera";
+  };
+}

From c3e3111231177af3311db6853fd5b200fda07528 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 13:24:35 +0000
Subject: [PATCH 031/116] * Add kde-workspace. * Make sure that polkit actions
 get installed in $out.

svn path=/nixpkgs/branches/kde-4.7/; revision=27737
---
 pkgs/desktops/kde-4.7/default.nix             |  2 ++
 pkgs/desktops/kde-4.7/libs/default.nix        |  2 +-
 .../kde-4.7/libs/polkit-install.patch         | 22 ++++++++---------
 pkgs/desktops/kde-4.7/workspace.nix           | 24 +++++++++++++++++++
 .../libraries/polkit-qt-1/default.nix         |  2 ++
 .../polkit-qt-1/polkit-install.patch          | 12 ++++++++++
 6 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/workspace.nix
 create mode 100644 pkgs/development/libraries/polkit-qt-1/polkit-install.patch

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 62c555e443f..d839337c835 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -55,6 +55,8 @@ recurseIntoAttrs rec {
 
   kde_baseapps = callPackage ./baseapps.nix { };
 
+  kde_workspace = callPackage ./workspace.nix { };
+
 ### OTHER MODULES
 
   gwenview = callPackage ./gwenview.nix { };
diff --git a/pkgs/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
index c36303a187f..b8b0b3d7367 100644
--- a/pkgs/desktops/kde-4.7/libs/default.nix
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -23,7 +23,7 @@ kde.package {
   #propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
   #  shared_desktop_ontologies ];
 
-  #patches = [ ./polkit-install.patch ];
+  patches = [ ./polkit-install.patch ];
 
   # cmake fails to find acl.h because of C++-style comment
   # TODO: OpenEXR
diff --git a/pkgs/desktops/kde-4.7/libs/polkit-install.patch b/pkgs/desktops/kde-4.7/libs/polkit-install.patch
index 6633ef1209b..d2ecac663ec 100644
--- a/pkgs/desktops/kde-4.7/libs/polkit-install.patch
+++ b/pkgs/desktops/kde-4.7/libs/polkit-install.patch
@@ -1,12 +1,12 @@
-Author: Yury Kudryashov
-Reason: other KDE modules try to install polkit action files into
-$kdelibs/share/polkit-1/actions
-Upstream: rejected, they propose to set install dir in each package
---- a/cmake/modules/FindPolkitQt-1.cmake.old	2010-08-12 16:13:45.000000000 +0400
-+++ b/cmake/modules/FindPolkitQt-1.cmake	2010-08-12 16:13:56.000000000 +0400
-@@ -101,4 +101,4 @@
-     endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
- endif (POLKITQT-1_FOUND)
+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(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
-+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions)
+-    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/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
new file mode 100644
index 00000000000..b7541dad521
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -0,0 +1,24 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
+, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
+, libusb, libxklavier, perl, python
+}:
+
+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
+      soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
+      libusb python
+    ];
+
+  # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
+  NIX_LDFLAGS = "-ldl";
+
+  meta = {
+    description = "KDE desktop environment workspace components";
+    license = "GPLv2";
+    kde.name = "kde-workspace";
+  };
+}
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix
index 7e00c115b10..008a75cff67 100644
--- a/pkgs/development/libraries/polkit-qt-1/default.nix
+++ b/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
   };
 
+  patches = [ ./polkit-install.patch ];
+
   buildInputs = [ cmake qt4 automoc4 ];
   
   propagatedBuildInputs = [ polkit glib ];
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)

From c7669210d1d4f022e86656065f89f70f36de640d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jul 2011 12:31:43 +0000
Subject: [PATCH 032/116] * Whitespace.

svn path=/nixpkgs/branches/kde-4.7/; revision=27757
---
 pkgs/applications/video/MPlayer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index e51e91478b7..0921c95f51c 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

From a90c3142ee1893419895d6102861a24b56ee7b87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jul 2011 13:08:49 +0000
Subject: [PATCH 033/116] * KDE 4.7rc2.

svn path=/nixpkgs/branches/kde-4.7/; revision=27759
---
 pkgs/desktops/kde-4.7/default.nix             |   2 +-
 .../kde-4.7/kde-package/manifest-4.6.90.nix   | 286 ------------------
 .../kde-4.7/kde-package/manifest-4.6.95.nix   | 286 ++++++++++++++++++
 3 files changed, 287 insertions(+), 287 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
 create mode 100644 pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index d839337c835..ae6f409cb31 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  release = "4.6.90";
+  release = "4.6.95";
 
   # Various packages (e.g. kdesdk) have been split up into many
   # smaller packages.  Some people may want to install the entire
diff --git a/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix b/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
deleted file mode 100644
index a77db18e335..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
+++ /dev/null
@@ -1,286 +0,0 @@
-[
-{
-  module = "blinken";
-  sha256 = "01pl05djzkp1i0f30zgzdlc1gbf116ah3k3rrsc1rj5k11r97gga";
-}
-{
-  module = "cantor";
-  sha256 = "0vyb0h4bdxksc1kpgxn0s8bcn2j8kk2dj519jqf3bxps8fc5b9pp";
-}
-{
-  module = "gwenview";
-  sha256 = "16jm0klq04sg1pmhmgmdkw0p7nxbdichzbz4g5rhwsd0qy2qagw5";
-}
-{
-  module = "kalgebra";
-  sha256 = "1m2jkzvk44557jd2mg7zjbsw0hslip4rqgsy0czw2dl8grplwlgj";
-}
-{
-  module = "kalzium";
-  sha256 = "0rbazz5izynk3m6kxsxfx0d99wg5k1n8lb3r57l9zpiq18z99xn5";
-}
-{
-  module = "kamera";
-  sha256 = "1vainjdr6kjwdh4fxkaq3kr8ljs51a973g2q86zac2x58j5nhm1v";
-}
-{
-  module = "kanagram";
-  sha256 = "0x1d151y7ssdzds6vfs0dnx6wndk1dbs2gv21rng8f2v1fdsdlcy";
-}
-{
-  module = "kate";
-  sha256 = "0qa18mxhvxd14xrlnlz93r2js3ax3ykqk38a9fcbzna7x4a52f7p";
-}
-{
-  module = "kbruch";
-  sha256 = "17wnrjkf2cm9jl4z6m4mbxygs23hnspr3cig541b6wfpg4q3chh2";
-}
-{
-  module = "kcolorchooser";
-  sha256 = "03sj7jmlc66ifri5wnrqqiwgrnam20284m3kpwcd2s11y4f0jawq";
-}
-{
-  module = "kdeaccessibility";
-  sha256 = "0kz8qc51dqi9yhnqsjfn8447iqrvzz0vqq32nr469hm45npshnzf";
-}
-{
-  module = "kdeadmin";
-  sha256 = "0w1naiy8nfgshsx0j03ma6frp2vxn6dakfv511pnlil8pngx40m9";
-}
-{
-  module = "kdeartwork";
-  sha256 = "1nck52rvjwkwcgg3dnyw7nwxcq54f0kxws5dcpf63vmksz2a8d5h";
-}
-{
-  module = "kde-baseapps";
-  sha256 = "1441ascv5skjy719r4rgk2zdb4y2laqjh1lf7imizc0xqmlxb18b";
-}
-{
-  module = "kdegames";
-  sha256 = "0i25j0gak1xgx4ap5a93f8vvmlcgvrsihis95gp655h878n03b72";
-}
-{
-  module = "kdegraphics-strigi-analyzer";
-  sha256 = "0ab7kqmysilsw6yk74i8l2809ckmm6k0n8354df3vf2ffsgfi2br";
-}
-{
-  module = "kdegraphics-thumbnailers";
-  sha256 = "1zvc0bvk66krxpxrlf74kmg6y3d3ngmil36bpcv7i6jnrqfay15h";
-}
-{
-  module = "kdelibs";
-  sha256 = "0ri1gdcl1ag12yl7p6qzfmrn9djhah45wpycpvs86p1m6vwdm866";
-}
-{
-  module = "kdemultimedia";
-  sha256 = "0g01zj8h8a2vqz8j45a99wlhi74hdixbid6h4bl6va0c0hn604yi";
-}
-{
-  module = "kdenetwork";
-  sha256 = "19y73gfw4kcq91abdbhj1v3iq5f26ljac3xanh9dfm8fa5s5jy0v";
-}
-{
-  module = "kdepim";
-  sha256 = "05bzmyvvi9fb63f4cdcbcs1cfwvhzpnkcimqr3cjnnskjhhmrjiy";
-}
-{
-  module = "kdepimlibs";
-  sha256 = "11zsyrhirdx7v1cjrrigml5y2gw27s7ms0n3bjj6jfdh98ygi1hs";
-}
-{
-  module = "kdepim-runtime";
-  sha256 = "1p4yal2axs3035v48q0q8g9cb4bm37j9ban9rafqlh07dk1p4li7";
-}
-{
-  module = "kdeplasma-addons";
-  sha256 = "0d6ilvj74i3hp9pcpfkwl46xj1hfi642cn0ad8h4s2abs35abkm5";
-}
-{
-  module = "kde-runtime";
-  sha256 = "18g60qdmhylw48gdgqhbknziyhcmr7ww5viarsjxnmk7hif1f2za";
-}
-{
-  module = "kdesdk";
-  sha256 = "1s3r9cdwyr3ys2a7waq3b4lcgf7l21bfpig7xpp2fyzndqz54w47";
-}
-{
-  module = "kdetoys";
-  sha256 = "1a6spjiixazjln4wnaaqakb18if5d2rvlh0qiz24v3l356qh7wa9";
-}
-{
-  module = "kdeutils";
-  sha256 = "0ny0ic753q7gqmyn1ig33cl6m2lv8dh56xdb6pz7jcdj3szzg12h";
-}
-{
-  module = "kde-wallpapers";
-  sha256 = "08w5l3r01pjrf3n8rgfl319q3pk8kvbh96rs17shh85sahmhrd7k";
-}
-{
-  module = "kdewebdev";
-  sha256 = "0d6jgb89sl7n621n25arw40acwsw9v382a28ghawsf3rsk8bjp02";
-}
-{
-  module = "kde-workspace";
-  sha256 = "1i2jlkp1hasxpwfp86hp3z4lggiazp20d4y0vga706xl94vjsacp";
-}
-{
-  module = "kgamma";
-  sha256 = "1ngxz74mmsm9b37lrb541yh1nsn70ca5x3rs5i8mk27rrps4b1p9";
-}
-{
-  module = "kgeography";
-  sha256 = "0s8px1qvdjdbcjxwq34gfbaap4c5fzas8q6ivjmxa7m8whfhkvyf";
-}
-{
-  module = "khangman";
-  sha256 = "11vcp28r9vjf291bqlah6mmdclfghzpnfpf78hcclbrd7b1wc29w";
-}
-{
-  module = "kig";
-  sha256 = "1nz4c4dq7a0q23hw2rwvivliw2s1l29p823a6hnq7sdrqqrid5mi";
-}
-{
-  module = "kimono";
-  sha256 = "10kcgaw79sdq27s1pglrbfdd0lalgyai0lanxd49x9gwcf1iigg5";
-}
-{
-  module = "kiten";
-  sha256 = "0hw6hv1pccdgvdhhs1gxskx393xl9aj22zhj183jrsimd87k1kga";
-}
-{
-  module = "klettres";
-  sha256 = "1h8v5smrdpi3x3vvsyylax19ykaipnixfgjdms97c84zsvz898gy";
-}
-{
-  module = "kmplot";
-  sha256 = "13v36pqxsdxc3x2yl807bcvbmyh48s9w77mgr9w2x4hn1l4ms3f0";
-}
-{
-  module = "kolourpaint";
-  sha256 = "1sc357lcnk7al92sj763bjhhyvc07cf1plbgy2xvhkcfp6b5l425";
-}
-{
-  module = "konsole";
-  sha256 = "0bi5b6lh0b388azcgrsmh45dflgxfln8d1qp8x2prsd85hi3v0bq";
-}
-{
-  module = "korundum";
-  sha256 = "1al9pq6vn14x28kkf1zmp1kfiq1z52hidy3jxnajv39ildja13y8";
-}
-{
-  module = "kross-interpreters";
-  sha256 = "0d8lna1m1qn6r8rdhrs39x1b98n0271asa75i4hzgz6xic6z8afy";
-}
-{
-  module = "kruler";
-  sha256 = "0kbkl7xbznxfa8pq7jicd7lh1469j87cnz1hf1vsj40lcb6hs7dj";
-}
-{
-  module = "ksaneplugin";
-  sha256 = "1mnna8jjjcvjrg7a9yg0mggbah44wyx24yzlkdgr7l4h4g0ka4bi";
-}
-{
-  module = "ksnapshot";
-  sha256 = "0hp07r7yv61chvhjw05q6acyd4hqlbk8bnbiy9nxaz4grsab1v54";
-}
-{
-  module = "kstars";
-  sha256 = "1aiwbbrcv7373hn8656bbja0jn71f5m36mdpwr5jflg4g2vh6inb";
-}
-{
-  module = "ktouch";
-  sha256 = "04msgkyy5ar4bqsc43dvjwlbj5mmvd7ajylg1lqni04qr01dibh3";
-}
-{
-  module = "kturtle";
-  sha256 = "1ay1dxrgrz3kdjmb2wms2y7jkarsis6jfszw2qc2i9zgzjh8b05b";
-}
-{
-  module = "kwordquiz";
-  sha256 = "05v6c2hi55phkcaqvamak8xii5fpwsf82h3y3499flpczrni6prb";
-}
-{
-  module = "libkdcraw";
-  sha256 = "1f02ymqdlawy053hq97phy328z829k2jqxs81gfyig7vbq1xf888";
-}
-{
-  module = "libkdeedu";
-  sha256 = "1d45mz3qkzxrv0ap4rs3zciczxmw3lfiai3cm74k98sxixwqpx9v";
-}
-{
-  module = "libkexiv2";
-  sha256 = "0jw5151rd23bxxqh2sg14mi5kvc5gm74aliiglbniiv7qgxn1mls";
-}
-{
-  module = "libkipi";
-  sha256 = "0w4wiikhqz88x7wbzmms0y7zxka7mpqq8vw61w89p3yl2x4qhmsn";
-}
-{
-  module = "libksane";
-  sha256 = "0czqijqz5l45mvydzvi0gmqx4sw77wirnh92dv2rc6bs34ik8i75";
-}
-{
-  module = "marble";
-  sha256 = "14lfr5rzj37wfp4chk1h54kslwph8pknkk6s82l1svm5naa7c3bf";
-}
-{
-  module = "mobipocket";
-  sha256 = "0qbcmwcrg306x0yrm783n640c0bdn0aq47jmgynr5327plvpqlsh";
-}
-{
-  module = "okular";
-  sha256 = "1kl7px5jzk33wsdhfh67s6zkip9zkgw50d23spqz021ynf8zx6vg";
-}
-{
-  module = "oxygen-icons";
-  sha256 = "1qz9c6d3m0lb20f1hb7bpgrfyv2rc0z4zkbhm51nr5p0p5m2mpdj";
-}
-{
-  module = "parley";
-  sha256 = "03nlfvy5cls51np77n4id0blkrpz31ad7vd2cilhsfws965lmi6a";
-}
-{
-  module = "perlkde";
-  sha256 = "06qggm4sxs8mlhmhrkxfjinvwi0m2vm2plxgz0l92rm7kbvr3g6l";
-}
-{
-  module = "perlqt";
-  sha256 = "00xa1g5n4jwncv73gjfc5hay9lfh94mx3amhpss0fmvzz2j3j1xk";
-}
-{
-  module = "pykde4";
-  sha256 = "1qns08xfj3yxrqhr2k1parmaphf7m0m4fks3s42mj30ksx6ayx2x";
-}
-{
-  module = "qtruby";
-  sha256 = "130dbr4c81zn53h6v79q6ffk3rsp4zzxa2qkzmml9236gswfbvkw";
-}
-{
-  module = "qyoto";
-  sha256 = "0dnvbjpmcflcpnyhp9ivn87iq7ff6ifp874ds34mzrk5yr48c9fn";
-}
-{
-  module = "rocs";
-  sha256 = "11fzfsip6jr4dxxznrxcx6pab6h83a0m2l5bccd1c72q3pjhsv42";
-}
-{
-  module = "smokegen";
-  sha256 = "0wnbsg2178rryx6jl9n6r73b5h9cgdhbhypfhq9w9javijlyrbbr";
-}
-{
-  module = "smokekde";
-  sha256 = "1jqwqpw0n60ll88i2i6wkw1kqpi8jcar6sjg0ayh0b3fvzgas4yn";
-}
-{
-  module = "smokeqt";
-  sha256 = "12q34lp4gs55svblqf12rh4fbzfh5r34mz1apnsfxwvv1anzvb9l";
-}
-{
-  module = "step";
-  sha256 = "0vbxag6dcc32y048sll42081xzh5sbi7r6rlv0ic75bpj7bj65b0";
-}
-{
-  module = "svgpart";
-  sha256 = "1c3kh3kj0dbps7vnz5a9lmqkimgdlmkhwdvcc2x74jwcnb4d5d3z";
-}
-]
diff --git a/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix b/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix
new file mode 100644
index 00000000000..861d7ca8e7a
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix
@@ -0,0 +1,286 @@
+[
+{
+  module = "blinken";
+  sha256 = "0lpmgx9a5188d8p7vi17c3jrra5269gidq3iyznnr9bg3zcj12cs";
+}
+{
+  module = "cantor";
+  sha256 = "0xviwr5hk2hcadan5srk3p2d10q52z19458afxy88rwdd8x7jaav";
+}
+{
+  module = "gwenview";
+  sha256 = "04ij4l2fahvw8wgrkbc8k642s06dlqy8m5cpwd29mlcsqx7rnszx";
+}
+{
+  module = "kalgebra";
+  sha256 = "0c9vrpkdwicjr7kykqwxgzkm28h3qh2dsfjkxf0ldpx29kc1bv6m";
+}
+{
+  module = "kalzium";
+  sha256 = "0fj3kz8iim81fm14gk36ibdq58aq9s8z85vwa7w28byavyqbihx1";
+}
+{
+  module = "kamera";
+  sha256 = "1hcgriyn8i71wfc5r22qwkmrkfk0ckvjiwxjsk9z3b97v1xrvi1n";
+}
+{
+  module = "kanagram";
+  sha256 = "1ay5hn6xbgka68mhk95vdh0yn4hwvhjzk77mml31z5xwbw4khc9b";
+}
+{
+  module = "kate";
+  sha256 = "048mzlbhqrvba0grw5dnf0g95kkvsvqffc8jz82nnhycgy1wzgb3";
+}
+{
+  module = "kbruch";
+  sha256 = "1pwq9934g4kb9hk1dpgml62jb104gr58fwq13np0dvdjjkk1zkvz";
+}
+{
+  module = "kcolorchooser";
+  sha256 = "0nl9v04k8xbw3gy1v03c4cp4ay25p185dz25lga5j88xh9p12h2z";
+}
+{
+  module = "kdeaccessibility";
+  sha256 = "18k6y28ir8a00s0pxp4pfl8bc25vrrlw3gkh0lbvn0f7xlc6b3xr";
+}
+{
+  module = "kdeadmin";
+  sha256 = "12p626py4yw5cs29yfkj02pjl167irjyjnd5316cvjjhbyh5bdh9";
+}
+{
+  module = "kdeartwork";
+  sha256 = "1h6gya0hs5jz5bwnlaj1mbx66ksmmarpkvz8css9gi6wxd0b1jpm";
+}
+{
+  module = "kde-baseapps";
+  sha256 = "0m76729njglibhcwv03aq38kj12f7rjifh0n8fhd3nj9hy5k5px6";
+}
+{
+  module = "kdegames";
+  sha256 = "0mg4ivhbxvf92v3zwwq50ixn8waapgvnzxkp0g1vy960s2wgi4lr";
+}
+{
+  module = "kdegraphics-strigi-analyzer";
+  sha256 = "0ka17ck02391iaiqh9d4vrr7w6dgvi2272jrzm8694gk20zawwqw";
+}
+{
+  module = "kdegraphics-thumbnailers";
+  sha256 = "19npmsbhpyvs6x4r1hc9kfxpa86z2sari43y1wm9mzrrzpdzjbys";
+}
+{
+  module = "kdelibs";
+  sha256 = "10zk08r3vvrpsci1lprsc47imfhvxxv48hi3kh4p0l7vgr0ffrx0";
+}
+{
+  module = "kdemultimedia";
+  sha256 = "0y00zsdwhv73fnb2h5hfbfwhjrhy3ss3b74ripy31rcsh1qn2dyp";
+}
+{
+  module = "kdenetwork";
+  sha256 = "11daqwa3vw52hykzc9dl2k20dwi6m8qzdyln25y4ka0mh74i8i18";
+}
+{
+  module = "kdepim";
+  sha256 = "1a8i2x2b71ddgr4rsl8001zhhjwsp11137f0ajakcgj2x7gkqri3";
+}
+{
+  module = "kdepimlibs";
+  sha256 = "1mg8vc8savyi7izlmh9pqdvl6pvf4lb9m7vd4sn66z2mpx4cyc4n";
+}
+{
+  module = "kdepim-runtime";
+  sha256 = "12bhgqiv2xb4mg45fzyzxd4q7gds25y8275cz00bv4ndh9lklkd9";
+}
+{
+  module = "kdeplasma-addons";
+  sha256 = "0dska74igbmydpca914ha61q7wg68hl6lcrd6a6xyb1xjx1m7lqm";
+}
+{
+  module = "kde-runtime";
+  sha256 = "0a860kaqiv3jyxa1266w6ybnciw1ag0gr767am1gjnn5z9fr6m9q";
+}
+{
+  module = "kdesdk";
+  sha256 = "1h9dkh529czdwzx8riq8npkq2xsljgxaiafa8ra51bm497xvm121";
+}
+{
+  module = "kdetoys";
+  sha256 = "0mj0b48v56ixvbvmd70nq3rc14qms1a6pb2xyaarvpy4fc6mf0rx";
+}
+{
+  module = "kdeutils";
+  sha256 = "02cb4y5ljz7gs324p64wnd7qdx4m9wcjcjsfb750nlazsxbbbi26";
+}
+{
+  module = "kde-wallpapers";
+  sha256 = "0dq8zpx0nskqh3lqxq39l7kg8cv3n9dj1s0bwg7yfpahzg3903yk";
+}
+{
+  module = "kdewebdev";
+  sha256 = "0bv4k146snifyds3npxaga4260rx2nk0l6lqbsk1wdyrpkpwwwa0";
+}
+{
+  module = "kde-workspace";
+  sha256 = "0jqlgyz34dn98fxnrmj0ymdhppqxg7xsz9vkqdid98d86zvpbxzg";
+}
+{
+  module = "kgamma";
+  sha256 = "1r64gfm181xph1rkpk8jp92pghg3yvm9amsz20mprl57lz7mxdpw";
+}
+{
+  module = "kgeography";
+  sha256 = "0bm28cyal3cks1xkyazbnp8j0yf78pr2ihszgdjldipwnm7sqxc5";
+}
+{
+  module = "khangman";
+  sha256 = "1s5vwc7ybcd6rkfqkmpn6vnp0sz8lwhjf91w4mxw1dqipylvipyb";
+}
+{
+  module = "kig";
+  sha256 = "0ncxd5i4hpxl972i9f6kc1z7k4466f6bfm6ykivm4jvcg1p3kzml";
+}
+{
+  module = "kimono";
+  sha256 = "024fx0yy3vk0glkv787ia30804hn8ym8vccg78jr9zarfm96sv4m";
+}
+{
+  module = "kiten";
+  sha256 = "1xmwrw8pgm48vfnk7q5634dycg80qr79s8x5sjh3kaa51kkqzg3c";
+}
+{
+  module = "klettres";
+  sha256 = "078kr53k1nslwlgqvxzgd7ysnq0kfzfmcwng5yl8i49wrkkragc5";
+}
+{
+  module = "kmplot";
+  sha256 = "0pan00jx1417d6w1xkn94l38mq1g5ry0dskms4drfmjyadiq98cv";
+}
+{
+  module = "kolourpaint";
+  sha256 = "02ks2v5x5n78x77fyvh5r95y7qrvlcawb138jhcqyhipylya4mf6";
+}
+{
+  module = "konsole";
+  sha256 = "10z7n58wgvyiq5d8in63wdbpd4x5zylan89j3pz2l0l0h38a1rwl";
+}
+{
+  module = "korundum";
+  sha256 = "0djnrwfdi32ik2w85c4hnk6lq6i7bpc95a5npsrp7r2wz76qa21k";
+}
+{
+  module = "kross-interpreters";
+  sha256 = "10188b9j0whlkj58lsvfq7zyjy5k0mazk6jahwj608qbyiv5x1b8";
+}
+{
+  module = "kruler";
+  sha256 = "0fswz4c8richv37w4cfrzfsyz3afxr58d5kapcca6b55w5j5sa4h";
+}
+{
+  module = "ksaneplugin";
+  sha256 = "1kjiyad8s70dagjsi57gcrvyz80fcgm4ivszmnsh99808m7whwlh";
+}
+{
+  module = "ksnapshot";
+  sha256 = "1sinwiwxan9ky42ip9ry34m5dm0p7ybijafj8g0jv9pq9vbghc35";
+}
+{
+  module = "kstars";
+  sha256 = "1snmj7m5mi4wfm3n168a3sf6cmf8cp5g86qhb678pm13mypyaba7";
+}
+{
+  module = "ktouch";
+  sha256 = "0ln3kl665vnz9kmf3hj31v7r1k6psfsvbmhrc0nsd4b8jml8flsc";
+}
+{
+  module = "kturtle";
+  sha256 = "1aa4fkb9z52nil9pm81hwpimvhr87f7av8z239kcmjwdna2bf50h";
+}
+{
+  module = "kwordquiz";
+  sha256 = "1kl7ghl1s9rj1fh7aarfk29f8qzagmh4i1yasp494amb6g3x56ib";
+}
+{
+  module = "libkdcraw";
+  sha256 = "17q2v8aylh7dgfd2f5cg0nkqd0xlzhna6dmvglhxlr3zgpx59pcn";
+}
+{
+  module = "libkdeedu";
+  sha256 = "1j4ppkyj8fy016x5sgpl6n03xj5wsrm2ksgh531ks4lz8dlvnq0s";
+}
+{
+  module = "libkexiv2";
+  sha256 = "04402lbmf7bl1rybw7fnqxihmkhbzrcj05ag4nc1hy07wv5s5yzk";
+}
+{
+  module = "libkipi";
+  sha256 = "0hs6n783p6d731cdiibjq2rjldamb2bf9xvxbwrsa5b85ln09yw1";
+}
+{
+  module = "libksane";
+  sha256 = "1n211mckknayh41pynpqh3g1hyngss3i2hfvz9bjx2kikjmc8m26";
+}
+{
+  module = "marble";
+  sha256 = "1w32qsxj5yfvv1dd2kph11k46pb828j68pscz3x3j5xh3pwqngaw";
+}
+{
+  module = "mobipocket";
+  sha256 = "1r8nmcfl440d1v51hy0sgmhrh8qdljskmn0pvfp2vaaxfqrqpwis";
+}
+{
+  module = "okular";
+  sha256 = "1hdjhrdpbrvrxixzpls3n8zynj8qypid8m2805m0y0wfzalidmgl";
+}
+{
+  module = "oxygen-icons";
+  sha256 = "03ikafi23ac0cqif3sxh8cxln0gz8yrag0cyl95p8sf7ih5iyy64";
+}
+{
+  module = "parley";
+  sha256 = "18lvnid98kphinx2i90dy5jjfbfbyc30zbn0bbqjk577lfxl5nds";
+}
+{
+  module = "perlkde";
+  sha256 = "0hfb7b9a6c5yjk57fr5k0a8xxcs333nz8ps9dk5hyrljj1k08mxm";
+}
+{
+  module = "perlqt";
+  sha256 = "097ckqr58zj97b8wr51rxh2am1x1jpvfz3vm91sbmys6jg5zi5v4";
+}
+{
+  module = "pykde4";
+  sha256 = "0xr4xlds7ixsvpd8h2rziwpffaj4rxqjl7439nygk8zy1f959g68";
+}
+{
+  module = "qtruby";
+  sha256 = "1yqg9qnfjqq1f8q7si1klacn0wmylqx8b1hfgkhxrad9m0q7zhia";
+}
+{
+  module = "qyoto";
+  sha256 = "0sqsylcjfcnixbcf8x3ajzhc9gzpmfv1mh90bp7wz6cwrnb776wq";
+}
+{
+  module = "rocs";
+  sha256 = "1pc2l07wbfv0ky9wqyhby9c5ij7nlq8p7ybwp42zxlyq94s1rhw7";
+}
+{
+  module = "smokegen";
+  sha256 = "0y8wq7z8dgwgcf8wvgwqjdaf7j0w5lvy0bvsfzlskvg4bb4lh4lw";
+}
+{
+  module = "smokekde";
+  sha256 = "1lidwpaqx5h5z500qc26gc782b7db41l3s3n2lk0iv2yif9jrgxh";
+}
+{
+  module = "smokeqt";
+  sha256 = "1rg0bcjj26rxbfi2z1x1ba6h0sx1adr8l3n5mx8i71iq0qq5qsdv";
+}
+{
+  module = "step";
+  sha256 = "00w8ci89p7xph7njqlwch26vrs39cm09a162dgc4qaaqarzj9q37";
+}
+{
+  module = "svgpart";
+  sha256 = "04gis2pyfs6y7lxdajqbgj26xkv9qzs26wj4gd50zainy5235jrv";
+}
+]

From 71c508f64106a9a4cab7bd5fd7178c953138d2f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jul 2011 18:15:57 +0000
Subject: [PATCH 034/116] * Akonadi updated to 1.6.0.

svn path=/nixpkgs/branches/kde-4.7/; revision=27768
---
 .../kde-4.7/support/akonadi/default.nix         | 16 ++++++++++------
 .../akonadi/fix-broken-datadir-parameter.patch  | 17 -----------------
 pkgs/desktops/kde-4.7/workspace.nix             |  6 +++---
 3 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/support/akonadi/fix-broken-datadir-parameter.patch

diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
index eedd6b9f6e8..486849b23aa 100644
--- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
@@ -1,13 +1,17 @@
-{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.4.3";
+  name = "akonadi-1.6.0";
+  
   src = fetchurl {
-    url = "http://download.akonadi-project.org/${name}.tar.bz2";
-    sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk";
+    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+    sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f";
   };
-  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
-  patches = [ ./fix-broken-datadir-parameter.patch ];
+  
+  buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ];
+
+  enableParallelBuilding = true;
+  
   meta = with stdenv.lib; {
     description = "KDE PIM Storage Service";
     license = "LGPL";
diff --git a/pkgs/desktops/kde-4.7/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.7/support/akonadi/fix-broken-datadir-parameter.patch
deleted file mode 100644
index 09b594f4e21..00000000000
--- a/pkgs/desktops/kde-4.7/support/akonadi/fix-broken-datadir-parameter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix broken datadir parameter.
-
---- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-06-09 03:41:30.000000000 -0430
-+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp	2010-08-11 00:21:20.547181479 -0430
-@@ -250,11 +250,10 @@
-   // synthesize the mysqld command
-   QStringList arguments;
-   arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
-+  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
- #ifndef Q_WS_WIN
--  arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
-   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory );
- #else
--  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
-   arguments << QString::fromLatin1( "--shared-memory" );
- #endif
- 
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index b7541dad521..7cb03df0c42 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,6 +1,6 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python
+, libusb, libxklavier, perl, python, libqalculate, akonadi
 }:
 
 kde.package {
@@ -10,14 +10,14 @@ kde.package {
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
       xorg.libXcomposite xorg.libXdamage xorg.libXau
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python
+      libusb python libqalculate akonadi
     ];
 
   # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
   NIX_LDFLAGS = "-ldl";
 
   meta = {
-    description = "KDE desktop environment workspace components";
+    description = "KDE workspace components such as Plasma, Kwin and System Settings";
     license = "GPLv2";
     kde.name = "kde-workspace";
   };

From e061898b74ee791a6c573ab80b4a792d10d496b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jul 2011 18:54:27 +0000
Subject: [PATCH 035/116] * ConsoleKit updated to 0.4.5.

svn path=/nixpkgs/branches/kde-4.7/; revision=27770
---
 pkgs/development/libraries/consolekit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 ];

From 298c78ef406ac40bd99b7ffee3f4ad5e0ab3b914 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jul 2011 08:42:01 +0000
Subject: [PATCH 036/116] * Build kdm.

svn path=/nixpkgs/branches/kde-4.7/; revision=27772
---
 pkgs/desktops/kde-4.7/default.nix   |  7 ++-----
 pkgs/desktops/kde-4.7/workspace.nix | 12 +++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index ae6f409cb31..5970d94602d 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -29,6 +29,7 @@ recurseIntoAttrs rec {
   kde = callPackage ./kde-package { inherit release; stable = false; };
 
 ### SUPPORT
+
   akonadi = callPackage ./support/akonadi { };
 
   oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -42,16 +43,12 @@ recurseIntoAttrs rec {
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
+
   kdelibs = callPackage ./libs { };
 
   kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
-  kdebase = callPackage ./base { };
-
-  kdebase_workspace = callPackage ./base-workspace { };
-
-  kdebase_runtime = callPackage ./base-runtime { };
 
   kde_baseapps = callPackage ./baseapps.nix { };
 
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index 7cb03df0c42..f4820f76623 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,6 +1,6 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python, libqalculate, akonadi
+, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
 }:
 
 kde.package {
@@ -8,13 +8,15 @@ 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.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
+      xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate akonadi
+      libusb python libqalculate akonadi perl consolekit
     ];
 
-  # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
-  NIX_LDFLAGS = "-ldl";
+  # Workaround for undefined reference to ‘dlsym’ in
+  # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
+  NIX_LDFLAGS = "-ldl -lrt";
 
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System Settings";

From bc16ee83ae378ef2044c0052a5f8da9729fa5e70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jul 2011 09:50:37 +0000
Subject: [PATCH 037/116] * The NixOS kdm.nix module expects a
 kdebase_workspace attribute.

svn path=/nixpkgs/branches/kde-4.7/; revision=27794
---
 pkgs/desktops/kde-4.7/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 5970d94602d..d2a990d256c 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -54,6 +54,9 @@ recurseIntoAttrs rec {
 
   kde_workspace = callPackage ./workspace.nix { };
 
+  # Backwards compatibility.
+  kdebase_workspace = kde_workspace;
+
 ### OTHER MODULES
 
   gwenview = callPackage ./gwenview.nix { };

From e14c8876d12d213ebb1a16e870bb2cec5ac9f330 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jul 2011 09:59:45 +0000
Subject: [PATCH 038/116] * Udev updated to 172.

svn path=/nixpkgs/branches/kde-4.7/; revision=27795
---
 pkgs/os-specific/linux/udev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index 6a1ba55ff79..f8d7e1288f4 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -4,11 +4,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "udev-171";
+  name = "udev-172";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "0pk921963m10qyrv1bnwqxf91ds074xxgswkh616r8f1fihf9lgy";
+    sha256 = "0smxggvhhilcqcsi98fmk0nngzy1x8v6ibas609zysgza74rr5dq";
   };
 
   buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];

From b6b4761dc68e12d0ea4bff5241bf3c853de0f573 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 13:27:12 +0000
Subject: [PATCH 039/116] * libcanberra updated to 0.28.  Disabled the
 gstreamer backend by   default because there doesn't seem to be much point to
 it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27809
---
 pkgs/development/libraries/libcanberra/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix                    |  8 +-------
 2 files changed, 7 insertions(+), 14 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e296cd90d4c..3a102f36f98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3564,13 +3564,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 { };

From e482393ad173b619acda450920d446d09590eeba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 14:10:41 +0000
Subject: [PATCH 040/116] * Add kde-runtime.  It requires a newer Phonon than
 provided by Qt, so   add that as well.  Maybe we should build Qt without
 Phonon to remove   potential interference...

svn path=/nixpkgs/branches/kde-4.7/; revision=27810
---
 pkgs/desktops/kde-4.7/default.nix             |  6 +++--
 pkgs/desktops/kde-4.7/phonon.nix              | 26 +++++++++++++++++++
 pkgs/desktops/kde-4.7/runtime.nix             | 22 ++++++++++++++++
 .../kde-4.7/support/oxygen-icons/default.nix  |  7 ++---
 4 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/phonon.nix
 create mode 100644 pkgs/desktops/kde-4.7/runtime.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index d2a990d256c..1dfc88d2821 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -24,8 +24,6 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  phonon = null;
-
   kde = callPackage ./kde-package { inherit release; stable = false; };
 
 ### SUPPORT
@@ -40,6 +38,8 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
+  phonon = callPackage ./phonon.nix { };
+
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
@@ -54,6 +54,8 @@ recurseIntoAttrs rec {
 
   kde_workspace = callPackage ./workspace.nix { };
 
+  kde_runtime = callPackage ./runtime.nix { };
+
   # Backwards compatibility.
   kdebase_workspace = kde_workspace;
 
diff --git a/pkgs/desktops/kde-4.7/phonon.nix b/pkgs/desktops/kde-4.7/phonon.nix
new file mode 100644
index 00000000000..edcccb7bf0c
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/phonon.nix
@@ -0,0 +1,26 @@
+{ 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";
+  };  
+}
diff --git a/pkgs/desktops/kde-4.7/runtime.nix b/pkgs/desktops/kde-4.7/runtime.nix
new file mode 100644
index 00000000000..3674e4e3357
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/runtime.nix
@@ -0,0 +1,22 @@
+{ 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; })
+    ];
+
+  # Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
+  NIX_LDFLAGS = "-lutil";
+    
+  meta = {
+    license = "LGPL";
+    kde.name = "kde-runtime";
+  };
+
+}
diff --git a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
index 703dfe0f0cf..fb7a063fd8f 100644
--- a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
@@ -1,14 +1,15 @@
-{kde, cmake}:
+{ kde, cmake }:
 
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "4c2881683f8d66114ac79a9573498e627146aa647574efb9b8f89f837e1d7b06";
+  outputHash = "4736af7eef8c0defa8f5ae997ac85e0a19c4d1af9a9e963b2434317c5408ab86";
 
   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";
+    longDescription = "Icons for KDE's default theme";
     license = "GPL";
     kde.name = "oxygen-icons";
   };

From f3d8b47f220ef94778fc9f0de335ed8ac6935a76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 14:24:43 +0000
Subject: [PATCH 041/116] * Add kde-wallpapers, which contains the default KDE
 and KDM   wallpaper.

svn path=/nixpkgs/branches/kde-4.7/; revision=27811
---
 pkgs/desktops/kde-4.7/default.nix    |  2 ++
 pkgs/desktops/kde-4.7/wallpapers.nix | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.7/wallpapers.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 1dfc88d2821..385d28ab93e 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -75,6 +75,8 @@ recurseIntoAttrs rec {
 
   kamera = callPackage ./kamera.nix { };
 
+  kde_wallpapers = callPackage ./wallpapers.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
diff --git a/pkgs/desktops/kde-4.7/wallpapers.nix b/pkgs/desktops/kde-4.7/wallpapers.nix
new file mode 100644
index 00000000000..f2b3d966ab8
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/wallpapers.nix
@@ -0,0 +1,15 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b";
+
+  meta = {
+    description = "Wallpapers for KDE";
+    kde.name = "kde-wallpapers";
+  };
+}

From 9e92839468cfb4fe6e96058b646d4d774b0674cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 15:55:33 +0000
Subject: [PATCH 042/116] * Fix incorrect path to kde4-config in startkde.

svn path=/nixpkgs/branches/kde-4.7/; revision=27812
---
 pkgs/desktops/kde-4.7/workspace.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index f4820f76623..e78cbe75609 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -18,6 +18,12 @@ kde.package {
   # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
   NIX_LDFLAGS = "-ldl -lrt";
 
+  preConfigure =
+   ''
+     # Fix incorrect path to kde4-config.
+     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+   '';
+
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System Settings";
     license = "GPLv2";

From c416926580a2260e9cc44dc9920a948c0f406eaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 09:18:38 +0000
Subject: [PATCH 043/116] * Qt: remove Phonon since we can just use the
 external Phonon   package.  This also removes the GStreamer dependency
 because only   Phonon uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
---
 pkgs/development/libraries/qt-4.x/4.7/default.nix | 7 ++-----
 pkgs/top-level/all-packages.nix                   | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

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 e84c57501dc..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,5 +1,5 @@
 { 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
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
       -fontconfig -I${freetype}/include/freetype2
       -exceptions -xmlpatterns
-      -multimedia -audio-backend -phonon -phonon-backend
+      -multimedia -audio-backend -no-phonon
       -webkit -javascript-jit
       -make libs -make tools -make translations
       ${if buildDemos == true then "-make demos" else "-nomake demos"}
@@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
     libXfixes
     glib
     libtiff
-    gstreamer
-    gstPluginsBase
     pulseaudio
   ];
 
@@ -102,7 +100,6 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
-    ln -sv phonon $out/include/Phonon
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a102f36f98..25219e18ef0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4173,7 +4173,6 @@ let
   };
 
   qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
     inherit (pkgs.gnome) glib;
   };
 

From 3c668adea16d15c52e6c65d135a85267147c3a1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 10:29:20 +0000
Subject: [PATCH 044/116] * Pass Phonon as a dependency where needed.

svn path=/nixpkgs/branches/kde-4.7/; revision=27815
---
 pkgs/desktops/kde-4.7/baseapps.nix      | 4 ++--
 pkgs/desktops/kde-4.7/gwenview.nix      | 5 +++--
 pkgs/desktops/kde-4.7/kate.nix          | 4 ++--
 pkgs/desktops/kde-4.7/kcolorchooser.nix | 4 ++--
 pkgs/desktops/kde-4.7/konsole.nix       | 4 ++--
 pkgs/desktops/kde-4.7/ksnapshot.nix     | 4 ++--
 pkgs/desktops/kde-4.7/libkipi.nix       | 4 ++--
 pkgs/desktops/kde-4.7/libs/default.nix  | 7 ++-----
 pkgs/desktops/kde-4.7/okular.nix        | 4 ++--
 pkgs/desktops/kde-4.7/workspace.nix     | 3 ++-
 10 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/baseapps.nix b/pkgs/desktops/kde-4.7/baseapps.nix
index e32b1f6fcc2..61f52cc7454 100644
--- a/pkgs/desktops/kde-4.7/baseapps.nix
+++ b/pkgs/desktops/kde-4.7/baseapps.nix
@@ -1,12 +1,12 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
-, shared_desktop_ontologies, glib
+, shared_desktop_ontologies, glib, phonon
 }:
 
 kde.package {
 
   buildInputs =
     [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
-      glib
+      glib phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix
index f349b2f7920..26687c709a1 100644
--- a/pkgs/desktops/kde-4.7/gwenview.nix
+++ b/pkgs/desktops/kde-4.7/gwenview.nix
@@ -1,11 +1,12 @@
 { kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
-, shared_desktop_ontologies, kde_baseapps, libkipi }:
+, shared_desktop_ontologies, kde_baseapps, libkipi, phonon
+}:
 
 kde.package {
 
   buildInputs =
     [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
-      kde_baseapps libkipi
+      kde_baseapps libkipi phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/kate.nix b/pkgs/desktops/kde-4.7/kate.nix
index 6dfde7f76e1..f5b445791b1 100644
--- a/pkgs/desktops/kde-4.7/kate.nix
+++ b/pkgs/desktops/kde-4.7/kate.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl }:
+{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
 
   meta = {
     description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
diff --git a/pkgs/desktops/kde-4.7/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kcolorchooser.nix
index 929d0f09de6..0b9f2dcba74 100644
--- a/pkgs/desktops/kde-4.7/kcolorchooser.nix
+++ b/pkgs/desktops/kde-4.7/kcolorchooser.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "KDE color chooser utility";
diff --git a/pkgs/desktops/kde-4.7/konsole.nix b/pkgs/desktops/kde-4.7/konsole.nix
index 4b07cf1e0e7..4965921fcc6 100644
--- a/pkgs/desktops/kde-4.7/konsole.nix
+++ b/pkgs/desktops/kde-4.7/konsole.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "Konsole, the KDE terminal emulator";
diff --git a/pkgs/desktops/kde-4.7/ksnapshot.nix b/pkgs/desktops/kde-4.7/ksnapshot.nix
index 1f5af060ba4..6eadbd88c65 100644
--- a/pkgs/desktops/kde-4.7/ksnapshot.nix
+++ b/pkgs/desktops/kde-4.7/ksnapshot.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libkipi }:
+{ automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
 
   meta = {
     description = "KDE screenshot utility";
diff --git a/pkgs/desktops/kde-4.7/libkipi.nix b/pkgs/desktops/kde-4.7/libkipi.nix
index cb1e556af98..bb80755f9f2 100644
--- a/pkgs/desktops/kde-4.7/libkipi.nix
+++ b/pkgs/desktops/kde-4.7/libkipi.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "Interface library to kipi-plugins";
diff --git a/pkgs/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
index b8b0b3d7367..7f246e61f97 100644
--- a/pkgs/desktops/kde-4.7/libs/default.nix
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -3,7 +3,7 @@
 , 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
+, getopt, udev, herqq, phonon, gettext
 }:
 
 kde.package {
@@ -12,7 +12,7 @@ kde.package {
     [ 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 
+      shared_mime_info soprano strigi udev xz phonon libxml2
     ];
     
   # TODO: make sonnet plugins (dictionaries) really work.
@@ -20,9 +20,6 @@ kde.package {
   # Let kdelibs find openexr
   # Split plugins from libs?
 
-  #propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
-  #  shared_desktop_ontologies ];
-
   patches = [ ./polkit-install.patch ];
 
   # cmake fails to find acl.h because of C++-style comment
diff --git a/pkgs/desktops/kde-4.7/okular.nix b/pkgs/desktops/kde-4.7/okular.nix
index ef5069cd68c..1b9ab5f2706 100644
--- a/pkgs/desktops/kde-4.7/okular.nix
+++ b/pkgs/desktops/kde-4.7/okular.nix
@@ -1,11 +1,11 @@
 { automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
-, popplerQt4, qca2, qimageblitz, qt4 }:
+, popplerQt4, qca2, qimageblitz, qt4, phonon }:
 
 kde.package {
 
   buildInputs =
     [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
-      qca2 qimageblitz qt4
+      qca2 qimageblitz qt4 phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index e78cbe75609..e248f2a38e1 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,6 +1,7 @@
 { 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
 }:
 
 kde.package {
@@ -11,7 +12,7 @@ kde.package {
       xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
       xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate akonadi perl consolekit
+      libusb python libqalculate akonadi perl consolekit phonon
     ];
 
   # Workaround for undefined reference to ‘dlsym’ in

From 4437b6c49e3fcf8efc399cb56d08fdb5956ee0cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 11:57:18 +0000
Subject: [PATCH 045/116] * libdbusmenu-qt updated to 0.8.3.

svn path=/nixpkgs/branches/kde-4.7/; revision=27816
---
 pkgs/development/libraries/libdbusmenu-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index f21a1f9ab79..3c138cca416 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "libdbusmenu-qt";
-  v = "0.8.2";
+  v = "0.8.3";
 in
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "0fazwj4nhh9lr7zwz9ih20i6w60zlni3hcdwj6kz6521bkr8zg2s";
+    sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka";
   };
 
   buildInputs = [ cmake qt4 doxygen ];

From 7ae6dbd7d665f6e7844c98a3eb69d6df3bddedc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 12:37:50 +0000
Subject: [PATCH 046/116] * Add the GStreamer backend for Phonon.

svn path=/nixpkgs/branches/kde-4.7/; revision=27819
---
 pkgs/desktops/kde-4.7/default.nix             |  2 ++
 .../kde-4.7/phonon-backend-gstreamer.nix      | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 385d28ab93e..dc32da95f63 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -40,6 +40,8 @@ recurseIntoAttrs rec {
 
   phonon = callPackage ./phonon.nix { };
 
+  phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { };
+
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
diff --git a/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix b/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
new file mode 100644
index 00000000000..20e3d97b228
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
@@ -0,0 +1,22 @@
+{ 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";
+  };  
+}

From 49d38b9b9963d3e7eeb611bbfb46bcf31434f68d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 15:28:51 +0000
Subject: [PATCH 047/116] * qemu-kvm: use ALSA instead of OSS.

svn path=/nixpkgs/branches/kde-4.7/; revision=27828
---
 pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

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

From 1352c90c8a15b67bbc45d5db069e3d47effe1efd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 16:08:15 +0000
Subject: [PATCH 048/116] * MPlayer: don't build the OSS backend.

svn path=/nixpkgs/branches/kde-4.7/; revision=27829
---
 pkgs/applications/video/MPlayer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 0921c95f51c..348a5e7e323 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -136,6 +136,7 @@ stdenv.mkDerivation rec {
     --disable-ivtv
     --enable-vidix
     --enable-fbdev
+    --disable-ossaudio
   '';
 
   NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";

From b32ea60b4e926d431c47c1a4fb9ed7f164a651b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 11:53:49 +0000
Subject: [PATCH 049/116] * Remove some obsolete expressions.

svn path=/nixpkgs/branches/kde-4.7/; revision=27868
---
 .../desktops/kde-4.7/base-runtime/default.nix | 24 --------------
 .../kde-4.7/base-workspace/default.nix        | 31 -------------------
 .../no-software-compositing.patch             | 17 ----------
 pkgs/desktops/kde-4.7/base/default.nix        | 16 ----------
 4 files changed, 88 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/base-runtime/default.nix
 delete mode 100644 pkgs/desktops/kde-4.7/base-workspace/default.nix
 delete mode 100644 pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch
 delete mode 100644 pkgs/desktops/kde-4.7/base/default.nix

diff --git a/pkgs/desktops/kde-4.7/base-runtime/default.nix b/pkgs/desktops/kde-4.7/base-runtime/default.nix
deleted file mode 100644
index 293bc8dd04d..00000000000
--- a/pkgs/desktops/kde-4.7/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.name = "kdebase-runtime";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/base-workspace/default.nix b/pkgs/desktops/kde-4.7/base-workspace/default.nix
deleted file mode 100644
index 0fbafd2e407..00000000000
--- a/pkgs/desktops/kde-4.7/base-workspace/default.nix
+++ /dev/null
@@ -1,31 +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, networkmanager
-}:
-
-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 networkmanager ];
-
-  patches =
-    [ # Don't do compositing with the software GLX driver, since it's
-      # completely broken (corrupt output, server crashes, etc.).
-      # (NixOS/121)
-      ./no-software-compositing.patch
-    ];
-
-  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.name = "kdebase-workspace";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch b/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch
deleted file mode 100644
index 7c9e102bc95..00000000000
--- a/pkgs/desktops/kde-4.7/base-workspace/no-software-compositing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp
---- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp	2010-06-24 18:28:18.000000000 +0200
-+++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp	2011-03-11 16:33:07.296566718 +0100
-@@ -314,9 +314,10 @@
-     //else if( mDriver == "radeon" )
-     //    {
-     //    }
--    //else if( mDriver == "software" )
--    //    {
--    //    }
-+    else if( mDriver == "software" )
-+        {
-+        mRecommendCompositing = false;
-+        }
-     }
- 
- 
diff --git a/pkgs/desktops/kde-4.7/base/default.nix b/pkgs/desktops/kde-4.7/base/default.nix
deleted file mode 100644
index 2f0c78e5f01..00000000000
--- a/pkgs/desktops/kde-4.7/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.name = "kdebase";
-  };
-}

From ef041b7aa373c03433d5b730096af3ab321cff1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 11:56:11 +0000
Subject: [PATCH 050/116] * Hack to fix evaluation.

svn path=/nixpkgs/branches/kde-4.7/; revision=27869
---
 pkgs/desktops/kde-4.7/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index dc32da95f63..153b894e045 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,7 @@ recurseIntoAttrs rec {
 
   kdelibs = callPackage ./libs { };
 
-  kdepimlibs = callPackage ./pimlibs { };
+  #kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
 
@@ -79,6 +79,7 @@ recurseIntoAttrs rec {
 
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
+  /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
@@ -165,9 +166,11 @@ recurseIntoAttrs rec {
 
   kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ./pim { };
+  */
 
 ### DEVELOPMENT
 
+  /*
   kdebindings = callPackage ./bindings { };
 
   l10n = callPackage ./l10n { inherit release; };
@@ -175,5 +178,6 @@ recurseIntoAttrs rec {
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs
     (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
+  */
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25219e18ef0..e1194a077a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3001,6 +3001,8 @@ let
 
   clucene_core = callPackage ../development/libraries/clucene-core { };
 
+  cluceneCore = clucene_core; # !!! remove this
+
   clutter = callPackage ../development/libraries/clutter {
     inherit (gnome) glib pango gtk;
   };

From 7582e841e28bddded26f8ff87a2780a914dcd785 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 12:14:20 +0000
Subject: [PATCH 051/116] * Update xkeyboard-config to 2.1.  (The latest
 version, 2.3, requires   a newer version of libX11 than we have.)

svn path=/nixpkgs/branches/kde-4.7/; revision=27870
---
 pkgs/data/misc/xkeyboard-config/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 ];
 

From 439714b3fa8c47d5488a62bba95ad52d7f7daf68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 12:33:44 +0000
Subject: [PATCH 052/116] * Allow KDE to find the xkeyboard-config files.

svn path=/nixpkgs/branches/kde-4.7/; revision=27871
---
 pkgs/desktops/kde-4.7/workspace.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index e248f2a38e1..c87b709aa1d 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,7 +1,7 @@
 { 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
+, phonon, xkeyboard_config
 }:
 
 kde.package {
@@ -23,6 +23,10 @@ kde.package {
    ''
      # 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 = {

From 23831b76e38632ace39c9f8b8593fbefebbe5a00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 17:31:57 +0000
Subject: [PATCH 053/116] * dbus-python updated to 0.84.0.

svn path=/nixpkgs/branches/kde-4.7/; revision=27882
---
 .../python-modules/dbus/default.nix           | 27 +++++--------------
 pkgs/top-level/all-packages.nix               |  5 +---
 2 files changed, 8 insertions(+), 24 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1194a077a8..f4c6c822a69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1178,10 +1178,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;

From 9253901104b6c3a9ebe73586d6f7af34deed222c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 17:32:35 +0000
Subject: [PATCH 054/116] * Whitespace.

svn path=/nixpkgs/branches/kde-4.7/; revision=27883
---
 pkgs/development/libraries/gpgme/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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";
 }

From 489d1be9186d1954bf16c6efd9290e6057cf2159 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 18:21:38 +0000
Subject: [PATCH 055/116] * Cmake updated to 2.8.5.  Also added a patch that
 prevents Cmake from   looking in /usr and similar locations.  However, it
 *will* now look   in the Nixpkgs Glibc lib and include directories.  This
 ensures that   find_library can find libraries in Glibc.

svn path=/nixpkgs/branches/kde-4.7/; revision=27884
---
 .../tools/build-managers/cmake/default.nix    | 34 +++++--
 .../build-managers/cmake/search-path.patch    | 95 +++++++++++++++++++
 2 files changed, 119 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index bc667749625..081313972df 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";
+  minorVersion = "5";
   version = "${majorVersion}.${minorVersion}";
 in
+
 stdenv.mkDerivation rec {
   name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
 
@@ -16,26 +18,38 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
+    sha256 = "148bxnn5msl1zg366cdgxy2inzjj0n4jlhakymj6qr81bzvvy62y";
   };
 
+  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.

From aa6f8184b5d417c59621594e5b3544762e60d48f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 19:16:21 +0000
Subject: [PATCH 056/116] * Update kdepimlibs. * Remove unnecessary NIX_LDFLAGS
 hacks.

svn path=/nixpkgs/branches/kde-4.7/; revision=27887
---
 pkgs/desktops/kde-4.7/default.nix         |  2 +-
 pkgs/desktops/kde-4.7/pimlibs/default.nix | 12 +++++++-----
 pkgs/desktops/kde-4.7/runtime.nix         |  3 ---
 pkgs/desktops/kde-4.7/workspace.nix       |  7 ++-----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 153b894e045..ff4a61ad9b2 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,7 @@ recurseIntoAttrs rec {
 
   kdelibs = callPackage ./libs { };
 
-  #kdepimlibs = callPackage ./pimlibs { };
+  kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
 
diff --git a/pkgs/desktops/kde-4.7/pimlibs/default.nix b/pkgs/desktops/kde-4.7/pimlibs/default.nix
index a1e26384e47..643569352cd 100644
--- a/pkgs/desktops/kde-4.7/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.7/pimlibs/default.nix
@@ -1,11 +1,13 @@
-{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, automoc4, akonadi, soprano}:
+{ 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 automoc4 perl shared_mime_info ];
-  propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
-    akonadi soprano ];
+  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";
diff --git a/pkgs/desktops/kde-4.7/runtime.nix b/pkgs/desktops/kde-4.7/runtime.nix
index 3674e4e3357..6e6b9aa32a0 100644
--- a/pkgs/desktops/kde-4.7/runtime.nix
+++ b/pkgs/desktops/kde-4.7/runtime.nix
@@ -11,9 +11,6 @@ kde.package {
       (libcanberra.override { gtk = null; })
     ];
 
-  # Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
-  NIX_LDFLAGS = "-lutil";
-    
   meta = {
     license = "LGPL";
     kde.name = "kde-runtime";
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index c87b709aa1d..f1aaed0cb47 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,7 +1,7 @@
 { 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
+, phonon, xkeyboard_config, kdepimlibs
 }:
 
 kde.package {
@@ -13,12 +13,9 @@ kde.package {
       xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
       libusb python libqalculate akonadi perl consolekit phonon
+      kdepimlibs
     ];
 
-  # Workaround for undefined reference to ‘dlsym’ in
-  # kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
-  NIX_LDFLAGS = "-ldl -lrt";
-
   preConfigure =
    ''
      # Fix incorrect path to kde4-config.

From 8b4730bdbdcc85c78a5cd49c783f4ba6f2df9a07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 20:14:17 +0000
Subject: [PATCH 057/116] * Update pycups, PyQt and SIP.

svn path=/nixpkgs/branches/kde-4.7/; revision=27889
---
 .../python-modules/pycups/default.nix         | 13 ++++---
 .../python-modules/pyqt/default.nix           | 38 +++++++++----------
 .../python-modules/python-sip/default.nix     |  6 +--
 3 files changed, 27 insertions(+), 30 deletions(-)

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..4bce2dd8b21 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -1,39 +1,35 @@
-{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
-    lndir ${pythonDBus} $out
-    export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
+  configurePhase = ''
+    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)
-    '';
+      --dbus=${pythonDBus}/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 sip qt4 pythonDBus ];
 
   postInstall = ''
     for i in $out/bin/*; do
-      wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
-    done'';
+      wrapProgram $i --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages:$PYTHONPATH
+    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";

From 5a03576cb499ae3e52f61fbc11292bc50d692842 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 21:54:40 +0000
Subject: [PATCH 058/116] * Update kdegames.

svn path=/nixpkgs/branches/kde-4.7/; revision=27894
---
 pkgs/desktops/kde-4.7/default.nix             |  6 +++++
 pkgs/desktops/kde-4.7/games.nix               | 26 +++++++++++++++++++
 pkgs/desktops/kde-4.7/games/default.nix       | 19 --------------
 pkgs/desktops/kde-4.7/pykde4.nix              | 23 ++++++++++++++++
 pkgs/development/libraries/attica/default.nix |  5 +++-
 .../python-modules/pyqt/default.nix           |  4 ++-
 6 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/games.nix
 delete mode 100644 pkgs/desktops/kde-4.7/games/default.nix
 create mode 100644 pkgs/desktops/kde-4.7/pykde4.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index ff4a61ad9b2..373b3ee7819 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -61,6 +61,10 @@ recurseIntoAttrs rec {
   # Backwards compatibility.
   kdebase_workspace = kde_workspace;
 
+### BINDINGS
+
+  pykde4 = callPackage ./pykde4.nix { };
+
 ### OTHER MODULES
 
   gwenview = callPackage ./gwenview.nix { };
@@ -79,6 +83,8 @@ recurseIntoAttrs rec {
 
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
+  kdegames = callPackage ./games.nix { };
+
   /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
diff --git a/pkgs/desktops/kde-4.7/games.nix b/pkgs/desktops/kde-4.7/games.nix
new file mode 100644
index 00000000000..93a262452e5
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/games.nix
@@ -0,0 +1,26 @@
+{ 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.7/games/default.nix b/pkgs/desktops/kde-4.7/games/default.nix
deleted file mode 100644
index a83b2a9494a..00000000000
--- a/pkgs/desktops/kde-4.7/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.name = "kdegames";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/pykde4.nix b/pkgs/desktops/kde-4.7/pykde4.nix
new file mode 100644
index 00000000000..cca4e89279f
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/pykde4.nix
@@ -0,0 +1,23 @@
+{ kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
+, soprano, kdepimlibs, shared_desktop_ontologies, boost }:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
+      kdepimlibs shared_desktop_ontologies boost
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+    kde.name = "pykde4";
+  };
+}
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 0eff2cbb4eb..95de0834f29 100644
--- a/pkgs/development/libraries/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/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 4bce2dd8b21..1f53b15d5f9 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
     python configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
-  buildInputs = [ python pkgconfig makeWrapper sip qt4 pythonDBus ];
+  buildInputs = [ python pkgconfig makeWrapper qt4 ];
+
+  propagatedBuildInputs = [ sip pythonDBus ];
 
   postInstall = ''
     for i in $out/bin/*; do

From f9320cb33a34efb1a7a294e6aa62cae496f30530 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 22:18:41 +0000
Subject: [PATCH 059/116] * Update system-config-printer to 1.3.4.

svn path=/nixpkgs/branches/kde-4.7/; revision=27896
---
 .../misc/system-config-printer/default.nix    | 37 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 99873766024..4195a69b071 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,27 +1,38 @@
-{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
+}:
 
 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 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4c6c822a69..234d258b3e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1327,7 +1327,6 @@ let
   svnfs = callPackage ../tools/filesystems/svnfs { };
 
   system_config_printer = callPackage ../tools/misc/system-config-printer {
-    inherit (pythonPackages) notify;
     libxml2 = libxml2Python;
    };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81c80200b29..c40a074f95c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -910,6 +910,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/;

From a75f9edd105c026df2c1e4adb36ff30ddb4c0e3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 22:18:52 +0000
Subject: [PATCH 060/116] svn path=/nixpkgs/branches/kde-4.7/; revision=27897

---
 pkgs/tools/misc/system-config-printer/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 4195a69b071..92cc86eeef9 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      
       wrapPythonPrograms
       ( cd $out/share/system-config-printer/troubleshoot
         mv .__init__.py-wrapped __init__.py

From 9379248ef31de5e689df7e3ea2fe6339f1d17759 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jul 2011 01:28:09 +0000
Subject: [PATCH 061/116] * Update kdeadmin and kdegames.

svn path=/nixpkgs/branches/kde-4.7/; revision=27898
---
 pkgs/desktops/kde-4.7/admin.nix               | 50 +++++++++++++++++++
 pkgs/desktops/kde-4.7/admin/builder.sh        | 13 -----
 pkgs/desktops/kde-4.7/admin/default.nix       | 23 ---------
 pkgs/desktops/kde-4.7/default.nix             |  2 +
 pkgs/desktops/kde-4.7/games.nix               |  5 +-
 pkgs/desktops/kde-4.7/pykde4.nix              | 10 +++-
 .../python-modules/pyqt/default.nix           | 13 +++--
 .../misc/system-config-printer/default.nix    |  5 +-
 8 files changed, 74 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/admin.nix
 delete mode 100644 pkgs/desktops/kde-4.7/admin/builder.sh
 delete mode 100644 pkgs/desktops/kde-4.7/admin/default.nix

diff --git a/pkgs/desktops/kde-4.7/admin.nix b/pkgs/desktops/kde-4.7/admin.nix
new file mode 100644
index 00000000000..60a4d3e65c8
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/admin.nix
@@ -0,0 +1,50 @@
+{ kde, cmake, qt4, pkgconfig, perl, pythonPackages
+, sip, pycups, pygobject, system_config_printer
+, kdelibs, automoc4, phonon, kdepimlibs, pykde4
+, cups, nettools } @ args:
+
+let
+
+  system_config_printer = args.system_config_printer.override { withGUI = false; };
+
+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.7/admin/builder.sh b/pkgs/desktops/kde-4.7/admin/builder.sh
deleted file mode 100644
index 78e29543c1f..00000000000
--- a/pkgs/desktops/kde-4.7/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.7/admin/default.nix b/pkgs/desktops/kde-4.7/admin/default.nix
deleted file mode 100644
index c3b5a70b1dc..00000000000
--- a/pkgs/desktops/kde-4.7/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.name = "kdeadmin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 373b3ee7819..83af1eaeb4d 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -83,6 +83,8 @@ recurseIntoAttrs rec {
 
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
+  kdeadmin = callPackage ./admin.nix { };
+
   kdegames = callPackage ./games.nix { };
 
   /*
diff --git a/pkgs/desktops/kde-4.7/games.nix b/pkgs/desktops/kde-4.7/games.nix
index 93a262452e5..c005e508868 100644
--- a/pkgs/desktops/kde-4.7/games.nix
+++ b/pkgs/desktops/kde-4.7/games.nix
@@ -13,10 +13,7 @@ kde.package rec {
     
   # TODO: ggz
 
-  postInstall =
-    ''
-      wrapPythonPrograms
-    '';
+  postInstall = "wrapPythonPrograms";
 
   meta = {
     description = "KDE Games";
diff --git a/pkgs/desktops/kde-4.7/pykde4.nix b/pkgs/desktops/kde-4.7/pykde4.nix
index cca4e89279f..2b5420f552a 100644
--- a/pkgs/desktops/kde-4.7/pykde4.nix
+++ b/pkgs/desktops/kde-4.7/pykde4.nix
@@ -1,11 +1,11 @@
 { kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
-, soprano, kdepimlibs, shared_desktop_ontologies, boost }:
+, soprano, kdepimlibs, shared_desktop_ontologies, boost, lndir }:
 
 kde.package {
 
   buildInputs =
     [ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
-      kdepimlibs shared_desktop_ontologies boost
+      kdepimlibs shared_desktop_ontologies boost lndir
     ];
 
   NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
@@ -14,6 +14,12 @@ kde.package {
     ''
       substituteInPlace CMakeLists.txt \
         --replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+
+      # 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 = {
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 1f53b15d5f9..988599a04da 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
   };
   
   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'"
   
@@ -16,18 +21,18 @@ stdenv.mkDerivation rec {
       --confirm-license --bindir $out/bin \
       --destdir $out/lib/${python.libPrefix}/site-packages \
       --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
-      --dbus=${pythonDBus}/include/dbus-1.0 --verbose)
+      --dbus=$out/include/dbus-1.0 --verbose)
 
     python configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
-  buildInputs = [ python pkgconfig makeWrapper qt4 ];
+  buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
 
-  propagatedBuildInputs = [ sip pythonDBus ];
+  propagatedBuildInputs = [ sip ];
 
   postInstall = ''
     for i in $out/bin/*; do
-      wrapProgram $i --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages:$PYTHONPATH
+      wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
     done
   ''; # */
 
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 92cc86eeef9..a7a08f29187 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -2,6 +2,7 @@
 , makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
 , pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
 , xz, pythonPackages
+, withGUI ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +19,9 @@ stdenv.mkDerivation rec {
       pythonPackages.python pythonPackages.wrapPython
     ];
 
-  pythonPath = [ pythonDBus pycups pygtk pythonPackages.notify ];
+  pythonPath =
+    [ pythonDBus pycups pygobject ]
+    ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
     
   configureFlags = "--with-udev-rules";
 

From a5a9f1fb2e1a35dd217b58b5c8817bfa89d0ca44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jul 2011 01:54:04 +0000
Subject: [PATCH 062/116] * Fix kpythonpluginfactory.

svn path=/nixpkgs/branches/kde-4.7/; revision=27899
---
 pkgs/desktops/kde-4.7/pykde4.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/kde-4.7/pykde4.nix b/pkgs/desktops/kde-4.7/pykde4.nix
index 2b5420f552a..d5424d08c1e 100644
--- a/pkgs/desktops/kde-4.7/pykde4.nix
+++ b/pkgs/desktops/kde-4.7/pykde4.nix
@@ -15,6 +15,10 @@ kde.package {
       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.

From 012e221de9c6033fe4287ba8094c8384c36e0430 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jul 2011 23:59:59 +0000
Subject: [PATCH 063/116] * kde-workspace requires PAM.

svn path=/nixpkgs/branches/kde-4.7/; revision=27907
---
 pkgs/desktops/kde-4.7/workspace.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index f1aaed0cb47..9753a1a3eef 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,7 +1,7 @@
 { 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
+, phonon, xkeyboard_config, kdepimlibs, pam
 }:
 
 kde.package {
@@ -13,7 +13,7 @@ kde.package {
       xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
       libusb python libqalculate akonadi perl consolekit phonon
-      kdepimlibs
+      kdepimlibs pam
     ];
 
   preConfigure =

From 982a83aa2e0e2f67eadfdce2aa7eadec751a3896 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Jul 2011 01:29:51 +0000
Subject: [PATCH 064/116] * Added udisks, the replacement of the disk
 management bits of HAL   (which is obsolete). * lvm2: updated to 2.02.86. 
 Also install the pkgconfig files and   build liblvm2app. * Added libatasmart
 (udisks dependency for querying ATA SMART status). * Updated sg3_utils to
 1.31.

svn path=/nixpkgs/branches/kde-4.7/; revision=27908
---
 .../os-specific/linux/libatasmart/default.nix | 18 +++++++++++
 pkgs/os-specific/linux/lvm2/default.nix       | 11 ++++---
 pkgs/os-specific/linux/udisks/default.nix     | 32 +++++++++++++++++++
 pkgs/tools/system/sg3_utils/default.nix       |  4 +--
 pkgs/top-level/all-packages.nix               |  4 +++
 5 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/libatasmart/default.nix
 create mode 100644 pkgs/os-specific/linux/udisks/default.nix

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/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
new file mode 100644
index 00000000000..a454003869d
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -0,0 +1,32 @@
+{ 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";
+  };
+}
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 234d258b3e4..5d1c1cb2cc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5019,6 +5019,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 { };
@@ -5688,6 +5690,8 @@ let
   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;

From 174886639cb291f76cfeb0295c4329924da5fa33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Jul 2011 23:44:15 +0000
Subject: [PATCH 065/116] * Updated libnih and mountall.

svn path=/nixpkgs/branches/kde-4.7/; revision=27927
---
 pkgs/development/libraries/libnih/default.nix |  6 +-
 pkgs/os-specific/linux/mountall/default.nix   |  8 +-
 .../linux/mountall/no-plymouth.patch          | 76 +++++++++----------
 3 files changed, 45 insertions(+), 45 deletions(-)

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/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);
  

From 93f36bf9ce92eb0a7f656045c1a379329c91f2ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:28:18 +0000
Subject: [PATCH 066/116] * pm-utils updated to 1.4.1.  Also put all runtime
 dependencies in its   $PATH (because upower is called by dbus which doesn't
 allow setting   the $PATH).

svn path=/nixpkgs/branches/kde-4.7/; revision=27928
---
 pkgs/os-specific/linux/pm-utils/default.nix | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

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)"
     '';
 

From c26b778f34dc4df0cb4fbe51334326673285cf76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:29:15 +0000
Subject: [PATCH 067/116] * Added upower, which replaces HAL's power management
 functionality.

svn path=/nixpkgs/branches/kde-4.7/; revision=27929
---
 pkgs/os-specific/linux/upower/default.nix | 34 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/os-specific/linux/upower/default.nix

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
new file mode 100644
index 00000000000..4ffa873e9b5
--- /dev/null
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -0,0 +1,34 @@
+{ 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";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d1c1cb2cc5..53beee22167 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5703,6 +5703,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 { };

From 0daba7224548aaf590f02d802b0af24d69781bfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 13:52:36 +0000
Subject: [PATCH 068/116] * Updated cdparanoia to 10.2.

svn path=/nixpkgs/branches/kde-4.7/; revision=27938
---
 .../applications/audio/cdparanoia/default.nix | 14 +++---
 pkgs/applications/audio/cdparanoia/fix.patch  | 46 -------------------
 2 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/audio/cdparanoia/fix.patch

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 ----

From f709d6c2334b5dda0d8ea032a2d916efe370278b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:19:10 +0000
Subject: [PATCH 069/116] * xvidcore updated to 1.3.2.  Also create a
 libxvidcore.so symlink and   get rid of the static library.

svn path=/nixpkgs/branches/kde-4.7/; revision=27939
---
 pkgs/development/libraries/xvidcore/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 35a0de8a5f2..20b19e3dc0c 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.* libxvidcore.so)
+    '';
   
   meta = {
     description = "MPEG-4 video codec for PC";

From 5981e2c7231b20695a7fe2d24b97e99a65c1f3cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:20:56 +0000
Subject: [PATCH 070/116] * libmusicbrainz updated to 3.0.3.

svn path=/nixpkgs/branches/kde-4.7/; revision=27940
---
 pkgs/development/libraries/libmusicbrainz/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 = {

From 6c6968cf07edc746fb7239ec31553fedec91d2c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:33:38 +0000
Subject: [PATCH 071/116] * x264 updated to the latest snapshot.

svn path=/nixpkgs/branches/kde-4.7/; revision=27941
---
 pkgs/development/libraries/x264/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 = ''

From b7556bdf109240489c1af39e36a69296956468cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:34:05 +0000
Subject: [PATCH 072/116] * Now do it right.

svn path=/nixpkgs/branches/kde-4.7/; revision=27942
---
 pkgs/development/libraries/xvidcore/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 20b19e3dc0c..e03773292bb 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       rm $out/lib/*.a
-      (cd $out/lib && ln -s *.so.* libxvidcore.so)
+      (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
     '';
   
   meta = {

From 2ef93dae71423db37ee58cb10fb9c485db02e6cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:35:54 +0000
Subject: [PATCH 073/116] * ffmpeg updated to 0.8.  Disable libvorbis and
 libxvidcore support by   default because ffmpeg (libavcodec) has native
 support for those   formats.

svn path=/nixpkgs/branches/kde-4.7/; revision=27943
---
 pkgs/development/libraries/ffmpeg/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 3575e24c4f9..f4c86d67716 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -2,10 +2,10 @@
 , 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
 }:
 
@@ -17,11 +17,11 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.7-rc1";
+  name = "ffmpeg-0.8";
   
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
+    sha256 = "03zwwc1qs117pfjk9r071fbx4al3j0c85j97dgwqc0wp2z1zs9iy";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional faacSupport faac;
 
+  enableParallelBuilding = true;
+    
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [

From 4c2a6992d33e91f80765f5049187da789d4e8b50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:38:23 +0000
Subject: [PATCH 074/116] * Obsolete.

svn path=/nixpkgs/branches/kde-4.7/; revision=27944
---
 .../libraries/libmusicbrainz/find-neon.patch  | 52 -------------------
 .../libmusicbrainz/missing-include.patch      | 12 -----
 2 files changed, 64 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/find-neon.patch
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/missing-include.patch

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>

From fca12d0cf674e0d10f29a8de423b68058270cad8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 14:46:04 +0000
Subject: [PATCH 075/116] * ffmpeg: Add zlib and bzip2 to the build inputs to
 enable a few more   codecs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27945
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index f4c86d67716..5138bb12581 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -45,7 +45,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

From a6562218732ba5de420ef5cd3ac6aca4695460df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 15:08:16 +0000
Subject: [PATCH 076/116] * xine-lib: get it to build with the latest ffmpeg.

svn path=/nixpkgs/branches/kde-4.7/; revision=27946
---
 pkgs/development/libraries/xine-lib/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

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";

From 929160b86d48d36fb911d28f8e53301482522502 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 19:07:36 +0000
Subject: [PATCH 077/116] * mpeg2dec -> libmpeg2, and updated to 0.5.1.

svn path=/nixpkgs/branches/kde-4.7/; revision=27949
---
 pkgs/development/libraries/libmpeg2/default.nix | 15 +++++++++++++++
 pkgs/development/libraries/mpeg2dec/default.nix | 17 -----------------
 pkgs/top-level/all-packages.nix                 |  4 +++-
 3 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/libmpeg2/default.nix
 delete mode 100644 pkgs/development/libraries/mpeg2dec/default.nix

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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53beee22167..584986f75fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3989,7 +3989,9 @@ let
     qt = qt4;
   };
 
-  mpeg2dec = callPackage ../development/libraries/mpeg2dec { };
+  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
+
+  mpeg2dec = libmpeg2;
 
   msilbc = callPackage ../development/libraries/msilbc { };
 

From 0deb1fa33d584cbe7249b9fbe73219338b357a0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 19:08:00 +0000
Subject: [PATCH 078/116] * Updated libraw1394 and libavc1394.

svn path=/nixpkgs/branches/kde-4.7/; revision=27950
---
 pkgs/development/libraries/libavc1394/default.nix | 8 ++++----
 pkgs/development/libraries/libraw1394/default.nix | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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/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"];
   };
 }

From ac9579626ff7c000f879f8355c450cb7512a5671 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 20:10:13 +0000
Subject: [PATCH 079/116] * Updated gst-plugins-good and gst-ffmpeg.

svn path=/nixpkgs/branches/kde-4.7/; revision=27951
---
 .../gstreamer/gst-ffmpeg/default.nix          | 20 ++++++++--------
 .../gstreamer/gst-plugins-good/default.nix    | 23 +++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

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-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 18aea3761aa..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;

From fabc00a176b5539fd72124b8664f05f1f51027ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 20:10:45 +0000
Subject: [PATCH 080/116] * Added gst-plugins-ugly and gst-plugins-bad.

svn path=/nixpkgs/branches/kde-4.7/; revision=27952
---
 .../libraries/gstreamer/default.nix           |  4 +++
 .../gstreamer/gst-plugins-bad/default.nix     | 30 +++++++++++++++++++
 .../gstreamer/gst-plugins-ugly/default.nix    | 30 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
 create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 32fbec844ce..0394bb5fadb 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -7,6 +7,10 @@ rec {
 
   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-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-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+";
+  };
+}

From 9725e1376f6b6b3b9b749eb99a666d9af3f2ba71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 20:17:36 +0000
Subject: [PATCH 081/116] * Updated kdemultimedia.

svn path=/nixpkgs/branches/kde-4.7/; revision=27953
---
 pkgs/desktops/kde-4.7/default.nix            |  3 ++-
 pkgs/desktops/kde-4.7/multimedia.nix         | 18 ++++++++++++++++++
 pkgs/desktops/kde-4.7/multimedia/default.nix | 17 -----------------
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/multimedia.nix
 delete mode 100644 pkgs/desktops/kde-4.7/multimedia/default.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 83af1eaeb4d..cbdd737331a 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -86,6 +86,8 @@ recurseIntoAttrs rec {
   kdeadmin = callPackage ./admin.nix { };
 
   kdegames = callPackage ./games.nix { };
+  
+  kdemultimedia = callPackage ./multimedia.nix { };
 
   /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
@@ -116,7 +118,6 @@ recurseIntoAttrs rec {
   kdeedu = callPackage ./edu { };
   kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
-  kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
   
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.7/multimedia/default.nix b/pkgs/desktops/kde-4.7/multimedia/default.nix
deleted file mode 100644
index e18257e02a1..00000000000
--- a/pkgs/desktops/kde-4.7/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.name = "kdemultimedia";
-  };
-}

From 626b7cd9f493f821c77efcc729377184fd66f6ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 00:04:46 +0000
Subject: [PATCH 082/116] * Fix the xvinfo build.

svn path=/nixpkgs/branches/kde-4.7/; revision=27955
---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

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=\".\"";
   };

From a8dc106b711589b2a8411747e66fbb4cd5eddf46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 00:05:10 +0000
Subject: [PATCH 083/116] * alsa-plugins updated to 1.0.24.

svn path=/nixpkgs/branches/kde-4.7/; revision=27956
---
 .../linux/alsa-plugins/default.nix            | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  5 +++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index dc36757e020..da46f7853fd 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 {
-  name = "alsa-plugins-1.0.23";
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
+
+stdenv.mkDerivation rec {
+  name = "alsa-plugins-1.0.24";
 
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.23.tar.bz2;
-    sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
+    url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
+    sha256 = "0qqjhqviv07456kshhm5dd132x81i9qb60vw24zhib7y5pmi53ps";
   };
 
-  # 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 584986f75fc..7b922843cb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4834,7 +4834,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 { };

From 65be4d7202955159f7631133a50b93535f419ec0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 01:19:35 +0000
Subject: [PATCH 084/116] * alsa-plugins 1.0.24 seems to break the PulseAudio
 plugin (playback   in Audacious and Spotify stops after a second or so), so
 revert to   1.0.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27957
---
 pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index da46f7853fd..2ae39d4cf16 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.0.24";
+  name = "alsa-plugins-1.0.23";
 
   src = fetchurl {
     url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
-    sha256 = "0qqjhqviv07456kshhm5dd132x81i9qb60vw24zhib7y5pmi53ps";
+    sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
   };
 
   buildInputs =

From 3fac08a5650b1fbc31bff822797ae9adba61a004 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 02:14:19 +0000
Subject: [PATCH 085/116] * Audacious updated to 3.0.

svn path=/nixpkgs/branches/kde-4.7/; revision=27959
---
 pkgs/applications/audio/audacious/default.nix    | 14 ++++++++------
 pkgs/development/libraries/libmcs/default.nix    | 12 ++++++------
 pkgs/development/libraries/libmowgli/default.nix | 10 +++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

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/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 = {

From 933dc681e7f5d238536470444fc1e282424d915d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 14:12:33 +0000
Subject: [PATCH 086/116] * Added rtkit, a DBus system service for elevating
 the scheduling   priority of user processes.

svn path=/nixpkgs/branches/kde-4.7/; revision=27961
---
 pkgs/os-specific/linux/rtkit/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/os-specific/linux/rtkit/default.nix

diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
new file mode 100644
index 00000000000..d2e94b15d4d
--- /dev/null
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -0,0 +1,17 @@
+{ 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";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b922843cb1..da3288efc89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5627,6 +5627,8 @@ let
 
   rt73fw = callPackage ../os-specific/linux/firmware/rt73 { };
 
+  rtkit = callPackage ../os-specific/linux/rtkit { };
+
   sdparm = callPackage ../os-specific/linux/sdparm { };
 
   shadow = callPackage ../os-specific/linux/shadow { };

From af4085482560f00c139277469dce5be2f4b5c7ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 15:25:21 +0000
Subject: [PATCH 087/116] * PulseAudio: use configuration files in /etc/pulse
 to allow NixOS to   override them.

svn path=/nixpkgs/branches/kde-4.7/; revision=27965
---
 pkgs/servers/pulseaudio/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 6a525fd2a1b..5219118963c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -31,10 +31,13 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-hal --disable-jack --localstatedir=/var
+    --disable-solaris --disable-hal --disable-jack
     --disable-oss-output --disable-oss-wrapper
+    --localstatedir=/var --sysconfdir=/etc
   '';
 
+  installFlags = "sysconfdir=$(out)/etc";
+
   enableParallelBuilding = true;
 
   meta = {

From 6c4f6ceb4fa36f2758bea9cc45f7d9f2140fd24d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 11:18:57 +0000
Subject: [PATCH 088/116] * Remove the KDE 4.6 RC expressions.

svn path=/nixpkgs/branches/kde-4.7/; revision=27984
---
 .../kde-4.6/accessibility/color-schemes.nix   |  14 -
 .../kde-4.6/accessibility/icon-themes.nix     |  15 -
 pkgs/desktops/kde-4.6/accessibility/jovie.nix |  18 --
 pkgs/desktops/kde-4.6/accessibility/kmag.nix  |  17 --
 .../kde-4.6/accessibility/kmousetool.nix      |  17 --
 .../desktops/kde-4.6/accessibility/kmouth.nix |  17 --
 pkgs/desktops/kde-4.6/admin/builder.sh        |  13 -
 pkgs/desktops/kde-4.6/admin/default.nix       |  23 --
 .../kde-4.6/artwork/FindXscreensaver.cmake    |  73 -----
 pkgs/desktops/kde-4.6/artwork/aurorae.nix     |  14 -
 .../kde-4.6/artwork/color-schemes.nix         |  15 -
 .../kde-4.6/artwork/desktop-themes.nix        |  15 -
 pkgs/desktops/kde-4.6/artwork/emoticons.nix   |  15 -
 .../artwork/high-resolution-wallpapers.nix    |  15 -
 .../desktops/kde-4.6/artwork/kscreensaver.nix |  16 --
 .../kde-4.6/artwork/nuvola-icon-theme.nix     |  16 --
 pkgs/desktops/kde-4.6/artwork/phase-style.nix |  15 -
 pkgs/desktops/kde-4.6/artwork/sounds.nix      |  15 -
 pkgs/desktops/kde-4.6/artwork/wallpapers.nix  |  15 -
 .../kde-4.6/artwork/weather-wallpapers.nix    |  15 -
 .../desktops/kde-4.6/base-runtime/default.nix |  24 --
 .../kde-4.6/base-workspace/default.nix        |  24 --
 pkgs/desktops/kde-4.6/base/default.nix        |  16 --
 pkgs/desktops/kde-4.6/bindings/default.nix    |  34 ---
 .../python-site-packages-install-dir.diff     |  54 ----
 pkgs/desktops/kde-4.6/bindings/sip-4.11.patch |  67 -----
 pkgs/desktops/kde-4.6/default.nix             | 152 ----------
 pkgs/desktops/kde-4.6/edu/default.nix         |  32 ---
 pkgs/desktops/kde-4.6/games/default.nix       |  19 --
 pkgs/desktops/kde-4.6/graphics/default.nix    |  20 --
 pkgs/desktops/kde-4.6/kde-package/default.nix |  50 ----
 .../kde-4.6/kde-package/kde-manifest.sh       |  39 ---
 .../kde-4.6/kde-package/manifest-4.6.0.nix    |  85 ------
 pkgs/desktops/kde-4.6/l10n/default.nix        |  42 ---
 pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh   |  32 ---
 pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix | 267 ------------------
 pkgs/desktops/kde-4.6/libs/default.nix        |  40 ---
 pkgs/desktops/kde-4.6/multimedia/default.nix  |  17 --
 pkgs/desktops/kde-4.6/network/default.nix     |  33 ---
 .../desktops/kde-4.6/network/log-feature.diff |  60 ----
 .../desktops/kde-4.6/oxygen-icons/default.nix |  15 -
 pkgs/desktops/kde-4.6/pim-runtime/default.nix |  25 --
 pkgs/desktops/kde-4.6/pim/default.nix         |  32 ---
 pkgs/desktops/kde-4.6/pimlibs/default.nix     |  15 -
 .../kde-4.6/plasma-addons/default.nix         |  20 --
 pkgs/desktops/kde-4.6/sdk/cervisia.nix        |  16 --
 pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix |  16 --
 pkgs/desktops/kde-4.6/sdk/find-svn.patch      |  59 ----
 pkgs/desktops/kde-4.6/sdk/kapptemplate.nix    |  17 --
 pkgs/desktops/kde-4.6/sdk/kate.nix            |  16 --
 pkgs/desktops/kde-4.6/sdk/kbugbuster.nix      |  17 --
 pkgs/desktops/kde-4.6/sdk/kcachegrind.nix     |  17 --
 .../kde-4.6/sdk/kdeaccounts-plugin.nix        |  15 -
 .../desktops/kde-4.6/sdk/kioslave-perldoc.nix |  18 --
 pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix    |  17 --
 pkgs/desktops/kde-4.6/sdk/kmtrace.nix         |  16 --
 pkgs/desktops/kde-4.6/sdk/kompare.nix         |  17 --
 pkgs/desktops/kde-4.6/sdk/kpartloader.nix     |  17 --
 pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix  |  16 --
 pkgs/desktops/kde-4.6/sdk/kstartperf.nix      |  17 --
 pkgs/desktops/kde-4.6/sdk/kuiviewer.nix       |  17 --
 pkgs/desktops/kde-4.6/sdk/lokalize.nix        |  20 --
 pkgs/desktops/kde-4.6/sdk/optional-docs.diff  |  39 ---
 pkgs/desktops/kde-4.6/sdk/poxml.nix           |  15 -
 pkgs/desktops/kde-4.6/sdk/scripts.nix         |  15 -
 pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix |  15 -
 pkgs/desktops/kde-4.6/sdk/umbrello.nix        |  16 --
 .../kde-4.6/support/akonadi/default.nix       |  17 --
 .../kde-4.6/support/attica/default.nix        |  16 --
 .../kde-4.6/support/polkit-qt-1/default.nix   |  20 --
 .../support/polkit-qt-1/policy-files.patch    |  25 --
 .../kde-4.6/support/soprano/default.nix       |  22 --
 pkgs/desktops/kde-4.6/toys/amor.nix           |  16 --
 pkgs/desktops/kde-4.6/toys/kteatime.nix       |  16 --
 pkgs/desktops/kde-4.6/toys/ktux.nix           |  16 --
 pkgs/desktops/kde-4.6/utils/ark.nix           |  21 --
 pkgs/desktops/kde-4.6/utils/kcalc.nix         |  16 --
 pkgs/desktops/kde-4.6/utils/kcharselect.nix   |  16 --
 pkgs/desktops/kde-4.6/utils/kdf.nix           |  16 --
 pkgs/desktops/kde-4.6/utils/kfloppy.nix       |  14 -
 pkgs/desktops/kde-4.6/utils/kgpg.nix          |  16 --
 .../desktops/kde-4.6/utils/kremotecontrol.nix |  14 -
 pkgs/desktops/kde-4.6/utils/ktimer.nix        |  16 --
 pkgs/desktops/kde-4.6/utils/kwallet.nix       |  16 --
 pkgs/desktops/kde-4.6/utils/okteta.nix        |  16 --
 .../desktops/kde-4.6/utils/printer-applet.nix |  22 --
 pkgs/desktops/kde-4.6/utils/superkaramba.nix  |  18 --
 pkgs/desktops/kde-4.6/utils/sweeper.nix       |  16 --
 pkgs/desktops/kde-4.6/webdev/kfilereplace.nix |  17 --
 .../kde-4.6/webdev/kimagemapeditor.nix        |  17 --
 pkgs/desktops/kde-4.6/webdev/klinkstatus.nix  |  19 --
 pkgs/desktops/kde-4.6/webdev/kommander.nix    |  16 --
 pkgs/top-level/all-packages.nix               |   4 -
 93 files changed, 2453 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/icon-themes.nix
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.6/accessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.6/admin/builder.sh
 delete mode 100644 pkgs/desktops/kde-4.6/admin/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/aurorae.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/desktop-themes.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/phase-style.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/sounds.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.6/base-runtime/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/base-workspace/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/base/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/bindings/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff
 delete mode 100644 pkgs/desktops/kde-4.6/bindings/sip-4.11.patch
 delete mode 100644 pkgs/desktops/kde-4.6/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/edu/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/games/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/graphics/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
 delete mode 100644 pkgs/desktops/kde-4.6/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
 delete mode 100644 pkgs/desktops/kde-4.6/libs/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/multimedia/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/network/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/network/log-feature.diff
 delete mode 100644 pkgs/desktops/kde-4.6/oxygen-icons/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/pim-runtime/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/pim/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/pimlibs/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/plasma-addons/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/find-svn.patch
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kbugbuster.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kmtrace.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kpartloader.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kstartperf.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/kuiviewer.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/optional-docs.diff
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.6/sdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.6/support/akonadi/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/support/attica/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch
 delete mode 100644 pkgs/desktops/kde-4.6/support/soprano/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/toys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.6/toys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.6/toys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/printer-applet.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.6/utils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.6/webdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.6/webdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.6/webdev/kommander.nix

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/accessibility/jovie.nix b/pkgs/desktops/kde-4.6/accessibility/jovie.nix
deleted file mode 100644
index 9270d5fb177..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/jovie.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-#TODO: working backend: speechd or opentts
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-    kde = {
-      name = "jovie";
-      module = "kdeaccessibility";
-      version = "0.6.0";
-      release = "4.5.90";
-      versionFile = "jovie/jovie/main.cpp";
-    };
-  };
-}
-
diff --git a/pkgs/desktops/kde-4.6/accessibility/kmag.nix b/pkgs/desktops/kde-4.6/accessibility/kmag.nix
deleted file mode 100644
index 207f1d0b3cb..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/kmag.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-    kde = {
-      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.6/accessibility/kmousetool.nix
deleted file mode 100644
index bb10de6e3ce..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-    kde = {
-      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.6/accessibility/kmouth.nix
deleted file mode 100644
index 6bbee6106fd..00000000000
--- a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-    kde = {
-      name = "kmouth";
-      module = "kdeaccessibility";
-      version = "1.1.1";
-      release = "4.5.90";
-      versionFile = "kmouth/version.h";
-    };
-  };
-}
-
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/FindXscreensaver.cmake b/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
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/color-schemes.nix b/pkgs/desktops/kde-4.6/artwork/color-schemes.nix
deleted file mode 100644
index ddf1cb77657..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-color-schemes-${meta.kde.version}";
-
-  buildInputs = [ cmake automoc4 kdelibs ];
-  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.6/artwork/desktop-themes.nix
deleted file mode 100644
index 4bca474f254..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-desktop-themes-${meta.kde.version}";
-
-  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.6/artwork/emoticons.nix
deleted file mode 100644
index 5ec584d4d0c..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/emoticons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-emotion-icons-${meta.kde.version}";
-
-  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.6/artwork/high-resolution-wallpapers.nix
deleted file mode 100644
index 56202288659..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-wallpapers-high-resolution-${meta.kde.version}";
-
-  buildInputs = [ cmake automoc4 kdelibs ];
-  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.6/artwork/kscreensaver.nix
deleted file mode 100644
index b7020c0e4f8..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
-
-kde.package rec {
-  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ];
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-  meta = {
-    description = "KDE screen saver and savers";
-    kde = {
-      name = "kscreensaver";
-      module = "kdeartwork";
-      version = "1.0";
-      release = "4.5.90";
-      versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp";
-    };
-  };
-}
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/artwork/sounds.nix b/pkgs/desktops/kde-4.6/artwork/sounds.nix
deleted file mode 100644
index 612bf1613f9..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/sounds.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-sounds-${meta.kde.version}";
-
-  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.6/artwork/wallpapers.nix
deleted file mode 100644
index b46d65aa550..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-wallpapers-${meta.kde.version}";
-
-  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.6/artwork/weather-wallpapers.nix
deleted file mode 100644
index d4f7d1d2a2f..00000000000
--- a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cmake, kde, automoc4, kdelibs }:
-
-kde.package rec {
-  name = "kde-weather-wallpapers-${meta.kde.version}";
-
-  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.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/bindings/default.nix b/pkgs/desktops/kde-4.6/bindings/default.nix
deleted file mode 100644
index 8c615ac3a7b..00000000000
--- a/pkgs/desktops/kde-4.6/bindings/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
-, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby
-}:
-
-# This function will only build the pykde4 module. I don't need the other bindings and
-# some bindings are even broken.
-
-kde.package rec {
-  patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ];
-
-  preConfigure = ''
-    CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
-    CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@")
-    CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
-    cmakeFlagsArray+=(
-      -DSIP_DEFAULT_SIP_DIR=$out/share/sip
-      -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
-      -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
-      -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 ];
-
-  meta = {
-    description = "KDE bindings";
-    longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
-    license = "LGPL";
-    kde.module = "kdebindings";
-  };
-}
-
diff --git a/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff
deleted file mode 100644
index 7fe64e7eff5..00000000000
--- a/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/python/pykde4/CMakeLists.txt b/python/pykde4/CMakeLists.txt
-index 01b69dc..375661d 100644
---- a/python/pykde4/CMakeLists.txt
-+++ b/python/pykde4/CMakeLists.txt
-@@ -188,12 +188,12 @@ IF(POLKITQT_FOUND)
-     SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt")
- ENDIF(POLKITQT_FOUND)
- 
--PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
-+PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
- 
- MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}")
- MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}")
- MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}")
--MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}")
-+MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}")
- 
- # Setup and install pykdeconfig.py
- 
-@@ -225,7 +225,7 @@ _pkg_config = {
-     'konsolepart':          'False',
-     'libdir':               '${LIB_DIR}',
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
--    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4',
-+    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
-     'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-     'pykde_version':        kde_version_hex,
-@@ -235,7 +235,7 @@ _pkg_config = {
- _default_macros = None")
- 
- CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py)
--PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
-+PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
-diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-index ea711ba..115c777 100644
---- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-+++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-@@ -1,5 +1,9 @@
- 
--PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
--PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
-+PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
-+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
- find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
-+  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
-+  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
diff --git a/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch
deleted file mode 100644
index 15059e2526d..00000000000
--- a/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Make kdebindings compile against sip-4.11, from KDE svn
-Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-===================================================================
---- kdebindings/python/pykde4/sip/kdecore/typedefs.sip	(revision 1170601)
-+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip	(revision 1170602)
-@@ -733,61 +733,6 @@
- };
- 
- 
--%MappedType QList<uint>
--{
--%TypeHeaderCode
--#include <qlist.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i) {
--        PyObject *pobj;
--
--#if PY_MAJOR_VERSION >= 3
--        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
--#else
--        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
--#endif
--            Py_DECREF(l);
--
--            return NULL;
--        }
--
--        PyList_SET_ITEM(l, i, pobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--        return PyList_Check(sipPy);
--
--    QList<uint> *ql = new QList<uint>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--#if PY_MAJOR_VERSION >= 3
--        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
--#else
--        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
--#endif        
--    }
--    
--    *sipCppPtr = ql;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE*>
- %MappedType QStack<TYPE*>
- {
diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
deleted file mode 100644
index b117535494a..00000000000
--- a/pkgs/desktops/kde-4.6/default.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
-
-let
-
-  release = "4.6.0";
-
-  # Various packages (e.g. kdesdk) have been split up into many
-  # smaller packages.  Some people may want to install the entire
-  # package, so provide a wrapper package that recombines them.
-  combinePkgs = name: pkgs:
-    let pkgs' = stdenv.lib.attrValues pkgs; in
-    runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; })
-      ''
-        mkdir -p $out/nix-support
-        echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
-      '';
-
-in
-
-rec {
-  recurseForRelease = true;
-  inherit callPackage stdenv;
-
-  qt4 = qt47;
-
-  phonon = null;
-
-  kde = callPackage ./kde-package { inherit release; };
-
-### SUPPORT
-  akonadi = callPackage ./support/akonadi { };
-
-  attica = callPackage ./support/attica { };
-
-  oxygen_icons = callPackage ./oxygen-icons { };
-
-  polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
-
-  soprano = callPackage ./support/soprano { };
-
-### LIBS
-  kdelibs = callPackage ./libs { };
-
-  kdepimlibs = callPackage ./pimlibs { };
-
-### BASE
-  kdebase = callPackage ./base { };
-
-  kdebase_workspace = callPackage ./base-workspace { };
-
-  kdebase_runtime = callPackage ./base-runtime { };
-
-### OTHER MODULES
-
-  kdeaccessibility = combinePkgs "kdeaccessibility" {
-    colorSchemes = callPackage ./accessibility/color-schemes.nix { };
-    iconThemes = callPackage ./accessibility/icon-themes.nix { };
-    jovie = callPackage ./accessibility/jovie.nix { };
-    kmag = callPackage ./accessibility/kmag.nix { };
-    kmousetool = callPackage ./accessibility/kmousetool.nix { };
-    kmouth = callPackage ./accessibility/kmouth.nix { };
-  };
-
-  kdeadmin = callPackage ./admin { };
-  
-  kdeartwork = combinePkgs "kdeartwork" {
-    aurorae = callPackage ./artwork/aurorae.nix { };
-    colorSchemes = 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 { };
-    wallpapers = callPackage ./artwork/wallpapers.nix { };
-    nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { };
-    sounds = callPackage ./artwork/sounds.nix { };
-    weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
-    phase_style = callPackage ./artwork/phase-style.nix { };
-    kscreensaver = callPackage ./artwork/kscreensaver.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 { };
-    kprofilemethod = callPackage ./sdk/kprofilemethod.nix { };
-    kstartperf = callPackage ./sdk/kstartperf.nix { };
-    kuiviewer = callPackage ./sdk/kuiviewer.nix { };
-    lokalize = callPackage ./sdk/lokalize.nix { };
-    poxml = callPackage ./sdk/poxml.nix { };
-    scripts = callPackage ./sdk/scripts.nix { };
-    umbrello = callPackage ./sdk/umbrello.nix { };
-  };
-  
-  kdetoys = combinePkgs "kdetoys" {
-    amor = callPackage ./toys/amor.nix { };
-    kteatime = callPackage ./toys/kteatime.nix { };
-    ktux = callPackage ./toys/ktux.nix { };
-  };
-
-  kdeutils = combinePkgs "kdeutils" {
-    ark = callPackage ./utils/ark.nix { };
-    kcalc = callPackage ./utils/kcalc.nix { };
-    kcharselect = callPackage ./utils/kcharselect.nix { };
-    kdf = callPackage ./utils/kdf.nix { };
-    kfloppy = callPackage ./utils/kfloppy.nix { };
-    kgpg = callPackage ./utils/kgpg.nix { };
-    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 { };
-  };
-
-  kdewebdev = combinePkgs "kdewebdev" {
-    klinkstatus = callPackage ./webdev/klinkstatus.nix { };
-    kommander = callPackage ./webdev/kommander.nix { };
-    kfilereplace = callPackage ./webdev/kfilereplace.nix { };
-    kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
-  };
-
-  kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ./pim { };
-
-### DEVELOPMENT
-
-  kdebindings = callPackage ./bindings { };
-
-  l10n = callPackage ./l10n { inherit release; };
-
-  # Make the split packages visible to `nix-env -q'.
-  misc = recurseIntoAttrs
-    (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
-
-}
diff --git a/pkgs/desktops/kde-4.6/edu/default.nix b/pkgs/desktops/kde-4.6/edu/default.nix
deleted file mode 100644
index 2227975a955..00000000000
--- a/pkgs/desktops/kde-4.6/edu/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
-, xplanet, libspectre, pkgconfig, libqalculate, python
-, kdelibs, automoc4, eigen, attica}:
-
-kde.package {
-
-#TODO:
-#* Boost.Python (1.31 or higher)  <http://www.boost.org/> - fails to find
-# * libcfitsio0 (3.09 or higher)  <http://indi.sf.net>
-# * libindi (0.6.1 or higher)  <http://indi.sf.net>
-# * R  <http://www.r-project.org/>
-# * OCaml  <http://caml.inria.fr/>
-# * LibFacile  <http://www.recherche.enac.fr/log/facile/>
-# * Avogadro (1.0 or higher)  <http://avogadro.openmolecules.net>
-# * libgps
-
-  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm
-    gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig
-    libqalculate python ];
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${python}/include/${python.libPrefix}"
-    export NIX_LDFLAGS="$NIX_LDFLAGS -l${python.libPrefix} -lboost_python"
-  '';
-  cmakeFlags = '' -DBOOST_PYTHON_INCLUDES="${boost}/include" -DBOOST_PYTHON_LIBS="boost_python" -DKIG_ENABLE_PYTHON_SCRIPTING=1'';
-
-  meta = {
-    description = "KDE Educative software";
-    license = "GPL";
-    kde.module = "kdeedu";
-  };
-}
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/graphics/default.nix b/pkgs/desktops/kde-4.6/graphics/default.nix
deleted file mode 100644
index ed6527373eb..00000000000
--- a/pkgs/desktops/kde-4.6/graphics/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
-, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
-, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
-
-kde.package {
-
-  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
-    (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
-    kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ];
-
-  meta = {
-    description = "KDE graphics utilities";
-    longDescription = ''
-      Contains various graphics utilities such as Gwenview image viewer and
-      Okular  document reader.
-    '';
-    license = "GPL";
-    kde.module = "kdegraphics";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/kde-package/default.nix b/pkgs/desktops/kde-4.6/kde-package/default.nix
deleted file mode 100644
index de3cf05b70d..00000000000
--- a/pkgs/desktops/kde-4.6/kde-package/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, release }:
-
-rec {
-  inherit release;
-
-  manifest = import (./manifest + "-${release}.nix");
-
-  defaultArgs = { module, name ? module, ... }:
-
-    (
-      {
-        name = "${name}-${release}";
-
-        src = fetchurl {
-          url = "mirror://kde/" + (if manifest.stable then "" else "un")
-            + "stable/${release}/src/${module}-${release}.tar.bz2";
-          sha256 = builtins.getAttr module manifest.packages;
-        };
-
-        meta = {
-          maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-          platforms = stdenv.lib.platforms.linux;
-        };
-      } // (if module == name then { } else {
-        cmakeFlags = ''
-          -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
-          -DBUILD_doc=TRUE -DBUILD_${name}=TRUE'';
-      })
-    );
-
-  package = a@{meta, ...}:
-    assert a.meta ? kde;
-    let
-      default = defaultArgs a.meta.kde;
-    in
-# hand-written merge
-    stdenv.mkDerivation (
-      default
-        // removeAttrs a [ "meta" "cmakeFlags" ]
-        // {
-          meta = default.meta // a.meta;
-        }
-        // (if default ? cmakeFlags || a ? cmakeFlags then {
-          cmakeFlags =
-            (if default ? cmakeFlags then "${default.cmakeFlags}" else "")
-            + (if default ? cmakeFlags && a ? cmakeFlags then " " else "")
-            + (if a ? cmakeFlags then a.cmakeFlags else "");
-        } else { }
-      ));
-}
diff --git a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh
deleted file mode 100755
index fbaf490e8be..00000000000
--- a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-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 ["
-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 $hash >&2
-done
-echo "  ];"
-echo "}"
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/default.nix b/pkgs/desktops/kde-4.6/l10n/default.nix
deleted file mode 100644
index 22acca2d1cf..00000000000
--- a/pkgs/desktops/kde-4.6/l10n/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  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 ];
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
deleted file mode 100755
index cc0eec20aaa..00000000000
--- a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
-  lang=${i%-${release}.tar.bz2}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
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/network/default.nix b/pkgs/desktops/kde-4.6/network/default.nix
deleted file mode 100644
index c7c38611731..00000000000
--- a/pkgs/desktops/kde-4.6/network/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kde, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
-, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
-, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
-, kdebase_workspace
-, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
-
-kde.package {
-
-  buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
-    libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
-    libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano
-    qimageblitz strigi libktorrent kdebase kdebase_workspace ];
-
-  patches = [ ./log-feature.diff ];
-#TODO
-# * telepathy-qt4 (0.18 or higher)  <http://telepathy.freedesktop.org>
-# * KWebKitPart  <https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart>
-# * libortp (0.13 or higher)  <http://www.linphone.org/index.php/eng/code_review/ortp>
-# * XMMS  <http://www.xmms.org>
-# * mediastreamer (2.3.0 or higher)  <http://www.linphone.org/index.php/eng/code_review/mediastreamer2>
-# * libmeanwhile  <http://meanwhile.sf.net>
-# * libgadu (1.8.0 or higher)  <http://toxygen.net/libgadu/>
-
-# Let cmake find libktorrent. Waiting for upstream fix
-  KDEDIRS="${libktorrent}";
-
-  meta = {
-    description = "KDE network utilities";
-    longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
-    license = "GPL";
-    kde.module = "kdenetwork";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/network/log-feature.diff b/pkgs/desktops/kde-4.6/network/log-feature.diff
deleted file mode 100644
index 6770dd399e3..00000000000
--- a/pkgs/desktops/kde-4.6/network/log-feature.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/kget/CMakeLists.txt	2010-08-16 19:08:36.000000000 +0400
-+++ b/kget/CMakeLists.txt	2010-08-16 22:04:24.000000000 +0400
-@@ -53,21 +53,20 @@
- add_subdirectory(desktop)
- add_subdirectory(plasma)
- 
--# find kworkspace library to allow the shutdown after downloads completed option
--find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
--if(KDE4_KWORKSPACE_LIBRARY)
--    set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY})
-+macro_optional_find_package(KDE4Workspace)
-+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget")
-+if(KDE4WORKSPACE_FOUND)
-     add_definitions(-DHAVE_KWORKSPACE)
--    set(KWORKSPACE_FOUND true)
--endif(KDE4_KWORKSPACE_LIBRARY)
-+	include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
-+endif(KDE4WORKSPACE_FOUND)
- 
- # find libkonq to allow actions and open with options in the context menu of a transfer
--find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
--if(KDE4_KONQUEROR_LIBRARY)
--    set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
-+macro_optional_find_package(LibKonq)
-+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer")
-+if(LIBKONQ_FOUND)
-     add_definitions(-DHAVE_KONQUEROR)
--    set(KONQUEROR_FOUND true)
--endif(KDE4_KONQUEROR_LIBRARY)
-+	include_directories(${LIBKONQ_INCLUDE_DIR})
-+endif(LIBKONQ_FOUND)
- 
- 
- include_directories(
-@@ -142,9 +141,9 @@
- 
- target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
- 
--if (KWORKSPACE_FOUND)
--    target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
--endif (KWORKSPACE_FOUND)
-+if (KDE4WORKSPACE_FOUND)
-+    target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
-+endif (KDE4WORKSPACE_FOUND)
- 
- if (HAVE_NEPOMUK)
-   target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
-@@ -294,9 +293,9 @@
-   target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
- endif (HAVE_NEPOMUK)
- 
--if (KONQUEROR_FOUND)
--  target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
--endif (KONQUEROR_FOUND)
-+if (LIBKONQ_FOUND)
-+  target_link_libraries(kget ${LIBKONQ_LIBRARY})
-+endif (LIBKONQ_FOUND)
- 
- if (QGPGME_FOUND)
-   target_link_libraries(kget ${QGPGME_LIBRARIES})
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/plasma-addons/default.nix b/pkgs/desktops/kde-4.6/plasma-addons/default.nix
deleted file mode 100644
index 65e4e3a9772..00000000000
--- a/pkgs/desktops/kde-4.6/plasma-addons/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
-, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
-, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
-# TODO: qwt, scim, MARBLE!!
-
-kde.package {
-
-  preConfigure =
-    "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake";
-
-  buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
-    attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
-    libqalculate soprano libXtst kdeedu ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-    kde.module = "kdeplasma-addons";
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/cervisia.nix b/pkgs/desktops/kde-4.6/sdk/cervisia.nix
deleted file mode 100644
index e0ff5c30597..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/cervisia.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-    kde = {
-      name = "cervisia";
-      module = "kdesdk";
-      version = "3.5.0";
-      release = "4.5.90";
-      versionFile = "cervisia/version.h";
-    };
-  };
-}
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/find-svn.patch b/pkgs/desktops/kde-4.6/sdk/find-svn.patch
deleted file mode 100644
index 61cb49b308f..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/find-svn.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
-index 59bcb96..2eac05d 100644
---- a/cmake/modules/FindSVN.cmake
-+++ b/cmake/modules/FindSVN.cmake
-@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
- FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
-    /usr/local/apr/bin
- )
-+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
-+   /usr/local/apr/bin
-+)
- 
- if(SVNCONFIG_EXECUTABLE)
- 
-@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
-       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-    else(APRCONFIG_EXECUTABLE)
-       FIND_PATH(_INCLUDES apr_pools.h
--         ${SVN_INCLUDES}/apr-0/
--         ${SVN_INCLUDES}/apr-1/
--         ${SVN_INCLUDES}/apr-1.0/
--         /usr/include/apr-0/
--         /usr/include/apr-1/
--         /usr/include/apr-1.0/
--         /usr/local/include/apr-0/
--         /usr/local/include/apr-1/
--         /usr/local/include/apr-1.0/
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-       )
-       if(_INCLUDES)
-          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
-          set(SVN_FOUND FALSE) # no apr == can't compile!
-       endif(_INCLUDES)
-    endif(APRCONFIG_EXECUTABLE)
-+
-+   # Use apu-config if it exists
-+   if(APUCONFIG_EXECUTABLE)
-+      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
-+      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
-+      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
-+      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+   else(APUCONFIG_EXECUTABLE)
-+      FIND_PATH(_INCLUDES apu.h
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-+      )
-+      if(_INCLUDES)
-+         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+      else(_INCLUDES)
-+         set(SVN_FOUND FALSE) # no apr == can't compile!
-+      endif(_INCLUDES)
-+   endif(APUCONFIG_EXECUTABLE)
-    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
-    if(SVN_LIBRARIES)
-       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
diff --git a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix
deleted file mode 100644
index daf75993bdb..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "A KDE 4 project template generator";
-    kde = {
-      name = "kapptemplate";
-      module = "kdesdk";
-      version = "0.1";
-      release = "4.5.90";
-      versionFile = "kapptemplate/main.cpp";
-    };
-  };
-}
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/kcachegrind.nix b/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix
deleted file mode 100644
index 103e2dc071c..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-    kde = {
-      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.6/sdk/kdeaccounts-plugin.nix
deleted file mode 100644
index 4cfa3eb2a0c..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 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.6/sdk/kioslave-perldoc.nix
deleted file mode 100644
index c5a5f2b5b61..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, perl }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 perl ];
-
-  cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON";
-
-  meta = {
-    description = "perldoc: kioslave";
-    kde = {
-      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.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/kompare.nix b/pkgs/desktops/kde-4.6/sdk/kompare.nix
deleted file mode 100644
index 5366edfa855..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kompare.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-    kde = {
-      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.6/sdk/kpartloader.nix
deleted file mode 100644
index 8702a7f7328..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "A test application for KParts";
-    kde = {
-      name = "kpartloader";
-      module = "kdesdk";
-      version = "1.0";
-      release = "4.5.90";
-      versionFile = "kpartloader.cpp";
-    };
-  };
-}
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/sdk/kstartperf.nix b/pkgs/desktops/kde-4.6/sdk/kstartperf.nix
deleted file mode 100644
index cd43be1cece..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libtool }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libtool ];
-
-
-  meta = {
-    description = "Measures start up time of a KDE application";
-    kde = {
-      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.6/sdk/kuiviewer.nix
deleted file mode 100644
index e8ea5b5b36c..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  meta = {
-    description = "Displays Qt Designer's UI files";
-    kde = {
-      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.6/sdk/lokalize.nix
deleted file mode 100644
index 4911cb22ae4..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/lokalize.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, hunspell }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 hunspell ];
-
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.'';
-    kde = {
-      name = "lokalize";
-      module = "kdesdk";
-      version = "1.1";
-      release = "4.5.90";
-      versionFile = "src/version.h";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/sdk/optional-docs.diff b/pkgs/desktops/kde-4.6/sdk/optional-docs.diff
deleted file mode 100644
index f67e1f4cdd8..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/optional-docs.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 63cdef8..0c5b50a 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -3,22 +3,30 @@ if( UNIX )
-     add_subdirectory(cervisia)
-   endif()
- endif( UNIX )
--add_subdirectory(kapptemplate)
-+if(BUILD_kapptemplate)
-+  add_subdirectory(kapptemplate)
-+endif()
- if(BUILD_kbugbuster)
-   add_subdirectory(kbugbuster)
- endif()
- if(BUILD_kcachegrind)
-   add_subdirectory(kcachegrind)
- endif()
--add_subdirectory(kmtrace)
-+if(BUILD_kmtrace)
-+  add_subdirectory(kmtrace)
-+endif()
- if(BUILD_kompare)
-   add_subdirectory(kompare)
- endif()
- if(BUILD_lokalize)
-   add_subdirectory(lokalize)
- endif()
--add_subdirectory(poxml)
--add_subdirectory(scripts)
-+if(BUILD_poxml)
-+  add_subdirectory(poxml)
-+endif()
-+if(BUILD_scripts)
-+  add_subdirectory(scripts)
-+endif()
- 
- if(LIBXSLT_FOUND AND LIBXML2_FOUND)
-   if(BUILD_umbrello)
diff --git a/pkgs/desktops/kde-4.6/sdk/poxml.nix b/pkgs/desktops/kde-4.6/sdk/poxml.nix
deleted file mode 100644
index 652110b38ff..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/poxml.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, antlr }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 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.6/sdk/scripts.nix
deleted file mode 100644
index 204c24cfba5..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/scripts.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  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.6/sdk/strigi-analyzer.nix
deleted file mode 100644
index 88c935ade4a..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-
-  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.6/sdk/umbrello.nix
deleted file mode 100644
index d465e97012b..00000000000
--- a/pkgs/desktops/kde-4.6/sdk/umbrello.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ];
-
-
-  meta = {
-    description = "Umbrello UML modeller";
-    kde = {
-      name = "umbrello";
-      module = "kdesdk";
-      version = "2.5.2"; # release - 200
-      release = "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/attica/default.nix b/pkgs/desktops/kde-4.6/support/attica/default.nix
deleted file mode 100644
index 0eff2cbb4eb..00000000000
--- a/pkgs/desktops/kde-4.6/support/attica/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{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";
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = qt4.meta.platforms;
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
deleted file mode 100644
index 88a63b3881c..00000000000
--- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
-
-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 ];
-
-  meta = {
-    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
-  };
-}
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/support/soprano/default.nix b/pkgs/desktops/kde-4.6/support/soprano/default.nix
deleted file mode 100644
index 101cbfbe60b..00000000000
--- a/pkgs/desktops/kde-4.6/support/soprano/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc, pkgconfig}:
-
-stdenv.mkDerivation rec {
-  name = "soprano-2.6.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "0dfdc4hcv25kwmv3wp13qjw2jg2fax4gcy79yia7sdgz5ik59xq2";
-  };
-
-  # 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 ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/toys/amor.nix b/pkgs/desktops/kde-4.6/toys/amor.nix
deleted file mode 100644
index 2c68ffe6fa8..00000000000
--- a/pkgs/desktops/kde-4.6/toys/amor.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-    kde = {
-      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.6/toys/kteatime.nix
deleted file mode 100644
index 14cfcd07f58..00000000000
--- a/pkgs/desktops/kde-4.6/toys/kteatime.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-    kde = {
-      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.6/toys/ktux.nix
deleted file mode 100644
index af280761865..00000000000
--- a/pkgs/desktops/kde-4.6/toys/ktux.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, kdebase_workspace }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-    kde = {
-      name = "ktux";
-      module = "kdetoys";
-      version = "1.0.1";
-      release = "4.5.90";
-      versionFile = "src/sprite.cpp";
-    };
-  };
-}
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/kcalc.nix b/pkgs/desktops/kde-4.6/utils/kcalc.nix
deleted file mode 100644
index dd8e6f47cdc..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kcalc.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-    kde = {
-      name = "kcalc";
-      module = "kdeutils";
-      version = "2.7";
-      release = "4.5.90";
-      versionFile = "version.h";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/kcharselect.nix b/pkgs/desktops/kde-4.6/utils/kcharselect.nix
deleted file mode 100644
index 9952a5fa018..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kcharselect.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE character selection utility";
-    kde = {
-      name = "kcharselect";
-      module = "kdeutils";
-      version = "1.7";
-      release = "4.5.90";
-      versionFile = "main.cc";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/kdf.nix b/pkgs/desktops/kde-4.6/utils/kdf.nix
deleted file mode 100644
index 9e07ac65a76..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kdf.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE free disk space utility";
-    kde = {
-      name = "kdf";
-      module = "kdeutils";
-      version = "0.11";
-      release = "4.5.90";
-      versionFile = "kdf.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/ktimer.nix b/pkgs/desktops/kde-4.6/utils/ktimer.nix
deleted file mode 100644
index 069985d7025..00000000000
--- a/pkgs/desktops/kde-4.6/utils/ktimer.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE Timer";
-    kde = {
-      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.6/utils/kwallet.nix
deleted file mode 100644
index 395fe1da448..00000000000
--- a/pkgs/desktops/kde-4.6/utils/kwallet.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-    kde = {
-      name = "kwallet";
-      module = "kdeutils";
-      version = "1.6";
-      release = "4.5.90";
-      versionFile = "main.cpp";
-    };
-  };
-}
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/utils/superkaramba.nix b/pkgs/desktops/kde-4.6/utils/superkaramba.nix
deleted file mode 100644
index 75ed3bc0eed..00000000000
--- a/pkgs/desktops/kde-4.6/utils/superkaramba.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ];
-
-  cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE";
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-    kde = {
-      name = "superkaramba";
-      module = "kdeutils";
-      version = "0.55";
-      release = "4.5.90";
-      versionFile = "src/main.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/utils/sweeper.nix b/pkgs/desktops/kde-4.6/utils/sweeper.nix
deleted file mode 100644
index 9e702ff708c..00000000000
--- a/pkgs/desktops/kde-4.6/utils/sweeper.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-    kde = {
-      name = "sweeper";
-      module = "kdeutils";
-      version = "1.5";
-      release = "4.5.90";
-      versionFile = "main.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix
deleted file mode 100644
index e428f359783..00000000000
--- a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-    kde = {
-      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.6/webdev/kimagemapeditor.nix
deleted file mode 100644
index a3ae85a8f16..00000000000
--- a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-    kde = {
-      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.6/webdev/klinkstatus.nix
deleted file mode 100644
index 7c419a572d3..00000000000
--- a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy,
-  ruby }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost
-    htmlTidy ruby ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-    kde = {
-      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.6/webdev/kommander.nix
deleted file mode 100644
index c450e1d7810..00000000000
--- a/pkgs/desktops/kde-4.6/webdev/kommander.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da3288efc89..3bbc4daeb7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7674,10 +7674,6 @@ 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;
   };

From bf229fc9853b7b03cbdcc0dae9f31590f3086ed8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 12:20:12 +0000
Subject: [PATCH 089/116] * Move Phonon out of KDE.

svn path=/nixpkgs/branches/kde-4.7/; revision=27988
---
 pkgs/desktops/kde-4.5/default.nix                             | 2 --
 pkgs/desktops/kde-4.5/libs/default.nix                        | 4 ++--
 pkgs/desktops/kde-4.7/default.nix                             | 4 ----
 .../libraries/phonon-backend-gstreamer/default.nix}           | 0
 .../phonon.nix => development/libraries/phonon/default.nix}   | 0
 pkgs/top-level/all-packages.nix                               | 4 ++++
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{desktops/kde-4.7/phonon-backend-gstreamer.nix => development/libraries/phonon-backend-gstreamer/default.nix} (100%)
 rename pkgs/{desktops/kde-4.7/phonon.nix => development/libraries/phonon/default.nix} (100%)

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d09b4ae3f53..c152a90d2b6 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -24,8 +24,6 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  phonon = null;
-
   kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT
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.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index cbdd737331a..d57878388fc 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -38,10 +38,6 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
-  phonon = callPackage ./phonon.nix { };
-
-  phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { };
-
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
diff --git a/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
rename to pkgs/development/libraries/phonon-backend-gstreamer/default.nix
diff --git a/pkgs/desktops/kde-4.7/phonon.nix b/pkgs/development/libraries/phonon/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/phonon.nix
rename to pkgs/development/libraries/phonon/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bbc4daeb7c..f95935c43eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4107,6 +4107,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 { };

From 6f8c9ddc39c689b8e082cb9016313ec6ea8a3fa7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 12:52:15 +0000
Subject: [PATCH 090/116] * KDE 4.7.0.

svn path=/nixpkgs/branches/kde-4.7/; revision=27989
---
 pkgs/desktops/kde-4.7/default.nix             |   4 +-
 .../kde-4.7/kde-package/manifest-4.6.95.nix   | 286 ------------------
 .../kde-4.7/kde-package/manifest-4.7.0.nix    | 286 ++++++++++++++++++
 pkgs/desktops/kde-4.7/l10n/manifest-4.5.5.nix | 277 -----------------
 pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix | 262 ++++++++++++++++
 5 files changed, 550 insertions(+), 565 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix
 create mode 100644 pkgs/desktops/kde-4.7/kde-package/manifest-4.7.0.nix
 delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.5.5.nix
 create mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index d57878388fc..6e9a68d6f3c 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  release = "4.6.95";
+  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
@@ -24,7 +24,7 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  kde = callPackage ./kde-package { inherit release; stable = false; };
+  kde = callPackage ./kde-package { inherit release; stable = true; };
 
 ### SUPPORT
 
diff --git a/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix b/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix
deleted file mode 100644
index 861d7ca8e7a..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.95.nix
+++ /dev/null
@@ -1,286 +0,0 @@
-[
-{
-  module = "blinken";
-  sha256 = "0lpmgx9a5188d8p7vi17c3jrra5269gidq3iyznnr9bg3zcj12cs";
-}
-{
-  module = "cantor";
-  sha256 = "0xviwr5hk2hcadan5srk3p2d10q52z19458afxy88rwdd8x7jaav";
-}
-{
-  module = "gwenview";
-  sha256 = "04ij4l2fahvw8wgrkbc8k642s06dlqy8m5cpwd29mlcsqx7rnszx";
-}
-{
-  module = "kalgebra";
-  sha256 = "0c9vrpkdwicjr7kykqwxgzkm28h3qh2dsfjkxf0ldpx29kc1bv6m";
-}
-{
-  module = "kalzium";
-  sha256 = "0fj3kz8iim81fm14gk36ibdq58aq9s8z85vwa7w28byavyqbihx1";
-}
-{
-  module = "kamera";
-  sha256 = "1hcgriyn8i71wfc5r22qwkmrkfk0ckvjiwxjsk9z3b97v1xrvi1n";
-}
-{
-  module = "kanagram";
-  sha256 = "1ay5hn6xbgka68mhk95vdh0yn4hwvhjzk77mml31z5xwbw4khc9b";
-}
-{
-  module = "kate";
-  sha256 = "048mzlbhqrvba0grw5dnf0g95kkvsvqffc8jz82nnhycgy1wzgb3";
-}
-{
-  module = "kbruch";
-  sha256 = "1pwq9934g4kb9hk1dpgml62jb104gr58fwq13np0dvdjjkk1zkvz";
-}
-{
-  module = "kcolorchooser";
-  sha256 = "0nl9v04k8xbw3gy1v03c4cp4ay25p185dz25lga5j88xh9p12h2z";
-}
-{
-  module = "kdeaccessibility";
-  sha256 = "18k6y28ir8a00s0pxp4pfl8bc25vrrlw3gkh0lbvn0f7xlc6b3xr";
-}
-{
-  module = "kdeadmin";
-  sha256 = "12p626py4yw5cs29yfkj02pjl167irjyjnd5316cvjjhbyh5bdh9";
-}
-{
-  module = "kdeartwork";
-  sha256 = "1h6gya0hs5jz5bwnlaj1mbx66ksmmarpkvz8css9gi6wxd0b1jpm";
-}
-{
-  module = "kde-baseapps";
-  sha256 = "0m76729njglibhcwv03aq38kj12f7rjifh0n8fhd3nj9hy5k5px6";
-}
-{
-  module = "kdegames";
-  sha256 = "0mg4ivhbxvf92v3zwwq50ixn8waapgvnzxkp0g1vy960s2wgi4lr";
-}
-{
-  module = "kdegraphics-strigi-analyzer";
-  sha256 = "0ka17ck02391iaiqh9d4vrr7w6dgvi2272jrzm8694gk20zawwqw";
-}
-{
-  module = "kdegraphics-thumbnailers";
-  sha256 = "19npmsbhpyvs6x4r1hc9kfxpa86z2sari43y1wm9mzrrzpdzjbys";
-}
-{
-  module = "kdelibs";
-  sha256 = "10zk08r3vvrpsci1lprsc47imfhvxxv48hi3kh4p0l7vgr0ffrx0";
-}
-{
-  module = "kdemultimedia";
-  sha256 = "0y00zsdwhv73fnb2h5hfbfwhjrhy3ss3b74ripy31rcsh1qn2dyp";
-}
-{
-  module = "kdenetwork";
-  sha256 = "11daqwa3vw52hykzc9dl2k20dwi6m8qzdyln25y4ka0mh74i8i18";
-}
-{
-  module = "kdepim";
-  sha256 = "1a8i2x2b71ddgr4rsl8001zhhjwsp11137f0ajakcgj2x7gkqri3";
-}
-{
-  module = "kdepimlibs";
-  sha256 = "1mg8vc8savyi7izlmh9pqdvl6pvf4lb9m7vd4sn66z2mpx4cyc4n";
-}
-{
-  module = "kdepim-runtime";
-  sha256 = "12bhgqiv2xb4mg45fzyzxd4q7gds25y8275cz00bv4ndh9lklkd9";
-}
-{
-  module = "kdeplasma-addons";
-  sha256 = "0dska74igbmydpca914ha61q7wg68hl6lcrd6a6xyb1xjx1m7lqm";
-}
-{
-  module = "kde-runtime";
-  sha256 = "0a860kaqiv3jyxa1266w6ybnciw1ag0gr767am1gjnn5z9fr6m9q";
-}
-{
-  module = "kdesdk";
-  sha256 = "1h9dkh529czdwzx8riq8npkq2xsljgxaiafa8ra51bm497xvm121";
-}
-{
-  module = "kdetoys";
-  sha256 = "0mj0b48v56ixvbvmd70nq3rc14qms1a6pb2xyaarvpy4fc6mf0rx";
-}
-{
-  module = "kdeutils";
-  sha256 = "02cb4y5ljz7gs324p64wnd7qdx4m9wcjcjsfb750nlazsxbbbi26";
-}
-{
-  module = "kde-wallpapers";
-  sha256 = "0dq8zpx0nskqh3lqxq39l7kg8cv3n9dj1s0bwg7yfpahzg3903yk";
-}
-{
-  module = "kdewebdev";
-  sha256 = "0bv4k146snifyds3npxaga4260rx2nk0l6lqbsk1wdyrpkpwwwa0";
-}
-{
-  module = "kde-workspace";
-  sha256 = "0jqlgyz34dn98fxnrmj0ymdhppqxg7xsz9vkqdid98d86zvpbxzg";
-}
-{
-  module = "kgamma";
-  sha256 = "1r64gfm181xph1rkpk8jp92pghg3yvm9amsz20mprl57lz7mxdpw";
-}
-{
-  module = "kgeography";
-  sha256 = "0bm28cyal3cks1xkyazbnp8j0yf78pr2ihszgdjldipwnm7sqxc5";
-}
-{
-  module = "khangman";
-  sha256 = "1s5vwc7ybcd6rkfqkmpn6vnp0sz8lwhjf91w4mxw1dqipylvipyb";
-}
-{
-  module = "kig";
-  sha256 = "0ncxd5i4hpxl972i9f6kc1z7k4466f6bfm6ykivm4jvcg1p3kzml";
-}
-{
-  module = "kimono";
-  sha256 = "024fx0yy3vk0glkv787ia30804hn8ym8vccg78jr9zarfm96sv4m";
-}
-{
-  module = "kiten";
-  sha256 = "1xmwrw8pgm48vfnk7q5634dycg80qr79s8x5sjh3kaa51kkqzg3c";
-}
-{
-  module = "klettres";
-  sha256 = "078kr53k1nslwlgqvxzgd7ysnq0kfzfmcwng5yl8i49wrkkragc5";
-}
-{
-  module = "kmplot";
-  sha256 = "0pan00jx1417d6w1xkn94l38mq1g5ry0dskms4drfmjyadiq98cv";
-}
-{
-  module = "kolourpaint";
-  sha256 = "02ks2v5x5n78x77fyvh5r95y7qrvlcawb138jhcqyhipylya4mf6";
-}
-{
-  module = "konsole";
-  sha256 = "10z7n58wgvyiq5d8in63wdbpd4x5zylan89j3pz2l0l0h38a1rwl";
-}
-{
-  module = "korundum";
-  sha256 = "0djnrwfdi32ik2w85c4hnk6lq6i7bpc95a5npsrp7r2wz76qa21k";
-}
-{
-  module = "kross-interpreters";
-  sha256 = "10188b9j0whlkj58lsvfq7zyjy5k0mazk6jahwj608qbyiv5x1b8";
-}
-{
-  module = "kruler";
-  sha256 = "0fswz4c8richv37w4cfrzfsyz3afxr58d5kapcca6b55w5j5sa4h";
-}
-{
-  module = "ksaneplugin";
-  sha256 = "1kjiyad8s70dagjsi57gcrvyz80fcgm4ivszmnsh99808m7whwlh";
-}
-{
-  module = "ksnapshot";
-  sha256 = "1sinwiwxan9ky42ip9ry34m5dm0p7ybijafj8g0jv9pq9vbghc35";
-}
-{
-  module = "kstars";
-  sha256 = "1snmj7m5mi4wfm3n168a3sf6cmf8cp5g86qhb678pm13mypyaba7";
-}
-{
-  module = "ktouch";
-  sha256 = "0ln3kl665vnz9kmf3hj31v7r1k6psfsvbmhrc0nsd4b8jml8flsc";
-}
-{
-  module = "kturtle";
-  sha256 = "1aa4fkb9z52nil9pm81hwpimvhr87f7av8z239kcmjwdna2bf50h";
-}
-{
-  module = "kwordquiz";
-  sha256 = "1kl7ghl1s9rj1fh7aarfk29f8qzagmh4i1yasp494amb6g3x56ib";
-}
-{
-  module = "libkdcraw";
-  sha256 = "17q2v8aylh7dgfd2f5cg0nkqd0xlzhna6dmvglhxlr3zgpx59pcn";
-}
-{
-  module = "libkdeedu";
-  sha256 = "1j4ppkyj8fy016x5sgpl6n03xj5wsrm2ksgh531ks4lz8dlvnq0s";
-}
-{
-  module = "libkexiv2";
-  sha256 = "04402lbmf7bl1rybw7fnqxihmkhbzrcj05ag4nc1hy07wv5s5yzk";
-}
-{
-  module = "libkipi";
-  sha256 = "0hs6n783p6d731cdiibjq2rjldamb2bf9xvxbwrsa5b85ln09yw1";
-}
-{
-  module = "libksane";
-  sha256 = "1n211mckknayh41pynpqh3g1hyngss3i2hfvz9bjx2kikjmc8m26";
-}
-{
-  module = "marble";
-  sha256 = "1w32qsxj5yfvv1dd2kph11k46pb828j68pscz3x3j5xh3pwqngaw";
-}
-{
-  module = "mobipocket";
-  sha256 = "1r8nmcfl440d1v51hy0sgmhrh8qdljskmn0pvfp2vaaxfqrqpwis";
-}
-{
-  module = "okular";
-  sha256 = "1hdjhrdpbrvrxixzpls3n8zynj8qypid8m2805m0y0wfzalidmgl";
-}
-{
-  module = "oxygen-icons";
-  sha256 = "03ikafi23ac0cqif3sxh8cxln0gz8yrag0cyl95p8sf7ih5iyy64";
-}
-{
-  module = "parley";
-  sha256 = "18lvnid98kphinx2i90dy5jjfbfbyc30zbn0bbqjk577lfxl5nds";
-}
-{
-  module = "perlkde";
-  sha256 = "0hfb7b9a6c5yjk57fr5k0a8xxcs333nz8ps9dk5hyrljj1k08mxm";
-}
-{
-  module = "perlqt";
-  sha256 = "097ckqr58zj97b8wr51rxh2am1x1jpvfz3vm91sbmys6jg5zi5v4";
-}
-{
-  module = "pykde4";
-  sha256 = "0xr4xlds7ixsvpd8h2rziwpffaj4rxqjl7439nygk8zy1f959g68";
-}
-{
-  module = "qtruby";
-  sha256 = "1yqg9qnfjqq1f8q7si1klacn0wmylqx8b1hfgkhxrad9m0q7zhia";
-}
-{
-  module = "qyoto";
-  sha256 = "0sqsylcjfcnixbcf8x3ajzhc9gzpmfv1mh90bp7wz6cwrnb776wq";
-}
-{
-  module = "rocs";
-  sha256 = "1pc2l07wbfv0ky9wqyhby9c5ij7nlq8p7ybwp42zxlyq94s1rhw7";
-}
-{
-  module = "smokegen";
-  sha256 = "0y8wq7z8dgwgcf8wvgwqjdaf7j0w5lvy0bvsfzlskvg4bb4lh4lw";
-}
-{
-  module = "smokekde";
-  sha256 = "1lidwpaqx5h5z500qc26gc782b7db41l3s3n2lk0iv2yif9jrgxh";
-}
-{
-  module = "smokeqt";
-  sha256 = "1rg0bcjj26rxbfi2z1x1ba6h0sx1adr8l3n5mx8i71iq0qq5qsdv";
-}
-{
-  module = "step";
-  sha256 = "00w8ci89p7xph7njqlwch26vrs39cm09a162dgc4qaaqarzj9q37";
-}
-{
-  module = "svgpart";
-  sha256 = "04gis2pyfs6y7lxdajqbgj26xkv9qzs26wj4gd50zainy5235jrv";
-}
-]
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/l10n/manifest-4.5.5.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.5.5.nix
deleted file mode 100644
index 31a6a50fb77..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.5.5.nix
+++ /dev/null
@@ -1,277 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0dn4aiv48dhknp9wv7fsjdy8fhrwiwnbp65qq66nfrly51ranv8s";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "07srb5r4a0j2pakk8xsv7ky5s2cjd9liyzrx86xyzxpf21p83xbd";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0rhs16c331cjhxjqq08hkl1c8vjg4nyy3mjfw5idh9qv05y9af5z";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1cm8ynlylmpggapplfzggkd9j98nycm1mybh87pk4vqdh3vm8wm4";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1rblfliw810yadmdplyg6n9ss7zzq318cfgvhscjjl0c9ndcx7x2";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1x2wg76i3jgylr56ynj4p53kym1wmk789spsrgnh2y5zgppf1h43";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0rmpzlxds8m527vkfkd48pgqcpdmyr86hi53b9gy1z237hjzjp2w";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0zwgzcr6d94h9j2ghj6mxdss98cp9x6wlf1cp4v743addmjja26v";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1phdg7miligjyya5srj11szijbrk67n27d2zrjninbpvj6jhmsx2";
-}
-{
-  lang = "eo";
-  saneName = "eo";
-  sha256 = "0jlf8i4csmrp6k05v3hkx8kk45kx42klfn9z9xdn8lak5ckycbrm";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "04kybzwkxsj64zqwiwir70fddf4zbfqpzfy01xhwz4fwinjl2pp0";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1s3wg2pxp40111s3w82jpcgzz6j2103q3kdsm6s2mc5343i44bcs";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1hqzdg2g8c6knwv6dqvrlk31v35p91f1hh04n41w2acxzrhl8r5p";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1fagzkgcnj8wihkhkd0xbfjr4x4774xsdc3n17wy2d49kinkgxa8";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "14796jqhkhr60dxc0f69lavaikci6qn6avgiy1f2apfirs60lfi4";
-}
-{
-  lang = "fy";
-  saneName = "fy";
-  sha256 = "0c39sr4q4dl4rf6irs0c5km3xwaip0iw8a8pfljsd9an7bpzs9f9";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1gfbi896kwrjaz4jkif3276qjx4ixjy8mybhmkc3c19crk1lvfn4";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1s368cszycmn8dr4l1fycr1rswqm93d0hlxjr007hp0n07fddkiw";
-}
-{
-  lang = "gu";
-  saneName = "gu";
-  sha256 = "1ca5j72kd8dbvwvvks4zhjz92v39x7g7qpdxzqscwm5cg17arxr9";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0wchlwvw8rhiz08kglkqpj1vjiiagqrmypgyn4jiar2ds5b3kxl9";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "0sdlj0w2vgvsp44jy1rgc35vyvndsybdf2xyxml8zhr48rhijnr7";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1rspkmppz9mpf4lp4a2jm708ilygpxdi3crnsfvrfb3qsywxz520";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "12kk692z9xaks9pys9pwq1zgb817grzgrkcm943yzdr68k5mvfhm";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "15464pdhfjw0dvmdjvl1c23cqnxgka498xh6fy2prrkwnsk4cra5";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "1iiypv1yf6mp5hp14yr7dgvk7ydb66yyp7ayjswf78ak7cl9kc4v";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1v182xds7y3mpbm6jy3hbxr0ld4if67mx6027izbflnydydjindk";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1lycijcrcsfviiqj34jqmap6czps8j1nsjp0fizkk6gmicfdwyxb";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "12li937isc3479a70z8x32y2lqbl97y833cpcmbsxpa93c3hrzs3";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1kd0a2rh35k0yl5irv8jxhycvacg7444y02czdhmpg9z40xpl73k";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1fvn0lh3psc3ijn8j26m5likvw466kvdda5f30p3md12ydd9h15x";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0n7m67rjplc8q3bw5fyignba0kglzbrqay0qmgiqzdqn8yw72vjq";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0p3f9rd6wvcxac9jv23msszq03nhi4sn6i98rszh7p93rwllhrpk";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "19lzs8avagiydmv4rmpxmzv5dsaprf9wl6iwzk9g1lqg4x16nisw";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0xqwz6gbzv142izhf4qwx9qzny8k24712k9pvr0xpak5s7sn0838";
-}
-{
-  lang = "ml";
-  saneName = "ml";
-  sha256 = "07f8j5zqa0wil5mmdpv16dw4cd6qzsqfqply4jq276g16g80ihg6";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "149r3y0x4yahgmln2qg085b86whdhmh6dx11cxn8r31l497a0jp7";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0zly7l2bpnmxv60kyyhm8n9mkd7w66sc18i98462zk2d2l7k2xyz";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0a8dp40i8mxjjf08wg6xmx88fivkqpiv2icbpl3nm8xxhxjgx462";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0sa7qiiffma83p0yk31l5rkng2z1cm3m8r05jyvici5048i1sg9w";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0zj88vi9spyc06vgd2hifsix8sa3lcchjjpplv5jll7dvicdw8vd";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0hhrpws9nhqb6yhlnbv03150jykb7fx3wbbmjg36fh78cbqjknjd";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0yck1nrmyx9zpk65znnga9jhv6mjv3gmhvlqis3fs3panp5ngdhl";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1w14431b3n3z3yjm8l2kcbs8gpv58gj55p801mb17bdfh5dvs7r5";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0fzjgifv1skmgbfng5lpajan0icg87xipq0817vy0g2izrs356k8";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0021hfr1zdvym8rsccypsbci8kcjal1dfhqrj8dci8lf78bf05hn";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0iq9vn16na58iak6lg3h12cblajv28bk90f80b4ki8lsz0wynqky";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1pzq68bahnr8afnyxmhhsiyzn83f34xgymly1b71hkavkg5f05zz";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "03g69ffxgiw9fzsznkxxrmma9m7plasy7qlf15vrcp7faj0pjl7s";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0i140ddjdc1l5v52inimhzgx1i9sbrb88ggg1bc6nnsk762jxn2a";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "10s7j601dzhsl40f1rifn6mazi0hgl3isalv3pak6d0b690y6lnb";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "061jqvcajk05cp4w4fcxdsh0drkynn170cyw0491iq6rqz2wsqsk";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0xnxyavzz5f861fm7g4xqjqdr3b9k6mrjfpc5yjf4wa8g60ra2jl";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0p789j8jnfpgwlbl73mcx9jpxb7h7hgmmksqhrc2ng42z2jmlv6d";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "07jqagsp54805kz30lybizbj66njslwyfzh66xrlgfx5vsbfn6sk";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "17mrvf1flqyfnla96idj87m5406mjjm696kf505y4si78nlnc6s2";
-}
-]
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";
+}
+]

From 35781b1bf360f5eeeb89e8913808f55270adb8f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 14:09:16 +0000
Subject: [PATCH 091/116] * Cmake 2.8.5 doesn't build on i686-linux  
 (http://hydra.nixos.org/build/1181148), so revert to 2.8.4 for now.

svn path=/nixpkgs/branches/kde-4.7/; revision=27990
---
 pkgs/development/tools/build-managers/cmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 081313972df..c7484ee6e84 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "5";
+  minorVersion = "4";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "148bxnn5msl1zg366cdgxy2inzjj0n4jlhakymj6qr81bzvvy62y";
+    sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
   };
 
   patches =

From 7d06b01a345d25f7f06aafa6d3a7156aacf7a7a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 08:43:43 +0000
Subject: [PATCH 092/116] * Fix KDE's fixed-output derivations.

svn path=/nixpkgs/branches/kde-4.7/; revision=27995
---
 pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix | 2 +-
 pkgs/desktops/kde-4.7/wallpapers.nix                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
index fb7a063fd8f..5c4944f47c3 100644
--- a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
@@ -3,7 +3,7 @@
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "4736af7eef8c0defa8f5ae997ac85e0a19c4d1af9a9e963b2434317c5408ab86";
+  outputHash = "7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96";
 
   buildInputs = [ cmake ];
   
diff --git a/pkgs/desktops/kde-4.7/wallpapers.nix b/pkgs/desktops/kde-4.7/wallpapers.nix
index f2b3d966ab8..9b83b4a9f08 100644
--- a/pkgs/desktops/kde-4.7/wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/wallpapers.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";

From 4c05eb6e2e3ff5fe89d5a45d102e26cac2b8b7a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 08:45:58 +0000
Subject: [PATCH 093/116] svn path=/nixpkgs/branches/kde-4.7/; revision=27996

---
 pkgs/development/libraries/phonon-backend-gstreamer/default.nix | 1 +
 pkgs/development/libraries/phonon/default.nix                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index 20e3d97b228..17744bad32c 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
   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
index edcccb7bf0c..6cf63aa757a 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";
     license = "LGPLv2";
+    platforms = stdenv.lib.platforms.linux;
   };  
 }

From dd8cc506b52e92641f4dff55bc2b642e0653b3e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 12:31:07 +0000
Subject: [PATCH 094/116] * Update kdeutils.

svn path=/nixpkgs/branches/kde-4.7/; revision=27997
---
 pkgs/desktops/kde-4.7/admin.nix               |  4 +--
 pkgs/desktops/kde-4.7/default.nix             | 12 +++++----
 pkgs/desktops/kde-4.7/sdk/okteta.nix          | 15 +++++++++++
 pkgs/desktops/kde-4.7/utils/ark.nix           | 13 +++++----
 pkgs/desktops/kde-4.7/utils/filelight.nix     | 14 ++++++++++
 pkgs/desktops/kde-4.7/utils/kcalc.nix         |  6 ++---
 pkgs/desktops/kde-4.7/utils/kcharselect.nix   |  6 ++---
 pkgs/desktops/kde-4.7/utils/kdf.nix           |  6 ++---
 pkgs/desktops/kde-4.7/utils/kfloppy.nix       |  6 ++---
 pkgs/desktops/kde-4.7/utils/kgpg.nix          |  6 ++---
 .../desktops/kde-4.7/utils/kremotecontrol.nix |  4 +--
 pkgs/desktops/kde-4.7/utils/ktimer.nix        |  4 +--
 pkgs/desktops/kde-4.7/utils/kwallet.nix       |  4 +--
 pkgs/desktops/kde-4.7/utils/okteta.nix        | 15 -----------
 .../desktops/kde-4.7/utils/printer-applet.nix | 27 +++++++++++++------
 pkgs/desktops/kde-4.7/utils/superkaramba.nix  |  6 ++---
 pkgs/desktops/kde-4.7/utils/sweeper.nix       |  6 ++---
 17 files changed, 89 insertions(+), 65 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/sdk/okteta.nix
 create mode 100644 pkgs/desktops/kde-4.7/utils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.7/utils/okteta.nix

diff --git a/pkgs/desktops/kde-4.7/admin.nix b/pkgs/desktops/kde-4.7/admin.nix
index 60a4d3e65c8..f6722da307e 100644
--- a/pkgs/desktops/kde-4.7/admin.nix
+++ b/pkgs/desktops/kde-4.7/admin.nix
@@ -1,12 +1,10 @@
 { kde, cmake, qt4, pkgconfig, perl, pythonPackages
 , sip, pycups, pygobject, system_config_printer
 , kdelibs, automoc4, phonon, kdepimlibs, pykde4
-, cups, nettools } @ args:
+, cups, nettools }:
 
 let
 
-  system_config_printer = args.system_config_printer.override { withGUI = false; };
-
 in
 
 kde.package rec {
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 6e9a68d6f3c..95d6aa02743 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
+{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer } @ args:
 
 let
 
@@ -28,6 +28,8 @@ recurseIntoAttrs rec {
 
 ### SUPPORT
 
+  system_config_printer = args.system_config_printer.override { withGUI = false; };
+
   akonadi = callPackage ./support/akonadi { };
 
   oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -95,8 +97,6 @@ recurseIntoAttrs rec {
     kmouth = callPackage ./accessibility/kmouth.nix { };
   };
 
-  kdeadmin = callPackage ./admin { };
-  
   kdeartwork = combinePkgs "kdeartwork" {
     aurorae = callPackage ./artwork/aurorae.nix { };
     colorSchemes = callPackage ./artwork/color-schemes.nix { };
@@ -112,7 +112,6 @@ recurseIntoAttrs rec {
   };
   
   kdeedu = callPackage ./edu { };
-  kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
@@ -138,6 +137,7 @@ recurseIntoAttrs rec {
     poxml = callPackage ./sdk/poxml.nix { };
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
+    okteta = callPackage ./utils/okteta.nix { };
   };
   
   kdetoys = combinePkgs "kdetoys" {
@@ -145,6 +145,7 @@ recurseIntoAttrs rec {
     kteatime = callPackage ./toys/kteatime.nix { };
     ktux = callPackage ./toys/ktux.nix { };
   };
+  */
 
   kdeutils = combinePkgs "kdeutils" {
     ark = callPackage ./utils/ark.nix { };
@@ -156,12 +157,13 @@ recurseIntoAttrs 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" {
     klinkstatus = callPackage ./webdev/klinkstatus.nix { };
     kommander = callPackage ./webdev/kommander.nix { };
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..c6f1168b4e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/sdk/okteta.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* 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.7/utils/ark.nix b/pkgs/desktops/kde-4.7/utils/ark.nix
index 6f963bdb998..d3766bfa313 100644
--- a/pkgs/desktops/kde-4.7/utils/ark.nix
+++ b/pkgs/desktops/kde-4.7/utils/ark.nix
@@ -1,11 +1,10 @@
-{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson,
-  kdebase }:
+{ kde, cmake, kdelibs, qt4, libarchive, xz, automoc4
+, phonon, bzip2, kde_baseapps }:
 
 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
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon kde_baseapps
+      libarchive xz bzip2
     ];
 
   meta = {
@@ -13,7 +12,7 @@ kde.package {
     kde = {
       name = "ark";
       module = "kdeutils";
-      version = "2.15";
+      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.7/utils/kcalc.nix b/pkgs/desktops/kde-4.7/utils/kcalc.nix
index b04e6e9f983..932fd296e56 100644
--- a/pkgs/desktops/kde-4.7/utils/kcalc.nix
+++ b/pkgs/desktops/kde-4.7/utils/kcalc.nix
@@ -1,14 +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";
+      version = "2.9";
       versionFile = "version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/kcharselect.nix b/pkgs/desktops/kde-4.7/utils/kcharselect.nix
index 115efaa703e..563596a6de3 100644
--- a/pkgs/desktops/kde-4.7/utils/kcharselect.nix
+++ b/pkgs/desktops/kde-4.7/utils/kcharselect.nix
@@ -1,14 +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";
+      version = "1.9";
       versionFile = "main.cc";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/kdf.nix b/pkgs/desktops/kde-4.7/utils/kdf.nix
index a15341ab2db..a7f18ae96c5 100644
--- a/pkgs/desktops/kde-4.7/utils/kdf.nix
+++ b/pkgs/desktops/kde-4.7/utils/kdf.nix
@@ -1,14 +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";
+      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
index 440c139e4cc..9d8a8b2f99f 100644
--- a/pkgs/desktops/kde-4.7/utils/kfloppy.nix
+++ b/pkgs/desktops/kde-4.7/utils/kfloppy.nix
@@ -1,10 +1,10 @@
-{ 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 = "Helps you format floppies with the filesystem of your choice";
+    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
index 00a2d2a8739..415d3e47ce8 100644
--- a/pkgs/desktops/kde-4.7/utils/kgpg.nix
+++ b/pkgs/desktops/kde-4.7/utils/kgpg.nix
@@ -1,10 +1,10 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, kdepimlibs }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon kdepimlibs ];
 
   meta = {
-    description = "Simple KDE GUI for gpg";
+    description = "Simple KDE GUI for GPG";
     kde = {
       name = "kgpg";
       module = "kdeutils";
diff --git a/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix
index 1ea8a140dca..548e75f900d 100644
--- a/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix
+++ b/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libXtst }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
 
   meta = {
     description = "KDE remote control";
diff --git a/pkgs/desktops/kde-4.7/utils/ktimer.nix b/pkgs/desktops/kde-4.7/utils/ktimer.nix
index 9fd90e6616a..a343390ce50 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/utils/kwallet.nix b/pkgs/desktops/kde-4.7/utils/kwallet.nix
index 76331102227..5f0edcaa8da 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/utils/okteta.nix b/pkgs/desktops/kde-4.7/utils/okteta.nix
deleted file mode 100644
index 0b7cb6d388d..00000000000
--- a/pkgs/desktops/kde-4.7/utils/okteta.nix
+++ /dev/null
@@ -1,15 +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.3";
-      versionFile = "program/about.cpp";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/utils/printer-applet.nix b/pkgs/desktops/kde-4.7/utils/printer-applet.nix
index ea9d6a7426c..12c7eb96d47 100644
--- a/pkgs/desktops/kde-4.7/utils/printer-applet.nix
+++ b/pkgs/desktops/kde-4.7/utils/printer-applet.nix
@@ -1,20 +1,31 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4
-, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings,
-  pythonDBus, makeWrapper }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon
+, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
+, pythonDBus, makeWrapper }:
 
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl
-    system_config_printer kdebindings makeWrapper pythonDBus ];
+kde.package rec {
+  buildInputs =
+    [ cmake qt4 kdelibs automoc4 phonon
+      pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
 
-  postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $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.5";
+      version = "1.7";
       versionFile = "printer-applet.py";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/superkaramba.nix b/pkgs/desktops/kde-4.7/utils/superkaramba.nix
index e49874fc805..f0e6d9511ba 100644
--- a/pkgs/desktops/kde-4.7/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,7 +10,7 @@ kde.package {
     kde = {
       name = "superkaramba";
       module = "kdeutils";
-      version = "0.55";
+      version = "0.57";
       versionFile = "src/main.cpp";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/utils/sweeper.nix b/pkgs/desktops/kde-4.7/utils/sweeper.nix
index 3b1d73df803..1b4ca0ed7ee 100644
--- a/pkgs/desktops/kde-4.7/utils/sweeper.nix
+++ b/pkgs/desktops/kde-4.7/utils/sweeper.nix
@@ -1,14 +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";
+      version = "1.7";
       versionFile = "main.cpp";
     };
   };

From e7b76a6db30c388b3e5008994167ebc5b7e45b69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 12:41:31 +0000
Subject: [PATCH 095/116] * Updated kdetoys.

svn path=/nixpkgs/branches/kde-4.7/; revision=27998
---
 pkgs/desktops/kde-4.7/default.nix       | 4 ++--
 pkgs/desktops/kde-4.7/toys/amor.nix     | 4 ++--
 pkgs/desktops/kde-4.7/toys/kteatime.nix | 4 ++--
 pkgs/desktops/kde-4.7/toys/ktux.nix     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 95d6aa02743..58741a86e99 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -139,13 +139,13 @@ recurseIntoAttrs rec {
     umbrello = callPackage ./sdk/umbrello.nix { };
     okteta = callPackage ./utils/okteta.nix { };
   };
-  
+  */
+
   kdetoys = combinePkgs "kdetoys" {
     amor = callPackage ./toys/amor.nix { };
     kteatime = callPackage ./toys/kteatime.nix { };
     ktux = callPackage ./toys/ktux.nix { };
   };
-  */
 
   kdeutils = combinePkgs "kdeutils" {
     ark = callPackage ./utils/ark.nix { };
diff --git a/pkgs/desktops/kde-4.7/toys/amor.nix b/pkgs/desktops/kde-4.7/toys/amor.nix
index dec967febde..3ff0706b9ba 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/toys/kteatime.nix b/pkgs/desktops/kde-4.7/toys/kteatime.nix
index 9df5d8ab528..54550d8f270 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/toys/ktux.nix b/pkgs/desktops/kde-4.7/toys/ktux.nix
index 8d2df5974a0..8f350f083ba 100644
--- a/pkgs/desktops/kde-4.7/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";

From 9650b1283ec7af5b05e379378ca53414030826ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 13:50:53 +0000
Subject: [PATCH 096/116] * Updated kdesdk.

svn path=/nixpkgs/branches/kde-4.7/; revision=27999
---
 pkgs/desktops/kde-4.7/default.nix                |  6 ++----
 pkgs/desktops/kde-4.7/sdk/cervisia.nix           |  6 +++---
 pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix    |  6 ++++--
 pkgs/desktops/kde-4.7/sdk/kapptemplate.nix       |  5 ++---
 pkgs/desktops/kde-4.7/sdk/kate.nix               | 15 ---------------
 pkgs/desktops/kde-4.7/sdk/kbugbuster.nix         | 15 ---------------
 pkgs/desktops/kde-4.7/sdk/kcachegrind.nix        |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix   |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix       |  6 +++---
 pkgs/desktops/kde-4.7/sdk/kmtrace.nix            |  8 ++++----
 pkgs/desktops/kde-4.7/sdk/kompare.nix            |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kpartloader.nix        |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix     |  7 +++----
 pkgs/desktops/kde-4.7/sdk/kstartperf.nix         |  4 ++--
 pkgs/desktops/kde-4.7/sdk/kuiviewer.nix          |  4 ++--
 pkgs/desktops/kde-4.7/sdk/lokalize.nix           |  6 +++---
 pkgs/desktops/kde-4.7/sdk/okteta.nix             |  4 ++--
 pkgs/desktops/kde-4.7/sdk/poxml.nix              |  5 ++---
 pkgs/desktops/kde-4.7/sdk/scripts.nix            |  4 ++--
 pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix    |  4 ++--
 pkgs/desktops/kde-4.7/sdk/umbrello.nix           |  4 ++--
 22 files changed, 48 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/sdk/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.7/sdk/kbugbuster.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 58741a86e99..7b329ec5a09 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -115,18 +115,17 @@ recurseIntoAttrs rec {
   kdegraphics = callPackage ./graphics { };
   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 { };
@@ -137,9 +136,8 @@ recurseIntoAttrs rec {
     poxml = callPackage ./sdk/poxml.nix { };
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
-    okteta = callPackage ./utils/okteta.nix { };
+    okteta = callPackage ./sdk/okteta.nix { };
   };
-  */
 
   kdetoys = combinePkgs "kdetoys" {
     amor = callPackage ./toys/amor.nix { };
diff --git a/pkgs/desktops/kde-4.7/sdk/cervisia.nix b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
index 98a45eae1d5..1fab0d56b5b 100644
--- a/pkgs/desktops/kde-4.7/sdk/cervisia.nix
+++ b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
@@ -1,14 +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";
+      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
index e216bfaea2a..777581bca91 100644
--- a/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
@@ -1,9 +1,11 @@
-{ kde, cmake, kdelibs, automoc4, kdebase }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kde_baseapps, kdepimlibs }:
 
 kde.package {
   # Needs kdebase for libkonq
-  buildInputs = [ cmake kdelibs automoc4 kdebase ];
+  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 = {
diff --git a/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
index 12445cb9f9b..e0069e5d7af 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kate.nix b/pkgs/desktops/kde-4.7/sdk/kate.nix
deleted file mode 100644
index 95b0fbfcdc4..00000000000
--- a/pkgs/desktops/kde-4.7/sdk/kate.nix
+++ /dev/null
@@ -1,15 +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)
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix
deleted file mode 100644
index dffb064f01b..00000000000
--- a/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix
+++ /dev/null
@@ -1,15 +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";
-      versionFile = "version.h";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
index b32f46135db..13c010fffb7 100644
--- a/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
@@ -1,7 +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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
index beac8a6d8f4..df5d45bc621 100644
--- a/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
@@ -1,7 +1,7 @@
-{ 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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
index 5c996243b52..a490920561d 100644
--- a/pkgs/desktops/kde-4.7/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";
 
diff --git a/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
index d58d915a7f2..af6c98f9118 100644
--- a/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
@@ -1,13 +1,13 @@
-{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, subversion, apr, aprutil }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi subversion apr aprutil ];
 
   patches = [ ./find-svn.patch ];
   cmakeFlags = "-DBUILD_kioslave=ON";
 
   meta = {
-    description = "svn:/ kioslave";
+    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
index 190a86bc2b5..e5a3392645e 100644
--- a/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
@@ -1,12 +1,12 @@
-{ kde, cmake, kdelibs, automoc4, gcc }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, gcc }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
-  preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
 
   meta = {
-    description = "KDE mtrace-based malloc debuger";
+    description = "KDE mtrace-based malloc debugger";
     kde = {
       name = "kmtrace";
       module = "kdesdk";
diff --git a/pkgs/desktops/kde-4.7/sdk/kompare.nix b/pkgs/desktops/kde-4.7/sdk/kompare.nix
index e20fc585dd2..aa07dbb1039 100644
--- a/pkgs/desktops/kde-4.7/sdk/kompare.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kompare.nix
@@ -1,7 +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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kpartloader.nix b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
index 25eb100dd53..6391ab145f5 100644
--- a/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
@@ -1,7 +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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
index 39640f92185..c87e0471457 100644
--- a/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
@@ -1,11 +1,10 @@
-{ 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 macros for profiling using QTime";
-    longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories.";
+    description = "A macro for profiling using QTime";
     kde = {
       name = "kprofilemethod";
       module = "kdesdk";
diff --git a/pkgs/desktops/kde-4.7/sdk/kstartperf.nix b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
index 0887531fdec..56d4c8bcb3f 100644
--- a/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
@@ -1,7 +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";
diff --git a/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
index 377a1563d64..c1b4f6fe08c 100644
--- a/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
@@ -1,7 +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";
diff --git a/pkgs/desktops/kde-4.7/sdk/lokalize.nix b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
index ec5381ee55d..f5d3aa0e0f9 100644
--- a/pkgs/desktops/kde-4.7/sdk/lokalize.nix
+++ b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
@@ -1,7 +1,7 @@
-{ 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";
@@ -12,7 +12,7 @@ kde.package {
     kde = {
       name = "lokalize";
       module = "kdesdk";
-      version = "1.1";
+      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
index c6f1168b4e9..ef590ab50c4 100644
--- a/pkgs/desktops/kde-4.7/sdk/okteta.nix
+++ b/pkgs/desktops/kde-4.7/sdk/okteta.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, shared_mime_info, qca2 }:
 
 kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* shared_mime_info qca2 */ ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi shared_mime_info qca2 ];
 
   meta = {
     description = "KDE byte editor";
diff --git a/pkgs/desktops/kde-4.7/sdk/poxml.nix b/pkgs/desktops/kde-4.7/sdk/poxml.nix
index 683fa77debd..ae092170668 100644
--- a/pkgs/desktops/kde-4.7/sdk/poxml.nix
+++ b/pkgs/desktops/kde-4.7/sdk/poxml.nix
@@ -1,8 +1,7 @@
-{ 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";
diff --git a/pkgs/desktops/kde-4.7/sdk/scripts.nix b/pkgs/desktops/kde-4.7/sdk/scripts.nix
index 2bbb9262597..70fdb8b606b 100644
--- a/pkgs/desktops/kde-4.7/sdk/scripts.nix
+++ b/pkgs/desktops/kde-4.7/sdk/scripts.nix
@@ -1,7 +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 = "Various scripts to ease KDE development";
diff --git a/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
index 0215a24608a..cacabdcb326 100644
--- a/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
@@ -1,7 +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 = "Strigi analyzers for diff, po and ts";
diff --git a/pkgs/desktops/kde-4.7/sdk/umbrello.nix b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
index 85e63c66e1b..9785d6c3146 100644
--- a/pkgs/desktops/kde-4.7/sdk/umbrello.nix
+++ b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
@@ -1,7 +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";

From 2d4c4ae1bd32034748fa421e494f86bed1437299 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 14:16:12 +0000
Subject: [PATCH 097/116] * Updated kdewebdev.

svn path=/nixpkgs/branches/kde-4.7/; revision=28000
---
 pkgs/desktops/kde-4.7/default.nix                | 2 +-
 pkgs/desktops/kde-4.7/webdev/kfilereplace.nix    | 4 ++--
 pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix | 4 ++--
 pkgs/desktops/kde-4.7/webdev/klinkstatus.nix     | 8 ++++----
 pkgs/desktops/kde-4.7/webdev/kommander.nix       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 7b329ec5a09..91b672f7b15 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -161,7 +161,6 @@ recurseIntoAttrs rec {
     filelight = callPackage ./utils/filelight.nix { };
   };
 
-  /*
   kdewebdev = combinePkgs "kdewebdev" {
     klinkstatus = callPackage ./webdev/klinkstatus.nix { };
     kommander = callPackage ./webdev/kommander.nix { };
@@ -169,6 +168,7 @@ recurseIntoAttrs rec {
     kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
   };
 
+  /*
   kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ./pim { };
   */
diff --git a/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
index ab56a26878a..5e05cfd3f52 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
index 958e714e32c..1664ece34f0 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
index 5024cb771ef..aadcec7ec79 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/webdev/kommander.nix b/pkgs/desktops/kde-4.7/webdev/kommander.nix
index 4a761b2eabe..43d9b0aeb65 100644
--- a/pkgs/desktops/kde-4.7/webdev/kommander.nix
+++ b/pkgs/desktops/kde-4.7/webdev/kommander.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 = "A graphical editor of scripted dialogs";

From d3df8a30859fdd71d88b335062f4493569afc5eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 14:30:07 +0000
Subject: [PATCH 098/116] * Updated kdeaccessibility.

svn path=/nixpkgs/branches/kde-4.7/; revision=28001
---
 .../kde-4.7/accessibility/color-schemes.nix        | 13 -------------
 .../desktops/kde-4.7/accessibility/icon-themes.nix | 14 --------------
 pkgs/desktops/kde-4.7/accessibility/jovie.nix      |  4 ++--
 .../desktops/kde-4.7/accessibility/kaccessible.nix | 14 ++++++++++++++
 pkgs/desktops/kde-4.7/accessibility/kmag.nix       |  4 ++--
 pkgs/desktops/kde-4.7/accessibility/kmousetool.nix |  4 ++--
 pkgs/desktops/kde-4.7/accessibility/kmouth.nix     |  5 ++---
 pkgs/desktops/kde-4.7/default.nix                  |  7 +++----
 8 files changed, 25 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
 create mode 100644 pkgs/desktops/kde-4.7/accessibility/kaccessible.nix

diff --git a/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
deleted file mode 100644
index 0be6cf2c6d5..00000000000
--- a/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
+++ /dev/null
@@ -1,13 +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";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
deleted file mode 100644
index 40e8a21d0e6..00000000000
--- a/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
+++ /dev/null
@@ -1,14 +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";
-    };
-  };
-}
-
diff --git a/pkgs/desktops/kde-4.7/accessibility/jovie.nix b/pkgs/desktops/kde-4.7/accessibility/jovie.nix
index 5fc138ca5c3..6b270534e44 100644
--- a/pkgs/desktops/kde-4.7/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 = {
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.7/accessibility/kmag.nix b/pkgs/desktops/kde-4.7/accessibility/kmag.nix
index 84cad4d1e54..b8ddf55cea6 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
index 308aaad07e1..cbde5728ef7 100644
--- a/pkgs/desktops/kde-4.7/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";
diff --git a/pkgs/desktops/kde-4.7/accessibility/kmouth.nix b/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
index e576dfb6823..ad6a565e1b6 100644
--- a/pkgs/desktops/kde-4.7/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";
@@ -12,4 +12,3 @@ kde.package {
     };
   };
 }
-
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 91b672f7b15..f3e3dfa5071 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -87,16 +87,15 @@ recurseIntoAttrs rec {
   
   kdemultimedia = callPackage ./multimedia.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 { };
   };
 
+  /*
   kdeartwork = combinePkgs "kdeartwork" {
     aurorae = callPackage ./artwork/aurorae.nix { };
     colorSchemes = callPackage ./artwork/color-schemes.nix { };

From 8099c514f9ec217fd32f1429217df89683035c36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 16:04:44 +0000
Subject: [PATCH 099/116] * Xscreensaver updated to 5.14.

svn path=/nixpkgs/branches/kde-4.7/; revision=28003
---
 pkgs/applications/graphics/xscreensaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 =

From f966079e300c593ea454bcf7874df37cd778eced Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 16:05:25 +0000
Subject: [PATCH 100/116] * Eigen updated to 2.0.16

svn path=/nixpkgs/branches/kde-4.7/; revision=28004
---
 pkgs/development/libraries/eigen/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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;

From aee4ccdee0e02c9f73e468bb3c575dd146bcedd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 16:09:55 +0000
Subject: [PATCH 101/116] * Updated kdeartwork.

svn path=/nixpkgs/branches/kde-4.7/; revision=28005
---
 pkgs/desktops/kde-4.7/artwork/aurorae.nix           |  4 ++--
 pkgs/desktops/kde-4.7/artwork/color-schemes.nix     |  5 +++--
 pkgs/desktops/kde-4.7/artwork/desktop-themes.nix    |  5 +++--
 pkgs/desktops/kde-4.7/artwork/emoticons.nix         |  5 +++--
 .../kde-4.7/artwork/high-resolution-wallpapers.nix  |  5 +++--
 pkgs/desktops/kde-4.7/artwork/kscreensaver.nix      |  7 +++++--
 pkgs/desktops/kde-4.7/artwork/kwin-styles.nix       | 13 +++++++++++++
 pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix |  5 +++--
 pkgs/desktops/kde-4.7/artwork/phase-style.nix       |  7 ++++---
 pkgs/desktops/kde-4.7/artwork/sounds.nix            |  5 +++--
 pkgs/desktops/kde-4.7/artwork/wallpapers.nix        |  5 +++--
 .../desktops/kde-4.7/artwork/weather-wallpapers.nix |  5 +++--
 pkgs/desktops/kde-4.7/default.nix                   |  7 ++++---
 pkgs/desktops/kde-4.7/libkexiv2.nix                 |  4 ++--
 14 files changed, 54 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/artwork/kwin-styles.nix

diff --git a/pkgs/desktops/kde-4.7/artwork/aurorae.nix b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
index 183914bf231..c48cbad4e84 100644
--- a/pkgs/desktops/kde-4.7/artwork/aurorae.nix
+++ b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
@@ -1,9 +1,9 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "aurorae-themes-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
   
   meta = {
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/color-schemes.nix b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
index 7d20acb3a81..ec0fabcea82 100644
--- a/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-color-schemes-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
   meta = {
     description = "Additional KDE color schemes";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
index 760acd02928..6490e75aaa5 100644
--- a/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-desktop-themes-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
     description = "Additional KDE desktop themes";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/emoticons.nix b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
index 05d40947a94..b5086efa4ff 100644
--- a/pkgs/desktops/kde-4.7/artwork/emoticons.nix
+++ b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-emotion-icons-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
     description = "Additional KDE emotion icons (smiles)";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
index 17e0af4c86f..07103168c0a 100644
--- a/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
index ca7e65b9f39..422eba781d5 100644
--- a/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
@@ -1,8 +1,11 @@
-{ 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 screensavers";
     kde = {
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
index 8bd1f401136..fd084ebb692 100644
--- a/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
+++ b/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
@@ -1,11 +1,12 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ 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 automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+  
   meta = {
     description = "KDE nuvola icon theme";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/phase-style.nix b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
index c4295b66810..c2876f2df29 100644
--- a/pkgs/desktops/kde-4.7/artwork/phase-style.nix
+++ b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
@@ -1,11 +1,12 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-style-phase-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
-    description = "KDE phase style. Clean classical look";
+    description = "Phase, a widget style for KDE";
     kde = {
       name = "styles";
       module = "kdeartwork";
diff --git a/pkgs/desktops/kde-4.7/artwork/sounds.nix b/pkgs/desktops/kde-4.7/artwork/sounds.nix
index e0824503281..7789c4f09c5 100644
--- a/pkgs/desktops/kde-4.7/artwork/sounds.nix
+++ b/pkgs/desktops/kde-4.7/artwork/sounds.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-sounds-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
     description = "New login/logout sounds";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
index e2cad0b7178..0543813a0ef 100644
--- a/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-wallpapers-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
     description = "Additional KDE wallpapers";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
index b4354c10f87..9579ceca74c 100644
--- a/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
 
 kde.package rec {
   name = "kde-weather-wallpapers-${kde.release}";
 
-  buildInputs = [ cmake automoc4 kdelibs ];
+  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
   meta = {
     description = "Additional KDE wallpapers (weather)";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index f3e3dfa5071..e07a5d24590 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -95,10 +95,9 @@ recurseIntoAttrs rec {
     kaccessible = callPackage ./accessibility/kaccessible.nix { };
   };
 
-  /*
   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 { };
@@ -108,8 +107,10 @@ recurseIntoAttrs 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 { };
   kdegraphics = callPackage ./graphics { };
   kdenetwork = callPackage ./network { };
@@ -178,10 +179,10 @@ recurseIntoAttrs rec {
   kdebindings = callPackage ./bindings { };
 
   l10n = callPackage ./l10n { inherit release; };
+  */
 
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs
     (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
-  */
 
 }
diff --git a/pkgs/desktops/kde-4.7/libkexiv2.nix b/pkgs/desktops/kde-4.7/libkexiv2.nix
index 6719caef899..0d740584570 100644
--- a/pkgs/desktops/kde-4.7/libkexiv2.nix
+++ b/pkgs/desktops/kde-4.7/libkexiv2.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, exiv2 }:
+{ automoc4, cmake, kde, kdelibs, qt4, exiv2, perl, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 perl phonon ];
 
   meta = {
     description = "Exiv2 support library";

From 76fffef17550831a2b3a9e75fbb7c51166d4f56a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 17:24:59 +0000
Subject: [PATCH 102/116] * More stuff.

svn path=/nixpkgs/branches/kde-4.7/; revision=28006
---
 pkgs/desktops/kde-4.7/default.nix      |  8 ++++++-
 pkgs/desktops/kde-4.7/kamera.nix       |  4 ++--
 pkgs/desktops/kde-4.7/kgamma.nix       | 12 +++++++++++
 pkgs/desktops/kde-4.7/kipi-plugins.nix | 29 ++++++++++++++++++++++++++
 pkgs/desktops/kde-4.7/kolourpaint.nix  | 12 +++++++++++
 pkgs/desktops/kde-4.7/libkdcraw.nix    | 12 +++++++++++
 6 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/kgamma.nix
 create mode 100644 pkgs/desktops/kde-4.7/kipi-plugins.nix
 create mode 100644 pkgs/desktops/kde-4.7/kolourpaint.nix
 create mode 100644 pkgs/desktops/kde-4.7/libkdcraw.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index e07a5d24590..d3a64462488 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -40,7 +40,9 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
-  #kipi_plugins = callPackage ./kipi-plugins { };
+  libkdcraw = callPackage ./libkdcraw.nix { };
+
+  kipi_plugins = callPackage ./kipi-plugins.nix { };
 
 ### LIBS
 
@@ -87,6 +89,10 @@ recurseIntoAttrs rec {
   
   kdemultimedia = callPackage ./multimedia.nix { };
 
+  kolourpaint = callPackage ./kolourpaint.nix { };
+
+  kgamma = callPackage ./kgamma.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     #jovie = callPackage ./accessibility/jovie.nix { };
     kmag = callPackage ./accessibility/kmag.nix { };
diff --git a/pkgs/desktops/kde-4.7/kamera.nix b/pkgs/desktops/kde-4.7/kamera.nix
index aa3446c7558..056136ecd12 100644
--- a/pkgs/desktops/kde-4.7/kamera.nix
+++ b/pkgs/desktops/kde-4.7/kamera.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libgphoto2 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libgphoto2 }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 libgphoto2 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libgphoto2 ];
 
   meta = {
     description = "KDE camera interface library";
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/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";
+  };
+}

From 980b45310233b21702a4da44793e439558a85642 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 17:48:39 +0000
Subject: [PATCH 103/116] * Fix localisation.

svn path=/nixpkgs/branches/kde-4.7/; revision=28007
---
 pkgs/desktops/kde-4.7/default.nix      | 2 +-
 pkgs/desktops/kde-4.7/l10n/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index d3a64462488..7dff75be9ab 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -183,9 +183,9 @@ recurseIntoAttrs rec {
 
   /*
   kdebindings = callPackage ./bindings { };
+  */
 
   l10n = callPackage ./l10n { inherit release; };
-  */
 
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs
diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix
index e2ee8e4dc40..d737888ec14 100644
--- a/pkgs/desktops/kde-4.7/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
 
@@ -16,7 +16,7 @@ let
         inherit sha256;
       };
 
-      buildInputs = [ cmake perl gettext kdelibs automoc4 ];
+      buildInputs = [ cmake perl gettext kdelibs automoc4 qt4 phonon ];
 
       meta = {
         description = "KDE translation for ${lang}";

From 35437ef75b5ee91e8e016300fedd7ff048b75ba4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 19:05:52 +0000
Subject: [PATCH 104/116] * Updated kdepim-runtime and kdepim.

svn path=/nixpkgs/branches/kde-4.7/; revision=28008
---
 pkgs/desktops/kde-4.7/default.nix             |  9 +++--
 pkgs/desktops/kde-4.7/pim-runtime.nix         | 17 ++++++++++
 pkgs/desktops/kde-4.7/pim-runtime/default.nix | 27 ---------------
 pkgs/desktops/kde-4.7/pim.nix                 | 34 +++++++++++++++++++
 pkgs/desktops/kde-4.7/pim/default.nix         | 34 -------------------
 .../{pimlibs/default.nix => pimlibs.nix}      |  0
 6 files changed, 55 insertions(+), 66 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.7/pim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.7/pim-runtime/default.nix
 create mode 100644 pkgs/desktops/kde-4.7/pim.nix
 delete mode 100644 pkgs/desktops/kde-4.7/pim/default.nix
 rename pkgs/desktops/kde-4.7/{pimlibs/default.nix => pimlibs.nix} (100%)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 7dff75be9ab..ccfcb61c71b 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,7 @@ recurseIntoAttrs rec {
 
   kdelibs = callPackage ./libs { };
 
-  kdepimlibs = callPackage ./pimlibs { };
+  kdepimlibs = callPackage ./pimlibs.nix { };
 
 ### BASE
 
@@ -174,10 +174,9 @@ recurseIntoAttrs 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
 
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-runtime/default.nix b/pkgs/desktops/kde-4.7/pim-runtime/default.nix
deleted file mode 100644
index d92f1eecc73..00000000000
--- a/pkgs/desktops/kde-4.7/pim-runtime/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
-, automoc4, phonon, akonadi, soprano, strigi}:
-
-kde.package rec {
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
-                  kdelibs kdepimlibs
-		  automoc4 phonon akonadi soprano strigi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
-  };
-
-  meta = {
-    description = "KDE PIM runtime";
-    homepage = http://www.kde.org;
-    license = "GPL";
-    kde = {
-      name = "kdepim-runtime";
-      version = "4.4.8";
-    };
-  };
-}
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/pim/default.nix b/pkgs/desktops/kde-4.7/pim/default.nix
deleted file mode 100644
index cdcc3dc023d..00000000000
--- a/pkgs/desktops/kde-4.7/pim/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
-, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
-
-kde.package rec {
-
-  buildInputs = [ cmake 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
-  '';
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
-    sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
-  };
-
-  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";
-      version = "4.4.8";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/pimlibs/default.nix b/pkgs/desktops/kde-4.7/pimlibs.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/pimlibs/default.nix
rename to pkgs/desktops/kde-4.7/pimlibs.nix

From 483bedccda1ece4f4404c652ddc080f8aca79f50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 31 Jul 2011 19:12:10 +0000
Subject: [PATCH 105/116] * Disable kdebindings in the old KDE 4.5.  It doesn't
 build anymore   due to changes in Phonon and other packages.  It's not really
   important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
---
 pkgs/desktops/kde-4.5/bindings/default.nix | 4 ++--
 pkgs/desktops/kde-4.5/default.nix          | 5 +++--
 pkgs/desktops/kde-4.5/games/default.nix    | 4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)

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 c152a90d2b6..d5fdc8628cf 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -123,7 +123,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 { };
   };
@@ -140,7 +140,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";

From 08b9b370a4cf7dbf434b70b9c6b1b4fa06176885 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 08:32:20 +0000
Subject: [PATCH 106/116] * KDE 4.5: use an old ffmpeg.

svn path=/nixpkgs/branches/kde-4.7/; revision=28102
---
 pkgs/desktops/kde-4.5/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d5fdc8628cf..a4b5d8fb467 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,6 +24,8 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
+  ffmpeg = ffmpeg_0_6_90;
+
   kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT

From 99ff06be3e18511d1e46c8833bc1a6feb99bd46f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 09:08:57 +0000
Subject: [PATCH 107/116] * KDE 4.5 needs an older version of
 shared-desktop-ontologies.

svn path=/nixpkgs/branches/kde-4.7/; revision=28103
---
 pkgs/desktops/kde-4.5/default.nix             |  2 ++
 pkgs/desktops/kde-4.5/pim-runtime/default.nix |  4 ++--
 pkgs/desktops/kde-4.5/pim/default.nix         |  4 ++--
 .../shared-desktop-ontologies/default.nix     | 22 +++++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index a4b5d8fb467..e8cb4ab56d3 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -26,6 +26,8 @@ recurseIntoAttrs rec {
 
   ffmpeg = ffmpeg_0_6_90;
 
+  shared_desktop_ontologies = callPackage ./support/shared-desktop-ontologies { };
+
   kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT
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 ];
+  };
+}
+

From 0cb6cfb7a149fbb19862895df44ffeea87e601f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 09:23:10 +0000
Subject: [PATCH 108/116] * Update vlc to 1.1.11.

svn path=/nixpkgs/branches/kde-4.7/; revision=28104
---
 pkgs/applications/video/vlc/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix         | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98e4e49e65d..88eb7873f68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7195,8 +7195,6 @@ let
   };
 
   vlc = callPackage ../applications/video/vlc {
-    dbus = dbus.libs;
-    alsa = alsaLib;
     lua = lua5;
   };
 

From d9ed123038c11fa357176410d3da89293544ecf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 11:57:46 +0000
Subject: [PATCH 109/116] * Audacity: use an older ffmpeg
 (http://hydra.nixos.org/build/1187243).

svn path=/nixpkgs/branches/kde-4.7/; revision=28107
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88eb7873f68..e9e4d379b8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5986,6 +5986,7 @@ let
 
   audacity = callPackage ../applications/audio/audacity {
     portaudio = portaudioSVN;
+    ffmpeg = ffmpeg_0_6_90;
   };
 
   aumix = callPackage ../applications/audio/aumix {

From 4e321d8bd8f4409f59371d0bf6d3e2fd34be65a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 11:58:11 +0000
Subject: [PATCH 110/116] * Zathura updated to 0.0.8.4 (to fix
 http://hydra.nixos.org/build/1191958).

svn path=/nixpkgs/branches/kde-4.7/; revision=28108
---
 pkgs/applications/misc/zathura/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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;
   };
 }

From 444263db251404835db0996eae207f30b802b0d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 12:01:09 +0000
Subject: [PATCH 111/116] * ffmpeg updated to 0.8.1 (including security fixes).

svn path=/nixpkgs/branches/kde-4.7/; revision=28109
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 70b97a3b92e..b77b52a5e65 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.8";
+  name = "ffmpeg-0.8.1";
   
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "03zwwc1qs117pfjk9r071fbx4al3j0c85j97dgwqc0wp2z1zs9iy";
+    sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

From 06a0d9d95c4f46979ccd9b32312a4025876083ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 12:03:16 +0000
Subject: [PATCH 112/116] * More packages that require the old ffmpeg.  BTW,
 maybe this should be the old-ABI ffmpeg (0.7.2).

svn path=/nixpkgs/branches/kde-4.7/; revision=28110
---
 pkgs/top-level/all-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e4d379b8c..f63ff50aa7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4070,7 +4070,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
@@ -4705,7 +4706,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 { };
 

From e33ef05c269dbb0fbedd28a0d413be38d927e5dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 13:26:00 +0000
Subject: [PATCH 113/116] * Add rtkit to the channel.

svn path=/nixpkgs/branches/kde-4.7/; revision=28111
---
 pkgs/os-specific/linux/rtkit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index d2e94b15d4d..05ebd0bf845 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://0pointer.de/blog/projects/rtkit;
     descriptions = "A daemon that hands out real-time priority to processes";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From c64cd58c957f84245fe3977de8512872d639df87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 14:35:31 +0000
Subject: [PATCH 114/116] * D-Bus updated to 1.4.14.

svn path=/nixpkgs/branches/kde-4.7/; revision=28114
---
 pkgs/development/libraries/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index f6cf76a379d..6a5952e66a1 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.10";
+  version = "1.4.14";
   
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "05wmvfvsbqjsy2mwawjdqw4v3jii3f79hp1bldflhpaj448v9d7w";
+    sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
   };
 
   patches = [ ./ignore-missing-includedirs.patch ];

From 5a04f8450d983c06f1758be4004b188390258fa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Aug 2011 11:45:57 +0000
Subject: [PATCH 115/116] * Hack to fix D-Bus X11 autolaunch support in D-Bus
 >= 1.4.8.

svn path=/nixpkgs/branches/kde-4.7/; revision=28140
---
 pkgs/development/libraries/dbus/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 6a5952e66a1..712ef36bdd7 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -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";
   };
 

From 7c0ca0d5651dd3127f60fe022e48bf7ad7154d5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Aug 2011 22:36:20 +0000
Subject: [PATCH 116/116] svn path=/nixpkgs/branches/kde-4.7/; revision=28146

---
 pkgs/os-specific/linux/udisks/default.nix | 1 +
 pkgs/os-specific/linux/upower/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
index a454003869d..79187752a6c 100644
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
   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
index 4ffa873e9b5..441a1a06c40 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://upower.freedesktop.org/;
     description = "A D-Bus service for power management";
+    platforms = stdenv.lib.platforms.linux;
   };
 }