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
..
accessibility/mousetweaks	mousetweaks: init at 3.32.0	2019-04-28 14:23:20 -04:00
altcoins	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02: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
display-managers	treewide: name -> pname	2019-08-17 10:54:38 +00:00
editors	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
gis	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
graphics	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
kde	ktouch: add missing Qt5QuickControls2 dependency	2019-08-22 14:17:12 +02:00
misc	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
networking	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
office	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
radio	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
science	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
search	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
version-management	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
video	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
virtualization	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
window-managers	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00