From c81f618a343bbd8ee0473cbfd7217ee711b5ab58 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Feb 2012 14:33:10 +0000
Subject: [PATCH] svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
---
 pkgs/desktops/kde-4.8/kdepim-runtime.nix | 7 +++++++
 pkgs/tools/archivers/unzip/default.nix   | 2 +-
 pkgs/top-level/release.nix               | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix
index ef637f3f075b..f9280aad23ac 100644
--- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix
@@ -5,6 +5,13 @@ kde {
   buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
     libxslt ];
 
+  patches = map fetchurl [ {
+    # See https://bugs.kde.org/show_bug.cgi?id=289932
+    url = "http://bugsfiles.kde.org/attachment.cgi?id=68763";
+    name = "delays-in-nepomuk-indexing.patch";
+    sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85";
+  } ];
+
   meta = {
     description = "KDE PIM runtime";
     license = "GPL";
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 59ce1e397cf7..8309a2102ab4 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
     homepage = http://www.info-zip.org;
     description = "An extraction utility for archives compressed in .zip format";
     license = "free"; # http://www.info-zip.org/license.html
-    meta.platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.all;
   };
 } // (if enableNLS then {
   patches =
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 44419a040fdb..c6b470050971 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -304,7 +304,6 @@ with (import ./release-lib.nix);
   udev = linux;
   uml = ["i686-linux"];
   unrar = linux;
-  unzip = all;
   upstart = linux;
   usbutils = linux;
   utillinux = linux;