Update from trunk

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

16 files changed, 146 insertions, 22 deletions

diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
new file mode 100644
index 0000000000000..148e95acee06e
--- /dev/null
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, perl}: 
+
+stdenv.mkDerivation rec {
+  name = "yacas-1.2.2";
+
+  src = fetchurl {
+    url = "http://yacas.sourceforge.net/backups/${name}.tar.gz";
+    sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78";
+  };
+
+  # Perl is only for the documentation
+  buildInputs = [ perl ];
+
+  patches = [ ./gcc43.patch ];
+
+  meta = { 
+      description = "Easy to use, general purpose Computer Algebra System";
+      homepage = http://yacas.sourceforge.net/;
+      license = "GPLv2+";
+      maintainers = with stdenv.lib.maintainers; [viric];
+      platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/applications/science/math/yacas/gcc43.patch b/pkgs/applications/science/math/yacas/gcc43.patch
new file mode 100644
index 0000000000000..054f80cff927e
--- /dev/null
+++ b/pkgs/applications/science/math/yacas/gcc43.patch
@@ -0,0 +1,17 @@
+Taken from gentoo:
+http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup
+Index: yacas-1.2.2-gcc43.patch
+===================================================================
+--- a/manmake/manripper.cpp
++++ b/manmake/manripper.cpp
+@@ -1,7 +1,8 @@
+ 
+-#include <stdio.h>
+-#include <ctype.h>
++#include <cstdio>
++#include <cctype>
+ #include <string>
++#include <cstring>
+ #include <map>
+ 
+ using namespace std;
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
new file mode 100644
index 0000000000000..27a4014d461d6
--- /dev/null
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, libmatchbox, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "matchbox-1.2.2";
+
+  buildInputs = [ libmatchbox pkgconfig ];
+
+  src = fetchurl {
+    url = http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2;
+    sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
+  };
+
+  meta = {
+    description = "X window manager for non-desktop embedded systems";
+    homepage = http://matchbox-project.org/;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix
index d1b58b280c6c0..6f41ed7daa619 100644
--- a/pkgs/desktops/kde-4.5/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-{ pn, v, stable ? true, sha256, subdir ? null }: args:
+a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
 stdenv.mkDerivation ({
   name = "${pn}-${v}";
   src = fetchurl {
@@ -13,5 +13,5 @@ stdenv.mkDerivation ({
     platforms = stdenv.lib.platforms.linux;
     inherit stable;
     homepage = http://www.kde.org;
-  } // ( if args ? meta then args.meta else { } );
-} // args)
+  } // ( if a ? meta then a.meta else { } );
+} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index cdb2c8cc2532b..71daed339cd16 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -9,7 +9,7 @@ kdePackage {
   pn = "kdelibs";
   v = "4.5.0";
   sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
-} {
+
   buildInputs = [
     cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
     shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index 7338589e2e2c7..8452161b66c3d 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -1,13 +1,10 @@
-{ stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
+{ kdePackage, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
 , kdelibs, automoc4, akonadi, soprano}:
 
-stdenv.mkDerivation rec {
-  name = "kdepimlibs-4.4.95";
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
-    sha256 = "06ap22p9x7l698skkrnsh7k3h1z0v6h3h3fwjrv4y6lv5vygccny";
-  };
+kdePackage {
+  pn = "kdepimlibs";
+  v = "4.5.0";
+  sha256 = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
 
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
     shared_mime_info kdelibs automoc4 akonadi soprano ];
@@ -15,7 +12,5 @@ stdenv.mkDerivation rec {
   meta = {
     description = "KDE PIM libraries";
     license = "LGPL";
-    homepage = http://www.kde.org;
-    inherit (kdelibs.meta) maintainers;
   };
 }
diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
index 2c98f37e8d200..b701e61ba03c4 100644
--- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
@@ -4,7 +4,11 @@ kdePackage {
   pn = "oxygen-icons";
   v = "4.5.0";
   sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
-} {
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1fil2rbvy4j47gqpn4xcjvjwxy4yq5mvpwcd5lhp8fdzgsc0jmdn";
+
   buildInputs = [ cmake ];
   meta = {
     description = "KDE Oxygen theme icons";
diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
index dfdb83293a2ba..03543a6d7e2f7 100644
--- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
@@ -5,7 +5,7 @@ kdePackage {
   v = "0.96.1";
   subdir = "apps/KDE4.x/admin";
   sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
-} {
+
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
 }
diff --git a/pkgs/desktops/kde-4.5/support/soprano/default.nix b/pkgs/desktops/kde-4.5/support/soprano/default.nix
index a2cc42a18f0dd..923c719b43208 100644
--- a/pkgs/desktops/kde-4.5/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.5/support/soprano/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.4.64";
+  name = "soprano-2.5.0";
 
   src = fetchurl {
     url = "mirror://sf/soprano/${name}.tar.bz2";
-    sha256 = "1jrpgp573r2q20v108a0528f92n7g892pdr44fgskcq7wf8l8mzv";
+    sha256 = "01g0shwxksr6mg2g1pj1pbwz6nir5rw16ysmmly85891p62j8nxn";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
diff --git a/pkgs/desktops/xfce-4/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4/applications/xfce4-power-manager.nix
new file mode 100644
index 0000000000000..543b7660975fa
--- /dev/null
+++ b/pkgs/desktops/xfce-4/applications/xfce4-power-manager.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
+, libxfcegui4, libxfce4util, libnotify, xfce4panel }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-power-manager-0.8.5";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2";
+    sha1 = "b1ce0f120733ec1a6267d50ba5c2990bbbbccfd4";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk dbus_glib xfconf libxfcegui4 libxfce4util
+      libnotify xfce4panel
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${libxfcegui4}/include/xfce4";
+
+  meta = {
+    homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
+    description = "A power manager for the Xfce Desktop Environment";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 81c06316fd98d..3d4abf9b3582a 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -55,6 +55,8 @@ rec {
 
   ristretto = callPackage ./applications/ristretto.nix { };
 
+  xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
+
   #### ART
 
   xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
new file mode 100644
index 0000000000000..b45b443f6dee8
--- /dev/null
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
+
+stdenv.mkDerivation rec {
+  name = "libmatchbox-1.9";
+
+  buildInputs = [ libXft libICE pango libjpeg ];
+  propagatedBuildInputs = [ libX11 libXext libpng ];
+
+  src = fetchurl {
+    url = http://matchbox-project.org/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2;
+    sha256 = "006zdrgs7rgh7dvakjmqsp1q9karq6c5cz4gki2l15fhx0cf40fv";
+  };
+
+  meta = {
+    description = "Library of the matchbox X window manager";
+    homepage = http://matchbox-project.org/;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4332e35f90585..b0c4b325dfbc9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1358,11 +1358,11 @@ let
   })) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.2.0";
+    name = "xf86-input-synaptics-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.tar.bz2;
-      sha256 = "033232bvvy0ibr6w0fmcm3mjv212fl2bywj22d32wbxd4m6avmfx";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2;
+      sha256 = "1a1dvdc1g8fgkhr3fn3rnly1bz3f6kz1qjxyrmm22qmsair4w2yj";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto recordproto libX11 libXi xorgserver xproto libXtst ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list
index 37bc5d742e48a..c542576d900a6 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.5.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.5.list
@@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a447c56d46233..c8c50626aebb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3287,6 +3287,10 @@ let
 
   libmad = callPackage ../development/libraries/libmad { };
 
+  libmatchbox = callPackage ../development/libraries/libmatchbox {
+    inherit (gtkLibs) pango;
+  };
+
   libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
 
   libmcs = callPackage ../development/libraries/libmcs { };
@@ -5745,6 +5749,8 @@ let
    qt = qt4;
   };
 
+  matchbox = callPackage ../applications/window-managers/matchbox { };
+
   meld = callPackage ../applications/version-management/meld {
     inherit (gnome) scrollkeeper;
     pygtk = pyGtkGlade;
@@ -6727,6 +6733,8 @@ let
     withX = true;
   };
 
+  yacas = callPackage ../applications/science/math/yacas { };
+
   ### SCIENCE / MISC
 
   golly = callPackage ../applications/science/misc/golly { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 563df607aad4f..01d21a49e6488 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -562,5 +562,19 @@ with (import ./release-lib.nix);
     xsetroot = linux;
   };
 
+  xfce4 = {
+    gtk_xfce_engine = linux;
+    mousepad = linux;
+    ristretto = linux;
+    terminal = linux;
+    thunar = linux;
+    xfce4_power_manager = linux;
+    xfce4icontheme = linux;
+    xfce4panel = linux;
+    xfce4session = linux;
+    xfdesktop = linux;
+    xfwm4 = linux;
+  };
+
 } ))