Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv ... Conflicts: pkgs/tools/security/gnupg/default.nix		2014-10-09 10:57:57 +02:00
..
darwin	Remove broken libunwindNative package	2014-09-29 19:58:09 +02:00
generic	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02: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	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00
adapters.nix	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +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