Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
..
astronomy	stellarium: update to version 0.11.4a	2013-01-19 02:26:03 +01:00
biology	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
chemistry/avogadro	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
electronics	Fix tarball	2012-11-26 20:31:45 -05:00
geometry	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
logic	Update HOL Light to revision 155	2013-02-08 15:26:35 +01:00
math	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
misc	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
molecular-dynamics/gromacs	remove reference to meta.nix	2012-11-23 15:46:49 +01:00