Peter Simons 6c577a37b6 Merge branch 'master' into hs-vulkan		2018-04-20 17:51:07 +02:00
..
applications	inboxer: 1.0.4 -> 1.1.2 (#39233)	2018-04-20 16:03:24 +02:00
build-support	Merge pull request #39003 from P-E-Meunier/carnix-0.7	2018-04-19 12:09:55 -05:00
common-updater	common-updater: support updating source URL	2018-03-16 23:17:07 +09:00
data	Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes	2018-04-19 21:46:24 +02:00
desktops	Merge pull request #38032 from romildo/deepin	2018-04-17 09:55:21 -05:00
development	Merge branch 'master' into hs-vulkan	2018-04-20 17:51:07 +02:00
games	Merge pull request #39173 from knedlsepp/enable-xskat-darwin	2018-04-20 08:37:19 +02:00
misc	Revert "beep: fix for CVE-2018-0492"	2018-04-20 08:50:31 +08:00
os-specific	linux-copperhead: 4.15.17.a -> 4.15.18.a	2018-04-19 21:37:29 -04:00
servers	postgresql100: 10.2 -> 10.3	2018-04-20 08:05:28 -05:00
shells	pkgs/shells: move extensions to subdirs	2018-04-17 14:47:32 -05:00
stdenv	Merge pull request #39172 from obsidiansystems/ios-cross	2018-04-19 17:00:05 -04:00
test	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
tools	ansible: 2.5.0 -> 2.5.1	2018-04-19 21:36:55 -04:00
top-level	grepcidr: init at 2.0 (#38685)	2018-04-20 15:40:28 +02:00