Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ...

Conflicts:
	pkgs/applications/editors/vim/macvim.nix

2014-11-04 14:30:43 +01:00

..

compat.nix

sp-compat: Fix build

2014-01-17 12:13:20 +01:00

default.nix

Fix evaluation

2014-09-30 00:51:00 +02:00

setup-hook.sh

Merge remote-tracking branch 'origin/master' into staging.

2014-10-31 11:14:24 +01:00