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
..
applications	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
build-support	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
common-updater
data	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
desktops	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
development	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
games	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
os-specific	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
servers	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
shells	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
stdenv
test
tools	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
top-level	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00