Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
builder.sh	Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"	2012-12-28 15:46:45 +01:00
default-builder.sh
default.nix	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
setup.sh	stdenv/setup.sh: Always run postPatch hook.	2013-02-27 15:26:18 +01:00