nixpkgs/pkgs
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
..
applications Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
build-support Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
data Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
desktops Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
development Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
games Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
lib Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
misc Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
os-specific Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
servers Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
shells Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
stdenv Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
test
tools Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
top-level Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00