Vladimír Čunát 5b0398dc36 Merge branch 'master' into staging-next ... Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190		2018-08-13 20:43:59 +02:00
..
astronomy	Merge pull request #42885 from smaret/gildas	2018-08-13 10:55:18 +02:00
biology	Merge branch 'master' into staging-next	2018-08-13 20:43:59 +02:00
chemistry	Merge master into staging	2018-08-09 18:28:15 +02:00
electronics	treewide: Make configureFlags lists	2018-08-03 17:06:03 -04:00
geometry	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
logic	Merge branch 'master' into staging-next	2018-08-12 10:33:41 +02:00
machine-learning	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
math	Merge branch 'master' into staging-next	2018-08-12 10:33:41 +02:00
medicine/aliza	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
misc	treewide: Make configureFlags lists	2018-08-03 17:06:03 -04:00
molecular-dynamics	gromacs: 2018.1 -> 2018.2 (#42504)	2018-06-27 19:02:19 +02:00
physics	treewide: http -> https sources (#42676)	2018-06-28 20:43:35 +02:00
programming	treewide: remove callPackage_i686	2018-07-05 14:04:52 -04:00
robotics	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
spyder	spyder: use python3	2018-07-26 12:43:18 +02:00