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
..
2.5.nix
3.1.nix
3.6.nix
3.7.nix
3.8.nix	protobuf3_8: init at 3.8.0	2019-06-28 01:26:08 -05:00
3.9.nix	protobuf3_9: 3.9.0 -> 3.9.1	2019-08-24 16:20:00 -05:00
generic-v3.nix	treewide: name -> pname	2019-08-17 10:54:38 +00:00
generic.nix	treewide: name -> pname	2019-08-17 10:54:38 +00:00