JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
This commit is contained in:
Yury G. Kudryashov 2012-02-14 14:33:10 +00:00
parent 02eaa57b56
commit c81f618a34
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/kde-4.8/kdepim-runtime.nix
View File

@ -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";

2
pkgs/tools/archivers/unzip/default.nix
View File

@ -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 =

1
pkgs/top-level/release.nix
View File

@ -304,7 +304,6 @@ with (import ./release-lib.nix);
udev = linux;
uml = ["i686-linux"];
unrar = linux;
unzip = all;
upstart = linux;
usbutils = linux;
utillinux = linux;