* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14965

21 files changed, 71 insertions, 63 deletions

diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix
index a741525b0710..b51f6cf5976e 100644
--- a/pkgs/desktops/kde-4.2/admin/default.nix
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -3,10 +3,10 @@
  kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeadmin-4.2.1";
+  name = "kdeadmin-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdeadmin-4.2.1.tar.bz2;
-    sha1 = "888203103fe86010461b1e38d51ba9a20f3250e8";
+    url = mirror://kde/stable/4.2.2/src/kdeadmin-4.2.2.tar.bz2;
+    sha1 = "3bf8f689d6fcafcfdfb2bea4c6003e56c80c4601";
   };
   builder = ./builder.sh;
   inherit system_config_printer;
diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix
index e1cc3f4b441d..4fd38cc22c58 100644
--- a/pkgs/desktops/kde-4.2/artwork/default.nix
+++ b/pkgs/desktops/kde-4.2/artwork/default.nix
@@ -2,10 +2,10 @@
  kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
 
 stdenv.mkDerivation {
-  name = "kdeartwork-4.2.1";
+  name = "kdeartwork-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdeartwork-4.2.1.tar.bz2;
-    sha1 = "02bd99ca5cf303bdeb991b3e85b45dfc4e69e0bc";
+    url = mirror://kde/stable/4.2.2/src/kdeartwork-4.2.2.tar.bz2;
+    sha1 = "306eede44f62fdef0892ad40988ada51f06bfa73";
   };
   buildInputs = [ cmake qt4 perl xscreensaver
                   kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix
index 5728b206c92a..4cf2c7413bc0 100644
--- a/pkgs/desktops/kde-4.2/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix
@@ -2,10 +2,10 @@
  automoc4, phonon, strigi, soprano, cluceneCore}:
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.2.1";
+  name = "kdebase-runtime-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdebase-runtime-4.2.1.tar.bz2;
-    sha1 = "e80d1882d36e4c9737e80fcb5080bc683403ddb5";
+    url = mirror://kde/stable/4.2.2/src/kdebase-runtime-4.2.2.tar.bz2;
+    sha1 = "0b100ceb77fa2e8cbe5303f7fea28b02117c7658";
   };
 /*  CLUCENE_HOME=cluceneCore;*/
   buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs
diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix
index a73b8d3b7c59..1038df9b2c67 100644
--- a/pkgs/desktops/kde-4.2/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, cmake, perl, python,
+{stdenv, fetchurl, cmake, perl, python, pam, ConsoleKit,
  qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings,
  libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver,
  lm_sensors, libxklavier, libusb, pthread_stubs, boost,
  automoc4, phonon, strigi, soprano, qimageblitz}:
 
 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.2.1";
+  name = "kdebase-workspace-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdebase-workspace-4.2.1.tar.bz2;
-    sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0";
+    url = mirror://kde/stable/4.2.2/src/kdebase-workspace-4.2.2.tar.bz2;
+    sha1 = "9397220827f378cedf38e800e06e9ca8b1a1235d";
   };
   CMAKE_PREFIX_PATH=kdepimlibs;
-  buildInputs = [ cmake perl python qt4 /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
+  buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
                   libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
                   lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
 }
diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix
index 901145b5b48d..0f6d2e912593 100644
--- a/pkgs/desktops/kde-4.2/base/default.nix
+++ b/pkgs/desktops/kde-4.2/base/default.nix
@@ -2,10 +2,10 @@
  automoc4, phonon, strigi, qimageblitz, soprano}:
 
 stdenv.mkDerivation {
-  name = "kdebase-4.2.1";
+  name = "kdebase-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdebase-4.2.1.tar.bz2;
-    sha1 = "c500024294a7621d176d26bdabdd138d18ec827d";
+    url = mirror://kde/stable/4.2.2/src/kdebase-4.2.2.tar.bz2;
+    sha1 = "10309413767b856d303102155911518519e5b57e";
   };
   buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
                   automoc4 phonon strigi qimageblitz soprano ];
diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix
index 712f321bef25..7364ba5d415a 100644
--- a/pkgs/desktops/kde-4.2/bindings/default.nix
+++ b/pkgs/desktops/kde-4.2/bindings/default.nix
@@ -5,10 +5,10 @@
 # some bindings are even broken.
 
 stdenv.mkDerivation {
-  name = "kdebindings-4.2.1";
+  name = "kdebindings-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdebindings-4.2.1.tar.bz2;
-    sha1 = "96353bb3269a7ca37ff31487a0fb7a9c25958963";
+    url = mirror://kde/stable/4.2.2/src/kdebindings-4.2.2.tar.bz2;
+    sha1 = "1d5eb1bb92f68172d0a0345070b1120c2601ab8c";
   };
   builder = ./builder.sh;
   buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 364c5a28a8bd..4e24259d874c 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -54,8 +54,8 @@ rec {
 
 ### BASE  
   kdebase_workspace = import ./base-workspace {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
-    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl python pam sip pyqt4;
+    inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit;
     inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
     inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon strigi soprano qimageblitz;
diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix
index 5336ecccfb6f..b70cf3613ca5 100644
--- a/pkgs/desktops/kde-4.2/edu/default.nix
+++ b/pkgs/desktops/kde-4.2/edu/default.nix
@@ -3,10 +3,10 @@
  kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeedu-4.2.1";
+  name = "kdeedu-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdeedu-4.2.1.tar.bz2;
-    sha1 = "f2381f33f6586b950e925423d135b9e66b7bf428";
+    url = mirror://kde/stable/4.2.2/src/kdeedu-4.2.2.tar.bz2;
+    sha1 = "c6aaf3639188e66d14da0d404a9b5d5fb95e7df5";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
                   kdelibs automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix
index cc099d9cb704..29ba3e9a26ff 100644
--- a/pkgs/desktops/kde-4.2/games/default.nix
+++ b/pkgs/desktops/kde-4.2/games/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegames-4.2.1";
+  name = "kdegames-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdegames-4.2.1.tar.bz2;
-    sha1 = "dee8a0fece054bc3b6234fa088ca16b8f5f87795";
+    url = mirror://kde/stable/4.2.2/src/kdegames-4.2.2.tar.bz2;
+    sha1 = "ffd4dde8c10f14de9da4e44d22b2ac19c8bfce9b";
   };
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
 }
diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix
index e468bded53ff..678eb67f98ef 100644
--- a/pkgs/desktops/kde-4.2/graphics/default.nix
+++ b/pkgs/desktops/kde-4.2/graphics/default.nix
@@ -3,10 +3,10 @@
  kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegraphics-4.2.1";
+  name = "kdegraphics-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2;
-    sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e";
+    url = mirror://kde/stable/4.2.2/src/kdegraphics-4.2.2.tar.bz2;
+    sha1 = "cb7bda631b6e5b1866b07c622c7dc54771a87760";
   };
   buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
                   stdenv.gcc.libc libXxf86vm
diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix
index 881ca1b4f853..57893cedcfbd 100644
--- a/pkgs/desktops/kde-4.2/libs/default.nix
+++ b/pkgs/desktops/kde-4.2/libs/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-4.2.1";
+  name = "kdelibs-4.2.2";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdelibs-4.2.1.tar.bz2;
-    sha1 = "d2214b9864b64e4a8382a9f593d082c801c58571";
+    url = mirror://kde/stable/4.2.2/src/kdelibs-4.2.2.tar.bz2;
+    sha1 = "7769bac38b27d8726c27eb3bb0b79f370f77457f";
   };
   
   buildInputs = [
diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix
index 77f7164e82d9..d7c78330ff17 100644
--- a/pkgs/desktops/kde-4.2/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.2/multimedia/default.nix
@@ -2,10 +2,10 @@
  kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.2.1";
+  name = "kdemultimedia-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdemultimedia-4.2.1.tar.bz2;
-    sha1 = "5382c963fae0ca6528c326b73234525e170a5c2e";
+    url = mirror://kde/stable/4.2.2/src/kdemultimedia-4.2.2.tar.bz2;
+    sha1 = "bacbf584cd38be5234bb5a4419a275c6f4164721";
   };
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia
                   kdelibs automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix
index 451b50ad69ec..bbb90648dd78 100644
--- a/pkgs/desktops/kde-4.2/network/default.nix
+++ b/pkgs/desktops/kde-4.2/network/default.nix
@@ -4,10 +4,10 @@
  kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.2.1";
+  name = "kdenetwork-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdenetwork-4.2.1.tar.bz2;
-    sha1 = "d6d730c167cd72d43904715014b2adc8f7d5bc1e";
+    url = mirror://kde/stable/4.2.2/src/kdenetwork-4.2.2.tar.bz2;
+    sha1 = "335a09012602400318d6e703fdcc390f5a2f7761";
   };
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix
index 8f36dac341b3..b112d3af5ed6 100644
--- a/pkgs/desktops/kde-4.2/pim/default.nix
+++ b/pkgs/desktops/kde-4.2/pim/default.nix
@@ -3,10 +3,10 @@
  kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdepim-4.2.1";
+  name = "kdepim-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdepim-4.2.1.tar.bz2;
-    sha1 = "be97f4d34eb19b08c30988e07a75c24d5ccad08c";
+    url = mirror://kde/stable/4.2.2/src/kdepim-4.2.2.tar.bz2;
+    sha1 = "abd6d9e7777cf192aa7919dce56644e942d8e2e9";
   };
   CMAKE_PREFIX_PATH=kdepimlibs;
   builder = ./builder.sh;  
diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix
index 134e01aa00e0..6231c838f350 100644
--- a/pkgs/desktops/kde-4.2/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix
@@ -2,10 +2,10 @@
  kdelibs, automoc4, phonon, akonadi}:
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-4.2.1";
+  name = "kdepimlibs-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdepimlibs-4.2.1.tar.bz2;
-    sha1 = "150228037fcd740fec0a490149cd1980ddb8fb57";
+    url = mirror://kde/stable/4.2.2/src/kdepimlibs-4.2.2.tar.bz2;
+    sha1 = "895ae97d393ec47386de71bbe76fb5a685d3850f";
   };
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap
                   kdelibs automoc4 phonon akonadi ];
diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
index ad9b16337723..18d2d9e04a19 100644
--- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
@@ -2,10 +2,10 @@
  kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeplasma-addons-4.2.1";
+  name = "kdeplasma-addons-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdeplasma-addons-4.2.1.tar.bz2;
-    sha1 = "8e164a8e1476862392371f765372c2e168895d55";
+    url = mirror://kde/stable/4.2.2/src/kdeplasma-addons-4.2.2.tar.bz2;
+    sha1 = "6b4afe369597b8cdeff05e1b0feda0d48aea59d6";
   };
   inherit kdebase_workspace;
   builder = ./builder.sh;
diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix
index 353e5ccfe72c..75f22f2ab416 100644
--- a/pkgs/desktops/kde-4.2/sdk/default.nix
+++ b/pkgs/desktops/kde-4.2/sdk/default.nix
@@ -2,10 +2,10 @@
  kdelibs, kdepimlibs, automoc4, phonon, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdesdk-4.2.1";
+  name = "kdesdk-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdesdk-4.2.1.tar.bz2;
-    sha1 = "dca74527bcf6e5925ec58a74196e683cc68a259a";
+    url = mirror://kde/stable/4.2.2/src/kdesdk-4.2.2.tar.bz2;
+    sha1 = "ea610bc2cf3f5beb37f03ac6ff7822fca5234003";
   };
   CMAKE_PREFIX_PATH=kdepimlibs;
   builder=./builder.sh;
diff --git a/pkgs/desktops/kde-4.2/support/soprano/default.nix b/pkgs/desktops/kde-4.2/support/soprano/default.nix
index 87bac0c90506..a19270e939a9 100644
--- a/pkgs/desktops/kde-4.2/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.2/support/soprano/default.nix
@@ -2,10 +2,18 @@
 
 stdenv.mkDerivation {
   name = "soprano-2.2.3";
+  
   src = fetchurl {
     url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2;
     md5 = "22c992a252144ae0a3a964ba2f6f1933";
   };
-  JAVA_HOME=jdk;
-  buildInputs = [ cmake qt4 jdk cluceneCore redland ];
+  
+  #JAVA_HOME=jdk;
+  
+  buildInputs = [ cmake qt4 /* jdk */ cluceneCore redland ];
+
+  meta = {
+    homepage = http://soprano.sourceforge.net/;
+    description = "An object-oriented C++/Qt4 framework for RDF data";
+  };
 }
diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix
index e1a23ce16cb1..a5959d922741 100644
--- a/pkgs/desktops/kde-4.2/toys/default.nix
+++ b/pkgs/desktops/kde-4.2/toys/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdetoys-4.2.1";
+  name = "kdetoys-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdetoys-4.2.1.tar.bz2;
-    sha1 = "46157a10a35d37e798faa8bb988ac1c3f2a51f07";
+    url = mirror://kde/stable/4.2.2/src/kdetoys-4.2.2.tar.bz2;
+    sha1 = "5057ae39c77be8792fb1c23fd8cf1e3ac06942cf";
   };
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix
index a77c2feed9db..2458e47b7421 100644
--- a/pkgs/desktops/kde-4.2/utils/default.nix
+++ b/pkgs/desktops/kde-4.2/utils/default.nix
@@ -2,10 +2,10 @@
  kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}:
 
 stdenv.mkDerivation {
-  name = "kdeutils-4.2.1";
+  name = "kdeutils-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdeutils-4.2.1.tar.bz2;
-    sha1 = "2f875d05584b25b928b38e1da2b04c073acefd35";
+    url = mirror://kde/stable/4.2.2/src/kdeutils-4.2.2.tar.bz2;
+    sha1 = "98e388776b1c270fc6a629c94455024e08bb85b4";
   };
   builder = ./builder.sh;
   inherit system_config_printer;
diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix
index 9b06650a4028..6e7d0b9bea49 100644
--- a/pkgs/desktops/kde-4.2/webdev/default.nix
+++ b/pkgs/desktops/kde-4.2/webdev/default.nix
@@ -2,10 +2,10 @@
  kdelibs, kdepimlibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdewebdev-4.2.1";
+  name = "kdewebdev-4.2.2";
   src = fetchurl {
-    url = mirror://kde/stable/4.2.1/src/kdewebdev-4.2.1.tar.bz2;
-    sha1 = "438bef3bb32ce53a83c6f30f65fb49d4d4e7c76a";
+    url = mirror://kde/stable/4.2.2/src/kdewebdev-4.2.2.tar.bz2;
+    sha1 = "fe43dad60a72bcaaafa0d0384fa5635c6a9c4795";
   };
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];