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
..
builder.sh	stdenv: Don't use sed to build the setup script	2014-08-09 12:45:52 +02:00
default-builder.sh	* "." -> "source".	2005-12-05 14:11:09 +00:00
default.nix	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
setup.sh	stdenv: Put moving docs to $out/share in a separate setup hook	2014-08-09 12:47:05 +02:00