Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
2019-05-10 10:59:06 +02:00
2019-05-20 22:23:22 +10:00
2019-08-17 10:54:38 +00:00
2019-08-18 12:53:44 +02:00
2018-11-23 15:17:56 -08:00
2019-08-17 10:54:38 +00:00
2019-07-17 11:44:21 +03:00
2019-05-28 15:33:28 +09:00
2019-08-20 22:54:05 -07:00
2019-04-22 10:19:54 +02:00
2019-08-17 10:54:38 +00:00
2019-08-17 10:54:38 +00:00
2019-07-15 20:29:39 +08:00
2019-06-25 12:26:35 -04:00
2019-03-19 00:09:10 -05:00
2019-08-17 10:54:38 +00:00
2018-11-28 20:14:40 -06:00