Frederik Rietdijk d159271516 Merge pull request #26705 from jerith666/cp-ver-fix ... crashplan: move version and rev inside 'mkDerivation rec', simplify src		2017-06-19 09:41:17 +02:00
..
applications	Merge pull request #26705 from jerith666/cp-ver-fix	2017-06-19 09:41:17 +02:00
build-support	Remove kdeWrapper	2017-06-18 08:43:39 -05:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	qt5: rename qmakeHook to qmake	2017-06-18 08:41:57 -05:00
desktops	plasma-workspace: requires libXtst	2017-06-19 10:37:39 +08:00
development	Merge branch 'staging'	2017-06-19 07:29:42 +02:00
games	qt5: rename qmakeHook to qmake	2017-06-18 08:41:57 -05:00
misc	vimPlugins.command-t: fix ruby build	2017-06-18 12:56:45 +01:00
os-specific	Merge branch 'staging'	2017-06-19 07:29:42 +02:00
servers	Merge pull request #26658 from rushmorem/cockroach	2017-06-18 00:46:24 +02:00
shells	rssh: don't set special bits	2017-06-16 07:31:21 -05:00
stdenv	darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv	2017-06-01 23:23:56 +02:00
test
tools	Merge branch 'staging'	2017-06-19 07:29:42 +02:00
top-level	Merge pull request #26655 from gnidorah/master3	2017-06-18 16:37:14 +01:00