Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +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	* "." -> "source".	2005-12-05 14:11:09 +00:00
default.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
setup-repeatable.sh	Kindly ask strip to not mess up timestamps in static libraries	2013-06-25 11:15:45 +03:00
setup.sh	stdenv: default builder fixes (merge #554)	2013-06-30 09:00:12 +02:00