Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
astronomy	iconv: remove usage on Linux in several packages	2014-11-03 12:58:54 +01:00
biology
chemistry/avogadro
electronics	boost: Remove boost.lib	2014-11-02 17:22:27 -08:00
geometry
logic	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
math	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
misc	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
molecular-dynamics/gromacs
spyder