Michael Weiss 8ae8602bf7 Merge branch 'master' into staging-next ... Manually resolved a conflict in pkgs/development/libraries/libbladeRF/default.nix.		2021-01-09 12:16:11 +01:00
..
astronomy	Merge branch 'master' into staging-next	2021-01-07 13:04:31 +01:00
biology	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
chemistry	Merge staging-next into staging	2021-01-04 20:51:32 +01:00
electronics	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00
geometry	gama: 2.09 -> 2.12	2020-12-23 16:58:32 +00:00
logic	Merge branch 'master' into staging-next	2021-01-09 12:16:11 +01:00
machine-learning	treewide: remove enableParallelBuilding = true if using cmake	2021-01-03 18:37:40 +07:00
math	Merge master into staging-next	2021-01-08 12:29:36 +00:00
medicine	aliza: 1.48.10 -> 1.98.32	2020-08-10 11:16:16 +02:00
misc	Merge staging-next into staging	2021-01-04 20:51:32 +01:00
molecular-dynamics	ViennaRNA: init at 2.4.17	2021-01-02 18:53:31 +01:00
physics	treewide: remove enableParallelBuilding = true if using cmake	2021-01-03 18:37:40 +07:00
programming	treewide: cmake buildInputs to nativeBuildInputs, minor cleanups	2021-01-01 11:52:33 +07:00
robotics	Merge staging-next into staging	2021-01-03 16:33:28 +10:00