Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
astronomy	treewide: name -> pname	2019-08-17 10:54:38 +00:00
biology	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
chemistry	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
electronics	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
geometry	treewide: name -> pname	2019-08-17 10:54:38 +00:00
logic	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
machine-learning	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
math	treewide: name -> pname	2019-08-17 10:54:38 +00:00
medicine/aliza	aliza: ? -> 1.48.10	2019-05-21 11:31:38 +02:00
misc	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
molecular-dynamics	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
physics	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
programming	treewide: name -> pname	2019-08-17 10:54:38 +00:00
robotics	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00