Jan Malakhovski ad35019501 Merge branch 'master' into staging ... Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master		2018-05-26 00:20:17 +00:00
..
astronomy	celestia: clean up	2018-04-15 17:21:23 +02:00
biology	star: 2.5.3a -> 2.6.0c (#40518)	2018-05-15 15:09:06 +02:00
chemistry	jmol: made it runnable	2018-04-25 22:42:07 +02:00
electronics	gtkwave: 3.3.89 -> 3.3.90	2018-05-18 08:59:50 -05:00
geometry	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
logic	proverif: 1.97pl1 -> 2.00	2018-05-22 06:58:10 +00:00
machine-learning	treewide: add version to packages	2018-05-25 15:48:05 -05:00
math	qalculate-gtk: 2.3.0 -> 2.5.0	2018-05-24 18:19:55 +02:00
medicine/aliza	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
misc	simgrid: cleanup	2018-05-25 15:48:28 -05:00
molecular-dynamics	gromacs: 4.6.7 -> 2018	2018-03-08 15:30:04 -08:00
physics	Merge pull request #39577 from veprbl/pr/pythia_8.235	2018-04-28 11:44:37 +01:00
programming	fdr: 4.2.0 -> 4.2.3	2017-12-29 02:01:31 +01:00
robotics	qgroundcontrol: 3.2.7 -> 3.3.0	2018-03-24 12:08:06 +01:00
spyder	python.pkgs.spyder: fix setup.py patch	2018-05-25 11:00:14 +01:00