John Ericson 6bdf9a7f6d ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv ... SymlinkJoin doesn't know or care about this.		2018-01-04 11:45:36 -05:00
..
applications	Merge pull request #33338 from matthiasbeyer/update-toot	2018-01-02 19:19:16 +01:00
build-support	lxterminal: patch m4 to respect XML_CATALOG_FILES	2018-01-02 00:58:20 -07:00
common-updater
data
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-01 15:09:55 +01:00
development	ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv	2018-01-04 11:45:36 -05:00
games	Merge remote-tracking branch 'upstream/staging' into HEAD	2018-01-02 19:10:45 +01:00
misc	Merge pull request #33292 from bkchr/mgba	2018-01-02 02:23:38 +01:00
os-specific	haskell infra: Fix cross as much as possible without changing hashes	2018-01-02 21:00:13 -05:00
servers	searx: 0.12.0 -> 0.13.1	2018-01-01 15:49:54 +01:00
shells
stdenv	linux bootstrap tools: Use same derivation whether cross compiling or not	2018-01-02 13:52:41 -05:00
test
tools	Merge remote-tracking branch 'upstream/staging' into HEAD	2018-01-02 19:10:45 +01:00
top-level	Merge commit '9361b7eb85045c7e7dd20d2ddd716a9d10bf4bd4' into ericson2314-cross-base	2018-01-03 17:20:40 -05:00