Vladimír Čunát 031baae714 Merge branch 'staging' into v/modular ... Conflicts (as in p/modular-stdenv): pkgs/stdenv/linux/default.nix		2014-08-30 08:33:10 +02:00
..
generic	mutiout: make it builtin	2014-08-30 08:27:43 +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