nixpkgs/pkgs/stdenv
Vladimír Čunát 2990145170 remerge to retrieve refactoring lost 10 days ago
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-31 13:09:15 +02:00
..
generic remerge to retrieve refactoring lost 10 days ago 2014-08-31 13:09:15 +02:00
linux Merge branch 'staging' into v/modular 2014-08-30 08:33:10 +02:00
native Add SmartOS native GCC path. 2013-02-28 20:04:04 +01:00
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 WIP2 2014-08-26 01:10:56 +02:00
default.nix Prevent an unnecessary evaluation of lib 2014-08-09 12:45:18 +02:00