nixpkgs/pkgs/development
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
..
androidenv Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
compilers Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
eclipse
guile-modules
interpreters Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
libraries Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
misc
ocaml-modules Remove a bunch of unreferenced files 2012-11-29 13:43:37 +01:00
perl-modules Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
python-modules Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
qtcreator qtcreator: Build QmlDesigner Plugin 2012-11-27 23:13:18 +01:00
ruby-modules
tools Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
web Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00