Frederik Rietdijk 9267b477f1 python.pkgs.pytest.setupHook: fix cache name, fixes #40273 ... The cache is not named `.pytest-cache` but `.pytest_cache`.		2018-08-05 11:56:21 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
build-support	Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"	2018-07-31 09:48:16 +02:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
desktops	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
development	python.pkgs.pytest.setupHook: fix cache name, fixes #40273	2018-08-05 11:56:21 +02:00
games	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
shells	oh-my-zsh: 2018-04-25 -> 2018-07-29	2018-07-29 20:07:43 +00:00
stdenv	Merge pull request #44423 from obsidiansystems/configureFlags-cleanup	2018-08-03 17:49:01 -04:00
test	pkgs/tests: Add test for LD_LIBRARY_PATH	2018-08-01 19:02:21 +03:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-08-04 15:17:42 +03:00