Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
arm-eabi.patch
builder.sh	Get rid of tabs	2014-01-07 10:28:07 +01:00
default.nix	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
gfortran-driving.patch
gnat-cflags.patch
java-jvgenmain-link.patch
libstdc++-target.patch
no-sys-dirs.patch
parallel-bconfig.patch	gcc-4.{7,8}: hacky fix for parallel builds	2014-01-03 10:42:46 +01:00