John Ericson 611eefb067 Merge pull request #44025 from obsidiansystems/stdenv-deps-typo ... mkDerivation: depsHostBuild -> depsHostHost		2018-07-23 16:09:21 -04:00
..
applications	parity-ui: fix after merge	2018-07-22 11:51:50 +02:00
build-support	Merge master into staging	2018-07-22 11:14:41 +02:00
common-updater
data	Merge staging-next into master	2018-07-22 11:04:28 +02:00
desktops	Merge master into staging	2018-07-22 11:14:41 +02:00
development	python.pkgs.pytest-flake8: disable test, fix build	2018-07-23 10:01:25 +02:00
games	Merge staging-next into master	2018-07-22 11:04:28 +02:00
misc	Merge master into staging-next	2018-07-21 19:43:53 +02:00
os-specific	Merge master into staging	2018-07-22 11:14:41 +02:00
servers	Merge master into staging	2018-07-22 11:14:41 +02:00
shells	Merge pull request #43912 from r-ryantm/auto-update/powershell	2018-07-22 08:44:38 +02:00
stdenv	Merge pull request #44025 from obsidiansystems/stdenv-deps-typo	2018-07-23 16:09:21 -04:00
test	tests: add some cross tests	2018-07-21 17:00:05 -04:00
tools	parallel: 20180622 -> 20180722	2018-07-23 20:36:35 +02:00
top-level	Merge master into staging	2018-07-22 11:14:41 +02:00