Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
builder.sh
default-builder.sh
default.nix	stdenv: improve message on evaluation check (no hash changes)	2015-01-11 21:38:19 +01:00
setup.sh	stdenv: Remove redundant "building ..." message	2015-01-12 13:04:26 +01:00