Author: urkud
Date: Tue Feb 14 14:33:10 2012
New Revision: 32273
URL: https://nixos.org/websvn/nix/?rev=32273&sc=1
Log:
svn merge ^/nixpkgs/trunk
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdepim-runtime.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/archivers/unzip/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/release.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdepim-runtime.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdepim-runtime.nix
Tue Feb 14 14:29:25 2012 (r32272)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.8/kdepim-runtime.nix
Tue Feb 14 14:33:10 2012 (r32273)
@@ -5,6 +5,13 @@
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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/archivers/unzip/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/archivers/unzip/default.nix
Tue Feb 14 14:29:25 2012 (r32272)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/archivers/unzip/default.nix
Tue Feb 14 14:33:10 2012 (r32273)
@@ -27,7 +27,7 @@
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 =
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/release.nix Tue Feb 14
14:29:25 2012 (r32272)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/release.nix Tue Feb 14
14:33:10 2012 (r32273)
@@ -304,7 +304,6 @@
udev = linux;
uml = ["i686-linux"];
unrar = linux;
- unzip = all;
upstart = linux;
usbutils = linux;
utillinux = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
