Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
astronomy	gpredict: 1.3 → 2.2.1	2018-02-26 05:26:41 +01:00
biology	picard-tools: 2.17.4 -> 2.17.10	2018-02-28 15:02:46 +00:00
chemistry	Merge pull request #34094 from markuskowa/octopus-pr	2018-02-10 14:14:01 +00:00
electronics	verilator: 3.900 -> 3.920	2018-02-28 12:36:17 +01:00
geometry	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
logic	cryptoverif: 1.22 -> 1.28	2018-02-26 08:32:20 +01:00
machine-learning	shogun: fix parallel building	2017-12-07 08:52:42 +00:00
math	pari: 2.9.3 -> 2.9.4	2018-02-28 14:27:07 +00:00
medicine/aliza	aliza: 1.29.2->1.36.3	2017-11-12 17:46:37 +01:00
misc	Merge pull request #33839 from mimadrid/update/gephi-0.9.2	2018-01-15 01:10:52 +08:00
molecular-dynamics	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
physics	sherpa: 2.2.1 -> 2.2.4	2017-08-31 14:32:05 -04:00
programming	fdr: 4.2.0 -> 4.2.3	2017-12-29 02:01:31 +01:00
robotics	qgroundcontrol: 2.9.4 -> 3.2.7, unbreak build	2018-01-13 04:03:38 +08:00
spyder	python: spyder: 3.2.6 -> 3.2.7	2018-02-26 18:44:17 +01:00