nixpkgs/pkgs/development
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
..
androidenv Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
arduino inotool: add avr-gcc-libc to inputs 2012-12-23 18:21:51 +02:00
compilers Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +01:00
eclipse update ecj to 3.7.2 2012-08-25 19:39:19 +02:00
guile-modules
interpreters Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
libraries Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +01:00
misc AVR GCC: enable C++ support (makes it usable with Arduino) 2012-12-23 18:20:34 +02:00
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 Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
qtcreator qtcreator: Build QmlDesigner Plugin 2012-11-27 23:13:18 +01:00
ruby-modules
tools Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
web Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00