Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +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
default.nix	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
setup.sh	stdenv: Put moving docs to $out/share in a separate setup hook	2014-08-09 12:47:05 +02:00