Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
astronomy	Merge branch 'master'	2018-03-05 14:53:27 +01:00
biology	picard-tools: 2.17.4 -> 2.17.10	2018-02-28 15:02:46 +00:00
chemistry	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
electronics	Merge branch 'master'	2018-03-05 14:53:27 +01:00
geometry	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
logic	symbiyosys: 2018.02.04 -> 2018.03.07	2018-03-08 21:23:20 -06:00
machine-learning	shogun: add patch for json-c 0.13	2018-03-05 22:00:03 +01:00
math	sage: set platforms to the set where I can build it; Hydra ARM builds seem to fail	2018-03-10 13:50:11 +01:00
medicine/aliza	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
misc	Merge branch 'master'	2018-03-05 14:53:27 +01: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