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
..
scripts	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
default.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
wrapper.nix	Merge branch 'master' into flip-map-foreach	2019-08-18 18:00:25 +03:00