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
..
darwin	Set MACOSX_DEPLOYMENT_TARGET to 10.9	2014-11-04 13:28:31 +01:00
generic	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
linux	stdenv-linux: Turn allowedRequisites back on	2014-10-06 22:11:05 +02:00
native	gcc-wrapper: Remove NIX_GCC_NEEDS_GREP	2014-09-23 19:43:38 +02:00
nix	Remove dead code	2014-11-04 13:26:51 +01:00
adapters.nix	gcc-wrapper: Wrap ld.gold	2014-10-10 14:55:17 +02:00
common-path.nix
default.nix	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00