Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-11-06 10:16:39 +01:00

..

darwin

Set SDKROOT etc. in stdenvNative

2014-11-04 16:35:13 +01:00

generic

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

2014-11-06 10:16:39 +01:00

linux

stdenv-linux: Turn allowedRequisites back on

2014-10-06 22:11:05 +02:00

native

Set SDKROOT etc. in stdenvNative

2014-11-04 16:35:13 +01: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