4 commits

Author	SHA1	Message	Date
Lluís Batlle i Rossell	5417c720fd	Merging from trunk. ... I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878	2010-08-02 15:48:19 +00:00
Peter Simons	70240d36ac	Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=22400	2010-06-23 14:35:18 +00:00
Yury G. Kudryashov	b39389560f	Add meta.platforms to qt4 and merkaartor ... Should fix one of hydra evaluation errors svn path=/nixpkgs/trunk/; revision=22360	2010-06-21 17:06:08 +00:00
Yury G. Kudryashov	0864c1422e	Move qt-4.x into subfolder ... svn path=/nixpkgs/trunk/; revision=21658	2010-05-07 20:08:31 +00:00