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
..
admin	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
archivers	treewide: name -> pname	2019-08-17 10:54:38 +00:00
audio	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
backup	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
bluetooth	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
bootloaders/refind	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
cd-dvd	treewide: name -> pname	2019-08-17 10:54:38 +00:00
compression	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
filesystems	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
graphics	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
inputmethods	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
misc	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
networking	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
nix	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
package-management	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
security	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
system	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
text	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
toml2nix	toml2nix: init at 0.1.1 (#53883)	2019-01-15 23:36:36 +02:00
typesetting	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
video	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
virtualization	cri-tools: 1.14.0 -> 1.15.0	2019-08-20 22:49:23 +02:00
X11	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00