Frederik Rietdijk 20a4a4b593 pythonPackages.pytest.setupHook: run in correct phase ... It was reported that the 2nd solution wasn't working as expected because it was ran in the wrong phase. This commit creates a new phase, in between the installCheckPhase and distPhase.		2018-09-04 19:18:13 +02:00
..
applications	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00
build-support	lib: ensure directories of linkFarm links exist (#45628)	2018-09-01 14:53:23 +02:00
common-updater
data	faba-icon-theme: add python3 for install script	2018-09-04 03:23:40 +02:00
desktops	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00
development	pythonPackages.pytest.setupHook: run in correct phase	2018-09-04 19:18:13 +02:00
games	Merge pull request #46011 from markuskowa/homepages-2	2018-09-03 23:32:52 +02:00
misc	Merge pull request #46011 from markuskowa/homepages-2	2018-09-03 23:32:52 +02:00
os-specific	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00
servers	pdns-recursor: 4.1.3 -> 4.1.4 (#45984)	2018-09-03 22:15:11 +02:00
shells	ion: broken on darwin (#46010)	2018-09-03 22:38:15 +02:00
stdenv	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00
test
tools	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00
top-level	Merge branch 'master' into staging-next	2018-09-04 13:06:45 +02:00