Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/os-specific/linux/kernel/generic.nix		2018-02-07 03:41:24 +02:00
..
astronomy	gpredict: init at 1.3 (#32436)	2017-12-09 09:45:29 +00:00
biology	samtools: 1.6 -> 1.7	2018-02-06 15:38:00 +01:00
chemistry	molden: init at 5.7	2018-01-15 23:06:41 -08:00
electronics	bitscope: create derivations with version info	2018-02-03 21:14:50 +01:00
geometry
logic	symbiyosys: 2018.01.10 -> 2018.02.04	2018-02-04 11:59:35 -06:00
machine-learning	shogun: fix parallel building	2017-12-07 08:52:42 +00:00
math	sage: fix non-deterministic build failures	2018-02-05 15:03:24 +01: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
physics
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.pkgs.spyder: fix expression	2018-02-04 10:17:35 +01:00