Bas van Dijk 057fae5ea0 ghcWithHoogle: fix for ghcjs ... `haskell.packages.ghcjs.ghcWithHoogle` failed because the following line: for docdir in ${ghc.doc}/${docLibGlob}/*; do failed because `doc` is not an attribute of `ghc` when `ghc` is substituted for ghcjs.		2017-02-14 22:50:29 +01:00
..
applications	Merge pull request #22798 from Ma27/update/geogebra	2017-02-14 22:16:04 +01:00
build-support	Merging against upstream master	2017-02-13 17:16:28 -06:00
data	Merge branch 'master' into staging	2017-02-09 08:42:04 +01:00
desktops	Merging against upstream master	2017-02-13 17:16:28 -06:00
development	ghcWithHoogle: fix for ghcjs	2017-02-14 22:50:29 +01:00
games	amoeba: init at 1.1	2017-02-14 15:45:09 +02:00
misc	Merge pull request #22614 from cstrahan/ycm	2017-02-14 21:32:09 +01:00
os-specific	Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers	2017-02-14 16:25:06 +01:00
servers	Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers	2017-02-14 16:25:06 +01:00
shells	elvish: 0.1 -> 0.5	2017-02-12 21:37:53 +01:00
stdenv	Merge pull request #22387 from Ericson2314/cross-3-platforms	2017-02-05 17:41:31 -05:00
test
tools	Merge pull request #22801 from lsix/update_ddrescue	2017-02-14 20:06:18 +01:00
top-level	Merge pull request #22614 from cstrahan/ycm	2017-02-14 21:32:09 +01:00