Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00: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	kicad: upgrade to stable version 20130325, libraries to r220	2013-03-31 19:17:02 -07:00
geometry
logic	Update E prover	2013-04-21 16:30:40 +04:00
math	wxmaxima: don't try to build this package on FreeBSD	2013-03-22 12:53:07 +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