Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates ... Conflicts (simple): pkgs/development/libraries/glib/default.nix pkgs/development/libraries/mesa/default.nix		2013-09-02 15:44:57 +02:00
..
arduino
compilers	Merge branch 'x-updates' into stdenv-updates	2013-09-02 15:44:57 +02:00
eclipse
guile-modules
interpreters	perl: revert "re-enable the postPatch hook on Darwin"	2013-08-29 12:06:39 +02:00
libraries	Merge branch 'x-updates' into stdenv-updates	2013-09-02 15:44:57 +02:00
misc
mobile
ocaml-modules
perl-modules	Add patch to Net::Amazon::S3 to enable credentials from the environment/instance roles	2013-08-29 07:28:33 -04:00
python-modules	Add a patched version of buildout 2.2.0 for development with nix	2013-08-28 00:26:06 +02:00
qtcreator
ruby-modules
tools	Merge branch 'x-updates' into stdenv-updates	2013-09-02 15:44:57 +02:00
web