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
..
2019-08-13 15:00:05 -07:00
2019-08-18 12:53:44 +02:00
2019-08-17 10:54:38 +00:00
2019-06-15 10:06:54 +02:00
2019-06-09 20:26:19 +00:00
2019-07-20 06:45:54 -07:00
2019-08-13 11:58:39 +02:00
2019-04-22 10:19:54 +02:00
2019-07-15 09:41:36 +02:00
2019-08-17 10:54:38 +00:00