Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +02:00
..
generic	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
linux	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00
native
nix	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00
adapters.nix	Typo/comment	2014-04-22 18:42:44 +02:00
common-path.nix
default.nix	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00