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
..
amdadl-sdk	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
amdapp-sdk	treewide: name -> pname	2019-08-17 10:54:38 +00:00
avr/libc	treewide: name -> pname	2019-08-17 10:54:38 +00:00
avr8-burn-omat
google-clasp	google-clasp: init at 2.2.1 (#43376)	2019-08-22 13:29:43 +02:00
loc
msp430	treewide: name -> pname	2019-08-17 10:54:38 +00:00
newlib	treewide: name -> pname	2019-08-17 10:54:38 +00:00
qmk_firmware	treewide: name -> pname	2019-08-17 10:54:38 +00:00
rpiboot
stm32	treewide: name -> pname	2019-08-17 10:54:38 +00:00