Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
generic	checkPhase: Pass VERBOSE=y so that failing tests show something useful	2012-10-16 15:00:51 -04:00
linux	The loongson2f bootstrap files were already at nixos.org.	2012-10-25 23:22:41 +02:00
mingw
native
nix
adapters.nix	Add a stdenv adapter ‘keepDebugInfo’ to make a debug build	2012-10-31 13:46:51 +01:00
common-path.nix
default.nix