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
..
2018-12-02 15:51:59 +01:00
2019-01-09 08:28:29 +00:00
2018-06-10 01:15:45 -05:00
2019-08-22 14:07:55 -05:00