Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +02:00
..
generic	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
linux	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +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