Lluís Batlle i Rossell 719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.6/default.nix pkgs/development/compilers/gcc/4.7/default.nix The 4.7 had some weird parameters added in crossAttrs; I've removed them, but I don't understand where they come from.		2012-12-28 20:14:01 +00:00
..
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00
windows	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00