svn merge ^/nixpkgs/trunk

Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
This commit is contained in:
Yury G. Kudryashov
2012-02-06 23:03:12 +00:00
208 changed files with 2222 additions and 2185 deletions
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}