Frederik Rietdijk 0f50d5ac19 python.pkgs.trollius: use optionals instead of optional, fixes eval for neovim ... Eval of neovim was broken at 40851a4d26 (commitcomment-25817374).		2017-11-24 20:14:28 +01:00
..
applications	Merge remote-tracking branch 'upstream/python-unstable' into HEAD	2017-11-24 19:58:07 +01:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
desktops	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
development	python.pkgs.trollius: use optionals instead of optional, fixes eval for neovim	2017-11-24 20:14:28 +01:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
misc	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test
tools	Merge remote-tracking branch 'upstream/python-unstable' into HEAD	2017-11-23 16:38:39 +01:00
top-level	Merge remote-tracking branch 'upstream/python-unstable' into HEAD	2017-11-24 19:58:07 +01:00