Jonathan Ringer 6b15fdce86 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix		2021-05-20 22:11:42 -07:00
..
astronomy	siril: fix build with glib-2.68 dependency (#122874)	2021-05-13 15:03:29 -04:00
biology	samblaster: fix darwin build	2021-05-18 13:41:51 +02:00
chemistry	openmolcas: 20.10 -> 21.02	2021-05-19 13:44:46 +02:00
electronics	Merge pull request #123329 from evils/kicad-symlink	2021-05-18 01:40:23 +02:00
geometry	tetgen: 1.5.1 -> 1.6.0	2021-04-26 01:32:28 -04:00
logic	elan: fix darwin build	2021-05-15 12:02:46 +02:00
machine-learning	Merge master into staging-next	2021-05-19 00:55:36 +00:00
math	sageWithDoc: fix static asset deduplication	2021-05-20 18:29:02 -07:00
medicine	aliza: 1.98.43 -> 1.98.57	2021-03-27 23:49:33 +01:00
misc	rink: fix darwin build (#123501)	2021-05-18 10:34:25 -04:00
molecular-dynamics	mpi: use mpi attribute consistently as the default MPI implementations	2021-01-23 12:15:13 +01:00
networking/sumo	sumo: init at 1.8.0	2021-03-22 12:17:15 +01:00
physics	xfitter: fix for darwin	2021-05-01 13:15:06 -04:00
programming	treewide: makeWrapper buildInputs to nativeBuildInputs	2021-02-19 20:09:16 +07:00
robotics	Merge pull request #122759 from dotlambda/mono6	2021-05-18 01:25:35 +02:00