Lluís Batlle i Rossell dae3eb2383 Merging from trunk. ... I resolved two conflicts: - cmake (trunk fixes + stdenv-updates cross-compiling) - all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44) svn path=/nixpkgs/branches/stdenv-updates/; revision=18912		2009-12-12 18:39:09 +00:00
..
darwin	pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin	2009-11-05 13:44:30 +00:00
linux	Merging from trunk.	2009-12-12 18:39:09 +00:00