Shea Levy 3995655d2c Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld" ... This fix doesn't actually fix the cabal bug (see #16357), but it does cause other bugs (see #20476) Fixes #20476 This reverts commit b89fa5fd5c, reversing changes made to e4b146b041.		2016-11-17 07:25:42 -05:00
..
applications	Merge #20081: update alsa lib, plugins and utils	2016-11-17 11:26:00 +01:00
build-support	singularity: init 2.2	2016-11-15 09:11:53 +11:00
data	pecita: 5.3 -> 5.4	2016-11-17 00:06:41 +01:00
desktops	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
development	Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"	2016-11-17 07:25:42 -05:00
games	steam: use custom openssl	2016-11-09 21:18:32 -04:00
misc	vim-utils: fix typo	2016-11-13 12:07:10 +00:00
os-specific	Merge #20081: update alsa lib, plugins and utils	2016-11-17 11:26:00 +01:00
servers	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
shells	Merge #20081: update alsa lib, plugins and utils	2016-11-17 11:26:00 +01:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test
tools	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
top-level	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00