Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
generic	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
linux	Merge stdenv-updates-gcc47 into stdenv-updates	2013-03-09 12:01:39 +01:00
mingw	stdenv/setup.sh: Always run postPatch hook.	2013-02-27 15:26:18 +01:00
native	Add SmartOS native GCC path.	2013-02-28 20:04:04 +01:00
nix	GCC 4.7.2 + updated libraries compiles on Illumos/SmartOS!	2013-02-28 20:04:02 +01:00
adapters.nix	More renames	2012-12-28 19:42:10 +01:00
common-path.nix	* Don't use the "replace-literal" command in stdenv; instead use	2012-01-19 13:47:26 +00:00
default.nix	Attempt at getting GCC 4.7 compiled on Illumos...	2013-02-28 20:04:01 +01:00