Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
darwin	Set SDKROOT etc. in stdenvNative	2014-11-04 16:35:13 +01:00
generic	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
linux	Fix stdenv allowedRequisites check	2014-11-06 15:33:36 +01: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	useGoldLinker: Don't set dontStrip	2014-11-12 15:10:54 +01:00
common-path.nix	* Don't use the "replace-literal" command in stdenv; instead use	2012-01-19 13:47:26 +00:00
default.nix	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00