Update from trunk

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

8 files changed, 43 insertions, 18 deletions

diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix
index d1b58b280c6..6f41ed7daa6 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 cdb2c8cc253..71daed339cd 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 7338589e2e2..8452161b66c 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 2c98f37e8d2..b701e61ba03 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 dfdb83293a2..03543a6d7e2 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 a2cc42a18f0..923c719b432 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 00000000000..543b7660975
--- /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 81c06316fd9..3d4abf9b358 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 { };