Tuomas Tynkkynen 067d1cf330 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/science/math/sage/sage-src.nix		2018-10-27 19:58:03 +03:00
..
astronomy	gildas: 20181001_a -> 20181001_b (#48200)	2018-10-11 11:37:38 +02:00
biology	star: 2.6.1a -> 2.6.1c	2018-10-24 15:22:22 +02:00
chemistry	jmol: 14.29.22 -> 14.29.26	2018-10-15 21:05:03 -07:00
electronics	Merge pull request #48509 from r-ryantm/auto-update/gtkwave	2018-10-19 09:29:23 +01:00
geometry	drgeo: add license + homepage	2018-09-08 14:42:12 +02:00
logic	Merge pull request #48812 from mpickering/cedille	2018-10-24 15:29:47 +00:00
machine-learning	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
math	Merge remote-tracking branch 'upstream/master' into staging	2018-10-27 19:58:03 +03:00
medicine/aliza	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
misc	sasmodels: unstable -> 4.2.0	2018-10-17 14:36:46 +01:00
molecular-dynamics	gromacs: 2018.2 -> 2018.3 (#46275)	2018-09-12 23:07:27 +02:00
physics	xfitter: init at 2.0.0	2018-09-24 14:34:49 -04:00
programming	plm: remove dead homepage link, mark as broken	2018-09-02 01:46:25 +02:00
robotics	apmplanner2: fixed wrong path in .desktop file	2018-08-25 00:39:58 +02:00
spyder	spyder: use python3	2018-07-26 12:43:18 +02:00