Drew Risinger 5f4c238ea5 python3Packages.pytest-timeout: 1.3.3 -> 1.4.2 ... * Update version * switch to pytestCheckHook * Update meta: hompage & changelog * explicit runtime dependency on pytest Based on work by @jpgu-epam in #97527.		2020-10-29 12:39:11 -07:00
..
applications	Merge pull request #99345 from nh2/gstreamer-1.18.0	2020-10-29 14:04:16 +01:00
build-support	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
common-updater
data	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
desktops	Merge branch master into staging to fix eval error	2020-10-28 03:03:27 +01:00
development	python3Packages.pytest-timeout: 1.3.3 -> 1.4.2	2020-10-29 12:39:11 -07:00
games	Merge pull request #101859 from andir/steam-desktop	2020-10-27 12:33:24 -04:00
misc	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
os-specific	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
shells	Merge branch 'master' into staging-next	2020-10-28 18:48:18 +01:00
stdenv	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
test	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tools	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00
top-level	Merge branch 'staging-next' into staging	2020-10-28 18:48:56 +01:00