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
..
default.nix	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
deterministic-build.patch	Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by	2013-06-22 09:45:01 +03:00
nix-store-mtime.patch	* `patch' on FreeBSD doesn't like paths with // in them.	2011-04-04 15:48:58 +00:00
search-path.patch
setup-hook.sh