Lluís Batlle i Rossell 67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial.		2012-12-28 23:30:53 +01:00
..
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 23:30:53 +01:00
windows	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00